Merge pull request #7376 from abcdefg30/tsprereqs

Fix TS prerequisites.

mods/ts/rules/aircraft.yaml

@@ -7,7 +7,7 @@ DPOD:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 10
-		Owner: gdi
+		Prerequisites: ~gahpad
 	Helicopter:
 		LandWhenIdle: yes
 		ROT: 5
@@ -46,8 +46,7 @@ DSHP:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 10
-		Owner: gdi
+		Prerequisites: ~gahpad, gaweap
-		Prerequisites: gaweap
 	Helicopter:
 		LandWhenIdle: yes
 		ROT: 5
@@ -79,8 +78,7 @@ ORCA:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: gahpad
+		Prerequisites: ~gahpad
-		Owner: gdi
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
@@ -117,8 +115,7 @@ ORCAB:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: gahpad, gatech
+		Prerequisites: ~gahpad, gatech
-		Owner: gdi
 	Selectable:
 		Bounds: 30,24
 	Helicopter:
@@ -155,8 +152,7 @@ ORCATRAN:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 10
-		Owner: gdi
+		Prerequisites: ~gahpad
-		Prerequisites: gahpad
 	Helicopter:
 		LandWhenIdle: yes
 		ROT: 5
@@ -187,8 +183,7 @@ TRNSPORT:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 10
-		Owner: gdi
+		Prerequisites: ~gahpad, ~gadept
-		Prerequisites: gahpad, gadept
 	Helicopter:
 		LandWhenIdle: yes
 		ROT: 5
@@ -215,8 +210,7 @@ SCRIN:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: nahpad, natech
+		Prerequisites: ~nahpad, natech
-		Owner: nod
 	Selectable:
 		Bounds: 30,24
 		Voice: Scrin
@@ -253,8 +247,7 @@ APACHE:
 	Buildable:
 		Queue: Air
 		BuildPaletteOrder: 20
-		Prerequisites: nahpad
+		Prerequisites: ~nahpad
-		Owner: nod
 	Selectable:
 		Bounds: 30,24
 	Helicopter:

mods/ts/rules/infantry.yaml

@@ -3,7 +3,7 @@ E1:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: gdi,nod
+		Prerequisites: ~barracks
 	Valued:
 		Cost: 120
 	Tooltip:
@@ -34,7 +34,7 @@ E2:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Owner: gdi
+		Prerequisites: ~gapile
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -60,7 +60,7 @@ E3:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 20
-		Owner: nod
+		Prerequisites: ~nahand
 	Valued:
 		Cost: 250
 	Tooltip:
@@ -91,8 +91,7 @@ WEEDGUY:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
-		Prerequisites: nahand
+		Prerequisites: ~nahand
-		Owner: gdi
 		Hothey: c
 	Selectable:
 		Bounds: 12,17,0,-6
@@ -120,8 +119,7 @@ MEDIC:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 60
-		Prerequisites: gapile
+		Prerequisites: ~gapile
-		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Medic
@@ -152,8 +150,7 @@ ENGINEER:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 30
-		Prerequisites: barracks
+		Prerequisites: ~barracks
-		Owner: gdi, nod
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Engineer
@@ -183,8 +180,7 @@ UMAGON:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
-		Prerequisites: gapile, gatech
+		Prerequisites: ~gapile, gatech
-		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Umagon
@@ -215,8 +211,7 @@ GHOST:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
-		Prerequisites: gapile, gatech
+		Prerequisites: ~gapile, gatech
-		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Ghost
@@ -250,8 +245,7 @@ JUMPJET:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
-		Prerequisites: gapile, garadr
+		Prerequisites: ~gapile, garadr
-		Owner: gdi
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: JumpJet
@@ -277,8 +271,7 @@ CHAMSPY:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 60
-		Prerequisites: nahand, natech
+		Prerequisites: ~nahand, natech
-		Owner: nod
 	Valued:
 		Cost: 700
 	DisguiseToolTip:
@@ -315,8 +308,7 @@ CYBORG:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
-		Prerequisites: nahand
+		Prerequisites: ~nahand
-		Owner: nod
 	-Crushable:
 	Selectable:
 		Bounds: 14,30,0,-7
@@ -349,8 +341,7 @@ CYC2:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 50
-		Prerequisites: nahand, natech
+		Prerequisites: ~nahand, natech
-		Owner: nod
 	-Crushable:
 	Selectable:
 		Bounds: 14,30,0,-7
@@ -461,8 +452,7 @@ MHIJACK:
 	Buildable:
 		Queue: Infantry
 		BuildPaletteOrder: 10
-		Prerequisites: nahand, natech # natech must be natmpl
+		Prerequisites: ~nahand, natech # natech must be natmpl
-		Owner: nod
 	Valued:
 		Cost: 100
 	Tooltip:

mods/ts/rules/player.yaml

@@ -6,24 +6,34 @@ Player:
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		ReadyAudio: ConstructionComplete
+		SpeedUp: True
+		RequireOwner: false
 	ClassicProductionQueue@Defense:
 		Type: Defense
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		ReadyAudio: ConstructionComplete
+		SpeedUp: True
+		RequireOwner: false
 	ClassicProductionQueue@Vehicle:
 		Type: Vehicle
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		SpeedUp: True
+		RequireOwner: false
 	ClassicProductionQueue@Infantry:
 		Type: Infantry
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		SpeedUp: True
+		RequireOwner: false
 	ClassicProductionQueue@Air:
 		Type: Air
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
+		SpeedUp: True
+		RequireOwner: false
 	PlaceBuilding:
 	SupportPowerManager:
 	ScriptTriggers:

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
+		Prerequisites: anypower, ~structures.gdi
-		Owner: 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
@@ -173,7 +177,6 @@ GASILO:
 		Queue: Building
 		BuildPaletteOrder: 70
 		Prerequisites: proc
-		Owner: gdi, nod
 	Valued:
 		Cost: 150
 	Tooltip:
@@ -215,8 +218,7 @@ GAWEAP:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
-		Owner: gdi
+		Prerequisites: proc, ~structures.gdi
-		Prerequisites: proc
 	Building:
 		Footprint: xxx= xxx= xxx=
 		Dimensions: 4,3
@@ -253,7 +255,7 @@ NAPOWR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 0
-		Owner: nod
+		Prerequisites: ~structures.nod
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -288,8 +290,7 @@ NAAPWR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 5
-		Prerequisites: factory
+		Prerequisites: factory, ~structures.nod
-		Owner: nod
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -324,8 +325,7 @@ NAHAND:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 30
-		Prerequisites: anypower
+		Prerequisites: anypower, ~structures.nod
-		Owner: nod
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -372,8 +372,7 @@ NAWEAP:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 50
-		Owner: nod
+		Prerequisites: proc, ~structures.nod
-		Prerequisites: proc
 	Building:
 		Footprint: xxx= xxx= xxx=
 		Dimensions: 4,3
@@ -406,8 +405,7 @@ GASAND:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1000
-		Prerequisites: proc
+		Prerequisites: ~structures.gdi
-		Owner: gdi
 	SoundOnDamageTransition:
 		DamagedSound: sandbag1.aud
 		DestroyedSound: sandbag1.aud
@@ -434,8 +432,7 @@ GAWALL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1001
-		Prerequisites: gapile
+		Prerequisites: ~structures.gdi
-		Owner: gdi
 	SoundOnDamageTransition:
 		DamagedSound:
 		DestroyedSound:
@@ -460,8 +457,7 @@ NAWALL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 1001
-		Prerequisites: nahand
+		Prerequisites: ~structures.nod
-		Owner: nod
 	SoundOnDamageTransition:
 		DamagedSound:
 		DestroyedSound:
@@ -624,7 +620,7 @@ GASPOT:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 10
-		Owner: gdi, nod
+		Prerequisites: anypower
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -653,7 +649,7 @@ GALITE:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 10
-		Owner: gdi, nod
+		Prerequisites: anypower
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -677,8 +673,7 @@ GARADR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 90
-		Owner: gdi
+		Prerequisites: proc, ~structures.gdi
-		Prerequisites: proc
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -717,8 +712,7 @@ NARADR:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 90
-		Owner: nod
+		Prerequisites: proc, ~structures.nod
-		Prerequisites: proc
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -757,8 +751,7 @@ GATECH:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 100
-		Owner: gdi
+		Prerequisites: gaweap, garadr, ~structures.gdi
-		Prerequisites: gaweap, garadr
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -787,8 +780,7 @@ NATECH:
 	Buildable:
 		Queue: Building
 		BuildPaletteOrder: 100
-		Owner: nod
+		Prerequisites: naweap, naradr, ~structures.nod
-		Prerequisites: naweap, naradr
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -821,9 +813,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
@@ -852,13 +843,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
@@ -891,8 +881,7 @@ GADEPT:
 		Description: Repairs vehicles
 	Buildable:
 		BuildPaletteOrder: 80
-		Prerequisites: factory
+		Prerequisites: factory, ~structures.gdi
-		Owner: gdi
 		Queue: Building
 	Building:
 		Footprint: =x= xxx =x=
@@ -928,8 +917,7 @@ NASTLH:
 		Description: Generates a cloaking field
 	Buildable:
 		BuildPaletteOrder: 80
-		Prerequisites: proc, natech
+		Prerequisites: proc, natech, ~structures.nod
-		Owner: nod
 		Queue: Building
 	Building:
 		Footprint: xxx xxx
@@ -968,8 +956,7 @@ GAVULC:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 30
-		Prerequisites: gapile
+		Prerequisites: gapile, ~structures.gdi
-		Owner: gdi
 	Building:
 	Selectable:
 		Bounds: 48, 48, 0, -12
@@ -1027,8 +1014,7 @@ GAROCK:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 40
-		Prerequisites: gapile
+		Prerequisites: gapile, ~structures.gdi
-		Owner: gdi
 	Building:
 	Selectable:
 		Bounds: 48, 48, 0, -12
@@ -1078,8 +1064,7 @@ GACSAM:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 60
-		Prerequisites: garadr
+		Prerequisites: garadr, ~structures.gdi
-		Owner: gdi
 	Building:
 	Selectable:
 		Bounds: 48, 48, 0, -12
@@ -1127,9 +1112,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
@@ -1170,9 +1154,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
@@ -1212,8 +1195,7 @@ NAOBEL:
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 90
-		Prerequisites: natech
+		Prerequisites: natech, ~structures.nod
-		Owner: nod
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -1258,7 +1240,6 @@ NAPULS:
 		Queue: Defense
 		BuildPaletteOrder: 90
 		Prerequisites: radar
-		Owner: nod, gdi
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2

mods/ts/rules/vehicles.yaml

@@ -3,8 +3,7 @@ MCV:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 110
-		Owner: gdi, nod
+		Prerequisites: ~factory, tech
-		Prerequisites: factory, tech
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -45,8 +44,7 @@ APC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
-		Prerequisites: gaweap, gapile
+		Prerequisites: ~gaweap, gapile
-		Owner: gdi
 	Mobile:
 		ROT: 5
 		Speed: 113
@@ -76,8 +74,7 @@ HARV:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
-		Prerequisites: factory, proc
+		Prerequisites: ~factory, proc
-		Owner: gdi, nod
 		InitialActivity: FindResources
 	Selectable:
 		Priority: 7
@@ -128,8 +125,7 @@ HVR:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
-		Prerequisites: gaweap, garadr
+		Prerequisites: ~gaweap, garadr
-		Owner: gdi
 		Hothey: v
 	Mobile:
 		Speed: 99
@@ -172,7 +168,7 @@ HVR:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 60
-		Owner: gdi
+ 		Prerequisites: ~gaweap
 	Mobile:
 		Speed: 56
 		ROT: 5
@@ -210,7 +206,7 @@ TRUCKB:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 120
-		Owner: gdi, nod
+		Prerequisites: factory
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -239,8 +235,7 @@ LPST:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: factory, radar
+		Prerequisites: ~factory, radar
-		Owner: gdi, nod
 	Health:
 		HP: 600
 	Armor:
@@ -269,7 +264,7 @@ ICBM:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Owner: gdi
+		Prerequisites: ~gaweap
 	Health:
 		HP: 500
 	Armor:
@@ -294,8 +289,7 @@ REPAIR:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 70
-		Prerequisites: naweap
+		Prerequisites: ~naweap
-		Owner: nod
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -326,8 +320,7 @@ ART2:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
-		Prerequisites: naweap, naradr
+		Prerequisites: ~naweap, naradr
-		Owner: nod
 	Health:
 		HP: 300
 	Armor:
@@ -357,8 +350,7 @@ WEED:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
-		Prerequisites: naweap, natech # TODO: natech must be nawast
+		Prerequisites: ~naweap, natech # TODO: natech must be nawast
-		Owner: nod
 	Mobile:
 		Speed: 71
 		ROT: 5
@@ -382,7 +374,7 @@ BUS:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 300
-		Owner: gdi
+		Prerequisites: ~gaweap
 	Mobile:
 		ROT: 5
 		Speed: 113
@@ -409,7 +401,7 @@ PICK:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 300
-		Owner: gdi
+		Prerequisites: ~gaweap
 	Mobile:
 		ROT: 5
 		Speed: 113
@@ -436,7 +428,7 @@ CAR:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 300
-		Owner: gdi
+		Prerequisites: ~gaweap
 	Mobile:
 		ROT: 5
 		Speed: 113
@@ -462,7 +454,7 @@ GGHUNT:
 		Name: Hunter-Seeker Droid
 	Buildable:
 		BuildPaletteOrder: 20
-		Owner: gdi, nod
+		Prerequisites: factory
 		Queue: Vehicle
 	Mobile:
 		ROT: 16
@@ -488,7 +480,7 @@ WINI:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 300
-		Owner: gdi
+		Prerequisites: ~gaweap
 	Mobile:
 		ROT: 5
 		Speed: 113
@@ -515,8 +507,7 @@ MMCH:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
-		Prerequisites: gaweap
+		Prerequisites: ~gaweap
-		Owner: gdi
 	Mobile:
 		ROT: 5
 		Speed: 56
@@ -551,8 +542,7 @@ HMEC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 80
-		Prerequisites: gaweap, gatech
+		Prerequisites: ~gaweap, gatech
-		Owner: gdi
 	Mobile:
 		ROT: 3
 		Speed: 42
@@ -586,8 +576,7 @@ SMECH:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
-		Prerequisites: gaweap
+		Prerequisites: ~gaweap
-		Owner: gdi
 	Mobile:
 		ROT: 5
 		Speed: 99
@@ -616,8 +605,7 @@ BIKE:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
-		Prerequisites: naweap
+		Prerequisites: ~naweap
-		Owner: nod
 	Mobile:
 		ROT: 8
 		Speed: 170
@@ -654,8 +642,7 @@ BGGY:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
-		Prerequisites: naweap
+		Prerequisites: ~naweap
-		Owner: nod
 	Mobile:
 		ROT: 8
 		Speed: 142
@@ -687,8 +674,7 @@ SAPC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
-		Prerequisites: naweap, natech
+		Prerequisites: ~naweap, natech
-		Owner: nod
 	Mobile:
 		ROT: 5
 		Speed: 71
@@ -716,8 +702,7 @@ SUBTANK:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
-		Prerequisites: naweap, natech
+		Prerequisites: ~naweap, natech
-		Owner: nod
 	Mobile:
 		ROT: 6
 		Speed: 71
@@ -745,8 +730,7 @@ SONIC:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 70
-		Prerequisites: gaweap, gatech
+		Prerequisites: ~gaweap, gatech
-		Owner: gdi
 	Mobile:
 		ROT: 4
 		Speed: 56
@@ -779,8 +763,7 @@ TTNK:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 60
-		Prerequisites: naweap
+		Prerequisites: ~naweap
-		Owner: nod
 	Mobile:
 		ROT: 5
 		Speed: 85
@@ -825,9 +808,8 @@ 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
+		Prerequisites: ~naweap, natech
 		Queue: Vehicle
-		Owner: nod
 	Mobile:
 		ROT: 5
 		Speed: 85