From f12feba62d0f2a060f543dc7662ce4875f3aaa25 Mon Sep 17 00:00:00 2001
From: bb <bb@wildfiregames.com>
Date: Mon, 17 Feb 2020 18:00:32 +0000
Subject: [PATCH] Correct military colony footprint/obstruction

Patch By: Nescio
Differential Revision: D2639
This was SVN commit r23504.
---
 .../templates/structures/ptol_military_colony.xml          | 6 +++---
 .../templates/structures/sele_military_colony.xml          | 6 +++---
 ...mplate_structure_civic_civil_centre_military_colony.xml | 7 -------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
index d891c2f1a1..0a4701367f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre_military_colony">
   <Footprint>
-    <Square width="40.0" depth="40.0"/>
-    <Height>12.0</Height>
+    <Square width="34" depth="33"/>
+    <Height>12</Height>
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
@@ -10,7 +10,7 @@
     <Tooltip>This is the Ptolemaic expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
   </Identity>
   <Obstruction>
-    <Static width="36.0" depth="36.0"/>
+    <Static width="32" depth="31"/>
   </Obstruction>
   <ProductionQueue>
     <Entities replace="" datatype="tokens">
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml b/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
index 3aa4d3210a..d124796fc3 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre_military_colony">
   <Footprint>
-    <Square width="31.0" depth="31.0"/>
-    <Height>8.0</Height>
+    <Square width="31" depth="31"/>
+    <Height>8</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
@@ -10,7 +10,7 @@
     <Tooltip>This is the Seleucid expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
   </Identity>
   <Obstruction>
-    <Static width="30.0" depth="29.0"/>
+    <Static width="29" depth="29"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
index c3ab32a548..67acb2f48d 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -19,10 +19,6 @@
       <metal>200</metal>
     </Resources>
   </Cost>
-  <Footprint>
-    <Square width="25.0" depth="25.0"/>
-    <Height>12.0</Height>
-  </Footprint>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
@@ -33,9 +29,6 @@
     <Icon>structures/military_settlement.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
-  <Obstruction>
-    <Static width="23.0" depth="23.0"/>
-  </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
       -phase_town_{civ}