Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml	(revision 21279)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml	(revision 21280)
@@ -1,36 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
-    <BuildTime>120</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="16.0" depth="13.0"/>
     <Height>11.0</Height>
   </Footprint>
   <Health>
     <Max>1200</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Celtic Embassy</SpecificName>
     <Tooltip>Hire Celtic mercenaries. Research improvements for these mercenaries.</Tooltip>
     <Icon>structures/celtic_embassy.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="15.0" depth="12.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_swordsman_gaul_b
       units/{civ}_cavalry_swordsman_gaul_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_celtic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml	(revision 21279)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml	(revision 21280)
@@ -1,30 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
-    <BuildTime>200</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>200</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Iberian Embassy</SpecificName>
       <Tooltip>Hire Iberian mercenaries. Research improvements for these mercenaries.</Tooltip>
     <Icon>structures/iberian_embassy.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_javelinist_iber_b
       units/{civ}_infantry_slinger_iber_b
       units/{civ}_cavalry_swordsman_iber_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_iberian.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml	(revision 21279)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml	(revision 21280)
@@ -1,36 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_embassy">
   <Cost>
-    <BuildTime>150</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>0</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="13" depth="15.5"/>
     <Height>12.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <Civ>cart</Civ>
     <SpecificName>Italian Embassy</SpecificName>
     <Tooltip>Hire Italian mercenaries. Research improvements for these mercenaries.</Tooltip>
     <Icon>structures/italian_embassy.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="11.0" depth="14.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_swordsman_ital_b
       units/{civ}_cavalry_spearman_ital_b
     </Entities>
   </ProductionQueue>
   <VisualActor>
     <Actor>structures/carthaginians/embassy_italiote.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml	(revision 21279)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml	(revision 21280)
@@ -1,125 +1,125 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
   <Armour>
     <Hack op="add">-5.0</Hack>
     <Pierce op="add">-5.0</Pierce>
     <Crush op="add">-1.0</Crush>
     <Foundation>
       <Hack>1.0</Hack>
       <Pierce>5.0</Pierce>
       <Crush>1.0</Crush>
     </Foundation>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>25.0</Pierce>
       <Crush>0.0</Crush>
-      <MaxRange>50.0</MaxRange>
+      <MaxRange>60.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <Gravity>9.81</Gravity>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
       <Delay>0</Delay>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>15</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>neutral enemy</Territory>
     <Category>ArmyCamp</Category>
     <Distance>
       <FromClass>ArmyCamp</FromClass>
       <MinDistance>80</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>1500</CapturePoints>
     <RegenRate>10.0</RegenRate>
     <GarrisonRegenRate>3.0</GarrisonRegenRate>
   </Capturable>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
     <BuildTime>250</BuildTime>
     <Resources>
       <wood>500</wood>
       <stone>0</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="40.0" depth="40.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_rome_sb</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Civ>rome</Civ>
     <GenericName>Entrenched Army Camp</GenericName>
     <SpecificName>Castrum Vallum</SpecificName>
     <Classes datatype="tokens">ArmyCamp</Classes>
     <Icon>structures/roman_camp.png</Icon>
     <Tooltip>Build in neutral or enemy territory. Construct siege weapons and train citizen-soldiers. Heal garrisoned units slowly.</Tooltip>
   </Identity>
   <Loot>
     <xp>100</xp>
     <wood>100</wood>
   </Loot>
   <Obstruction>
     <Static width="36.0" depth="36.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_infantry_swordsman_b
       units/{civ}_infantry_spearman_a
       units/{civ}_infantry_javelinist_b
       units/{civ}_cavalry_spearman_b
       units/{civ}_mechanical_siege_ballista_packed
       units/{civ}_mechanical_siege_scorpio_packed
       units/{civ}_mechanical_siege_oxybeles_packed
       units/{civ}_mechanical_siege_lithobolos_packed
       units/{civ}_mechanical_siege_ram
       units/{civ}_mechanical_siege_tower
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_broch.xml</select>
       <constructed>interface/complete/building/complete_broch.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryDecay>
     <DecayRate>37.5</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence disable=""/>
   <Vision>
     <Range>60</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/romans/camp.xml</Actor>
     <FoundationActor>structures/fndn_8x8.xml</FoundationActor>
   </VisualActor>
   <WallPiece>
     <Length>29.5</Length>
     <Indent>8</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml	(revision 21279)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml	(revision 21280)
@@ -1,62 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_civic_civil_centre">
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
-    <MaxArrowCount>15</MaxArrowCount>
-    <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Territory>own neutral</Territory>
     <Category>Colony</Category>
     <Distance>
       <FromClass>CivilCentre</FromClass>
       <MinDistance>120</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <wood>200</wood>
       <stone>200</stone>
       <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>
   </Health>
   <Identity>
     <GenericName>Military Colony</GenericName>
     <SpecificName>Klēroukhía</SpecificName>
     <Classes datatype="tokens">Colony</Classes>
     <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}
       -phase_city_{civ}
       upgrade_rank_advanced_mercenary
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryDecay>
     <DecayRate>1</DecayRate>
   </TerritoryDecay>
   <TerritoryInfluence>
     <Radius>80</Radius>
   </TerritoryInfluence>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml	(revision 21279)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defense_tower_sentry.xml	(revision 21280)
@@ -1,73 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_defense_tower">
   <Armour>
     <Hack op="add">-5</Hack>
     <Pierce op="add">-5</Pierce>
     <Crush op="add">-2</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Pierce>9</Pierce>
       <MaxRange>70</MaxRange>
-      <MinRange>0</MinRange>
+      <MinRange>10</MinRange>
       <ElevationBonus>9</ElevationBonus>
     </Ranged>
   </Attack>
-  <Capturable>
-    <CapturePoints>800</CapturePoints>
-  </Capturable>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="9.5" depth="8.5"/>
     <Height>9.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>3</Max>
   </GarrisonHolder>
   <Health>
-    <Max>250</Max>
+    <Max>500</Max>
   </Health>
   <Identity>
     <GenericName>Sentry Tower</GenericName>
     <Icon>structures/sentry_tower.png</Icon>
     <Classes datatype="tokens">GarrisonTower</Classes>
     <VisibleClasses datatype="tokens">Village DefenseTower SentryTower</VisibleClasses>
     <Tooltip>Shoots arrows. Garrison to provide extra defence. Needs the murder holes tech to protect its foot. Upgradeable to stone tower.</Tooltip>
   </Identity>
   <Loot>
     <wood>20</wood>
   </Loot>
   <Obstruction>
     <Static width="9.0" depth="7.5"/>
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
       tower_watch
     </Technologies>
   </ProductionQueue>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>16</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Upgrade>
     <Tower>
       <Entity>structures/{civ}_defense_tower</Entity>
       <Tooltip>Reinforce with stone and upgrade to a defense tower.</Tooltip>
       <RequiredTechnology>phase_town</RequiredTechnology>
       <Cost>
         <wood>50</wood>
         <stone>100</stone>
       </Cost>
       <Time>100</Time>
     </Tower>
   </Upgrade>
   <VisualActor>
     <Actor>props/special/palisade_rocks_fort.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml	(revision 21279)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml	(revision 21280)
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Armour>
     <Pierce>30</Pierce>
     <Foundation>
       <Hack>3</Hack>
       <Pierce>10</Pierce>
       <Crush>3</Crush>
     </Foundation>
   </Armour>
   <BuildRestrictions>
     <Category>Embassy</Category>
   </BuildRestrictions>
   <Cost>
-    <BuildTime>200</BuildTime>
+    <BuildTime>150</BuildTime>
     <PopulationBonus>0</PopulationBonus>
     <Resources>
       <food>0</food>
       <wood>100</wood>
       <stone>100</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="16.0" depth="16.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>6</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_3x3</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Town Embassy</VisibleClasses>
     <GenericName>Embassy</GenericName>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <stone>20</stone>
   </Loot>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Technologies datatype="tokens">
       upgrade_rank_advanced_mercenary
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_gymnasium.xml</select>
       <constructed>interface/complete/building/complete_gymnasium.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
     <Radius>25</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>24</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_3x3.xml</FoundationActor>
   </VisualActor>
 </Entity>