Remove TargetableAircraft

mods/ra/maps/allies-05a/map.yaml

@@ -1668,8 +1668,8 @@ Rules:
 			Range: 4c0
 		Tooltip:
 			ShowOwnerRow: false
-		TargetableAircraft:
-			GroundedTargetTypes: Ground
+		Targetable@GROUND:
+			TargetTypes: Ground
 	TRAN.IN:
 		Inherits: TRAN
 		RenderSprites:

mods/ra/rules/aircraft.yaml

@@ -12,6 +12,7 @@ BADR:
 		Speed: 149
 		Repulsable: False
 		MaximumPitch: 56
+		AirborneUpgrades: airborne
 	Cargo:
 		MaxWeight: 10
 	-Selectable:
@@ -49,6 +50,7 @@ BADR.Bomber:
 		Speed: 149
 		Repulsable: False
 		MaximumPitch: 56
+		AirborneUpgrades: airborne
 	AmmoPool:
 		Ammo: 7
 	-Selectable:
@@ -106,6 +108,7 @@ MIG:
 		RearmBuildings: afld
 		RepulsionSpeed: 40
 		MaximumPitch: 56
+		AirborneUpgrades: airborne
 	AutoTarget:
 		TargetWhenIdle: false
 		TargetWhenDamaged: false
@@ -167,6 +170,7 @@ YAK:
 		Speed: 178
 		RepulsionSpeed: 40
 		MaximumPitch: 56
+		AirborneUpgrades: airborne
 	AutoTarget:
 		TargetWhenIdle: false
 		TargetWhenDamaged: false
@@ -215,6 +219,7 @@ TRAN:
 		Speed: 112
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
 		AltitudeVelocity: 0c100
+		AirborneUpgrades: airborne
 	WithRotor@PRIMARY:
 		Offset: -597,0,341
 		Sequence: rotor2
@@ -261,6 +266,7 @@ HELI:
 		InitialFacing: 20
 		ROT: 4
 		Speed: 149
+		AirborneUpgrades: airborne
 	AutoTarget:
 		InitialStance: HoldFire
 	WithRotor:
@@ -312,6 +318,7 @@ HIND:
 		InitialFacing: 20
 		ROT: 4
 		Speed: 112
+		AirborneUpgrades: airborne
 	AutoTarget:
 		InitialStance: HoldFire
 	WithRotor:
@@ -341,10 +348,11 @@ U2:
 		Speed: 373
 		Repulsable: False
 		MaximumPitch: 56
+		AirborneUpgrades: airborne
 	AttackBomber:
 	-Selectable:
 	-Voiced:
-	-TargetableAircraft:
+	-Targetable@AIRBORNE:
 	-GainsExperience:
 	Contrail@1:
 		Offset: -725,683,0

mods/ra/rules/defaults.yaml

@@ -339,9 +339,14 @@
 	SelectionDecorations:
 	Selectable:
 		Bounds: 24,24
-	TargetableAircraft:
+	Targetable@GROUND:
+		TargetTypes: Ground, Repair, Vehicle
+		UpgradeTypes: airborne
+		UpgradeMaxEnabledLevel: 0
+	Targetable@AIRBORNE:
 		TargetTypes: Air
-		GroundedTargetTypes: Ground, Repair, Vehicle
+		UpgradeTypes: airborne
+		UpgradeMinEnabledLevel: 1
 	HiddenUnderFog:
 		Type: CenterPosition
 	AttackMove:

mods/ra/rules/husks.yaml

@@ -88,6 +88,7 @@ TRAN.Husk:
 	Helicopter:
 		ROT: 4
 		Speed: 149
+		AirborneUpgrades: airborne
 	WithRotor@PRIMARY:
 		Offset: -597,0,341
 	WithRotor@SECONDARY:
@@ -119,6 +120,7 @@ BADR.Husk:
 	Plane:
 		ROT: 5
 		Speed: 149
+		AirborneUpgrades: airborne
 	SmokeTrailWhenDamaged@0:
 		Offset: -432,560,0
 		Interval: 2
@@ -141,6 +143,7 @@ MIG.Husk:
 	Plane:
 		ROT: 5
 		Speed: 186
+		AirborneUpgrades: airborne
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,171
 		Interval: 2
@@ -160,6 +163,7 @@ YAK.Husk:
 	Plane:
 		ROT: 5
 		Speed: 149
+		AirborneUpgrades: airborne
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,0
 		Interval: 2
@@ -177,6 +181,7 @@ HELI.Husk:
 	Helicopter:
 		ROT: 4
 		Speed: 149
+		AirborneUpgrades: airborne
 	WithRotor:
 		Offset: 0,0,85
 	SmokeTrailWhenDamaged:
@@ -195,6 +200,7 @@ HIND.Husk:
 	Helicopter:
 		ROT: 4
 		Speed: 112
+		AirborneUpgrades: airborne
 	WithRotor:
 	SmokeTrailWhenDamaged:
 		Offset: -427,0,0
@@ -210,6 +216,7 @@ U2.Husk:
 	Plane:
 		ROT: 7
 		Speed: 373
+		AirborneUpgrades: airborne
 	Contrail@1:
 		Offset: -725,683,0
 	Contrail@2: