From 4d0ac8bd1495a9ca011abd6434beb547d872cd74 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 15 Feb 2017 15:15:16 +0100 Subject: [PATCH 1/3] Fix the powerproxy actors of ra missing sequences --- mods/ra/maps/desert-shellmap/rules.yaml | 5 +---- mods/ra/maps/evacuation/rules.yaml | 4 ++-- mods/ra/maps/survival02/rules.yaml | 6 ++---- mods/ra/rules/misc.yaml | 6 ++++++ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/mods/ra/maps/desert-shellmap/rules.yaml b/mods/ra/maps/desert-shellmap/rules.yaml index c7546f9c42..3988c41e73 100644 --- a/mods/ra/maps/desert-shellmap/rules.yaml +++ b/mods/ra/maps/desert-shellmap/rules.yaml @@ -108,14 +108,11 @@ E7: -AnnounceOnKill: powerproxy.paratroopers: - AlwaysVisible: ParatroopersPower: DisplayBeacon: false DropItems: E1,E1,E2,E3,E4 powerproxy.parazombies: - AlwaysVisible: + Inherits: powerproxy.paratroopers ParatroopersPower: DropItems: ZOMBIE,ZOMBIE,ZOMBIE,ZOMBIE,ZOMBIE - QuantizedFacings: 8 - DisplayBeacon: false diff --git a/mods/ra/maps/evacuation/rules.yaml b/mods/ra/maps/evacuation/rules.yaml index 598aeb90af..7161ddf741 100644 --- a/mods/ra/maps/evacuation/rules.yaml +++ b/mods/ra/maps/evacuation/rules.yaml @@ -202,11 +202,11 @@ Camera.SAM: Range: 2c0 powerproxy.paras1: - AlwaysVisible: + Inherits: powerproxy.paratroopers ParatroopersPower: DropItems: E1,E1,E1,E2,3TNK powerproxy.paras2: - AlwaysVisible: + Inherits: powerproxy.paratroopers ParatroopersPower: DropItems: E1,E1,E1,E2,E2 diff --git a/mods/ra/maps/survival02/rules.yaml b/mods/ra/maps/survival02/rules.yaml index 0c5e0095db..43cc4b65f5 100644 --- a/mods/ra/maps/survival02/rules.yaml +++ b/mods/ra/maps/survival02/rules.yaml @@ -9,17 +9,15 @@ World: Briefing: INCOMING REPORT:\n\nCommander! The Soviets have rendered us useless...\nReports indicate Soviet reinforcements are coming to finish us off... The situation looks bleak...\n SovietSquad: - AlwaysVisible: + Inherits: powerproxy.paratroopers ParatroopersPower: DropItems: E1,E1,E2,E4,E4 - QuantizedFacings: 8 DisplayBeacon: false SovietPlatoonUnits: - AlwaysVisible: + Inherits: powerproxy.paratroopers ParatroopersPower: DropItems: E1,E1,E2,E4,E4,E1,E1,E2,E4,E4 - QuantizedFacings: 8 DisplayBeacon: false MINV: diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index fe50c856be..52150fa02c 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -290,6 +290,9 @@ powerproxy.parabombs: DisplayBeacon: True BeaconPoster: pbmbicon CameraActor: camera + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles powerproxy.sonarpulse: AlwaysVisible: @@ -319,6 +322,9 @@ powerproxy.paratroopers: CameraActor: camera.paradrop DisplayBeacon: true BeaconPoster: pinficon + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles barracks.upgraded: AlwaysVisible: From b6bc08ac2555fc96452c3d463e6e0e1a901082c3 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 15 Feb 2017 15:15:16 +0100 Subject: [PATCH 2/3] Move airstrike.proxy to the shared campaign maprules --- mods/cnc/maps/cnc64gdi01/rules.yaml | 20 -------------------- mods/cnc/maps/gdi03/rules.yaml | 20 -------------------- mods/cnc/maps/gdi05a/rules.yaml | 16 ---------------- mods/cnc/maps/gdi05b/rules.yaml | 16 ---------------- mods/cnc/maps/gdi07/rules.yaml | 20 -------------------- mods/cnc/maps/nod08a/rules.yaml | 16 ---------------- mods/cnc/maps/nod08b/rules.yaml | 16 ---------------- mods/cnc/rules/campaign-maprules.yaml | 21 +++++++++++++++++++++ 8 files changed, 21 insertions(+), 124 deletions(-) diff --git a/mods/cnc/maps/cnc64gdi01/rules.yaml b/mods/cnc/maps/cnc64gdi01/rules.yaml index d2d75c34c4..9b3ab6624f 100644 --- a/mods/cnc/maps/cnc64gdi01/rules.yaml +++ b/mods/cnc/maps/cnc64gdi01/rules.yaml @@ -46,23 +46,3 @@ OLDLST: RejectsOrders: Cargo: Types: disabled - -airstrike.proxy: - AlwaysVisible: - AirstrikePower: - Icon: airstrike - StartFullyCharged: True - ChargeTime: 120 - SquadSize: 3 - QuantizedFacings: 8 - Description: Air Strike - LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSpeechNotification: AirstrikeReady - SelectTargetSpeechNotification: SelectTarget - InsufficientPowerSpeechNotification: InsufficientPower - IncomingSpeechNotification: EnemyPlanesApproaching - UnitType: a10 - DisplayBeacon: True - BeaconPoster: airstrike - DisplayRadarPing: True - CameraActor: camera diff --git a/mods/cnc/maps/gdi03/rules.yaml b/mods/cnc/maps/gdi03/rules.yaml index 0bb0747ce6..6252199150 100644 --- a/mods/cnc/maps/gdi03/rules.yaml +++ b/mods/cnc/maps/gdi03/rules.yaml @@ -82,23 +82,3 @@ HQ: -AirstrikePower: Buildable: Description: Provides an overview of the battlefield.\n Requires power to operate. - -airstrike.proxy: - AlwaysVisible: - AirstrikePower: - Icon: airstrike - StartFullyCharged: True - ChargeTime: 120 - SquadSize: 3 - QuantizedFacings: 8 - Description: Air Strike - LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud - InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud - UnitType: a10 - DisplayBeacon: True - BeaconPoster: airstrike - DisplayRadarPing: True - CameraActor: camera diff --git a/mods/cnc/maps/gdi05a/rules.yaml b/mods/cnc/maps/gdi05a/rules.yaml index b340c04c74..68c49a93ea 100644 --- a/mods/cnc/maps/gdi05a/rules.yaml +++ b/mods/cnc/maps/gdi05a/rules.yaml @@ -156,21 +156,5 @@ MoneyCrate: UseCashTick: yes airstrike.proxy: - AlwaysVisible: AirstrikePower: - Icon: airstrike - StartFullyCharged: True - ChargeTime: 120 SquadSize: 1 - QuantizedFacings: 8 - Description: Air Strike - LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud - InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud - UnitType: a10 - DisplayBeacon: True - BeaconPoster: airstrike - DisplayRadarPing: True - CameraActor: camera diff --git a/mods/cnc/maps/gdi05b/rules.yaml b/mods/cnc/maps/gdi05b/rules.yaml index 032297a92b..fb651d547b 100644 --- a/mods/cnc/maps/gdi05b/rules.yaml +++ b/mods/cnc/maps/gdi05b/rules.yaml @@ -124,21 +124,5 @@ FTNK: Prerequisites: ~disabled airstrike.proxy: - AlwaysVisible: AirstrikePower: - Icon: airstrike - StartFullyCharged: True - ChargeTime: 120 SquadSize: 1 - QuantizedFacings: 8 - Description: Air Strike - LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud - InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud - UnitType: a10 - DisplayBeacon: True - BeaconPoster: airstrike - DisplayRadarPing: True - CameraActor: camera diff --git a/mods/cnc/maps/gdi07/rules.yaml b/mods/cnc/maps/gdi07/rules.yaml index abad7eb71e..8a278ca357 100644 --- a/mods/cnc/maps/gdi07/rules.yaml +++ b/mods/cnc/maps/gdi07/rules.yaml @@ -123,23 +123,3 @@ HQ: -AirstrikePower: Buildable: Description: Provides an overview of the battlefield.\n Requires power to operate. - -airstrike.proxy: - AlwaysVisible: - AirstrikePower: - Icon: airstrike - StartFullyCharged: True - ChargeTime: 120 - SquadSize: 3 - QuantizedFacings: 8 - Description: Air Strike - LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud - InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud - UnitType: a10 - DisplayBeacon: True - BeaconPoster: airstrike - DisplayRadarPing: True - CameraActor: camera diff --git a/mods/cnc/maps/nod08a/rules.yaml b/mods/cnc/maps/nod08a/rules.yaml index 91b0fcf330..4e646af849 100644 --- a/mods/cnc/maps/nod08a/rules.yaml +++ b/mods/cnc/maps/nod08a/rules.yaml @@ -139,24 +139,8 @@ A10.IN: Weapon: Napalm.in airstrike.proxy: - AlwaysVisible: AirstrikePower: - Icon: airstrike - StartFullyCharged: True - ChargeTime: 120 - SquadSize: 3 - QuantizedFacings: 8 - Description: Air Strike - LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud - InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud UnitType: a10.in - DisplayBeacon: True - BeaconPoster: airstrike - DisplayRadarPing: True - CameraActor: camera FACT.IN: Inherits: FACT diff --git a/mods/cnc/maps/nod08b/rules.yaml b/mods/cnc/maps/nod08b/rules.yaml index ad7ad93922..639c9aa75b 100644 --- a/mods/cnc/maps/nod08b/rules.yaml +++ b/mods/cnc/maps/nod08b/rules.yaml @@ -156,24 +156,8 @@ A10.IN: Weapon: Napalm.in airstrike.proxy: - AlwaysVisible: AirstrikePower: - Icon: airstrike - StartFullyCharged: True - ChargeTime: 120 - SquadSize: 3 - QuantizedFacings: 8 - Description: Air Strike - LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. - EndChargeSound: airredy1.aud - SelectTargetSound: select1.aud - InsufficientPowerSound: nopower1.aud - IncomingSound: enemya.aud UnitType: a10.in - DisplayBeacon: True - BeaconPoster: airstrike - DisplayRadarPing: True - CameraActor: camera BOAT: Health: diff --git a/mods/cnc/rules/campaign-maprules.yaml b/mods/cnc/rules/campaign-maprules.yaml index ff9579bdc2..f020448b16 100644 --- a/mods/cnc/rules/campaign-maprules.yaml +++ b/mods/cnc/rules/campaign-maprules.yaml @@ -26,3 +26,24 @@ Player: PlayerResources: DefaultCashLocked: True DefaultCash: 5000 + +airstrike.proxy: + AlwaysVisible: + AirstrikePower: + Icon: airstrike + StartFullyCharged: True + ChargeTime: 120 + SquadSize: 3 + QuantizedFacings: 8 + Description: Air Strike + LongDesc: Deploy an aerial napalm strike.\nBurns buildings and infantry along a line. + EndChargeSpeechNotification: AirstrikeReady + SelectTargetSpeechNotification: SelectTarget + InsufficientPowerSpeechNotification: InsufficientPower + IncomingSpeechNotification: EnemyPlanesApproaching + UnitType: a10 + DisplayBeacon: True + BeaconPoster: airstrike + DisplayRadarPing: True + CameraActor: camera + From 4a14b130024b127d0e98c852072553c03aa4dd96 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 15 Feb 2017 15:15:16 +0100 Subject: [PATCH 3/3] Fix missing sequences on the airstrike.proxy in cnc --- mods/cnc/rules/campaign-maprules.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mods/cnc/rules/campaign-maprules.yaml b/mods/cnc/rules/campaign-maprules.yaml index f020448b16..a2a4840e98 100644 --- a/mods/cnc/rules/campaign-maprules.yaml +++ b/mods/cnc/rules/campaign-maprules.yaml @@ -46,4 +46,6 @@ airstrike.proxy: BeaconPoster: airstrike DisplayRadarPing: True CameraActor: camera - + ArrowSequence: arrow + ClockSequence: clock + CircleSequence: circles