Convert Cargo to conditions.

2016-12-03 15:34:15 +00:00
parent ea46199cab
commit 45af024b15
12 changed files with 47 additions and 32 deletions
--- a/mods/cnc/rules/ships.yaml
+++ b/mods/cnc/rules/ships.yaml
@@ -76,4 +76,4 @@ LST:
 		MaxWeight: 5
 		PipCount: 5
 		PassengerFacing: 0
-		LoadingUpgrades: notmobile
+		LoadingCondition: notmobile
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -120,7 +120,7 @@ APC:
 		Types: Infantry
 		MaxWeight: 5
 		PipCount: 5
-		LoadingUpgrades: notmobile
+		LoadingCondition: notmobile
 	SpawnActorOnDeath:
 		Actor: APC.Husk

--- a/mods/ra/maps/infiltration/rules.yaml
+++ b/mods/ra/maps/infiltration/rules.yaml
@@ -55,7 +55,6 @@ SPY.Strong:
 	ExternalCaptures:
 		CaptureTypes: MissionObjective
 	Passenger:
-		GrantUpgrades: mobile

 DOG.Patrol:
 	Inherits: DOG
@@ -76,6 +75,8 @@ TRUK.Hijackable:
 		Types: Infantry
 		MaxWeight: 5
 		PipCount: 5
+		PassengerConditions:
+			spy.strong: mobile
 	AutoTargetIgnore:
 	-Huntable:
 	ExternalCapturable:
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -242,7 +242,7 @@ LST:
 		MaxWeight: 5
 		PipCount: 5
 		PassengerFacing: 0
-		LoadingUpgrades: notmobile
+		LoadingCondition: notmobile
 	-Chronoshiftable:

 PT:
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -355,7 +355,7 @@ JEEP:
 		Types: Infantry
 		MaxWeight: 1
 		PipCount: 1
-		LoadingUpgrades: notmobile
+		LoadingCondition: notmobile
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded

@@ -391,7 +391,7 @@ APC:
 		Types: Infantry
 		MaxWeight: 5
 		PipCount: 5
-		LoadingUpgrades: notmobile
+		LoadingCondition: notmobile
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded

@@ -752,7 +752,7 @@ STNK:
 		Types: Infantry
 		MaxWeight: 4
 		PipCount: 4
-		LoadingUpgrades: notmobile
+		LoadingCondition: notmobile
 	Cloak:
 		InitialDelay: 125
 		CloakDelay: 250
--- 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: loading
+		LoadingCondition: loading
 		EjectOnDeath: true

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

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

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

 LOCOMOTIVE:
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -802,7 +802,7 @@
 	Cargo:
 		Types: Infantry
 		UnloadVoice: Unload
-		LoadingUpgrades: loading
+		LoadingCondition: 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: loading
+		LoadingCondition: loading
 		EjectOnDeath: true
 	UpgradeOnTerrain:
 		Upgrades: inwater
--- a/mods/ts/rules/nod-vehicles.yaml
+++ b/mods/ts/rules/nod-vehicles.yaml
@@ -285,7 +285,7 @@ SAPC:
 		MaxWeight: 5
 		PipCount: 5
 		UnloadVoice: Unload
-		LoadingUpgrades: loading
+		LoadingCondition: loading
 		EjectOnDeath: true

 SUBTANK: