Fix ra shellmap; reimplement ra nuke.

OpenRA.Mods.RA/DefaultShellmapScript.cs

@@ -52,14 +52,14 @@ namespace OpenRA.Mods.RA
 				}, Actors["pdox"], -1, false);
 			}
 			
-			/*
+			
 			if (ticks == 100)
-				Actors["mslo1"].Trait<NukeSilo>().Attack(new int2(98, 52));
+				Actors["mslo1"].Trait<NukePower>().Activate(Actors["mslo1"], new Order(null,null,false) { TargetLocation = new int2(98, 52) });
 			if (ticks == 140)
-				Actors["mslo2"].Trait<NukeSilo>().Attack(new int2(95, 54));
+				Actors["mslo2"].Trait<NukePower>().Activate(Actors["mslo2"], new Order(null,null,false) { TargetLocation = new int2(95, 54) });
 			if (ticks == 180)
-				Actors["mslo3"].Trait<NukeSilo>().Attack(new int2(95, 49));
+				Actors["mslo3"].Trait<NukePower>().Activate(Actors["mslo3"], new Order(null,null,false) { TargetLocation = new int2(95, 49) });
-			 */
+			
 			if (ticks == 430)
 			{
 				Actors["mig1"].Trait<AttackPlane>().AttackTarget(Target.FromActor(Actors["greeceweap"]), false, true);

mods/ra/rules/structures.yaml

@@ -1,9 +1,4 @@
 MSLO:
-	CanPowerDown:
-	RequiresPower:
-	NukeSilo:
-		MissileWeapon: atomic
-		SpawnOffset: 10,0
 	Inherits: ^Building
 	Valued:
 		Cost: 2500
@@ -27,7 +22,19 @@ MSLO:
 	RevealsShroud:
 		Range: 5
 	IronCurtainable:
-	
+	NukePower:
+		Image: atomicon
+		ChargeTime: 540
+		Description: Atom Bomb
+		LongDesc: Launches a nuclear missile at a target location.
+		BeginChargeSound: aprep1.aud
+		EndChargeSound: aready1.aud
+		SelectTargetSound: slcttgt1.aud
+		LaunchSound: alaunch1.aud
+		MissileWeapon: atomic
+		SpawnOffset: 10,0
+	CanPowerDown:
+	RequiresPower:
 GAP:
 	RequiresPower:
 	CanPowerDown:
@@ -193,7 +200,7 @@ IRON:
 		Range: 10
 	Bib:
 	IronCurtainable:
-	IronCurtain:
+#	IronCurtain:
 
 PDOX:
 	RequiresPower:
@@ -222,7 +229,7 @@ PDOX:
 	RevealsShroud:
 		Range: 10
 	Bib:
-	Chronosphere:
+#	Chronosphere:
 	IronCurtainable:
 
 TSLA:
@@ -501,7 +508,7 @@ ATEK:
 		Range: 10
 	Bib:
 	IronCurtainable:
-	GpsLaunchSite:
+#	GpsLaunchSite:
 
 WEAP:
 	Inherits: ^Building

mods/ra/rules/system.yaml

@@ -25,74 +25,65 @@ Player:
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 	PlaceBuilding:
-	GpsPower:
+#	GpsPower:
-		Image: gpssicon
+#		Image: gpssicon
-		OneShot: yes
+#		OneShot: yes
-		ChargeTime: 8
+#		ChargeTime: 8
-		Description: GPS Satellite
+#		Description: GPS Satellite
-		LongDesc: Reveals the entire map
+#		LongDesc: Reveals the entire map
-		Prerequisites: ATEK
+#		Prerequisites: ATEK
-		RevealDelay: 15
+#		RevealDelay: 15
-		LaunchSound: satlnch1.aud
+#		LaunchSound: satlnch1.aud
-	ChronoshiftPower:
+#	ChronoshiftPower:
-		Image: warpicon
+#		Image: warpicon
-		ChargeTime: 2
+#		ChargeTime: 2
-		Description: Chronoshift
+#		Description: Chronoshift
-		LongDesc: Teleport a group of vehicles across\nthe map for 30 seconds.
+#		LongDesc: Teleport a group of vehicles across\nthe map for 30 seconds.
-		Prerequisites: PDOX
+#		Prerequisites: PDOX
-		SelectTargetSound: slcttgt1.aud
+#		SelectTargetSound: slcttgt1.aud
-		BeginChargeSound: chrochr1.aud
+#		BeginChargeSound: chrochr1.aud
-		EndChargeSound: chrordy1.aud
+#		EndChargeSound: chrordy1.aud
-		Duration: 30
+#		Duration: 30
-		KillCargo: yes
+#		KillCargo: yes
-	IronCurtainPower:
+#	IronCurtainPower:
-		Image: infxicon
+#		Image: infxicon
-		ChargeTime: 2
+#		ChargeTime: 2
-		Description: Invulnerability
+#		Description: Invulnerability
-		LongDesc: Makes a group of units invulnerable\nfor 10 seconds.
+#		LongDesc: Makes a group of units invulnerable\nfor 10 seconds.
-		Prerequisites: IRON
+#		Prerequisites: IRON
-		Duration: 10
+#		Duration: 10
-	SpyPlanePower:
+#	SpyPlanePower:
-		Image: smigicon
+#		Image: smigicon
-		ChargeTime: 3
+#		ChargeTime: 3
-		Description: Spy Plane
+#		Description: Spy Plane
-		LongDesc: Reveals an area of the map.
+#		LongDesc: Reveals an area of the map.
-		Prerequisites: AFLD
+#		Prerequisites: AFLD
-	ParatroopersPower:
+#	ParatroopersPower:
-		Image: pinficon
+#		Image: pinficon
-		ChargeTime: 6
+#		ChargeTime: 6
-		Description: Paratroopers
+#		Description: Paratroopers
-		LongDesc: A Badger drops a squad of Riflemen \nanywhere on the map
+#		LongDesc: A Badger drops a squad of Riflemen \nanywhere on the map
-		Prerequisites: AFLD
+#		Prerequisites: AFLD
-		DropItems: E1,E1,E1,E3,E3
+#		DropItems: E1,E1,E1,E3,E3
-		SelectTargetSound: slcttgt1.aud
+#		SelectTargetSound: slcttgt1.aud
-	NukePower:
+#	SonarPulsePower:
-		Image: atomicon
+#		Image: sonricon
-		ChargeTime: 9
+#		ChargeTime: 10
-		Description: Atom Bomb
+#		Description: Sonar Pulse (Single Use)
-		LongDesc: Launches a nuclear missile at a target location.
+#		LongDesc: Reveals all submarines on the map for a \nshort time.
-		Prerequisites: MSLO
+#		GivenAuto: no
-		BeginChargeSound: aprep1.aud
+#		OneShot: yes
-		EndChargeSound: aready1.aud
+#	AirstrikePower:
-		SelectTargetSound: slcttgt1.aud
+#		Image: pbmbicon
-		LaunchSound: alaunch1.aud
+#		ChargeTime: 1
-	SonarPulsePower:
+#		Description: Parabombs (Single Use)
-		Image: sonricon
+#		LongDesc: A Badger drops a load of parachuted bombs on your target.
-		ChargeTime: 10
+#		GivenAuto: no
-		Description: Sonar Pulse (Single Use)
+#		OneShot: yes
-		LongDesc: Reveals all submarines on the map for a \nshort time.
+#		UnitType: badr.bomber
-		GivenAuto: no
+#		SelectTargetSound: slcttgt1.aud
-		OneShot: yes
+#		FlareType: flare
-	AirstrikePower:
+	SupportPowerManager:
-		Image: pbmbicon
-		ChargeTime: 1
-		Description: Parabombs (Single Use)
-		LongDesc: A Badger drops a load of parachuted bombs on your target.
-		GivenAuto: no
-		OneShot: yes
-		UnitType: badr.bomber
-		SelectTargetSound: slcttgt1.aud
-		FlareType: flare
 	ConquestVictoryConditions:
 	PowerManager:
 	PlayerResources: