Fix ts prerequisistes

2015-01-23 21:04:26 +01:00
parent 98fd875a43
commit a5b0ea73b0
5 changed files with 91 additions and 135 deletions
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -7,7 +7,7 @@ GACNST:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 1000
-		Owner: None
+		Prerequisites: ~disabled
 	Health:
 		HP: 1500
 	Armor:
@@ -44,13 +44,19 @@ GACNST:
 		Amount: 0
 	Selectable:
 		Bounds: 144, 72, 0, -12
+	ProvidesCustomPrerequisite@gdi:
+		Race: gdi
+		Prerequisite: structures.gdi
+	ProvidesCustomPrerequisite@nod:
+		Race: nod
+		Prerequisite: structures.nod

 GAPOWR:
 	Inherits: ^Building
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 0
-		Owner: gdi
+		Prerequisites: ~structures.gdi
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -87,8 +93,7 @@ GAPILE:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 30
-		Prerequisites: anypower
-		Owner: gdi
+		Prerequisites: anypower, ~structures.gdi
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -136,7 +141,6 @@ PROC:
 		Queue: Building
 		BuildPaletteOrder: 20
 		Prerequisites: anypower
-		Owner: gdi, nod
 	Building:
 		Footprint: xxx= xx== xxx=
 		Dimensions: 4,3
@@ -172,7 +176,6 @@ GASILO:
 		Queue: Building
 		BuildPaletteOrder: 70
 		Prerequisites: proc
-		Owner: gdi, nod
 	Valued:
 		Cost: 150
 	Tooltip:
@@ -214,8 +217,7 @@ GAWEAP:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
-		Owner: gdi
-		Prerequisites: proc
+		Prerequisites: proc, ~structures.gdi
 	Building:
 		Footprint: xxx= xxx= xxx=
 		Dimensions: 4,3
@@ -252,7 +254,7 @@ NAPOWR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 0
-		Owner: nod
+		Prerequisites: ~structures.nod
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -287,8 +289,7 @@ NAAPWR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 5
-		Prerequisites: factory
-		Owner: nod
+		Prerequisites: factory, ~structures.nod
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -323,8 +324,7 @@ NAHAND:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 30
-		Prerequisites: anypower
-		Owner: nod
+		Prerequisites: anypower, ~structures.nod
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -371,8 +371,7 @@ NAWEAP:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
-		Owner: nod
-		Prerequisites: proc
+		Prerequisites: proc, ~structures.nod
 	Building:
 		Footprint: xxx= xxx= xxx=
 		Dimensions: 4,3
@@ -405,8 +404,7 @@ GASAND:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1000
-		Prerequisites: proc
-		Owner: gdi
+		Prerequisites: ~structures.gdi
 	SoundOnDamageTransition:
 		DamagedSound: sandbag1.aud
 		DestroyedSound: sandbag1.aud
@@ -433,8 +431,7 @@ GAWALL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1001
-		Prerequisites: gapile
-		Owner: gdi
+		Prerequisites: ~structures.gdi
 	SoundOnDamageTransition:
 		DamagedSound:
 		DestroyedSound:
@@ -459,8 +456,7 @@ NAWALL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1001
-		Prerequisites: nahand
-		Owner: nod
+		Prerequisites: ~structures.nod
 	SoundOnDamageTransition:
 		DamagedSound:
 		DestroyedSound:
@@ -623,7 +619,7 @@ GASPOT:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 10
-		Owner: gdi, nod
+		Prerequisites: anypower
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -652,7 +648,7 @@ GALITE:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 10
-		Owner: gdi, nod
+		Prerequisites: anypower
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -676,8 +672,7 @@ GARADR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 90
-		Owner: gdi
-		Prerequisites: proc
+		Prerequisites: proc, ~structures.gdi
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -716,8 +711,7 @@ NARADR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 90
-		Owner: nod
-		Prerequisites: proc
+		Prerequisites: proc, ~structures.nod
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -756,8 +750,7 @@ GATECH:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 100
-		Owner: gdi
-		Prerequisites: gaweap, garadr
+		Prerequisites: gaweap, garadr, ~structures.gdi
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -786,8 +779,7 @@ NATECH:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 100
-		Owner: nod
-		Prerequisites: naweap, naradr
+		Prerequisites: naweap, naradr, ~structures.nod
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -820,9 +812,8 @@ GAHPAD:
 		Description: Produces, rearms and\nrepairs helicopters
 	Buildable:
 		BuildPaletteOrder: 60
-		Owner: gdi
 		Queue: Building
-		Prerequisites: garadr
+		Prerequisites: garadr, ~structures.gdi
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -851,13 +842,12 @@ NAHPAD:
 	Valued:
 		Cost: 500
 	Tooltip:
-		Name: Nod Helipad
+		Name: Helipad
 		Description: Produces, rearms and\nrepairs helicopters
 	Buildable:
 		BuildPaletteOrder: 60
-		Owner: nod
 		Queue: Building
-		Prerequisites: naradr
+		Prerequisites: naradr, ~structures.nod
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -890,8 +880,7 @@ GADEPT:
 		Description: Repairs vehicles
 	Buildable:
 		BuildPaletteOrder: 80
-		Prerequisites: factory
-		Owner: gdi
+		Prerequisites: factory, ~structures.gdi
 		Queue: Building
 	Building:
 		Footprint: =x= xxx =x=
@@ -927,8 +916,7 @@ NASTLH:
 		Description: Generates a cloaking field
 	Buildable:
 		BuildPaletteOrder: 80
-		Prerequisites: proc, natech
-		Owner: nod
+		Prerequisites: proc, natech, ~structures.nod
 		Queue: Building
 	Building:
 		Footprint: xxx xxx
@@ -967,8 +955,7 @@ GAVULC:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 30
-		Prerequisites: gapile
-		Owner: gdi
+		Prerequisites: gapile, ~structures.gdi
 	Building:
 	Selectable:
 		Bounds: 48, 48, 0, -12
@@ -1026,8 +1013,7 @@ GAROCK:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 40
-		Prerequisites: gapile
-		Owner: gdi
+		Prerequisites: gapile, ~structures.gdi
 	Building:
 	Selectable:
 		Bounds: 48, 48, 0, -12
@@ -1077,8 +1063,7 @@ GACSAM:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 60
-		Prerequisites: garadr
-		Owner: gdi
+		Prerequisites: garadr, ~structures.gdi
 	Building:
 	Selectable:
 		Bounds: 48, 48, 0, -12
@@ -1126,9 +1111,8 @@ 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
+		Prerequisites: naradr, ~structures.nod
 		BuildPaletteOrder: 60
-		Owner: nod
 	Building:
 	Selectable:
 		Bounds: 36, 36, -2, -8
@@ -1169,9 +1153,8 @@ NALASR:
 		Description: Basic base defense. \nRequires power to operate.\n  Strong vs all ground units\n  Cannot target Aircraft
 	Buildable:
 		Queue: Defense
-		Prerequisites: nahand
+		Prerequisites: nahand, ~structures.nod
 		BuildPaletteOrder: 50
-		Owner: nod
 	Building:
 	Selectable:
 		Bounds: 36, 36, -2, -8
@@ -1211,8 +1194,7 @@ NAOBEL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 90
-		Prerequisites: natech
-		Owner: nod
+		Prerequisites: natech, ~structures.nod
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -1257,7 +1239,6 @@ NAPULS:
 		Queue: Defense
 		BuildPaletteOrder: 90
 		Prerequisites: radar
-		Owner: nod, gdi
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2