Move plugs and superweapons to Building queue.

mods/ts/rules/gdi-structures.yaml

@@ -66,13 +66,29 @@ GAPOWR:
 	IsometricSelectable:
 		Height: 48
 
+GAPOWRUP:
+	Inherits: ^BuildingPlug
+	Valued:
+		Cost: 150
+	Tooltip:
+		Name: Power Turbine
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 100
+		Prerequisites: gapowr, ~structures.gdi, ~techlevel.medium
+		Description: Provides extra power generation.
+	Plug:
+		Type: powrup
+	Power:
+		Amount: 50
+
 GAPILE:
 	Inherits: ^Building
 	Inherits@SHAPE: ^2x2Shape
 	Inherits@PRIMARY: ^PrimaryBuilding
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 30
+		BuildPaletteOrder: 20
 		Prerequisites: anypower, ~structures.gdi, ~techlevel.low
 		Description: Produces infantry.
 	Valued:
@@ -164,7 +180,7 @@ GAWEAP:
 		Prerequisite: factory
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 60
+		BuildPaletteOrder: 50
 		Prerequisites: proc, ~structures.gdi, ~techlevel.low
 		Description: Produces vehicles.
 	Building:
@@ -223,7 +239,7 @@ GAHPAD:
 	Tooltip:
 		Name: Helipad
 	Buildable:
-		BuildPaletteOrder: 130
+		BuildPaletteOrder: 80
 		Queue: Building
 		Prerequisites: garadr, ~structures.gdi, ~techlevel.medium
 		Description: Produces, rearms and\nrepairs helicopters.
@@ -274,7 +290,7 @@ GADEPT:
 	Tooltip:
 		Name: Service Depot
 	Buildable:
-		BuildPaletteOrder: 110
+		BuildPaletteOrder: 70
 		Prerequisites: factory, ~structures.gdi, ~techlevel.medium
 		Queue: Building
 		Description: Repairs vehicles.
@@ -332,7 +348,7 @@ GARADR:
 	Inherits@SHAPE: ^2x2Shape
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 80
+		BuildPaletteOrder: 40
 		Prerequisites: proc, ~structures.gdi, ~techlevel.low
 		Description: Provides an overview of the battlefield.\nCan detect cloaked units.\nRequires power to operate.
 	Valued:
@@ -375,7 +391,7 @@ GATECH:
 	Inherits@SHAPE: ^3x2Shape
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 150
+		BuildPaletteOrder: 90
 		Prerequisites: gaweap, garadr, ~structures.gdi, ~techlevel.medium
 		Description: Provides access to advanced GDI technologies.
 	Valued:
@@ -412,7 +428,7 @@ GAPLUG:
 	Tooltip:
 		Name: GDI Upgrade Center
 	Buildable:
-		BuildPaletteOrder: 170
+		BuildPaletteOrder: 110
 		Prerequisites: proc, gatech, ~structures.gdi, ~techlevel.superweapons
 		Queue: Building
 		Description: Can be upgraded for additional technology.
@@ -510,3 +526,35 @@ GAPLUG:
 	ProvidesPrerequisite@buildingname:
 	IsometricSelectable:
 		Height: 48
+
+GAPLUG2:
+	Inherits: ^BuildingPlug
+	Valued:
+		Cost: 1000
+	Tooltip:
+		Name: Seeker Control
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 110
+		Prerequisites: gaplug, gatech, gaweap, ~structures.gdi, ~techlevel.superweapons
+		Description: Enables use of the hunter-seeker droid.
+	Plug:
+		Type: plug.hunterseeker
+	Power:
+		Amount: -50
+
+GAPLUG3:
+	Inherits: ^BuildingPlug
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Ion Cannon Uplink
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 120
+		Prerequisites: gaplug, gatech, ~structures.gdi, ~techlevel.superweapons
+		Description: Enables use of the Ion Cannon.
+	Plug:
+		Type: plug.ioncannon
+	Power:
+		Amount: -100

mods/ts/rules/gdi-support.yaml

@@ -147,7 +147,7 @@ GAVULC:
 		Name: Vulcan Tower
 	Buildable:
 		Queue: Defense
-		BuildPaletteOrder: 120
+		BuildPaletteOrder: 80
 		Prerequisites: gactwr, gapile, ~structures.gdi, ~techlevel.low
 		Description: Basic base defense.\nDoes not require power to operate.\n  Strong vs Infantry, Light armor\n  Weak vs Aircraft
 	Plug:
@@ -163,7 +163,7 @@ GAROCK:
 		Name: RPG Upgrade
 	Buildable:
 		Queue: Defense
-		BuildPaletteOrder: 130
+		BuildPaletteOrder: 90
 		Prerequisites: gactwr, gapile, ~structures.gdi, ~techlevel.high
 		Description: GDI Advanced base defense.\nDoes not require power to operate.\n  Strong vs Armored ground units\n  Weak vs Aircraft
 	Plug:
@@ -179,58 +179,10 @@ GACSAM:
 		Name: SAM Upgrade
 	Buildable:
 		Queue: Defense
-		BuildPaletteOrder: 140
+		BuildPaletteOrder: 100
 		Prerequisites: gactwr, garadr, ~structures.gdi, ~techlevel.medium
 		Description: GDI Anti-Air base defense.\nDoes not require power to operate.\n  Strong vs Aircraft\n  Weak vs Ground units
 	Plug:
 		Type: tower.sam
 	Power:
 		Amount: -30
-
-GAPOWRUP:
-	Inherits: ^BuildingPlug
-	Valued:
-		Cost: 150
-	Tooltip:
-		Name: Power Turbine
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 80
-		Prerequisites: gapowr, ~structures.gdi, ~techlevel.medium
-		Description: Provides extra power generation.
-	Plug:
-		Type: powrup
-	Power:
-		Amount: 50
-
-GAPLUG2:
-	Inherits: ^BuildingPlug
-	Valued:
-		Cost: 1000
-	Tooltip:
-		Name: Seeker Control
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 170
-		Prerequisites: gaplug, gatech, gaweap, ~structures.gdi, ~techlevel.superweapons
-		Description: Enables use of the hunter-seeker droid.
-	Plug:
-		Type: plug.hunterseeker
-	Power:
-		Amount: -50
-
-GAPLUG3:
-	Inherits: ^BuildingPlug
-	Valued:
-		Cost: 1500
-	Tooltip:
-		Name: Ion Cannon Uplink
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 180
-		Prerequisites: gaplug, gatech, ~structures.gdi, ~techlevel.superweapons
-		Description: Enables use of the Ion Cannon.
-	Plug:
-		Type: plug.ioncannon
-	Power:
-		Amount: -100

mods/ts/rules/nod-structures.yaml

@@ -3,7 +3,7 @@ NAPOWR:
 	Inherits@SHAPE: ^2x2Shape
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 20
+		BuildPaletteOrder: 10
 		Prerequisites: ~structures.nod, ~techlevel.low
 		Description: Provides power for other structures.
 	Valued:
@@ -40,7 +40,7 @@ NAAPWR:
 	Inherits@SHAPE: ^2x3Shape
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 120
+		BuildPaletteOrder: 70
 		Prerequisites: factory, ~structures.nod, ~techlevel.medium
 		Description: Provides twice as much power as\nthe normal Power Plant.
 	Valued:
@@ -79,7 +79,7 @@ NAHAND:
 	Inherits@PRIMARY: ^PrimaryBuilding
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 40
+		BuildPaletteOrder: 20
 		Prerequisites: anypower, ~structures.nod, ~techlevel.low
 		Description: Produces infantry.
 	Valued:
@@ -174,7 +174,7 @@ NAWEAP:
 		Prerequisite: factory
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 70
+		BuildPaletteOrder: 50
 		Prerequisites: proc, ~structures.nod, ~techlevel.low
 		Description: Produces vehicles.
 	Building:
@@ -227,7 +227,7 @@ NAHPAD:
 	Tooltip:
 		Name: Helipad
 	Buildable:
-		BuildPaletteOrder: 140
+		BuildPaletteOrder: 80
 		Queue: Building
 		Prerequisites: naradr, ~structures.nod, ~techlevel.medium
 		Description: Produces, rearms and\nrepairs helicopters.
@@ -278,7 +278,7 @@ NARADR:
 	Inherits@SHAPE: ^2x2Shape
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 90
+		BuildPaletteOrder: 40
 		Prerequisites: proc, ~structures.nod, ~techlevel.low
 		Description: Provides an overview of the battlefield.\nCan detect cloaked units.\nRequires power to operate.
 	Valued:
@@ -321,7 +321,7 @@ NATECH:
 	Inherits@SHAPE: ^2x2Shape
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 160
+		BuildPaletteOrder: 90
 		Prerequisites: naweap, naradr, ~structures.nod, ~techlevel.medium
 		Description: Provides access to advanced Nod technologies.
 	Valued:
@@ -347,6 +347,47 @@ NATECH:
 		Amount: -150
 	ProvidesPrerequisite@buildingname:
 
+NASTLH:
+	Inherits: ^Building
+	Inherits@IDISABLED: ^DisableOnLowPowerOrPowerDown
+	Inherits@SHAPE: ^3x2Shape
+	HitShape:
+		TargetableOffsets: 250,0,0, 600,-864,0
+	Valued:
+		Cost: 2500
+	Tooltip:
+		Name: Stealth Generator
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 100
+		Prerequisites: proc, natech, ~structures.nod, ~techlevel.high
+		Description: Generates a cloaking field\nto hide your forces from the enemy.
+	Building:
+		Footprint: xxx XXX
+		Dimensions: 3,2
+	Health:
+		HP: 60000
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 6c0
+		MaxHeightDelta: 3
+	WithIdleOverlay@pulse:
+		RequiresCondition: !build-incomplete && !empdisable && !disabled
+		Sequence: pulse
+	WithRangeCircle:
+		Range: 12c0
+		Type: cloakgenerator
+	Power:
+		Amount: -350
+	ProximityExternalCondition:
+		RequiresCondition: !empdisable && !disabled
+		Condition: cloakgenerator
+		Range: 12c0
+		EnableSound: cloak5.aud
+		DisableSound: cloak5.aud
+		AffectsParent: true
+
 NATMPL:
 	Inherits: ^Building
 	Inherits@IDISABLED: ^DisableOnLowPowerOrPowerDown
@@ -355,7 +396,7 @@ NATMPL:
 		TargetableOffsets: -1280,363,0
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 180
+		BuildPaletteOrder: 110
 		Prerequisites: natech, ~structures.nod, ~techlevel.high
 		Description: Provides access to advanced Nod technologies.
 	ProvidesPrerequisite@buildingname:
@@ -396,3 +437,117 @@ NATMPL:
 	ExitsDebugOverlay:
 	IsometricSelectable:
 		Height: 60
+
+NAMISL:
+	Inherits: ^Building
+	Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
+	Inherits@SHAPE: ^2x2Shape
+	Buildable:
+		Queue: Building
+		BuildPaletteOrder: 120
+		Prerequisites: natech, ~structures.nod, ~techlevel.superweapons
+		BuildLimit: 1
+		Description: Launches a devastating missile\nat a target location.\nRequires power to operate.\nMaximum 1 can be built.
+	Valued:
+		Cost: 1300
+	Tooltip:
+		Name: Nod Missile Silo
+	ProvidesPrerequisite:
+		Prerequisite: tech
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Health:
+		HP: 100000
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 4c0
+	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete && !disabled
+		Sequence: idle-lights
+	Power:
+		Amount: -50
+	ProvidesPrerequisite@buildingname:
+	SupportPowerChargeBar:
+	NukePower:
+		PauseOnCondition: empdisable || disabled
+		Cursor: nuke
+		Icon: clustermissile
+		ChargeInterval: 13500
+		Description: Cluster Missile
+		LongDesc: Launches an explosive cluster warhead\nat a target location.
+		EndChargeSpeechNotification: ClusterMissileReady
+		SelectTargetSpeechNotification: SelectTarget
+		IncomingSpeechNotification: MissileLaunchDetected
+		LaunchSound: icbm1.aud
+		MissileWeapon: ClusterMissile
+		MissileDelay: 10
+		DetonationAltitude: 5c0
+		SpawnOffset: 72,72,0
+		DisplayTimerStances: None
+		DisplayBeacon: False
+		DisplayRadarPing: True
+		BeaconPoster:
+		CameraRange: 10c0
+		FlightVelocity: 1c0
+		TrailImage: small_smoke_trail
+		TrailPalette: effectalpha75
+		TrailInterval: 0
+		TrailSequences: idle
+	WithNukeLaunchOverlay:
+
+NAWAST:
+	Inherits: ^Building
+	HitShape:
+		Type: Rectangle
+			TopLeft: -1536, -1536
+			BottomRight: 512, 1536
+	Valued:
+		Cost: 1600
+	Tooltip:
+		Name: Waste Refinery
+	Buildable:
+		Queue: Buildig
+		BuildPaletteOrder: 130
+		Prerequisites: namisl, ~structures.nod, ~techlevel.superweapons
+		BuildLimit: 1
+		Description: Processes Veins\ninto useable resources.\nMaximum 1 can be built.
+	Building:
+		Footprint: Xx= xx= Xx=
+		Dimensions: 3,3
+	Health:
+		HP: 40000
+	RevealsShroud:
+		Range: 6c0
+		MaxHeightDelta: 3
+	TiberianSunRefinery:
+		DockAngle: 160
+		DockOffset: 2,1
+	StoresResources:
+		Capacity: 56
+	Power:
+		Amount: -40
+	FreeActor:
+		Actor: WEED
+		SpawnOffset: 3,1
+		Facing: 160
+	WithIdleOverlay@GLOW:
+		RequiresCondition: !build-incomplete
+		Sequence: idle-glow
+	WithIdleOverlay@LIGHTS:
+		RequiresCondition: !build-incomplete
+		Sequence: idle-lights
+	WithIdleOverlay@BIB:
+		RequiresCondition: !build-incomplete
+		Sequence: bib
+	ProvidesPrerequisite@buildingname:
+	WithResourceStoragePipsDecoration:
+		Position: BottomLeft
+		RequiresSelection: true
+		Margin: 8, 2
+		FullSequence: pip-red-building
+		EmptySequence: pip-empty-building
+		PipStride: 4, 2
+		PipCount: 15
+		Palette: pips

mods/ts/rules/nod-support.yaml

@@ -260,158 +260,3 @@ NASAM:
 		LocalOffset: 543,0,815
 	Power:
 		Amount: -30
-
-NASTLH:
-	Inherits: ^Building
-	Inherits@IDISABLED: ^DisableOnLowPowerOrPowerDown
-	Inherits@SHAPE: ^3x2Shape
-	HitShape:
-		TargetableOffsets: 250,0,0, 600,-864,0
-	Valued:
-		Cost: 2500
-	Tooltip:
-		Name: Stealth Generator
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 170
-		Prerequisites: proc, natech, ~structures.nod, ~techlevel.high
-		Description: Generates a cloaking field\nto hide your forces from the enemy.
-	Building:
-		Footprint: xxx XXX
-		Dimensions: 3,2
-	Health:
-		HP: 60000
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 6c0
-		MaxHeightDelta: 3
-	WithIdleOverlay@pulse:
-		RequiresCondition: !build-incomplete && !empdisable && !disabled
-		Sequence: pulse
-	WithRangeCircle:
-		Range: 12c0
-		Type: cloakgenerator
-	Power:
-		Amount: -350
-	ProximityExternalCondition:
-		RequiresCondition: !empdisable && !disabled
-		Condition: cloakgenerator
-		Range: 12c0
-		EnableSound: cloak5.aud
-		DisableSound: cloak5.aud
-		AffectsParent: true
-
-NAMISL:
-	Inherits: ^Building
-	Inherits@IDISABLE: ^DisableOnLowPowerOrPowerDown
-	Inherits@SHAPE: ^2x2Shape
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 180
-		Prerequisites: natech, ~structures.nod, ~techlevel.superweapons
-		BuildLimit: 1
-		Description: Launches a devastating missile\nat a target location.\nRequires power to operate.\nMaximum 1 can be built.
-	Valued:
-		Cost: 1300
-	Tooltip:
-		Name: Nod Missile Silo
-	ProvidesPrerequisite:
-		Prerequisite: tech
-	Building:
-		Footprint: xx xx
-		Dimensions: 2,2
-	Health:
-		HP: 100000
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 4c0
-	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !build-incomplete && !disabled
-		Sequence: idle-lights
-	Power:
-		Amount: -50
-	ProvidesPrerequisite@buildingname:
-	SupportPowerChargeBar:
-	NukePower:
-		PauseOnCondition: empdisable || disabled
-		Cursor: nuke
-		Icon: clustermissile
-		ChargeInterval: 13500
-		Description: Cluster Missile
-		LongDesc: Launches an explosive cluster warhead\nat a target location.
-		EndChargeSpeechNotification: ClusterMissileReady
-		SelectTargetSpeechNotification: SelectTarget
-		IncomingSpeechNotification: MissileLaunchDetected
-		LaunchSound: icbm1.aud
-		MissileWeapon: ClusterMissile
-		MissileDelay: 10
-		DetonationAltitude: 5c0
-		SpawnOffset: 72,72,0
-		DisplayTimerStances: None
-		DisplayBeacon: False
-		DisplayRadarPing: True
-		BeaconPoster:
-		CameraRange: 10c0
-		FlightVelocity: 1c0
-		TrailImage: small_smoke_trail
-		TrailPalette: effectalpha75
-		TrailInterval: 0
-		TrailSequences: idle
-	WithNukeLaunchOverlay:
-
-NAWAST:
-	Inherits: ^Building
-	HitShape:
-		Type: Rectangle
-			TopLeft: -1536, -1536
-			BottomRight: 512, 1536
-	Valued:
-		Cost: 1600
-	Tooltip:
-		Name: Waste Refinery
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 190
-		Prerequisites: namisl, ~structures.nod, ~techlevel.superweapons
-		BuildLimit: 1
-		Description: Processes Veins\ninto useable resources.\nMaximum 1 can be built.
-	Building:
-		Footprint: Xx= xx= Xx=
-		Dimensions: 3,3
-	Health:
-		HP: 40000
-	RevealsShroud:
-		Range: 6c0
-		MaxHeightDelta: 3
-	TiberianSunRefinery:
-		DockAngle: 160
-		DockOffset: 2,1
-	StoresResources:
-		Capacity: 56
-	Power:
-		Amount: -40
-	FreeActor:
-		Actor: WEED
-		SpawnOffset: 3,1
-		Facing: 160
-	WithIdleOverlay@GLOW:
-		RequiresCondition: !build-incomplete
-		Sequence: idle-glow
-	WithIdleOverlay@LIGHTS:
-		RequiresCondition: !build-incomplete
-		Sequence: idle-lights
-	WithIdleOverlay@BIB:
-		RequiresCondition: !build-incomplete
-		Sequence: bib
-	ProvidesPrerequisite@buildingname:
-	WithResourceStoragePipsDecoration:
-		Position: BottomLeft
-		RequiresSelection: true
-		Margin: 8, 2
-		FullSequence: pip-red-building
-		EmptySequence: pip-empty-building
-		PipStride: 4, 2
-		PipCount: 15
-		Palette: pips

mods/ts/rules/shared-structures.yaml

@@ -93,7 +93,7 @@ PROC:
 		Name: Tiberium Refinery
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 50
+		BuildPaletteOrder: 30
 		Prerequisites: anypower, ~techlevel.low
 		Description: Processes raw Tiberium\ninto useable resources.
 	Building:
@@ -156,7 +156,7 @@ GASILO:
 	Inherits@SHAPE: ^2x2Shape
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder: 100
+		BuildPaletteOrder: 60
 		Prerequisites: proc, ~techlevel.low
 		Description: Stores excess Tiberium.
 	Valued: