Merge pull request #9438 from atlimit8/UpgradableMobile

Upgradable Mobile and replace IDisableMove

mods/ts/rules/civilian-vehicles.yaml

@@ -98,6 +98,7 @@ BUS:
 		MaxWeight: 20
 		PipCount: 5
 		UnloadVoice: Unload
+		LoadingUpgrades: notmobile
 
 PICK:
 	Inherits: ^CivilianVoxelVehicle
@@ -119,6 +120,7 @@ PICK:
 		MaxWeight: 2
 		PipCount: 5
 		UnloadVoice: Unload
+		LoadingUpgrades: notmobile
 
 CAR:
 	Inherits: ^CivilianVoxelVehicle
@@ -140,6 +142,7 @@ CAR:
 		MaxWeight: 4
 		PipCount: 5
 		UnloadVoice: Unload
+		LoadingUpgrades: notmobile
 
 WINI:
 	Inherits: ^CivilianVoxelVehicle
@@ -161,6 +164,7 @@ WINI:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Unload
+		LoadingUpgrades: notmobile
 
 LOCOMOTIVE:
 	Inherits: ^Train
@@ -169,10 +173,8 @@ LOCOMOTIVE:
 	Tooltip:
 		Name: Train Locomotive
 	Cargo:
-		Types: Infantry
 		MaxWeight: 2
 		PipCount: 2
-		UnloadVoice: Unload
 
 TRAINCAR:
 	Inherits: ^Train
@@ -181,10 +183,8 @@ TRAINCAR:
 	Tooltip:
 		Name: Passenger Car
 	Cargo:
-		Types: Infantry
 		MaxWeight: 10
 		PipCount: 5
-		UnloadVoice: Unload
 
 CARGOCAR:
 	Inherits: ^Train
@@ -193,8 +193,6 @@ CARGOCAR:
 	Tooltip:
 		Name: Cargo Car
 	Cargo:
-		Types: Infantry
 		MaxWeight: 10
 		PipCount: 5
-		UnloadVoice: Unload
 

mods/ts/rules/defaults.yaml

@@ -73,6 +73,12 @@
 		UpgradeTypes: empdisable
 		Modifier: 0
 
+^EmpDisableMobile:
+	Inherits: ^EmpDisable
+	Mobile:
+		UpgradeTypes: notmobile
+		UpgradeMaxEnabledLevel: 0
+
 ^BasicBuilding:
 	Inherits@1: ^ExistsInWorld
 	Inherits@2: ^SpriteActor
@@ -334,7 +340,7 @@
 
 ^Cyborg:
 	Inherits@1: ^Infantry
-	Inherits@2: ^EmpDisable
+	Inherits@2: ^EmpDisableMobile
 	RevealsShroud:
 		Range: 4c0
 	MustBeDestroyed:
@@ -361,7 +367,7 @@
 ^Vehicle:
 	Inherits@1: ^GainsExperience
 	Inherits@2: ^ExistsInWorld
-	Inherits@3: ^EmpDisable
+	Inherits@3: ^EmpDisableMobile
 	DrawLineToTarget:
 	Mobile:
 		Crushes: crate
@@ -656,7 +662,7 @@
 	ActorLostNotification:
 
 ^Train:
-	Inherits@1: ^EmpDisable
+	Inherits@1: ^EmpDisableMobile
 	Inherits@2: ^ExistsInWorld
 	RenderVoxels:
 	WithVoxelBody:
@@ -667,6 +673,10 @@
 		ROT: 5
 		Voice: Move
 		Speed: 113
+	Cargo:
+		Types: Infantry
+		UnloadVoice: Unload
+		LoadingUpgrades: notmobile
 	Health:
 		HP: 100
 	Armor:

mods/ts/rules/gdi-vehicles.yaml

@@ -27,6 +27,7 @@ APC:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Unload
+		LoadingUpgrades: notmobile
 	-WithVoxelBody:
 	WithVoxelWaterBody:
 	LeavesTrails:

mods/ts/rules/nod-vehicles.yaml

@@ -226,6 +226,7 @@ SAPC:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Unload
+		LoadingUpgrades: notmobile
 
 SUBTANK:
 	Inherits: ^VoxelTank

mods/ts/rules/shared-vehicles.yaml

@@ -127,7 +127,7 @@ LPST:
 			gdi: lpst.gdi
 			nod: lpst.nod
 	DeployToUpgrade:
-		DeployedUpgrades: deployed
+		DeployedUpgrades: deployed, notmobile
 		UndeployedUpgrades: undeployed
 		DeployAnimation: make
 		Facing: 160
@@ -141,9 +141,6 @@ LPST:
 	WithSpriteBody@deployed:
 		UpgradeTypes: undeployed
 		UpgradeMaxEnabledLevel: 0
-	DisableOnUpgrade:
-		UpgradeTypes: undeployed
-		UpgradeMaxEnabledLevel: 0
 	DetectCloaked:
 		UpgradeTypes: deployed
 		UpgradeMinEnabledLevel: 1

mods/ts/weapons/superweapons.yaml

@@ -90,7 +90,7 @@ EMPulseCannon:
 	Warhead@emp: GrantUpgrade
 		Range: 3c0
 		Duration: 250
-		Upgrades: empdisable
+		Upgrades: empdisable, notmobile
 
 ClusterMissile:
 	ValidTargets: Ground, Water, Air