Update TD rules.

mods/cnc/rules/aircraft.yaml

@@ -26,23 +26,19 @@ TRAN:
 	WithIdleOverlay@ROTOR1AIR:
 		Offset: 597,0,85
 		Sequence: rotor
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	WithIdleOverlay@ROTOR1GROUND:
 		Offset: 597,0,85
 		Sequence: slow-rotor
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	WithIdleOverlay@ROTOR2AIR:
 		Offset: -597,0,171
 		Sequence: rotor2
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	WithIdleOverlay@ROTOR2GROUND:
 		Offset: -597,0,171
 		Sequence: slow-rotor2
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	Cargo:
 		Types: Infantry
 		MaxWeight: 10
@@ -98,13 +94,11 @@ HELI:
 	WithIdleOverlay@ROTORAIR:
 		Offset: 0,0,85
 		Sequence: rotor
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	WithIdleOverlay@ROTORGROUND:
 		Offset: 0,0,85
 		Sequence: slow-rotor
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	WithMuzzleOverlay:
 	SpawnActorOnDeath:
 		Actor: HELI.Husk

mods/cnc/rules/defaults.yaml

@@ -41,8 +41,7 @@
 		Delay: 100
 		HealIfBelow: 100
 		DamageCooldown: 125
-		UpgradeTypes: selfheal
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: selfheal
 	WithRankDecoration:
 		Image: rank
 		Sequence: rank
@@ -91,12 +90,11 @@
 	Tooltip:
 		GenericName: Vehicle
 	Cloak:
-		UpgradeTypes: cloak
-		UpgradeMinEnabledLevel: 1
 		InitialDelay: 15
 		CloakDelay: 90
 		CloakSound: trans1.aud
 		UncloakSound: trans1.aud
+		RequiresCondition: cloak
 	MustBeDestroyed:
 	Voiced:
 		VoiceSet: VehicleVoice
@@ -127,12 +125,10 @@
 		UseLocation: yes
 	Targetable@GROUND:
 		TargetTypes: Ground, Vehicle
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	Targetable@AIRBORNE:
 		TargetTypes: Air
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	SelectionDecorations:
 	WithSpriteControlGroupDecoration:
 	Selectable:
@@ -160,8 +156,7 @@
 		Offset: 43, 128, 0
 		ZOffset: -129
 	Hovers@CRUISING:
-		UpgradeTypes: cruising
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: cruising
 	MustBeDestroyed:
 	Voiced:
 		VoiceSet: VehicleVoice
@@ -217,12 +212,11 @@
 		CargoType: Infantry
 	HiddenUnderFog:
 	DamagedByTerrain:
-		UpgradeTypes: hazmatsuits
-		UpgradeMaxEnabledLevel: 0
 		Terrain: Tiberium, BlueTiberium
 		Damage: 2
 		DamageInterval: 16
 		DamageTypes: TiberiumDeath
+		RequiresCondition: !hazmatsuits
 	GlobalUpgradable@BIO:
 		Upgrades: hazmatsuits
 		Prerequisites: bio
@@ -230,8 +224,7 @@
 		Image: pips
 		Sequence: pip-hazmat
 		ReferencePoint: Bottom, Right
-		UpgradeTypes: hazmatsuits
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: hazmatsuits
 	ActorLostNotification:
 	SpawnActorOnDeath:
 		Probability: 10
@@ -249,8 +242,7 @@
 		Delay: 100
 		HealIfBelow: 100
 		DamageCooldown: 125
-		UpgradeTypes: hospitalheal
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: hospitalheal
 	GlobalUpgradable@HOSPITAL:
 		Upgrades: hospitalheal
 		Prerequisites: hosp
@@ -258,8 +250,7 @@
 		Image: pips
 		Sequence: pip-heal
 		ReferencePoint: Bottom, Right
-		UpgradeTypes: hospitalheal
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: hospitalheal
 	DetectCloaked:
 		Range: 2c0
 	DeathSounds@NORMAL:

mods/cnc/rules/ships.yaml

@@ -46,8 +46,6 @@ LST:
 		BuildPaletteOrder: 1000
 		Prerequisites: ~disabled
 	Mobile:
-		UpgradeTypes: notmobile
-		UpgradeMaxEnabledLevel: 0
 		Crushes: crate
 		TerrainSpeeds:
 			Clear: 100
@@ -61,6 +59,7 @@ LST:
 		InitialFacing: 0
 		TurnSpeed: 4
 		Speed: 142
+		RequiresCondition: !notmobile
 	Health:
 		HP: 400
 	Armor:

mods/cnc/rules/vehicles.yaml

@@ -88,10 +88,9 @@ APC:
 		Queue: Vehicle.GDI
 		Description: Armed infantry transport.\nCan attack Aircraft.\n  Strong vs Vehicles\n  Weak vs Infantry
 	Mobile:
-		UpgradeTypes: notmobile
-		UpgradeMaxEnabledLevel: 0
 		TurnSpeed: 8
 		Speed: 128
+		RequiresCondition: !notmobile
 	Health:
 		HP: 210
 	Armor:
@@ -517,7 +516,7 @@ STNK:
 	RevealsShroud:
 		Range: 7c0
 	Cloak:
-		-UpgradeTypes:
+		-RequiresCondition:
 		InitialDelay: 90
 		CloakDelay: 90
 		CloakSound: trans1.aud