Add an upgrade rule for Plane removal

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -1832,9 +1832,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
 						if (inftraits != null)
 						{
 							node.Value.Nodes.Add(new MiniYamlNode("QuantizeFacingsFromSequence", null, new List<MiniYamlNode>
-								{
+							{
-									new MiniYamlNode("Sequence", "stand"),
+								new MiniYamlNode("Sequence", "stand"),
-								}));
+							}));
 						}
 
 						var other = node.Value.Nodes.FirstOrDefault(x =>
@@ -2030,7 +2030,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
 							}
 							else
 								cloakedTargetTypes = new MiniYamlNode("TargetTypes", "");
-							node.Value.Nodes.Add(new MiniYamlNode("Targetable@UNDERWATER", "", new List<MiniYamlNode> {
+							node.Value.Nodes.Add(new MiniYamlNode("Targetable@UNDERWATER", "", new List<MiniYamlNode>
+							{
 								cloakedTargetTypes,
 								new MiniYamlNode("UpgradeTypes", "underwater"),
 								new MiniYamlNode("UpgradeMinEnabledLevel", "1")
@@ -2067,7 +2068,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
 							}
 							else
 								groundTargetTypes = new MiniYamlNode("TargetTypes", "");
-							node.Value.Nodes.Add(new MiniYamlNode("Targetable@GROUND", "", new List<MiniYamlNode> {
+							node.Value.Nodes.Add(new MiniYamlNode("Targetable@GROUND", "", new List<MiniYamlNode>
+							{
 								groundTargetTypes,
 								new MiniYamlNode("UpgradeTypes", "airborne"),
 								new MiniYamlNode("UpgradeMaxEnabledLevel", "0")
@@ -2175,6 +2177,12 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				if (engineVersion < 20150927)
+				{
+					if (depth == 1 && node.Key == "Plane")
+						node.Key = "Aircraft";
+				}
+
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}

mods/cnc/rules/aircraft.yaml

@@ -151,7 +151,7 @@ C17:
 		Description: Drops vehicle reinforcements on Airstrips
 	Valued:
 		Cost: 2000
-	Plane:
+	Aircraft:
 		ROT: 5
 		Speed: 326
 		Repulsable: False
@@ -188,7 +188,7 @@ A10:
 		Description: Used to deliver air strikes.
 	Valued:
 		Cost: 2000
-	Plane:
+	Aircraft:
 		ROT: 4
 		Speed: 373
 		Repulsable: False

mods/d2k/rules/aircraft.yaml

@@ -51,7 +51,7 @@ frigate:
 	Tooltip:
 		Name: Frigate
 		Description: Supply spacecraft
-	Plane:
+	Aircraft:
 		ROT: 1
 		Speed: 126
 		RepairBuildings: repair_pad
@@ -75,7 +75,7 @@ ornithopter:
 		HP: 900
 	Armor:
 		Type: light
-	Plane:
+	Aircraft:
 		ROT: 2
 		Speed: 189
 		RepairBuildings:
@@ -93,7 +93,7 @@ ornithopter.husk:
 	Inherits: ^AircraftHusk
 	Tooltip:
 		Name: Ornithopter
-	Plane:
+	Aircraft:
 		ROT: 5
 		Speed: 189
 		RepairBuildings:

mods/ra/maps/fort-lonestar/map.yaml

@@ -719,7 +719,7 @@ Rules:
 			HP: 60
 		Armor:
 			Type: Light
-		Plane:
+		Aircraft:
 			ROT: 5
 			Speed: 280
 		AmmoPool:

mods/ra/rules/aircraft.yaml

@@ -6,7 +6,7 @@ BADR:
 		HP: 300
 	Armor:
 		Type: Light
-	Plane:
+	Aircraft:
 		CruiseAltitude: 2560
 		ROT: 5
 		Speed: 149
@@ -44,7 +44,7 @@ BADR.Bomber:
 		HP: 300
 	Armor:
 		Type: Light
-	Plane:
+	Aircraft:
 		CruiseAltitude: 2560
 		ROT: 5
 		Speed: 149
@@ -100,7 +100,7 @@ MIG:
 		LocalYaw: -40, 24
 	AttackPlane:
 		FacingTolerance: 20
-	Plane:
+	Aircraft:
 		CruiseAltitude: 2560
 		InitialFacing: 192
 		ROT: 4
@@ -162,7 +162,7 @@ YAK:
 		MuzzleSequence: muzzle
 	AttackPlane:
 		FacingTolerance: 20
-	Plane:
+	Aircraft:
 		CruiseAltitude: 2560
 		RearmBuildings: afld
 		InitialFacing: 192
@@ -342,7 +342,7 @@ U2:
 		HP: 2000
 	Armor:
 		Type: Heavy
-	Plane:
+	Aircraft:
 		CruiseAltitude: 2560
 		ROT: 7
 		Speed: 373

mods/ra/rules/husks.yaml

@@ -117,7 +117,7 @@ BADR.Husk:
 	Inherits: ^PlaneHusk
 	Tooltip:
 		Name: Badger
-	Plane:
+	Aircraft:
 		ROT: 5
 		Speed: 149
 		AirborneUpgrades: airborne
@@ -140,7 +140,7 @@ MIG.Husk:
 		Offset: -598,-683,0
 	Contrail@2:
 		Offset: -598,683,0
-	Plane:
+	Aircraft:
 		ROT: 5
 		Speed: 186
 		AirborneUpgrades: airborne
@@ -160,7 +160,7 @@ YAK.Husk:
 		Name: Yak Attack Plane
 	Contrail:
 		Offset: -853,0,0
-	Plane:
+	Aircraft:
 		ROT: 5
 		Speed: 149
 		AirborneUpgrades: airborne
@@ -213,7 +213,7 @@ HIND.Husk:
 
 U2.Husk:
 	Inherits: ^PlaneHusk
-	Plane:
+	Aircraft:
 		ROT: 7
 		Speed: 373
 		AirborneUpgrades: airborne

mods/ts/rules/aircraft.yaml

@@ -115,7 +115,7 @@ ORCAB:
 		Prerequisites: ~gahpad, gatech
 	Selectable:
 		Bounds: 30,24
-	Plane:
+	Aircraft:
 		CruiseAltitude: 3072
 		MaximumPitch: 120
 		ROT: 3
@@ -226,7 +226,7 @@ SCRIN:
 		Bounds: 30,24
 	Voiced:
 		VoiceSet: Scrin
-	Plane:
+	Aircraft:
 		MaximumPitch: 90
 		ROT: 3
 		Speed: 168

mods/ts/rules/defaults.yaml

@@ -492,7 +492,7 @@
 
 ^Plane:
 	Inherits: ^Aircraft
-	Plane:
+	Aircraft:
 		RepairBuildings: gadept
 		RearmBuildings: gahpad, nahpad
 		LandWhenIdle: no