From 6d81de84a4d05696063ae76830d05a8e55b6fc63 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 2 Jul 2016 15:18:20 +0200 Subject: [PATCH] Replace direct references to filenames by ones to notifications where possible --- mods/cnc/maps/cnc64gdi01/rules.yaml | 6 ++--- mods/cnc/rules/structures.yaml | 18 +++++++-------- mods/ra/rules/misc.yaml | 8 +++---- mods/ra/rules/structures.yaml | 34 ++++++++++++++--------------- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mods/cnc/maps/cnc64gdi01/rules.yaml b/mods/cnc/maps/cnc64gdi01/rules.yaml index 60c82f31c4..b9df4ea532 100644 --- a/mods/cnc/maps/cnc64gdi01/rules.yaml +++ b/mods/cnc/maps/cnc64gdi01/rules.yaml @@ -55,10 +55,10 @@ airstrike.proxy: QuantizedFacings: 8 Description: Air Strike LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud + EndChargeSpeechNotification: AirstrikeReady + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud + IncomingSpeechNotification: EnemyPlanesApproaching UnitType: a10 DisplayBeacon: True BeaconPoster: airstrike diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index 9f1dd3ca93..0da6217d17 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -491,10 +491,10 @@ HQ: QuantizedFacings: 8 Description: Air Strike LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud + EndChargeSpeechNotification: AirstrikeReady + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud + IncomingSpeechNotification: EnemyPlanesApproaching UnitType: a10 DisplayBeacon: True BeaconPoster: airstrike @@ -581,10 +581,10 @@ EYE: ChargeTime: 180 Description: Ion Cannon LongDesc: Initiate an Ion Cannon strike.\nApplies instant damage to a small area. - BeginChargeSound: ionchrg1.aud - EndChargeSound: ionredy1.aud + BeginChargeSpeechNotification: IonCannonCharging + EndChargeSpeechNotification: IonCannonReady LaunchSound: ion1.aud - SelectTargetSound: select1.aud + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopower1.aud DisplayRadarPing: True CameraActor: camera.small @@ -631,11 +631,11 @@ TMPL: Description: Nuclear Strike LongDesc: Launch a tactical nuclear warhead.\nApplies heavy damage over a large area. BeginChargeSound: - EndChargeSound: nukavail.aud - SelectTargetSound: select1.aud + EndChargeSpeechNotification: NuclearWeaponAvailable + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopower1.aud LaunchSound: nuklnch1.aud - IncomingSound: nuke1.aud + IncomingSpeechNotification: NuclearWarheadApproaching MissileWeapon: atomic DisplayBeacon: True BeaconPoster: atomic diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index 4aa4c970a2..e273e294c7 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -280,7 +280,7 @@ powerproxy.parabombs: OneShot: true AllowMultiple: true UnitType: badr.bomber - SelectTargetSound: slcttgt1.aud + SelectTargetSpeechNotification: SelectTarget QuantizedFacings: 8 DisplayBeacon: True BeaconPoster: pbmbicon @@ -293,8 +293,8 @@ powerproxy.sonarpulse: Description: Sonar Pulse LongDesc: Reveals all submarines in the vicinity for a \nshort time. ChargeTime: 30 - EndChargeSound: pulse1.aud - SelectTargetSound: slcttgt1.aud + EndChargeSpeechNotification: SonarPulseReady + SelectTargetSpeechNotification: SelectTarget Actor: sonar LifeTime: 250 DeploySound: sonpulse.aud @@ -308,7 +308,7 @@ powerproxy.paratroopers: Description: Paratroopers LongDesc: A Badger drops a squad of infantry\nanywhere on the map. DropItems: E1,E1,E1,E3,E3 - SelectTargetSound: slcttgt1.aud + SelectTargetSpeechNotification: SelectTarget AllowImpassableCells: false QuantizedFacings: 8 CameraActor: camera.paradrop diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index eea313d810..94b4a43eee 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -25,11 +25,11 @@ MSLO: ChargeTime: 540 Description: Atom Bomb LongDesc: Launches a devastating atomic bomb\nat a target location. - BeginChargeSound: aprep1.aud - EndChargeSound: aready1.aud - SelectTargetSound: slcttgt1.aud + BeginChargeSpeechNotification: AbombPrepping + EndChargeSpeechNotification: AbombReady + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopowr1.aud - IncomingSound: alaunch1.aud + IncomingSpeechNotification: AbombLaunchDetected LaunchSound: MissileWeapon: atomic SpawnOffset: 0,427,0 @@ -310,10 +310,10 @@ IRON: Description: Invulnerability LongDesc: Makes a group of units invulnerable\nfor 20 seconds. Duration: 500 - SelectTargetSound: slcttgt1.aud + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopowr1.aud - BeginChargeSound: ironchg1.aud - EndChargeSound: ironrdy1.aud + BeginChargeSpeechNotification: IronCurtainCharging + EndChargeSpeechNotification: IronCurtainReady DisplayRadarPing: True Upgrades: invulnerability SupportPowerChargeBar: @@ -363,10 +363,10 @@ PDOX: ChargeTime: 120 Description: Chronoshift LongDesc: Teleports a group of units across\nthe map for 20 seconds. - SelectTargetSound: slcttgt1.aud + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopowr1.aud - BeginChargeSound: chrochr1.aud - EndChargeSound: chrordy1.aud + BeginChargeSpeechNotification: ChronosphereCharging + EndChargeSpeechNotification: ChronosphereReady Duration: 20 KillCargo: yes DisplayRadarPing: True @@ -377,10 +377,10 @@ PDOX: ChargeTime: 120 Description: Advanced Chronoshift LongDesc: Teleports a large group of units across\nthe map for 20 seconds. - SelectTargetSound: slcttgt1.aud + SelectTargetSpeechNotification: SelectTarget InsufficientPowerSound: nopowr1.aud - BeginChargeSound: chrochr1.aud - EndChargeSound: chrordy1.aud + BeginChargeSpeechNotification: ChronosphereCharging + EndChargeSpeechNotification: ChronosphereReady Duration: 20 KillCargo: yes DisplayRadarPing: True @@ -1175,8 +1175,8 @@ AFLD: ChargeTime: 180 Description: Spy Plane LongDesc: Reveals an area of the map\nand cloaked enemy units. - SelectTargetSound: slcttgt1.aud - EndChargeSound: spypln1.aud + SelectTargetSpeechNotification: SelectTarget + EndChargeSpeechNotification: SpyPlaneReady CameraActor: camera.spyplane CameraRemoveDelay: 150 UnitType: u2 @@ -1191,7 +1191,7 @@ AFLD: Description: Paratroopers LongDesc: A Badger drops a squad of infantry\nanywhere on the map. DropItems: E1,E1,E1,E3,E3 - SelectTargetSound: slcttgt1.aud + SelectTargetSpeechNotification: SelectTarget AllowImpassableCells: false QuantizedFacings: 8 CameraActor: camera.paradrop @@ -1204,7 +1204,7 @@ AFLD: ChargeTime: 360 Description: Parabombs LongDesc: A squad of Badgers drops parachuted\nbombs on your target. - SelectTargetSound: slcttgt1.aud + SelectTargetSpeechNotification: SelectTarget CameraActor: camera CameraRemoveDelay: 150 UnitType: badr.bomber