From 9a8f0d9aba6cc027c8324e6e5bb98c7b188b2292 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Sun, 29 May 2016 15:38:02 +0200
Subject: [PATCH] Removed empty top rows from TD base structure footprints

Removed top row of buildings where it only consisted of _ cells and adjusted the art offset instead. This fixes the issue that CenterPosition was located in the middle between the occupied and passable cell for defenses like Obelisks, makes their placement a bit more intuitive and makes setting up proper HitShapes easier.
---
 mods/cnc/rules/structures.yaml     | 37 +++++++++++++-----------------
 mods/cnc/sequences/structures.yaml | 25 ++++++++++++++++----
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index bbfa399645..e2c33c3162 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -283,14 +283,15 @@ HAND:
 		Prerequisites: anypower
 		Queue: Building.Nod
 	Building:
-		Footprint: __ xx xx
-		Dimensions: 2,3
+		Footprint: xx xx
+		Dimensions: 2,2
 	Health:
 		HP: 500
 	RevealsShroud:
 		Range: 5c0
 	Bib:
 	RallyPoint:
+		Offset: 1,2
 	Exit@1:
 		SpawnOffset: 512,1024,0
 		ExitCell: 1,2
@@ -366,8 +367,8 @@ WEAP:
 		Prerequisites: proc
 		Queue: Building.GDI
 	Building:
-		Footprint: ___ xxx ===
-		Dimensions: 3,3
+		Footprint: xxx ===
+		Dimensions: 3,2
 	Selectable:
 		Bounds: 72,54,0,5
 	SelectionDecorations:
@@ -380,10 +381,10 @@ WEAP:
 	WithProductionDoorOverlay:
 		Sequence: build-top
 	RallyPoint:
-		Offset: 0,3
+		Offset: 0,2
 	Exit@1:
-		SpawnOffset: -341,-341,0
-		ExitCell: 0,2
+		SpawnOffset: -512,-512,0
+		ExitCell: 0,1
 		ExitDelay: 3
 	Production:
 		Produces: Vehicle.GDI
@@ -604,8 +605,8 @@ TMPL:
 		Prerequisites: anyhq, ~techlevel.high
 		Queue: Building.Nod
 	Building:
-		Footprint: ___ xxx xxx
-		Dimensions: 3,3
+		Footprint: xxx xxx
+		Dimensions: 3,2
 	Selectable:
 		Bounds: 72,60,0,9
 	SelectionDecorations:
@@ -740,13 +741,10 @@ OBLI:
 		BuildPaletteOrder: 60
 		Prerequisites: tmpl, ~techlevel.high
 		Queue: Defence.Nod
-	Building:
-		Footprint: _ x
-		Dimensions: 1,2
 	Selectable:
-		Bounds: 24,24,0,12
+		Bounds: 24,24
 	SelectionDecorations:
-		VisualBounds: 22,42
+		VisualBounds: 22,42,0,-9
 	RequiresPower:
 	DisabledOverlay:
 	Health:
@@ -760,7 +758,7 @@ OBLI:
 	WithChargeAnimation:
 	Armament:
 		Weapon: Laser
-		LocalOffset: 0,0,725
+		LocalOffset: 0,-85,1280
 		FireDelay: 0
 	AttackCharge:
 		ChargeAudio: obelpowr.aud
@@ -820,13 +818,10 @@ ATWR:
 		BuildPaletteOrder: 60
 		Prerequisites: anyhq, ~techlevel.medium
 		Queue: Defence.GDI
-	Building:
-		Footprint: _ x
-		Dimensions: 1,2
 	Selectable:
-		Bounds: 24,24,0,12
+		Bounds: 24,24
 	SelectionDecorations:
-		VisualBounds: 24,48,0,-3
+		VisualBounds: 22,42,0,-9
 	RequiresPower:
 	DisabledOverlay:
 	Health:
@@ -839,7 +834,7 @@ ATWR:
 		HasMinibib: Yes
 	Turreted:
 		TurnSpeed: 255
-		Offset: 128,128,0
+		Offset: 128,128,384
 	Armament@PRIMARY:
 		Weapon: TowerMissle
 		LocalOffset: 256,128,0, 256,-128,0
diff --git a/mods/cnc/sequences/structures.yaml b/mods/cnc/sequences/structures.yaml
index 8e13a322d3..2925ed4258 100644
--- a/mods/cnc/sequences/structures.yaml
+++ b/mods/cnc/sequences/structures.yaml
@@ -109,6 +109,8 @@ silo:
 		AddExtension: False
 
 hand:
+	Defaults:
+		Offset: 0,-8
 	idle:
 	damaged-idle:
 		Start: 1
@@ -121,8 +123,10 @@ hand:
 	bib: bib3
 		UseTilesetExtension: true
 		Length: *
+		Offset: 0,0
 	icon: handicnh.tem
 		AddExtension: False
+		Offset: 0,0
 
 pyle:
 	idle:
@@ -145,9 +149,13 @@ pyle:
 		AddExtension: False
 
 weap:
+	Defaults:
+		Offset: 0,-12
 	idle:
+		ZOffset: -511
 	damaged-idle:
 		Start: 1
+		ZOffset: -511
 	dead:
 		Start: 2
 		Tick: 800
@@ -164,8 +172,10 @@ weap:
 	bib: bib2
 		UseTilesetExtension: true
 		Length: *
+		Offset: 0,0
 	icon: weapicnh.tem
 		AddExtension: False
+		Offset: 0,0
 
 afld:
 	idle:
@@ -322,6 +332,8 @@ eye:
 		AddExtension: False
 
 tmpl:
+	Defaults:
+		Offset: 0,-12
 	idle:
 	damaged-idle:
 		Start: 5
@@ -339,10 +351,14 @@ tmpl:
 	bib: bib2
 		UseTilesetExtension: true
 		Length: *
+		Offset: 0,0
 	icon: tmplicnh.tem
 		AddExtension: False
+		Offset: 0,0
 
 obli:
+	Defaults:
+		Offset: 0,-12
 	idle:
 	damaged-idle:
 		Start: 4
@@ -369,6 +385,7 @@ obli:
 		Offset: -1,-3
 	icon: obliicnh.tem
 		AddExtension: False
+		Offset: 0,0
 
 brik:
 	idle:
@@ -514,22 +531,19 @@ gtwr:
 		AddExtension: False
 
 atwr:
+	Defaults:
+		Offset: 0,-13
 	idle:
-		Offset: 0,-1
 	damaged-idle:
 		Start: 1
-		Offset: 0,-1
 	dead:
 		Start: 2
-		Offset: 0,-1
 		Tick: 800
 	make: atwrmake
 		Length: *
 		Tick: 80
-		Offset: 0,-1
 	muzzle: gunfire2
 		Length: *
-		Offset: 0,-1
 	bib: mbGTWR
 		UseTilesetExtension: true
 		TilesetOverrides:
@@ -540,6 +554,7 @@ atwr:
 		Offset: -3,0
 	icon: atwricnh.tem
 		AddExtension: False
+		Offset: 0,0
 
 hosp:
 	idle: