Make D2k use Locomotor

mods/d2k/rules/arrakis.yaml

@@ -79,11 +79,7 @@ sandworm:
 		Type: heavy
 	Mobile:
 		Speed: 42
-		TerrainSpeeds:
+		Locomotor: worm
-			Sand: 100
-			Dune: 100
-			SpiceSand: 100
-			Spice: 100
 	Targetable:
 		TargetTypes: Ground, Creep
 	WithSpriteBody:

mods/d2k/rules/defaults.yaml

@@ -168,17 +168,8 @@
 		GenericName: Unit
 	Huntable:
 	Mobile:
-		Crushes: crate, spicebloom
-		TerrainSpeeds:
-			Sand: 100
-			Rock: 100
-			Transition: 100
-			Concrete: 100
-			SpiceSand: 100
-			Spice: 100
-			SpiceBlobs: 100
-			Dune: 50
 		TurnSpeed: 5
+		Locomotor: vehicle
 		RequiresCondition: !notmobile
 	SelectionDecorations:
 	WithSpriteControlGroupDecoration:
@@ -223,7 +214,7 @@
 ^Tank:
 	Inherits: ^Vehicle
 	Mobile:
-		Crushes: crate, infantry, spicebloom
+		Locomotor: tank
 
 ^Husk:
 	Inherits@1: ^SpriteActor
@@ -281,18 +272,7 @@
 	RevealsShroud:
 		Range: 3c768
 	Mobile:
-		Crushes: crate, spicebloom
+		Locomotor: foot
-		SharesCell: true
-		TerrainSpeeds:
-			Sand: 100
-			Rock: 100
-			Transition: 100
-			Concrete: 100
-			SpiceSand: 100
-			Spice: 100
-			SpiceBlobs: 100
-			Dune: 80
-			Rough: 80
 	SelectionDecorations:
 	WithSpriteControlGroupDecoration:
 	Selectable:

mods/d2k/rules/vehicles.yaml

@@ -1,5 +1,5 @@
 mcv:
-	Inherits: ^Vehicle
+	Inherits: ^Tank
 	Buildable:
 		Prerequisites: repair_pad, upgrade.heavy, ~techlevel.medium
 		Queue: Armor
@@ -21,7 +21,6 @@ mcv:
 		Type: light
 	Mobile:
 		Speed: 31
-		Crushes: crate, infantry, spicebloom
 	RevealsShroud:
 		Range: 2c768
 	MustBeDestroyed:
@@ -50,7 +49,7 @@ mcv:
 	-RevealOnFire:
 
 harvester:
-	Inherits: ^Vehicle
+	Inherits: ^Tank
 	Buildable:
 		Queue: Armor
 		Prerequisites: refinery
@@ -80,7 +79,6 @@ harvester:
 		Type: harvester
 	Mobile:
 		Speed: 43
-		Crushes: crate, infantry, spicebloom
 	RevealsShroud:
 		Range: 3c768
 	Explodes:
@@ -331,7 +329,7 @@ devastator:
 	Mobile:
 		TurnSpeed: 3
 		Speed: 31
-		Crushes: crate, infantry, spicebloom, wall
+		Locomotor: devastator
 		RequiresCondition: !overload && !notmobile
 	AutoCarryable:
 		RequiresCondition: !overload

mods/d2k/rules/world.yaml

@@ -15,6 +15,63 @@
 		OverrideFullShroud: shroudfull
 		OverrideFullFog: fogfull
 		ShroudBlend: Multiply
+	Locomotor@FOOT:
+		Name: foot
+		Crushes: crate, spicebloom
+		SharesCell: true
+		TerrainSpeeds:
+			Sand: 100
+			Rock: 100
+			Transition: 100
+			Concrete: 100
+			SpiceSand: 100
+			Spice: 100
+			SpiceBlobs: 100
+			Dune: 80
+			Rough: 80
+	Locomotor@VEHICLE:
+		Name: vehicle
+		Crushes: crate, spicebloom
+		TerrainSpeeds:
+			Sand: 100
+			Rock: 100
+			Transition: 100
+			Concrete: 100
+			SpiceSand: 100
+			Spice: 100
+			SpiceBlobs: 100
+			Dune: 50
+	Locomotor@TANK:
+		Name: tank
+		Crushes: crate, infantry, spicebloom
+		TerrainSpeeds:
+			Sand: 100
+			Rock: 100
+			Transition: 100
+			Concrete: 100
+			SpiceSand: 100
+			Spice: 100
+			SpiceBlobs: 100
+			Dune: 50
+	Locomotor@DEVASTATOR:
+		Name: devastator
+		Crushes: crate, infantry, spicebloom, wall
+		TerrainSpeeds:
+			Sand: 100
+			Rock: 100
+			Transition: 100
+			Concrete: 100
+			SpiceSand: 100
+			Spice: 100
+			SpiceBlobs: 100
+			Dune: 50
+	Locomotor@WORM:
+		Name: worm
+		TerrainSpeeds:
+			Sand: 100
+			Dune: 100
+			SpiceSand: 100
+			Spice: 100
 	Faction@Random:
 		Name: Any
 		InternalName: Random