From b9b9cf7f926baea1e795df7e314877d3938a805f Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 2 Jul 2016 15:47:58 +0200 Subject: [PATCH] Make use of the new SpeechNotifications in ra and cnc --- mods/cnc/maps/cnc64gdi01/rules.yaml | 2 +- mods/cnc/rules/structures.yaml | 8 ++++---- mods/ra/rules/structures.yaml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mods/cnc/maps/cnc64gdi01/rules.yaml b/mods/cnc/maps/cnc64gdi01/rules.yaml index b9df4ea532..6f93d09f05 100644 --- a/mods/cnc/maps/cnc64gdi01/rules.yaml +++ b/mods/cnc/maps/cnc64gdi01/rules.yaml @@ -57,7 +57,7 @@ airstrike.proxy: LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. EndChargeSpeechNotification: AirstrikeReady SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopower1.aud + InsufficientPowerSpeechNotification: InsufficientPower IncomingSpeechNotification: EnemyPlanesApproaching UnitType: a10 DisplayBeacon: True diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml index f6de811e19..d6df99f16e 100644 --- a/mods/cnc/rules/structures.yaml +++ b/mods/cnc/rules/structures.yaml @@ -493,7 +493,7 @@ HQ: LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. EndChargeSpeechNotification: AirstrikeReady SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopower1.aud + InsufficientPowerSpeechNotification: InsufficientPower IncomingSpeechNotification: EnemyPlanesApproaching UnitType: a10 DisplayBeacon: True @@ -585,7 +585,7 @@ EYE: EndChargeSpeechNotification: IonCannonReady LaunchSound: ion1.aud SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopower1.aud + InsufficientPowerSpeechNotification: InsufficientPower DisplayRadarPing: True CameraActor: camera.small SupportPowerChargeBar: @@ -632,8 +632,8 @@ TMPL: LongDesc: Launch a tactical nuclear warhead.\nApplies heavy damage over a large area. EndChargeSpeechNotification: NuclearWeaponAvailable SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopower1.aud - LaunchSound: nuklnch1.aud + InsufficientPowerSpeechNotification: InsufficientPower + LaunchSpeechNotification: NuclearWeaponLaunched IncomingSpeechNotification: NuclearWarheadApproaching MissileWeapon: atomic DisplayBeacon: True diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 6404862157..8c927f77c4 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -28,7 +28,7 @@ MSLO: BeginChargeSpeechNotification: AbombPrepping EndChargeSpeechNotification: AbombReady SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopowr1.aud + InsufficientPowerSpeechNotification: InsufficientPower IncomingSpeechNotification: AbombLaunchDetected MissileWeapon: atomic SpawnOffset: 0,427,0 @@ -310,7 +310,7 @@ IRON: LongDesc: Makes a group of units invulnerable\nfor 20 seconds. Duration: 500 SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopowr1.aud + InsufficientPowerSpeechNotification: InsufficientPower BeginChargeSpeechNotification: IronCurtainCharging EndChargeSpeechNotification: IronCurtainReady DisplayRadarPing: True @@ -363,7 +363,7 @@ PDOX: Description: Chronoshift LongDesc: Teleports a group of units across\nthe map for 20 seconds. SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopowr1.aud + InsufficientPowerSpeechNotification: InsufficientPower BeginChargeSpeechNotification: ChronosphereCharging EndChargeSpeechNotification: ChronosphereReady Duration: 20 @@ -377,7 +377,7 @@ PDOX: Description: Advanced Chronoshift LongDesc: Teleports a large group of units across\nthe map for 20 seconds. SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSound: nopowr1.aud + InsufficientPowerSpeechNotification: InsufficientPower BeginChargeSpeechNotification: ChronosphereCharging EndChargeSpeechNotification: ChronosphereReady Duration: 20 @@ -768,7 +768,7 @@ ATEK: Description: GPS Satellite LongDesc: Reveals map terrain and provides tactical\ninformation. Requires power and active radar. RevealDelay: 15 - LaunchSound: satlnch1.aud + LaunchSpeechNotification: SatelliteLaunched DisplayTimer: True SupportPowerChargeBar: RequiresPower: