From 291af67b8c91ed83995de74d39cf74c318f56d86 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sat, 2 Jun 2018 00:35:01 +0200
Subject: [PATCH] Ensure select/deco bounds of TD buildings are consistent

Regardless of current frame's bounds.
---
 mods/cnc/rules/structures.yaml | 17 +++++++++++++++++
 mods/cnc/rules/tech.yaml       | 13 +++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index 238562d840..fbc7a95c6d 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -1,6 +1,8 @@
 FACT:
 	Inherits: ^BaseBuilding
 	Inherits@shape: ^3x2Shape
+	Selectable:
+		Bounds: 72,48
 	Valued:
 		Cost: 3500
 	Tooltip:
@@ -104,6 +106,8 @@ FACT.NOD:
 NUKE:
 	Inherits: ^BaseBuilding
 	Inherits@shape: ^2x2Shape
+	Selectable:
+		Bounds: 48,48
 	HitShape:
 		TargetableOffsets: 630,299,0
 	Valued:
@@ -134,6 +138,8 @@ NUKE:
 NUK2:
 	Inherits: ^BaseBuilding
 	Inherits@shape: ^2x2Shape
+	Selectable:
+		Bounds: 48,48
 	HitShape:
 		TargetableOffsets: 630,299,0
 	Valued:
@@ -251,6 +257,7 @@ SILO:
 	SelectionDecorations:
 	-AcceptsDeliveredCash:
 	Selectable:
+		Bounds: 48,24
 		DecorationBounds: 49,30
 
 PYLE:
@@ -351,6 +358,8 @@ HAND:
 
 AFLD:
 	Inherits: ^BaseBuilding
+	Selectable:
+		Bounds: 96,48
 	HitShape:
 		TargetableOffsets: 0,0,0, 0,-512,256, 0,-1451,384, 0,512,128, 0,1536,85
 		Type: Rectangle
@@ -452,6 +461,8 @@ WEAP:
 HPAD:
 	Inherits: ^BaseBuilding
 	Inherits@shape: ^2x2Shape
+	Selectable:
+		Bounds: 48,48
 	HitShape:
 		UseTargetableCellsOffsets: false
 		TargetableOffsets: 0,0,0, 768,-512,0, 768,512,0, -281,-512,0, -630,512,0
@@ -736,6 +747,8 @@ TMPL:
 GUN:
 	Inherits: ^Defense
 	Inherits@AUTOTARGET: ^AutoTargetGround
+	Selectable:
+		Bounds: 24,24
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -780,6 +793,8 @@ SAM:
 	Inherits@IDISABLE: ^DisabledOverlay
 	Inherits@AUTOTARGET: ^AutoTargetAir
 	Inherits@shape: ^2x1Shape
+	Selectable:
+		Bounds: 48,24
 	HitShape:
 		Type: Rectangle
 			TopLeft: -768,-512
@@ -871,6 +886,8 @@ OBLI:
 GTWR:
 	Inherits: ^Defense
 	Inherits@AUTOTARGET: ^AutoTargetGround
+	Selectable:
+		Bounds: 24,24
 	Valued:
 		Cost: 600
 	Tooltip:
diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
index eaa615f281..e22582d9df 100644
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -1,5 +1,7 @@
 V19:
 	Inherits: ^TechBuilding
+	Selectable:
+		Bounds: 24,24
 	CashTrickler:
 	Building:
 		Footprint: x
@@ -19,6 +21,8 @@ V19:
 
 V19.Husk:
 	Inherits: ^CivBuildingHusk
+	Interactable:
+		Bounds: 24,24
 	WithSpriteBody:
 	WithIdleOverlay:
 		StartSequence: fire-start
@@ -33,6 +37,7 @@ HOSP:
 	Inherits: ^TechBuilding
 	Inherits@shape: ^2x2Shape
 	Selectable:
+		Bounds: 48,48
 		Priority: 0
 	Building:
 		Footprint: xx xx
@@ -55,6 +60,8 @@ HOSP:
 
 HOSP.Husk:
 	Inherits: ^CivBuildingHusk
+	Interactable:
+		Bounds: 48,48
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -66,6 +73,8 @@ HOSP.Husk:
 BIO:
 	Inherits: ^TechBuilding
 	Inherits@shape: ^2x2Shape
+	Selectable:
+		Bounds: 48,48
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -98,6 +107,8 @@ BIO:
 
 BIO.Husk:
 	Inherits: ^CivBuildingHusk
+	Interactable:
+		Bounds: 48,48
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -107,6 +118,8 @@ BIO.Husk:
 MISS:
 	Inherits: ^CivBuilding
 	Inherits@shape: ^3x2Shape
+	Selectable:
+		Bounds: 72,48
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 3,2