Merge pull request #12782 from abcdefg30/paraCrash

Fix airstrikes and paratroopers crashing missions

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

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

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

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

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

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

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:

mods/cnc/rules/campaign-maprules.yaml

@@ -26,3 +26,26 @@ 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
+		ArrowSequence: arrow
+		ClockSequence: clock
+		CircleSequence: circles

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

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

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:

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: