From b219214426ee3b910b3f0eb24b724629043cd2f7 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Wed, 10 May 2017 23:13:45 +0200
Subject: [PATCH] Give TD civilian and tech buildings custom shapes

---
 mods/cnc/rules/civilian-desert.yaml | 42 +++++++++++++++++++++++++++++
 mods/cnc/rules/civilian.yaml        | 28 +++++++++++++++++++
 mods/cnc/rules/tech.yaml            |  3 +++
 3 files changed, 73 insertions(+)

diff --git a/mods/cnc/rules/civilian-desert.yaml b/mods/cnc/rules/civilian-desert.yaml
index be32e59231..ba1f6c435e 100644
--- a/mods/cnc/rules/civilian-desert.yaml
+++ b/mods/cnc/rules/civilian-desert.yaml
@@ -1,5 +1,11 @@
 V20:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: -840,-512,0, 0,0,0, -840,512,0
+		Type: Rectangle
+			TopLeft: -1024, -512
+			BottomRight: 1024, 896
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -22,6 +28,18 @@ V20.Husk:
 
 V21:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: 840,-512,0, 420,0,0, 840,512,0
+		Type: Rectangle
+			TopLeft: -1024, -1024
+			BottomRight: 1024, 0
+	HitShape@WELL:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: -770,512,0
+		Type: Rectangle
+			TopLeft: 0, 0
+			BottomRight: 1024, 598
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -44,6 +62,7 @@ V21.Husk:
 
 V22:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -82,6 +101,12 @@ V23.Husk:
 
 V24:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: -630,-512,0, 0,0,0, -630,256,0, 420,-512,0
+		Type: Rectangle
+			TopLeft: -1024, -683
+			BottomRight: 640, 853
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -104,6 +129,12 @@ V24.Husk:
 
 V25:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: 0,-128,0, 420,512,0
+		Type: Rectangle
+			TopLeft: -683, -683
+			BottomRight: 1024, 512
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -126,6 +157,7 @@ V25.Husk:
 
 V26:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -196,6 +228,7 @@ V29.Husk:
 
 V30:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -218,6 +251,7 @@ V30.Husk:
 
 V31:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -240,6 +274,7 @@ V31.Husk:
 
 V32:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -262,6 +297,7 @@ V32.Husk:
 
 V33:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -332,6 +368,12 @@ V36.Husk:
 
 V37:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: 0,0,0, 0,1024,0
+		Type: Rectangle
+			TopLeft: -512, -597
+			BottomRight: 1536, 597
 	SpawnActorOnDeath:
 		Actor: V37.Husk
 	Building:
diff --git a/mods/cnc/rules/civilian.yaml b/mods/cnc/rules/civilian.yaml
index 4c8e909a46..2bc735a7c6 100644
--- a/mods/cnc/rules/civilian.yaml
+++ b/mods/cnc/rules/civilian.yaml
@@ -1,5 +1,11 @@
 V01:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: -490,-384,0, 0,0,0, 0,470,0
+		Type: Rectangle
+			TopLeft: -768, -597
+			BottomRight: 896, 683
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -22,6 +28,12 @@ V01.Husk:
 
 V02:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: -490,-512,0, 0,0,0, 0,512,0
+		Type: Rectangle
+			TopLeft: -1024, -512
+			BottomRight: 1024, 597
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -44,6 +56,12 @@ V02.Husk:
 
 V03:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: -490,-512,0, 0,0,0, 421,512,0, -210,512,0
+		Type: Rectangle
+			TopLeft: -1024, -597
+			BottomRight: 1024, 597
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -66,6 +84,12 @@ V03.Husk:
 
 V04:
 	Inherits: ^CivBuilding
+	HitShape:
+		UseOccupiedCellsOffsets: false
+		TargetableOffsets: 0,0,0, -421,-256,0, -421,256,0
+		Type: Rectangle
+			TopLeft: -683, -432
+			BottomRight: 683, 683
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -88,6 +112,7 @@ V04.Husk:
 
 V05:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -110,6 +135,7 @@ V05.Husk:
 
 V06:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -132,6 +158,7 @@ V06.Husk:
 
 V07:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -330,6 +357,7 @@ V18.Husk:
 
 ARCO:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^2x1Shape
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
diff --git a/mods/cnc/rules/tech.yaml b/mods/cnc/rules/tech.yaml
index 58e3e9a808..7259be915f 100644
--- a/mods/cnc/rules/tech.yaml
+++ b/mods/cnc/rules/tech.yaml
@@ -25,6 +25,7 @@ V19.Husk:
 
 HOSP:
 	Inherits: ^TechBuilding
+	Inherits@shape: ^2x2Shape
 	Selectable:
 		Priority: 0
 	Building:
@@ -52,6 +53,7 @@ HOSP.Husk:
 
 BIO:
 	Inherits: ^TechBuilding
+	Inherits@shape: ^2x2Shape
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
@@ -86,6 +88,7 @@ BIO.Husk:
 
 MISS:
 	Inherits: ^CivBuilding
+	Inherits@shape: ^3x2Shape
 	Building:
 		Footprint: xxx xxx
 		Dimensions: 3,2