Merge pull request #10621 from teees/ts-fixes

Small ts rules fixes

mods/ts/rules/civilian-infantry.yaml

@@ -237,7 +237,7 @@ DOGGIE:
 		MaxMoveDelayInTicks: 45
 
 VISC_SML:
-	Inherits: ^Viceroid
+	Inherits: ^Visceroid
 	Tooltip:
 		Name: Baby Visceroid
 		Description: infantry transmorgifies into this
@@ -251,7 +251,7 @@ VISC_SML:
 		Image: vissml
 
 VISC_LRG:
-	Inherits: ^Viceroid
+	Inherits: ^Visceroid
 	Tooltip:
 		Name: Adult Visceroid
 		Description: 2 small visceroids combine into this

mods/ts/rules/civilian-vehicles.yaml

@@ -56,7 +56,7 @@ TRUCKB:
 	Inherits: ^TRUCK
 
 ICBM:
-	Inherits: ^CivilianVoxelVehicle
+	Inherits: ^CivilianVoxelCrusher
 	Valued:
 		Cost: 1400
 	Tooltip:
@@ -79,7 +79,7 @@ ICBM:
 		Voice: Move
 
 BUS:
-	Inherits: ^CivilianVoxelVehicle
+	Inherits: ^CivilianVoxelCrusher
 	Valued:
 		Cost: 800
 	Tooltip:
@@ -99,6 +99,7 @@ BUS:
 		PipCount: 5
 		UnloadVoice: Unload
 		LoadingUpgrades: notmobile
+		EjectOnDeath: true
 
 PICK:
 	Inherits: ^CivilianVoxelVehicle
@@ -121,6 +122,7 @@ PICK:
 		PipCount: 5
 		UnloadVoice: Unload
 		LoadingUpgrades: notmobile
+		EjectOnDeath: true
 
 CAR:
 	Inherits: ^CivilianVoxelVehicle
@@ -143,6 +145,7 @@ CAR:
 		PipCount: 5
 		UnloadVoice: Unload
 		LoadingUpgrades: notmobile
+		EjectOnDeath: true
 
 WINI:
 	Inherits: ^CivilianVoxelVehicle
@@ -165,6 +168,7 @@ WINI:
 		PipCount: 5
 		UnloadVoice: Unload
 		LoadingUpgrades: notmobile
+		EjectOnDeath: true
 
 LOCOMOTIVE:
 	Inherits: ^Train
@@ -175,6 +179,7 @@ LOCOMOTIVE:
 	Cargo:
 		MaxWeight: 2
 		PipCount: 2
+		EjectOnDeath: true
 
 TRAINCAR:
 	Inherits: ^Train
@@ -185,6 +190,7 @@ TRAINCAR:
 	Cargo:
 		MaxWeight: 10
 		PipCount: 5
+		EjectOnDeath: true
 
 CARGOCAR:
 	Inherits: ^Train
@@ -195,3 +201,4 @@ CARGOCAR:
 	Cargo:
 		MaxWeight: 10
 		PipCount: 5
+		EjectOnDeath: true

mods/ts/rules/defaults.yaml

@@ -450,6 +450,11 @@
 	Inherits: ^VoxelVehicle
 	-MustBeDestroyed:
 
+^CivilianVoxelCrusher:
+	Inherits: ^CivilianVoxelVehicle
+	Mobile:
+		Crushes: wall, crate, infantry
+
 ^Aircraft:
 	Inherits@1: ^GainsExperience
 	Inherits@2: ^ExistsInWorld
@@ -535,7 +540,7 @@
 		Moves: true
 		Velocity: 86
 
-^Viceroid:
+^Visceroid:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
 	DrawLineToTarget:
@@ -694,6 +699,7 @@
 	Mobile:
 		TerrainSpeeds:
 			Rail: 100
+		Crushes: wall, crate, infantry
 		ROT: 5
 		Voice: Move
 		Speed: 113

mods/ts/rules/gdi-vehicles.yaml

@@ -1,5 +1,5 @@
 APC:
-	Inherits: ^VoxelVehicle
+	Inherits: ^VoxelTank
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -64,7 +64,7 @@ HVR:
 	Health:
 		HP: 230
 	Armor:
-		Type: Light
+		Type: Wood
 	RevealsShroud:
 		Range: 7c0
 	Armament:
@@ -87,7 +87,7 @@ HVR:
 		MovingInterval: 6
 
 SMECH:
-	Inherits: ^Tank
+	Inherits: ^Vehicle
 	Valued:
 		Cost: 500
 	Tooltip:

mods/ts/rules/nod-vehicles.yaml

@@ -45,7 +45,7 @@ BIKE:
 	Health:
 		HP: 150
 	Armor:
-		Type: Light
+		Type: Wood
 	RevealsShroud:
 		Range: 5c0
 	Armament@PRIMARY:

mods/ts/rules/shared-vehicles.yaml

@@ -1,5 +1,5 @@
 MCV:
-	Inherits: ^VoxelVehicle
+	Inherits: ^VoxelTank
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 110
@@ -17,7 +17,6 @@ MCV:
 		Type: Light
 	Mobile:
 		Speed: 85
-		Crushes: wall, crate, infantry
 	RevealsShroud:
 		Range: 4c0
 	MustBeDestroyed:
@@ -100,7 +99,7 @@ HARV:
 			nod: harv.nod
 
 LPST:
-	Inherits: ^VoxelVehicle
+	Inherits: ^VoxelTank
 	-AppearsOnRadar:
 	-GainsExperience:
 	Buildable: