Redistribute defense/support structure rules for more consistency

mods/ts/mod.yaml

@@ -70,16 +70,17 @@ Rules:
 	./mods/ts/rules/civilian-infantry.yaml
 	./mods/ts/rules/civilian-structures.yaml
 	./mods/ts/rules/civilian-vehicles.yaml
-	./mods/ts/rules/gdi-defenses.yaml
 	./mods/ts/rules/gdi-infantry.yaml
 	./mods/ts/rules/gdi-structures.yaml
+	./mods/ts/rules/gdi-support.yaml
 	./mods/ts/rules/gdi-vehicles.yaml
-	./mods/ts/rules/nod-defenses.yaml
 	./mods/ts/rules/nod-infantry.yaml
 	./mods/ts/rules/nod-structures.yaml
+	./mods/ts/rules/nod-support.yaml
 	./mods/ts/rules/nod-vehicles.yaml
 	./mods/ts/rules/shared-infantry.yaml
 	./mods/ts/rules/shared-structures.yaml
+	./mods/ts/rules/shared-support.yaml
 	./mods/ts/rules/shared-vehicles.yaml
 	./mods/ts/rules/trees.yaml
 

mods/ts/rules/gdi-structures.yaml

@@ -59,22 +59,6 @@ GAPOWR:
 		UpgradeMinEnabledLevel: 1
 		Amount: 50
 
-GAPOWRUP:
-	Inherits: ^BuildingPlug
-	Valued:
-		Cost: 150
-	Tooltip:
-		Name: Power Turbine
-		Description: Provides extra power generation.
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 10
-		Prerequisites: gapowr, ~structures.gdi
-	Plug:
-		Type: powrup
-	Power:
-		Amount: 50
-
 GAPILE:
 	Inherits: ^Building
 	Buildable:
@@ -377,19 +361,3 @@ GAPLUG:
 		UpgradeTypes: plug.ioncannonb
 		UpgradeMinEnabledLevel: 1
 		Sequence: idle-ioncannonb
-
-GAPLUG3:
-	Inherits: ^BuildingPlug
-	Valued:
-		Cost: 1500
-	Tooltip:
-		Name: Ion Cannon Uplink
-		Description: Enables use of the Ion Cannon.
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 1000
-		Prerequisites: gaplug, gatech, ~structures.gdi
-	Plug:
-		Type: plug.ioncannon
-	Power:
-		Amount: -100

mods/ts/rules/gdi-support.yaml

@@ -175,3 +175,35 @@ GACSAM:
 		Type: tower.sam
 	Power:
 		Amount: -30
+
+GAPOWRUP:
+	Inherits: ^BuildingPlug
+	Valued:
+		Cost: 150
+	Tooltip:
+		Name: Power Turbine
+		Description: Provides extra power generation.
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 10
+		Prerequisites: gapowr, ~structures.gdi
+	Plug:
+		Type: powrup
+	Power:
+		Amount: 50
+
+GAPLUG3:
+	Inherits: ^BuildingPlug
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Ion Cannon Uplink
+		Description: Enables use of the Ion Cannon.
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 1000
+		Prerequisites: gaplug, gatech, ~structures.gdi
+	Plug:
+		Type: plug.ioncannon
+	Power:
+		Amount: -100

mods/ts/rules/nod-structures.yaml

@@ -293,56 +293,3 @@ NASTLH:
 		AffectsParent: true
 	Selectable:
 		Bounds: 124, 64, 15, 13
-
-NAMISL:
-	Inherits: ^Building
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 100
-		Owner: nod
-		Prerequisites: natech
-		BuildLimit: 1
-	Valued:
-		Cost: 1300
-	Tooltip:
-		Name: Nod Missile Silo
-		Description: Launches a devastating missile\nat a target location.\nRequires power to operate.
-	ProvidesCustomPrerequisite:
-		Prerequisite: tech
-	Building:
-		Footprint: xx xx
-		Dimensions: 2,2
-	Selectable:
-		Bounds: 75,48
-	Health:
-		HP: 1000
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 4c0
-	WithIdleOverlay@LIGHTS:
-		Sequence: idle-lights
-	Power:
-		Amount: -50
-	CanPowerDown:
-	RequiresPower:
-	DisabledOverlay:
-	SupportPowerChargeBar:
-	NukePower:
-		Icon: clustermissile
-		ChargeTime: 540
-		Description: Cluster Missile
-		LongDesc: Launches a conventional warhead\nat a target location.
-		BeginChargeSound:
-		EndChargeSound: 00-i154.aud
-		SelectTargetSound:
-		InsufficientPowerSound:
-		IncomingSound: 00-i150.aud
-		LaunchSound: icbm1.aud
-		MissileWeapon: ClusterMissile
-		SpawnOffset: 0,427,0
-		DisplayTimer: False
-		DisplayBeacon: False
-		DisplayRadarPing: True
-		BeaconPoster:
-		CameraActor: camera

mods/ts/rules/nod-support.yaml

@@ -243,3 +243,55 @@ GAARTY:
 		NoTransformSounds:
 	WithMuzzleFlash:
 	-WithDeathAnimation:
+
+NAMISL:
+	Inherits: ^Building
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 100
+		Prerequisites: natech, ~structures.nod
+		BuildLimit: 1
+	Valued:
+		Cost: 1300
+	Tooltip:
+		Name: Nod Missile Silo
+		Description: Launches a devastating missile\nat a target location.\nRequires power to operate.
+	ProvidesCustomPrerequisite:
+		Prerequisite: tech
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Selectable:
+		Bounds: 75,48
+	Health:
+		HP: 1000
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 4c0
+	WithIdleOverlay@LIGHTS:
+		Sequence: idle-lights
+	Power:
+		Amount: -50
+	CanPowerDown:
+	RequiresPower:
+	DisabledOverlay:
+	SupportPowerChargeBar:
+	NukePower:
+		Icon: clustermissile
+		ChargeTime: 540
+		Description: Cluster Missile
+		LongDesc: Launches a conventional warhead\nat a target location.
+		BeginChargeSound:
+		EndChargeSound: 00-i154.aud
+		SelectTargetSound:
+		InsufficientPowerSound:
+		IncomingSound: 00-i150.aud
+		LaunchSound: icbm1.aud
+		MissileWeapon: ClusterMissile
+		SpawnOffset: 0,427,0
+		DisplayTimer: False
+		DisplayBeacon: False
+		DisplayRadarPing: True
+		BeaconPoster:
+		CameraActor: camera

mods/ts/rules/shared-structures.yaml

@@ -126,72 +126,6 @@ GASILO:
 	Power:
 		Amount: -10
 
-GADPSA:
-	Inherits: ^Building
-	Valued:
-		Cost: 950
-	-AcceptsSupplies:
-	Tooltip:
-		Name: Deployed Sensor Array
-	-GivesBuildableArea:
-	Health:
-		HP: 600
-	Armor:
-		Type: Wood
-	RevealsShroud:
-		Range: 8c0
-	Transforms:
-		IntoActor: lpst
-		Offset: 1,1
-		Facing: 96
-		TransformSounds: place2.aud
-		NoTransformSounds:
-	RenderDetectionCircle:
-	DetectCloaked:
-		Range: 6
-	-WithDeathAnimation:
-
-NAPULS:
-	Inherits: ^Building
-	Valued:
-		Cost: 1000
-	Tooltip:
-		Name: EMP Cannon
-		Description: Disables vehicles. \nRequires power to operate.\n  Strong vs all ground units\n  Cannot target Aircraft
-	Buildable:
-		Queue: Defense
-		BuildPaletteOrder: 90
-		Prerequisites: radar
-	Building:
-		Footprint: xx xx
-		Dimensions: 2,2
-	Selectable:
-		Bounds: 78, 54, 0, -12
-	RequiresPower:
-	DisabledOverlay:
-	-GivesBuildableArea:
-	Health:
-		HP: 500
-	Armor:
-		Type: Heavy
-	RevealsShroud:
-		Range: 8c0
-	Turreted:
-		ROT: 10
-		InitialFacing: 300
-	AttackTurreted:
-	Armament:
-		Weapon: EMPulseCannon
-	AutoTarget:
-	RenderRangeCircle:
-	RenderDetectionCircle:
-	DetectCloaked:
-		Range: 5
-	WithTurret:
-		Sequence: turret
-	Power:
-		Amount: -150
-
 ANYPOWER:
 	Tooltip:
 		Name: Power Plant

mods/ts/rules/shared-support.yaml

@@ -0,0 +1,65 @@
+GADPSA:
+	Inherits: ^Building
+	Valued:
+		Cost: 950
+	-AcceptsSupplies:
+	Tooltip:
+		Name: Deployed Sensor Array
+	-GivesBuildableArea:
+	Health:
+		HP: 600
+	Armor:
+		Type: Wood
+	RevealsShroud:
+		Range: 8c0
+	Transforms:
+		IntoActor: lpst
+		Offset: 1,1
+		Facing: 96
+		TransformSounds: place2.aud
+		NoTransformSounds:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 6
+	-WithDeathAnimation:
+
+NAPULS:
+	Inherits: ^Building
+	Valued:
+		Cost: 1000
+	Tooltip:
+		Name: EMP Cannon
+		Description: Disables vehicles. \nRequires power to operate.\n  Strong vs all ground units\n  Cannot target Aircraft
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 90
+		Prerequisites: radar
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Selectable:
+		Bounds: 78, 54, 0, -12
+	RequiresPower:
+	DisabledOverlay:
+	-GivesBuildableArea:
+	Health:
+		HP: 500
+	Armor:
+		Type: Heavy
+	RevealsShroud:
+		Range: 8c0
+	Turreted:
+		ROT: 10
+		InitialFacing: 300
+	AttackTurreted:
+	Armament:
+		Weapon: EMPulseCannon
+	AutoTarget:
+	RenderRangeCircle:
+	RenderDetectionCircle:
+	DetectCloaked:
+		Range: 5
+	WithTurret:
+		Sequence: turret
+	Power:
+		Amount: -150