Merge pull request #6716 from LipkeGu/ts_PreReqs

[TS] Correcting the Prerequisites
2014-10-16 06:53:03 +02:00
parent 8119273517 7306cd32c8
commit a946fac06b
4 changed files with 52 additions and 27 deletions
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -115,7 +115,7 @@ ORCAB:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: gahpad
+		Prerequisites: gahpad, gatech
 		Owner: gdi
 	Selectable:
 		Bounds: 30,24
@@ -184,7 +184,7 @@ TRNSPORT:
 		Queue: Air
 		BuildPaletteOrder: 10
 		Owner: gdi
-		Prerequisites: gahpad
+		Prerequisites: gahpad, gadept
 	Helicopter:
 		LandWhenIdle: yes
 		ROT: 5
@@ -210,7 +210,7 @@ SCRIN:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: nahpad
+		Prerequisites: nahpad, natech
 		Owner: nod
 	Selectable:
 		Bounds: 30,24
--- a/mods/ts/rules/infantry.yaml
+++ b/mods/ts/rules/infantry.yaml
@@ -88,6 +88,7 @@ WEEDGUY:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
+		Prerequisites: nahand
 		Owner: gdi
 		Hothey: c
 	Selectable:
@@ -116,6 +117,7 @@ MEDIC:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 60
+		Prerequisites: gapile
 		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
@@ -147,7 +149,8 @@ ENGINEER:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 30
-		Owner: gdi,nod
+		Prerequisites: barracks
+		Owner: gdi, nod
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Engineer
@@ -177,6 +180,7 @@ UMAGON:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
+		Prerequisites: gapile, gatech
 		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
@@ -208,6 +212,7 @@ GHOST:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
+		Prerequisites: gapile, gatech
 		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
@@ -242,6 +247,7 @@ JUMPJET:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
+		Prerequisites: gapile, garadr
 		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
@@ -268,6 +274,7 @@ CHAMSPY:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 60
+		Prerequisites: nahand, natech
 		Owner: nod
 	Valued:
 		Cost: 700
@@ -305,6 +312,7 @@ CYBORG:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
+		Prerequisites: nahand
 		Owner: nod
 	-Crushable:
 	Selectable:
@@ -338,6 +346,7 @@ CYC2:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
+		Prerequisites: nahand, natech
 		Owner: nod
 	-Crushable:
 	Selectable:
@@ -365,7 +374,6 @@ MUTANT:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: forgotten
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -394,7 +402,6 @@ MWMN:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: forgotten
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -423,7 +430,6 @@ MUTANT3:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: forgotten
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -452,7 +458,8 @@ MHIJACK:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: forgotten
+		Prerequisites: nahand, natech # natech must be natmpl
+		Owner: nod
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -479,7 +486,6 @@ TRATOS:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: forgotten
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -505,7 +511,6 @@ OXANNA:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: forgotten
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -529,7 +534,6 @@ SLAV:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: forgotten
 	Valued:
 		Cost: 100
 	Tooltip:
@@ -555,7 +559,6 @@ DOGGIE:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 100
-		Owner: None
 	Health:
 		Radius: 213
 		HP: 250
@@ -585,7 +588,6 @@ VISSML:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 100
-		Owner: None
 	Health:
 		HP: 200
 	PoisonedByTiberium:
@@ -616,7 +618,6 @@ VISLRG:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 100
-		Owner: None
 	Health:
 		HP: 500
 	PoisonedByTiberium:
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -136,7 +136,7 @@ PROC:
 		Queue: Building
 		BuildPaletteOrder: 20
 		Prerequisites: anypower
-		Owner: gdi,nod
+		Owner: gdi, nod
 	Building:
 		Footprint: xxx= xx== xxx=
 		Dimensions: 4,3
@@ -405,7 +405,7 @@ GASAND:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1000
-		Prerequisites: gacnst
+		Prerequisites: proc
 		Owner: gdi
 	SoundOnDamageTransition:
 		DamagedSound: sandbag1.aud
@@ -433,7 +433,7 @@ GAWALL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1001
-		Prerequisites: gacnst
+		Prerequisites: gapile
 		Owner: gdi
 	SoundOnDamageTransition:
 		DamagedSound:
@@ -459,7 +459,7 @@ NAWALL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1001
-		Prerequisites: gacnst
+		Prerequisites: nahand
 		Owner: nod
 	SoundOnDamageTransition:
 		DamagedSound:
@@ -674,7 +674,7 @@ GARADR:
 		Queue: Building
 		BuildPaletteOrder: 90
 		Owner: gdi
-		Prerequisites: anypower, factory
+		Prerequisites: proc
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -714,7 +714,7 @@ NARADR:
 		Queue: Building
 		BuildPaletteOrder: 90
 		Owner: nod
-		Prerequisites: anypower, factory
+		Prerequisites: proc
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -754,7 +754,7 @@ GATECH:
 		Queue: Building
 		BuildPaletteOrder: 100
 		Owner: gdi
-		Prerequisites: garadr
+		Prerequisites: gaweap, garadr
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -784,7 +784,7 @@ NATECH:
 		Queue: Building
 		BuildPaletteOrder: 100
 		Owner: nod
-		Prerequisites: naradr
+		Prerequisites: naweap, naradr
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -855,6 +855,7 @@ NAHPAD:
 		BuildPaletteOrder: 60
 		Owner: nod
 		Queue: Building
+		Prerequisites: naradr
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -925,7 +926,7 @@ NASTLH:
 		Description: Generates a cloaking field
 	Buildable:
 		BuildPaletteOrder: 80
-		Prerequisites: proc,natech
+		Prerequisites: proc, natech
 		Owner: nod
 		Queue: Building
 	Building:
@@ -965,6 +966,7 @@ GAVULC:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 30
+		Prerequisites: gapile
 		Owner: gdi
 	Building:
 	Selectable:
@@ -1023,6 +1025,7 @@ GAROCK:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 40
+		Prerequisites: gapile
 		Owner: gdi
 	Building:
 	Selectable:
@@ -1073,6 +1076,7 @@ GACSAM:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 60
+		Prerequisites: garadr
 		Owner: gdi
 	Building:
 	Selectable:
@@ -1121,6 +1125,7 @@ NASAM:
 		Description: Nod Anti-Air base defense. \nRequires power to operate.\n  Strong vs all Aircraft\n  Cannot target ground units
 	Buildable:
 		Queue: Defense
+		Prerequisites: naradr
 		BuildPaletteOrder: 60
 		Owner: nod
 	Building:
@@ -1163,6 +1168,7 @@ NALASR:
 		Description: Basic base defense. \nRequires power to operate.\n  Strong vs all ground units\n  Cannot target Aircraft
 	Buildable:
 		Queue: Defense
+		Prerequisites: nahand
 		BuildPaletteOrder: 50
 		Owner: nod
 	Building:
@@ -1204,7 +1210,7 @@ NAOBEL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 90
-		Prerequisites: tech
+		Prerequisites: natech
 		Owner: nod
 	Building:
 		Footprint: xx xx
@@ -1250,7 +1256,7 @@ NAPULS:
 		Queue: Defense
 		BuildPaletteOrder: 90
 		Prerequisites: radar
-		Owner: nod,gdi
+		Owner: nod, gdi
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -3,7 +3,8 @@ MCV:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 110
-		Owner: gdi,nod
+		Owner: gdi, nod
+		Prerequisites: factory, tech
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -43,6 +44,7 @@ APC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
+		Prerequisites: gaweap, gapile
 		Owner: gdi
 	Mobile:
 		ROT: 5
@@ -73,7 +75,8 @@ HARV:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
-		Owner: gdi,nod
+		Prerequisites: factory, proc
+		Owner: gdi, nod
 		InitialActivity: FindResources
 	Selectable:
 		Priority: 7
@@ -121,6 +124,7 @@ HVR:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
+		Prerequisites: gaweap, garadr 
 		Owner: gdi
 		Hothey: v
 	Mobile:
@@ -229,6 +233,7 @@ LPST:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
+		Prerequisites: factory, radar
 		Owner: gdi, nod
 	Health:
 		HP: 600
@@ -283,6 +288,7 @@ REPAIR:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 70
+		Prerequisites: naweap
 		Owner: nod
 	Valued:
 		Cost: 1000
@@ -314,6 +320,7 @@ ART2:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
+		Prerequisites: naweap, naradr
 		Owner: nod
 	Health:
 		HP: 300
@@ -344,6 +351,7 @@ WEED:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
+		Prerequisites: naweap, natech # TODO: natech must be nawast
 		Owner: nod
 	Mobile:
 		Speed: 71
@@ -501,6 +509,7 @@ MMCH:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
+		Prerequisites: gaweap
 		Owner: gdi
 	Mobile:
 		ROT: 5
@@ -535,6 +544,7 @@ HMEC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 80
+		Prerequisites: gaweap, gatech
 		Owner: gdi
 	Mobile:
 		ROT: 3
@@ -568,6 +578,7 @@ SMECH:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
+		Prerequisites: gaweap
 		Owner: gdi
 	Mobile:
 		ROT: 5
@@ -597,6 +608,7 @@ BIKE:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
+		Prerequisites: naweap
 		Owner: nod
 	Mobile:
 		ROT: 8
@@ -631,6 +643,7 @@ BGGY:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
+		Prerequisites: naweap
 		Owner: nod
 	Mobile:
 		ROT: 8
@@ -663,6 +676,7 @@ SAPC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
+		Prerequisites: naweap, natech
 		Owner: nod
 	Mobile:
 		ROT: 5
@@ -691,6 +705,7 @@ SUBTANK:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
+		Prerequisites: naweap, natech
 		Owner: nod
 	Mobile:
 		ROT: 6
@@ -718,6 +733,7 @@ SONIC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 70
+		Prerequisites: gaweap, gatech
 		Owner: gdi
 	Mobile:
 		ROT: 4
@@ -750,6 +766,7 @@ TTNK:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 60
+		Prerequisites: naweap
 		Owner: nod
 	Mobile:
 		ROT: 5
@@ -791,6 +808,7 @@ STNK:
 		Description: Long-range missile tank that can cloak.\nHas weak armor. Can be spotted by infantry.\n  Strong vs Vehicles, Tanks, Aircraft\n  Weak vs Infantry.
 	Buildable:
 		BuildPaletteOrder: 90
+		Prerequisites: naweap, natech
 		Queue: Vehicle
 		Owner: nod
 	Mobile: