Implement isometric selection boxes for TS structures.

2020-03-21 16:00:52 +00:00
parent 88cdad4189
commit 9f3254dbd1
14 changed files with 686 additions and 106 deletions
--- a/mods/ts/rules/bridges.yaml
+++ b/mods/ts/rules/bridges.yaml
@@ -11,8 +11,10 @@ CABHUT:
 		Palette: player
 	Targetable:
 		TargetTypes: C4
-	-Selectable:
+	-IsometricSelectable:
+	-IsometricSelectionDecorations:
 	Interactable:
+	SelectionDecorations:
 	-Demolishable:
 	-Explodes:
 	-FrozenUnderFog:
--- a/mods/ts/rules/civilian-structures.yaml
+++ b/mods/ts/rules/civilian-structures.yaml
@@ -16,6 +16,8 @@ ABAN01:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 72

 ABAN02:
 	Inherits: ^CivBuilding
@@ -35,6 +37,8 @@ ABAN02:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 48

 ABAN03:
 	Inherits: ^CivBuilding
@@ -54,6 +58,8 @@ ABAN03:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 48

 ABAN04:
 	Inherits: ^CivBuilding
@@ -582,6 +588,8 @@ CA0012:
 		Type: light
 	Health:
 		HP: 10000
+	IsometricSelectable:
+		Height: 36

 CA0013:
 	Inherits: ^CivBuilding
@@ -595,6 +603,8 @@ CA0013:
 		Type: heavy
 	Health:
 		HP: 30000
+	IsometricSelectable:
+		Height: 48

 CA0014:
 	Inherits: ^CivBuilding
@@ -607,6 +617,8 @@ CA0014:
 		Type: heavy
 	Health:
 		HP: 30000
+	IsometricSelectable:
+		Height: 48

 CA0015:
 	Inherits: ^CivBuilding
@@ -631,6 +643,8 @@ CA0016:
 		Type: light
 	Health:
 		HP: 30000
+	IsometricSelectable:
+		Height: 48

 CA0017:
 	Inherits: ^CivBuilding
@@ -643,6 +657,8 @@ CA0017:
 		Type: heavy
 	Health:
 		HP: 30000
+	IsometricSelectable:
+		Height: 48

 CA0018:
 	Inherits: ^CivBuilding
@@ -659,6 +675,8 @@ CA0018:
 		Type: light
 	Health:
 		HP: 20000
+	IsometricSelectable:
+		Height: 48

 CA0019:
 	Inherits: ^CivBuilding
@@ -675,6 +693,8 @@ CA0019:
 		Type: light
 	Health:
 		HP: 20000
+	IsometricSelectable:
+		Height: 48

 CA0020:
 	Inherits: ^CivBuilding
@@ -691,6 +711,8 @@ CA0020:
 		Type: light
 	Health:
 		HP: 20000
+	IsometricSelectable:
+		Height: 48

 CA0021:
 	Inherits: ^CivBuilding
@@ -707,6 +729,8 @@ CA0021:
 		Type: light
 	Health:
 		HP: 20000
+	IsometricSelectable:
+		Height: 48

 CAARAY:
 	Inherits: ^CivBuilding
@@ -734,6 +758,8 @@ CAARAY:
 		Pieces: 5, 7
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 72

 CAARMR:
 	Inherits: ^CivBuilding
@@ -807,6 +833,8 @@ CAHOSP:
 		Pieces: 2, 4
 	MapEditorData:
 		Categories: Civilian building
+	IsometricSelectable:
+		Height: 48

 CAPYR01:
 	Inherits: ^CivBuilding
@@ -822,6 +850,8 @@ CAPYR01:
 		HP: 40000
 	MapEditorData:
 		ExcludeTilesets: SNOW
+	IsometricSelectable:
+		Height: 48

 CAPYR02:
 	Inherits: ^CivBuilding
@@ -841,6 +871,8 @@ CAPYR02:
 		Pieces: 6, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 4
+	IsometricSelectable:
+		Height: 96

 CAPYR03:
 	Inherits: ^CivBuilding
@@ -860,6 +892,8 @@ CAPYR03:
 		Pieces: 6, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 4
+	IsometricSelectable:
+		Height: 96

 CITY01:
 	Inherits: ^CivBuilding
@@ -879,6 +913,8 @@ CITY01:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 72

 CITY02:
 	Inherits: ^CivBuilding
@@ -898,6 +934,8 @@ CITY02:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 72

 CITY03:
 	Inherits: ^CivBuilding
@@ -917,6 +955,8 @@ CITY03:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 48

 CITY04:
 	Inherits: ^CivBuilding
@@ -936,6 +976,8 @@ CITY04:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 72

 CITY05:
 	Inherits: ^CivBuilding
@@ -955,6 +997,8 @@ CITY05:
 		Pieces: 5, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 2, 4
+	IsometricSelectable:
+		Height: 96

 CITY06:
 	Inherits: ^CivBuilding
@@ -974,6 +1018,8 @@ CITY06:
 		Pieces: 7, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 4
+	IsometricSelectable:
+		Height: 72

 CITY07:
 	Inherits: ^CivBuilding
@@ -993,6 +1039,8 @@ CITY07:
 		Pieces: 7, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 4
+	IsometricSelectable:
+		Height: 60

 CITY08:
 	Inherits: ^CivBuilding
@@ -1023,6 +1071,8 @@ CITY09:
 		HP: 40000
 	MapEditorData:
 		RequireTilesets: TEMPERATE
+	IsometricSelectable:
+		Height: 48

 CITY10:
 	Inherits: ^CivBuilding
@@ -1038,6 +1088,8 @@ CITY10:
 		HP: 30000
 	MapEditorData:
 		RequireTilesets: TEMPERATE
+	IsometricSelectable:
+		Height: 48

 CITY11:
 	Inherits: ^CivBuilding
@@ -1053,6 +1105,8 @@ CITY11:
 		HP: 50000
 	MapEditorData:
 		RequireTilesets: TEMPERATE
+	IsometricSelectable:
+		Height: 96

 CITY12:
 	Inherits: ^CivBuilding
@@ -1068,6 +1122,8 @@ CITY12:
 		HP: 60000
 	MapEditorData:
 		RequireTilesets: TEMPERATE
+	IsometricSelectable:
+		Height: 96

 CITY13:
 	Inherits: ^CivBuilding
@@ -1083,6 +1139,8 @@ CITY13:
 		HP: 50000
 	MapEditorData:
 		RequireTilesets: TEMPERATE
+	IsometricSelectable:
+		Height: 96

 CITY14:
 	Inherits: ^CivBuilding
@@ -1097,6 +1155,8 @@ CITY14:
 		HP: 60000
 	MapEditorData:
 		RequireTilesets: TEMPERATE
+	IsometricSelectable:
+		Height: 96

 CITY15:
 	Inherits: ^CivBuilding
@@ -1135,6 +1195,8 @@ CITY16:
 		Pieces: 7, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 4
+	IsometricSelectable:
+		Height: 72

 CITY17:
 	Inherits: ^CivBuilding
@@ -1154,6 +1216,8 @@ CITY17:
 		Pieces: 7, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 4
+	IsometricSelectable:
+		Height: 108

 CITY18:
 	Inherits: ^CivBuilding
@@ -1173,6 +1237,8 @@ CITY18:
 		Pieces: 8, 12
 	ThrowsShrapnel@LARGE:
 		Pieces: 5, 7
+	IsometricSelectable:
+		Height: 72

 CITY19:
 	Inherits: ^CivBuilding
@@ -1231,6 +1297,8 @@ CITY22:
 		HP: 10000
 	MapEditorData:
 		RequireTilesets: TEMPERATE
+	IsometricSelectable:
+		Height: 72

 CTDAM:
 	Inherits: ^CivBuilding
@@ -1278,6 +1346,8 @@ CTVEGA:
 		Pieces: 7, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 4
+	IsometricSelectable:
+		Height: 72

 GAKODK:
 	Inherits: ^CivBuilding
@@ -1313,16 +1383,22 @@ GAOLDCC2:
 		Name: Old Temple
 	Building:
 		Footprint: xx xX
+	IsometricSelectable:
+		Height: 36

 GAOLDCC3:
 	Inherits: ^OldBase
 	Tooltip:
 		Name: Old Weapons Factory
+	IsometricSelectable:
+		Height: 36

 GAOLDCC4:
 	Inherits: ^OldBase
 	Tooltip:
 		Name: Old Refinery
+	IsometricSelectable:
+		Height: 36

 GAOLDCC5:
 	Inherits: ^OldBase
@@ -1371,9 +1447,6 @@ GASPOT:
 	Building:
 		Footprint: x
 		Dimensions: 1, 1
-	Selectable:
-		Bounds: 48, 30, 0, -4
-		DecorationBounds: 48, 82, 0, -25
 	Power:
 		Amount: -10
 	Armor:
@@ -1387,6 +1460,8 @@ GASPOT:
 		Sequence: idle-lights
 	MapEditorData:
 		Categories: Civilian building
+	IsometricSelectable:
+		Height: 72

 GALITE:
 	Inherits: ^Building
@@ -1413,9 +1488,6 @@ GALITE:
 	WithIdleOverlay@LIGHTING:
 		Sequence: lighting
 		Palette: alpha
-	Selectable:
-		Bounds: 24, 24, 0, -4
-		DecorationBounds: 25, 35, 0, -12
 	-Cloak@EXTERNALCLOAK:
 	-ExternalCondition@CLOAKGENERATOR:
 	-ExternalCondition@CRATE-CLOAK:
@@ -1453,6 +1525,8 @@ GAICBM:
 	-WithDeathAnimation:
 	MapEditorData:
 		Categories: Vehicle
+	IsometricSelectable:
+		Height: 48

 NAMNTK:
 	Inherits: ^CivBuilding
@@ -1470,6 +1544,8 @@ NAMNTK:
 		Palette: player
 	WithIdleOverlay@LIGHTS:
 		Sequence: idle-lights
+	IsometricSelectable:
+		Height: 36

 NTPYRA:
 	Inherits: ^CivBuilding
@@ -1493,6 +1569,8 @@ NTPYRA:
 		Pieces: 7, 9
 	ThrowsShrapnel@LARGE:
 		Pieces: 3, 5
+	IsometricSelectable:
+		Height: 72

 UFO:
 	Inherits: ^CivBuilding
@@ -1502,9 +1580,6 @@ UFO:
 		Footprint: xxxxxx xxxxxx xxxxxx xxxxxx
 	RenderSprites:
 		Palette: terraindecoration
-	Selectable:
-		Bounds: 144, 72, 0, 0
-		DecorationBounds: 144, 72, 0, 0
 	Tooltip:
 		Name: Scrin Ship
 	Health:
@@ -1517,3 +1592,5 @@ UFO:
 		Pieces: 9, 12
 	ThrowsShrapnel@LARGE:
 		Pieces: 6, 8
+	IsometricSelectable:
+		Height: 144
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -1348,15 +1348,20 @@
 			green: pip-green
 			yellow: pip-yellow

-^SelectableCombatBuilding:
-	Inherits@selectiondecorations: ^Selectable
-	Selectable:
-		Priority: 4
-
 ^SelectableBuilding:
-	Inherits@selectiondecorations: ^Selectable
-	Selectable:
+	IsometricSelectable:
 		Priority: 2
+	IsometricSelectionDecorations:
+	WithTextControlGroupDecoration:
+		Margin: 1, 1
+	DrawLineToTarget:
+		QueuedLineWidth: 2
+		QueuedMarkerWidth: 3
+
+^SelectableCombatBuilding:
+	Inherits@selectiondecorations: ^SelectableBuilding
+	IsometricSelectable:
+		Priority: 4

 ^PrimaryBuilding:
 	PrimaryBuilding:
@@ -1366,6 +1371,5 @@
 		RequiresCondition: primary
 		Position: Top
 		RequiresSelection: true
-		Margin: 0, 5
 		Text: PRIMARY
 		Color: E0D048
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -29,9 +29,6 @@ GAPOWR:
 		RequiresCondition: !build-incomplete
 		PauseOnCondition: empdisable
 		Sequence: idle-plug
-	Selectable:
-		Bounds: 90, 48, 0, -6
-		DecorationBounds: 90, 84, 0, -12
 	Power:
 		Amount: 100
 		RequiresCondition: !empdisable
@@ -66,6 +63,8 @@ GAPOWR:
 		RequiresCondition: !empdisable && powrup.b
 		Amount: 50
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 48

 GAPILE:
 	Inherits: ^Building
@@ -85,9 +84,6 @@ GAPILE:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 88, 48, 0, -8
-		DecorationBounds: 88, 56, 0, -8
 	Health:
 		HP: 80000
 	Armor:
@@ -174,9 +170,6 @@ GAWEAP:
 	Building:
 		Footprint: xxX+ xxX+ xxX+
 		Dimensions: 4,3
-	Selectable:
-		Bounds: 154, 96, -2, -12
-		DecorationBounds: 154, 100, -2, -12
 	Health:
 		HP: 100000
 	RevealsShroud:
@@ -218,6 +211,8 @@ GAWEAP:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 48

 GAHPAD:
 	Inherits: ^Building
@@ -269,9 +264,6 @@ GAHPAD:
 		UseDeathTypeSuffix: false
 	Power:
 		Amount: -10
-	Selectable:
-		Bounds: 88, 66, 0, -5
-		DecorationBounds: 88, 66, 0, -5
 	ProvidesPrerequisite@buildingname:

 GADEPT:
@@ -289,9 +281,6 @@ GADEPT:
 	Building:
 		Footprint: =+= x++ x+=
 		Dimensions: 3,3
-	Selectable:
-		Bounds: 96, 64, -6, -6
-		DecorationBounds: 98, 68, -6, -6
 	Health:
 		HP: 110000
 	RevealsShroud:
@@ -355,9 +344,6 @@ GARADR:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 96, 48, 0, -6
-		DecorationBounds: 96, 118, 0, -38
 	Health:
 		HP: 100000
 	Armor:
@@ -380,6 +366,8 @@ GARADR:
 	Power:
 		Amount: -50
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 72

 GATECH:
 	Inherits: ^Building
@@ -399,9 +387,6 @@ GATECH:
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 3,2
-	Selectable:
-		Bounds: 110, 60, 3, -4
-		DecorationBounds: 110, 60, 3, -4
 	Health:
 		HP: 50000
 	Armor:
@@ -415,6 +400,8 @@ GATECH:
 	Power:
 		Amount: -150
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 48

 GAPLUG:
 	Inherits: ^Building
@@ -424,9 +411,6 @@ GAPLUG:
 		Cost: 1000
 	Tooltip:
 		Name: GDI Upgrade Center
-	Selectable:
-		Bounds: 115,72,0,-12
-		DecorationBounds: 115,104,0,-24
 	Buildable:
 		BuildPaletteOrder: 170
 		Prerequisites: proc, gatech, ~structures.gdi, ~techlevel.superweapons
@@ -524,3 +508,5 @@ GAPLUG:
 		PauseOnCondition: disabled
 		Sequence: idle-hunterseekerb
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 48
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -57,9 +57,6 @@ GACTWR:
 		BuildPaletteOrder: 70
 		Prerequisites: gapile, ~structures.gdi, ~techlevel.low
 		Description: Modular tower for base defenses.
-	Selectable:
-		Bounds: 48, 36, 0, -6
-		DecorationBounds: 48, 48, 0, -12
 	Health:
 		HP: 50000
 	Armor:
@@ -139,6 +136,8 @@ GACTWR:
 	ProvidesPrerequisite@buildingname:
 	Replacement:
 		ReplaceableTypes: GDITower
+	IsometricSelectable:
+		Height: 48

 GAVULC:
 	Inherits: ^BuildingPlug
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -15,9 +15,6 @@ NAPOWR:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 88, 48, 2, -6
-		DecorationBounds: 88, 80, 2, -12
 	Health:
 		HP: 75000
 	Armor:
@@ -35,6 +32,8 @@ NAPOWR:
 		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	ScalePowerWithHealth:
 	PowerTooltip:
+	IsometricSelectable:
+		Height: 48

 NAAPWR:
 	Inherits: ^Building
@@ -53,9 +52,6 @@ NAAPWR:
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 2,3
-	Selectable:
-		Bounds: 100, 54, 0, -4
-		DecorationBounds: 100, 74, 0, -12
 	Health:
 		HP: 75000
 	Armor:
@@ -74,6 +70,8 @@ NAAPWR:
 	ScalePowerWithHealth:
 	PowerTooltip:
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 48

 NAHAND:
 	Inherits: ^Building
@@ -93,9 +91,6 @@ NAHAND:
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 3,2
-	Selectable:
-		Bounds: 116, 60, 3, -6
-		DecorationBounds: 116, 78, 3, -8
 	Health:
 		HP: 80000
 	Armor:
@@ -185,9 +180,6 @@ NAWEAP:
 	Building:
 		Footprint: xxX+ xxX+ xxX+
 		Dimensions: 4,3
-	Selectable:
-		Bounds: 149, 80, -3, -10
-		DecorationBounds: 149, 116, -3, -20
 	Health:
 		HP: 100000
 	Armor:
@@ -223,6 +215,8 @@ NAWEAP:
 	Power:
 		Amount: -30
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 48

 NAHPAD:
 	Inherits: ^Building
@@ -274,10 +268,9 @@ NAHPAD:
 		UseDeathTypeSuffix: false
 	Power:
 		Amount: -10
-	Selectable:
-		Bounds: 78, 48, 0, -6
-		DecorationBounds: 78, 54, 0, -8
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 36

 NARADR:
 	Inherits: ^Building
@@ -297,9 +290,6 @@ NARADR:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 96, 48, 0, -6
-		DecorationBounds: 96, 72, 0, -12
 	Health:
 		HP: 100000
 	Armor:
@@ -322,6 +312,8 @@ NARADR:
 	Power:
 		Amount: -40
 	ProvidesPrerequisite@buildingname:
+	IsometricSelectable:
+		Height: 72

 NATECH:
 	Inherits: ^Building
@@ -341,9 +333,6 @@ NATECH:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 86, 48, 0, -4
-		DecorationBounds: 86, 58, 0, -4
 	Health:
 		HP: 50000
 	Armor:
@@ -379,8 +368,6 @@ NATMPL:
 		Dimensions: 4,3
 	RequiresBuildableArea:
 		Adjacent: 3
-	Selectable:
-		Bounds: 134, 120, 12, -12
 	Health:
 		HP: 100000
 	Armor:
@@ -407,3 +394,5 @@ NATMPL:
 		PauseOnCondition: empdisable
 	Exit@1:
 	ExitsDebugOverlay:
+	IsometricSelectable:
+		Height: 60
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -63,8 +63,6 @@ NAPOST:
 		NodeTypes: laserfencenode
 		SegmentType: nafnce
 		SegmentsRequireNode: true
-	Selectable:
-		Bounds: 42, 44, 0, -12
 	LineBuildNode:
 		Types: laserfencenode
 	Power:
@@ -156,9 +154,6 @@ NALASR:
 		Prerequisites: nahand, ~structures.nod, ~techlevel.low
 		BuildPaletteOrder: 90
 		Description: Basic base defense.\nRequires power to operate.\n  Strong vs Ground units\n  Weak vs Aircraft
-	Selectable:
-		Bounds: 40, 30, -8, -6
-		DecorationBounds: 40, 36, -8, -8
 	Health:
 		HP: 50000
 	Armor:
@@ -202,9 +197,6 @@ NAOBEL:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 88, 42, 0, -6
-		DecorationBounds: 88, 72, 0, -12
 	Health:
 		HP: 72500
 	Armor:
@@ -246,9 +238,6 @@ NASAM:
 		Prerequisites: naradr, ~structures.nod, ~techlevel.medium
 		BuildPaletteOrder: 100
 		Description: Nod Anti-Air base defense.\nRequires power to operate.\n  Strong vs Aircraft\n  Weak vs Ground units
-	Selectable:
-		Bounds: 40, 30, -3, -8
-		DecorationBounds: 40, 36, -3, -8
 	Health:
 		HP: 60000
 	Armor:
@@ -312,9 +301,6 @@ NASTLH:
 		EnableSound: cloak5.aud
 		DisableSound: cloak5.aud
 		AffectsParent: true
-	Selectable:
-		Bounds: 106, 48, 8, -6
-		DecorationBounds: 106, 60, 8, -15

 NAMISL:
 	Inherits: ^Building
@@ -335,9 +321,6 @@ NAMISL:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 75,48
-		DecorationBounds: 75,48
 	Health:
 		HP: 100000
 	Armor:
@@ -397,9 +380,6 @@ NAWAST:
 	Building:
 		Footprint: Xx= xx= Xx=
 		Dimensions: 3,3
-	Selectable:
-		Bounds: 100, 60, 5, -5
-		DecorationBounds: 100, 60, 5, -5
 	Health:
 		HP: 40000
 	RevealsShroud:
@@ -429,7 +409,9 @@ NAWAST:
 	WithResourceStoragePipsDecoration:
 		Position: BottomLeft
 		RequiresSelection: true
-		Margin: 5, 2
+		Margin: 8, 2
+		FullSequence: pip-red-building
+		EmptySequence: pip-empty-building
+		PipStride: 4, 2
 		PipCount: 15
-		FullSequence: pip-red
 		Palette: pips
--- a/mods/ts/rules/shared-structures.yaml
+++ b/mods/ts/rules/shared-structures.yaml
@@ -75,15 +75,14 @@ GACNST:
 		RequiresCondition: !build-incomplete
 	Power:
 		Amount: 0
-	Selectable:
-		Bounds: 144, 60, 0, -6
-		DecorationBounds: 144, 80, 0, -12
 	ProvidesPrerequisite@gdi:
 		Factions: gdi
 		Prerequisite: structures.gdi
 	ProvidesPrerequisite@nod:
 		Factions: nod
 		Prerequisite: structures.nod
+	IsometricSelectable:
+		Height: 36

 PROC:
 	Inherits: ^Building
@@ -100,9 +99,6 @@ PROC:
 	Building:
 		Footprint: xxX+ xx++ xxX+
 		Dimensions: 4,3
-	Selectable:
-		Bounds: 134, 96, 0, -12
-		DecorationBounds: 134, 122, 0, -18
 	Health:
 		HP: 90000
 	RevealsShroud:
@@ -148,8 +144,11 @@ PROC:
 	WithResourceStoragePipsDecoration:
 		Position: BottomLeft
 		RequiresSelection: true
-		Margin: 5, 2
-		PipCount: 10
+		Margin: 8, 2
+		FullSequence: pip-green-building
+		EmptySequence: pip-empty-building
+		PipStride: 4, 2
+		PipCount: 25
 		Palette: pips

 GASILO:
@@ -167,9 +166,6 @@ GASILO:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2, 2
-	Selectable:
-		Bounds: 80, 48, -5, 0
-		DecorationBounds: 80, 48, -5, 0
 	-GivesBuildableArea:
 	Health:
 		HP: 30000
@@ -203,8 +199,11 @@ GASILO:
 	WithResourceStoragePipsDecoration:
 		Position: BottomLeft
 		RequiresSelection: true
-		Margin: 5, 2
-		PipCount: 5
+		Margin: 8, 2
+		FullSequence: pip-green-building
+		EmptySequence: pip-empty-building
+		PipStride: 4, 2
+		PipCount: 12
 		Palette: pips

 ANYPOWER:
--- a/mods/ts/rules/shared-support.yaml
+++ b/mods/ts/rules/shared-support.yaml
@@ -14,9 +14,6 @@ NAPULS:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Selectable:
-		Bounds: 78, 54, 0, -12
-		DecorationBounds: 78, 54, 0, -12
 	Health:
 		HP: 50000
 	Armor: