Update D2K rules and shellmap.

mods/d2k/rules/aircraft.yaml

@@ -20,12 +20,10 @@ carryall.reinforce:
 		CanHover: True
 	Targetable@GROUND:
 		TargetTypes: Ground, Vehicle
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	Targetable@AIRBORNE:
 		TargetTypes: Air
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	SpawnActorOnDeath:
 		Actor: carryall.husk
 	Carryall:

mods/d2k/rules/arrakis.yaml

@@ -72,13 +72,11 @@ sandworm:
 	WithIdleAnimation:
 		Interval: 160
 		Sequences: lightninga, lightningb, lightningc, lightningd, lightninge, lightningf
-		UpgradeTypes: attacking
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !attacking
 	AmbientSound:
 		SoundFile: WRMSIGN1.WAV
 		Interval: 160
-		UpgradeTypes: attacking
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !attacking
 	WithAttackOverlay@mouth:
 		Sequence: mouth
 	WithAttackOverlay@sand:
@@ -106,8 +104,7 @@ sandworm:
 		Type: CenterPosition
 		TerrainTypes: Sand, Dune, SpiceSand, Spice
 		MovingInterval: 3
-		UpgradeTypes: attacking
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !attacking
 	UpgradeManager:
 	Buildable:
 		Description: Attracted by vibrations in the sand.\nWill eat units whole and has a large appetite.

mods/d2k/rules/defaults.yaml

@@ -42,8 +42,7 @@
 		Delay: 125
 		HealIfBelow: 100
 		DamageCooldown: 125
-		UpgradeTypes: selfheal
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: selfheal
 	WithRankDecoration:
 		Image: rank
 		Sequence: rank
@@ -60,8 +59,6 @@
 	Inherits@3: ^SpriteActor
 	Huntable:
 	Mobile:
-		UpgradeTypes: notmobile
-		UpgradeMaxEnabledLevel: 0
 		Crushes: crate, spicebloom
 		TerrainSpeeds:
 			Sand: 100
@@ -73,6 +70,7 @@
 			SpiceBlobs: 100
 			Dune: 50
 		TurnSpeed: 5
+		RequiresCondition: !notmobile
 	SelectionDecorations:
 	WithSpriteControlGroupDecoration:
 	Selectable:

mods/d2k/rules/infantry.yaml

@@ -94,34 +94,28 @@ thumper:
 	RevealsShroud:
 		Range: 2c768
 	Mobile:
-		UpgradeTypes: deployed
-		UpgradeMaxEnabledLevel: 0
 		Speed: 43
+		RequiresCondition: !deployed
 	DeployToUpgrade:
 		DeployedUpgrades: deployed
 		Facing: 128
 		AllowedTerrainTypes: Sand, Spice, Dune, SpiceSand
 	WithInfantryBody:
-		UpgradeTypes: deployed
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !deployed
 	WithSpriteBody@DEPLOYED:
 		Sequence: thump
-		UpgradeTypes: deployed
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: deployed
 	WithIdleOverlay@DEPLOYED:
 		Sequence: thump-sand
-		UpgradeTypes: deployed
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: deployed
 	AmbientSound:
 		SoundFile: THUMPER1.WAV
 		Interval: 60
-		UpgradeTypes: deployed
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: deployed
 	AttractsWorms:
 		Intensity: 1000
 		Falloff: 0, 0, 0, 100, 100, 100, 25, 11, 6, 4, 3, 2, 1, 0
-		UpgradeTypes: deployed
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: deployed
 	Passenger:
 		PipType: Blue
 	Voiced:

mods/d2k/rules/structures.yaml

@@ -98,15 +98,13 @@ construction_yard:
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
 		ZOffset: 256
-		UpgradeTypes: stardecoration
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: stardecoration
 	WithTextDecoration@primary:
 		RequiresSelection: true
 		Text: PRIMARY
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary
 
 wind_trap:
 	Inherits: ^Building
@@ -212,15 +210,13 @@ barracks:
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
 		ZOffset: 256
-		UpgradeTypes: stardecoration
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: stardecoration
 	WithTextDecoration@primary:
 		RequiresSelection: true
 		Text: PRIMARY
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary
 
 refinery:
 	Inherits: ^Building
@@ -393,15 +389,13 @@ light_factory:
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
 		ZOffset: 256
-		UpgradeTypes: stardecoration
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: stardecoration
 	WithTextDecoration@primary:
 		RequiresSelection: true
 		Text: PRIMARY
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary
 
 heavy_factory:
 	Inherits: ^Building
@@ -474,15 +468,13 @@ heavy_factory:
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
 		ZOffset: 256
-		UpgradeTypes: stardecoration
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: stardecoration
 	WithTextDecoration@primary:
 		RequiresSelection: true
 		Text: PRIMARY
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary
 
 outpost:
 	Inherits: ^Building
@@ -597,8 +589,7 @@ starport:
 		Text: PRIMARY
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary
 
 wall:
 	Inherits@1: ^SpriteActor
@@ -854,8 +845,7 @@ high_tech_factory:
 		Sequence: tag-upgraded
 		ReferencePoint: Top, Right
 		ZOffset: 256
-		UpgradeTypes: stardecoration
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: stardecoration
 
 research_centre:
 	Inherits: ^Building