Fix cargo/passenger interaction

2010-08-08 19:16:37 +12:00
parent e5878e8207
commit 6fc945ac91
8 changed files with 37 additions and 27 deletions
--- a/mods/cnc/defaults.yaml
+++ b/mods/cnc/defaults.yaml
@@ -13,6 +13,7 @@
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
+		CargoType: Vehicle
 	IronCurtainable: 
 	HiddenUnderFog:
 	GainsExperience:
@@ -36,6 +37,7 @@
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
+		CargoType: Vehicle
 	IronCurtainable: 
 	HiddenUnderFog:
 	GainsExperience:
@@ -80,6 +82,7 @@
 	RenderInfantry:
 	AutoTarget:
 	Passenger:
+		CargoType: Infantry
 	HiddenUnderFog:
 	PoisonedByTiberium:
 	GainsExperience:
--- a/mods/cnc/infantry.yaml
+++ b/mods/cnc/infantry.yaml
@@ -128,7 +128,7 @@ E6:
 		HP: 25
 	TakeCover:
 	Passenger:
-		ColorOfCargoPip: Yellow
+		PipType: Yellow
 	EngineerRepair:
 	EngineerCapture:
 	-AutoTarget:
--- a/mods/cnc/vehicles.yaml
+++ b/mods/cnc/vehicles.yaml
@@ -78,7 +78,7 @@ APC:
 	WithMuzzleFlash:
 	AutoTarget:
 	Cargo:
-		PassengerTypes: Foot
+		Types: Infantry
 		Passengers: 5
 		UnloadFacing: 220

@@ -418,7 +418,7 @@ TRAN:
 		SecondaryOffset: 0,-14,0,-2
 	WithShadow:
 	Cargo:
-		PassengerTypes: Foot
+		Types: Infantry
 		Passengers: 5

 HELI:
@@ -489,6 +489,7 @@ C17:
 	RenderUnit:
 	WithShadow:
 	Cargo:
+		Types: Infantry, Vehicle
 		Passengers: 10
 	Invulnerable:
 	-Selectable:
--- a/mods/ra/defaults.yaml
+++ b/mods/ra/defaults.yaml
@@ -13,6 +13,7 @@
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
+		CargoType: Vehicle
 	IronCurtainable: 
 	HiddenUnderFog:
 	GainsExperience:
@@ -36,6 +37,7 @@
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
+		CargoType: Vehicle
 	IronCurtainable: 
 	HiddenUnderFog:
 	GainsExperience:
@@ -62,6 +64,7 @@
 	RenderInfantry:
 	AutoTarget:
 	Passenger:
+		CargoType: Infantry
 	HiddenUnderFog:
 	TeslaInstantKills:
 	GainsExperience:
--- a/mods/ra/infantry.yaml
+++ b/mods/ra/infantry.yaml
@@ -125,7 +125,7 @@ E6:
 	Mobile:
 		Speed: 4
 	Passenger:
-		ColorOfCargoPip: Yellow
+		PipType: Yellow
 	EngineerRepair:
 	EngineerCapture:
 	TakeCover:
@@ -151,7 +151,7 @@ SPY:
 	RevealsShroud:
 		Range: 5
 	Passenger:
-		ColorOfCargoPip: Yellow
+		PipType: Yellow
 	RenderSpy:
 	TakeCover:
 	Spy:
@@ -204,7 +204,7 @@ MEDI:
 	RevealsShroud:
 		Range: 3
 	Passenger:
-		ColorOfCargoPip: Yellow
+		PipType: Yellow
 	AutoHeal:
 	AttackBase:
 		PrimaryWeapon: Heal
--- a/mods/ra/vehicles.yaml
+++ b/mods/ra/vehicles.yaml
@@ -13,6 +13,7 @@ BADR:
 	IronCurtainable:
 	Cargo:
 		Passengers: 10
+		Types: Infantry, Vehicle
 	-Selectable:
 	-GainsExperience:

@@ -307,7 +308,7 @@ APC:
 	WithMuzzleFlash:
 	AutoTarget:
 	Cargo:
-		PassengerTypes: Foot
+		Types: Infantry
 		Passengers: 5
 		UnloadFacing: 220

@@ -517,7 +518,7 @@ LST:
 		Range: 6
 	RenderUnit:
 	Cargo:
-		PassengerTypes: Foot,Wheel,Track
+		Types: Infantry, Vehicle
 		Passengers: 5
 	IronCurtainable:
 	RepairableNear:
@@ -640,7 +641,7 @@ TRAN:
 		SecondaryOffset: 0,-14,0,-2
 	WithShadow:
 	Cargo:
-		PassengerTypes: Foot
+		Types: Infantry
 		Passengers: 5
 	IronCurtainable: