Merge pull request #5854 from pchote/ra-poster

Add beacons to the RA spy plane and parabombs
2014-07-07 10:15:03 +02:00
parent 17e41a7b79 38a08c0967
commit fa83507a62
16 changed files with 55 additions and 97 deletions
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -991,7 +991,6 @@ Rules:
 			IncomingSound: enemya.aud
 			UnitType: a10
 			DisplayBeacon: True
-			BeaconDuration: -1
 			BeaconPoster: airstrike
 			DisplayRadarPing: True
 			CameraActor: camera
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -435,7 +435,6 @@ HQ:
 		IncomingSound: enemya.aud
 		UnitType: a10
 		DisplayBeacon: True
-		BeaconDuration: -1
 		BeaconPoster: airstrike
 		DisplayRadarPing: True
 		CameraActor: camera
@@ -550,7 +549,6 @@ TMPL:
 		IncomingSound: nuke1.aud
 		MissileWeapon: atomic
 		DisplayBeacon: True
-		BeaconDuration: -1
 		BeaconPoster: atomic
 		DisplayRadarPing: True
 		CameraActor: camera
--- a/mods/d2k/rules/atreides.yaml
+++ b/mods/d2k/rules/atreides.yaml
@@ -60,7 +60,6 @@ PALACEA:
 		UnitType: orni.bomber
 		SelectTargetSound:
 		DisplayBeacon: True
-		BeaconDuration: -1
 		CameraActor: camera
 	CanPowerDown:
 	DisabledOverlay:
--- a/mods/d2k/rules/harkonnen.yaml
+++ b/mods/d2k/rules/harkonnen.yaml
@@ -98,7 +98,6 @@ PALACEH:
 		SpawnOffset: -512,1c171,0
 		DisplayBeacon: True
 		DisplayRadarPing: True
-		BeaconDuration: -1
 		CameraActor: camera
 	CanPowerDown:
 	DisabledOverlay:
--- a/mods/d2k/rules/ordos.yaml
+++ b/mods/d2k/rules/ordos.yaml
@@ -89,7 +89,6 @@ PALACEO:
 		UnitType: orni.bomber
 		SelectTargetSound:
 		DisplayBeacon: True
-		BeaconDuration: -1
 		CameraActor: camera
 	CanPowerDown:
 	DisabledOverlay:
--- a/mods/ra/bits/lores-camicon.shp
+++ b/mods/ra/bits/lores-camicon.shp
--- a/mods/ra/bits/lores-pbmbicon.shp
+++ b/mods/ra/bits/lores-pbmbicon.shp
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -341,6 +341,7 @@ U2:
 	RenderUnit:
 	WithShadow:
 	IronCurtainable:
+	AttackBomber:
 	-Selectable:
 	-GainsExperience:
 	Contrail@1:
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -251,7 +251,10 @@ powerproxy.parabombs:
 		AllowMultiple: yes
 		UnitType: badr.bomber
 		SelectTargetSound: slcttgt1.aud
-		FlareActor: flare
+		QuantizedFacings: 8
+		DisplayBeacon: True
+		BeaconPoster: pbmbicon
+		CameraActor: camera

 powerproxy.sonarpulse:
 	SonarPulsePower:
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -37,7 +37,6 @@ MSLO:
 		SpawnOffset: 0,427,0
 		DisplayTimer: True
 		DisplayBeacon: True
-		BeaconDuration: -1
 		DisplayRadarPing: True
 		BeaconPoster: atomicon
 		CameraActor: camera
@@ -891,13 +890,19 @@ AFLD:
 		Produces: Plane
 	Reservable:
 	IronCurtainable:
-	SpyPlanePower:
+	AirstrikePower:
 		Icon: spyplane
 		ChargeTime: 180
 		Description: Spy Plane
 		LongDesc: Reveals an area of the map\nand cloaked enemy units.
 		SelectTargetSound: slcttgt1.aud
 		EndChargeSound: spypln1.aud
+		CameraActor: camera
+		CameraRemoveDelay: 150
+		UnitType: u2
+		QuantizedFacings: 8
+		DisplayBeacon: True
+		BeaconPoster: camicon
 	ParatroopersPower:
 		Icon: paratroopers
 		ChargeTime: 360
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -129,6 +129,14 @@ beacon:
 		Start: 0
 		Length: *
 		Offset: 0,-42
+	pbmbicon: lores-pbmbicon
+		Start: 0
+		Length: *
+		Offset: 0,-42
+	camicon: lores-camicon
+		Start: 0
+		Length: *
+		Offset: 0,-42
 	clock: beaconclock
 		Start: 0
 		Length: *