Remove notmobile condition from TS.

2016-11-20 16:53:56 +00:00
parent 7827d50e99
commit 983a24199a
6 changed files with 11 additions and 11 deletions
--- a/mods/ts/rules/civilian-vehicles.yaml
+++ b/mods/ts/rules/civilian-vehicles.yaml
@@ -102,7 +102,7 @@ BUS:
 		MaxWeight: 20
 		PipCount: 5
 		UnloadVoice: Unload
-		LoadingUpgrades: notmobile
+		LoadingUpgrades: loading
 		EjectOnDeath: true

 PICK:
@@ -126,7 +126,7 @@ PICK:
 		MaxWeight: 2
 		PipCount: 5
 		UnloadVoice: Unload
-		LoadingUpgrades: notmobile
+		LoadingUpgrades: loading
 		EjectOnDeath: true

 CAR:
@@ -150,7 +150,7 @@ CAR:
 		MaxWeight: 4
 		PipCount: 5
 		UnloadVoice: Unload
-		LoadingUpgrades: notmobile
+		LoadingUpgrades: loading
 		EjectOnDeath: true

 WINI:
@@ -174,7 +174,7 @@ WINI:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Unload
-		LoadingUpgrades: notmobile
+		LoadingUpgrades: loading
 		EjectOnDeath: true

 LOCOMOTIVE:
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -87,7 +87,7 @@
 ^EmpDisableMobile:
 	Inherits: ^EmpDisable
 	Mobile:
-		RequiresCondition: !notmobile
+		RequiresCondition: !empdisable && !deployed && !loading

 ^Cloakable:
 	Cloak@CLOAKGENERATOR:
@@ -795,7 +795,7 @@
 	Cargo:
 		Types: Infantry
 		UnloadVoice: Unload
-		LoadingUpgrades: notmobile
+		LoadingUpgrades: loading
 	Health:
 		HP: 100
 	Armor:
--- a/mods/ts/rules/gdi-vehicles.yaml
+++ b/mods/ts/rules/gdi-vehicles.yaml
@@ -28,7 +28,7 @@ APC:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Unload
-		LoadingUpgrades: notmobile
+		LoadingUpgrades: loading
 		EjectOnDeath: true
 	UpgradeOnTerrain:
 		Upgrades: inwater
--- a/mods/ts/rules/nod-vehicles.yaml
+++ b/mods/ts/rules/nod-vehicles.yaml
@@ -106,7 +106,7 @@ TTNK:
 	RenderSprites:
 		Image: ttnk
 	DeployToUpgrade:
-		DeployedUpgrades: deployed, notmobile
+		DeployedUpgrades: deployed
 		UndeployedUpgrades: undeployed
 		DeployAnimation: make
 		Facing: 160
@@ -285,7 +285,7 @@ SAPC:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Unload
-		LoadingUpgrades: notmobile
+		LoadingUpgrades: loading
 		EjectOnDeath: true

 SUBTANK:
--- a/mods/ts/rules/shared-vehicles.yaml
+++ b/mods/ts/rules/shared-vehicles.yaml
@@ -138,7 +138,7 @@ LPST:
 			gdi: lpst.gdi
 			nod: lpst.nod
 	DeployToUpgrade:
-		DeployedUpgrades: deployed, notmobile
+		DeployedUpgrades: deployed
 		UndeployedUpgrades: undeployed
 		DeployAnimation: make
 		Facing: 160
--- a/mods/ts/weapons/superweapons.yaml
+++ b/mods/ts/weapons/superweapons.yaml
@@ -110,7 +110,7 @@ EMPulseCannon:
 	Warhead@emp: GrantUpgrade
 		Range: 4c0
 		Duration: 250
-		Upgrades: empdisable, notmobile
+		Upgrades: empdisable

 ClusterMissile:
 	ValidTargets: Ground, Water, Air