Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military.xml	(revision 22181)
@@ -1,17 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Armour>
     <Hack>20</Hack>
     <Pierce>35</Pierce>
     <Crush>3</Crush>
     <Foundation>
       <Hack>1</Hack>
       <Pierce>5</Pierce>
       <Crush>1</Crush>
     </Foundation>
   </Armour>
+  <BuildRestrictions>
+    <Category>Military</Category>
+  </BuildRestrictions>
+  <GarrisonHolder>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+  </GarrisonHolder>
   <Identity>
     <GenericName>Military Structure</GenericName>
     <VisibleClasses datatype="tokens">Military</VisibleClasses>
   </Identity>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>50</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml	(revision 22181)
@@ -1,78 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="19.0" depth="19.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Infantry Cavalry</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Barracks</GenericName>
     <Tooltip>Train citizen-soldiers. Research training improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Village Barracks</VisibleClasses>
     <Icon>structures/barracks.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Loot>
     <wood>30</wood>
     <stone>10</stone>
   </Loot>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_infantry_spearman_b
       units/{civ}_infantry_pikeman_b
       units/{civ}_infantry_swordsman_b
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
       units/{civ}_cavalry_swordsman_b
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
       training_conscription
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_barracks.xml</select>
       <constructed>interface/complete/building/complete_barracks.xml</constructed>
     </SoundGroups>
   </Sound>
-  <TerritoryInfluence>
-    <Root>false</Root>
-    <Radius>50</Radius>
-    <Weight>40000</Weight>
-  </TerritoryInfluence>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml	(revision 22181)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <GarrisonHolder>
-    <List datatype="tokens">Infantry -Cavalry</List>
+    <List datatype="tokens">-Cavalry</List>
   </GarrisonHolder>
   <Identity>
     <Classes datatype="tokens">Archery</Classes>
     <GenericName>Archery Range</GenericName>
     <Icon>structures/range.png</Icon>
     <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       -units/{civ}_infantry_spearman_b
       -units/{civ}_infantry_pikeman_b
       -units/{civ}_infantry_swordsman_b
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_range.xml</constructed>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks_stables.xml	(revision 22181)
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_barracks">
   <GarrisonHolder>
-    <List datatype="tokens">Cavalry -Infantry</List>
+    <List datatype="tokens">-Infantry</List>
   </GarrisonHolder>
   <Identity>
     <GenericName>Stables</GenericName>
     <Tooltip>Train citizen-soldier cavalry. Research training improvements.</Tooltip>
     <Icon>structures/barracks.png</Icon>
     <Classes datatype="tokens">Stables</Classes>
   </Identity>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       -units/{civ}_infantry_spearman_b
       -units/{civ}_infantry_pikeman_b
       -units/{civ}_infantry_swordsman_b
       units/{civ}_cavalry_swordsman_b
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
     </Entities>
   </ProductionQueue>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml	(revision 22181)
@@ -1,78 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="22.0" depth="22.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Infantry Healer</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <GenericName>Blacksmith</GenericName>
     <Icon>structures/blacksmith.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Research weapons and armor improvements.</Tooltip>
     <VisibleClasses datatype="tokens">Town Blacksmith</VisibleClasses>
   </Identity>
   <Loot>
     <wood>50</wood>
     <metal>25</metal>
   </Loot>
   <Obstruction>
     <Static width="17.0" depth="17.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Technologies datatype="tokens">
       attack_infantry_melee_01
       attack_infantry_melee_02
       attack_infantry_ranged_01
       attack_infantry_ranged_02
       attack_cavalry_melee_01
       attack_cavalry_melee_02
       attack_cavalry_ranged_01
       attack_cavalry_ranged_02
       armor_infantry_01
       armor_infantry_02
       armor_cav_01
       armor_cav_02
       armor_hero_01
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_blacksmith.xml</select>
       <constructed>interface/complete/building/complete_blacksmith.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>38</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>32</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml	(revision 22181)
@@ -1,82 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <BuildRestrictions>
     <Territory>own ally neutral</Territory>
     <PlacementType>shore</PlacementType>
     <Category>Dock</Category>
   </BuildRestrictions>
   <Cost>
     <PopulationBonus>5</PopulationBonus>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>200</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="18.0" depth="18.0"/>
     <Height>8.0</Height>
   </Footprint>
+  <GarrisonHolder disable=""/>
   <Health>
     <Max>2500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_4x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Dock</GenericName>
     <Tooltip>Build upon a shoreline to construct naval vessels and to open sea trade. Research naval improvements.</Tooltip>
     <Classes datatype="tokens">Naval NavalMarket</Classes>
     <VisibleClasses datatype="tokens">Economic Village Market Dock</VisibleClasses>
     <Icon>structures/dock.png</Icon>
   </Identity>
   <Loot>
     <food>30</food>
     <wood>30</wood>
   </Loot>
   <Market>
     <TradeType>land naval</TradeType>
     <InternationalBonus>0.2</InternationalBonus>
   </Market>
   <Obstruction>
     <Static width="18.0" depth="18.0"/>
   </Obstruction>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_ship_fishing
       units/{civ}_ship_merchant
       units/{civ}_ship_bireme
       units/{civ}_ship_trireme
     </Entities>
     <Technologies datatype="tokens">
       gather_capacity_fishing
       gather_fishing_net
       training_naval_architects
       armor_ship_reinforcedhull
       armor_ship_hypozomata
       armor_ship_hullsheathing
     </Technologies>
   </ProductionQueue>
   <RallyPointRenderer>
     <LinePassabilityClass>ship</LinePassabilityClass>
   </RallyPointRenderer>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
     <Sharable>true</Sharable>
   </ResourceDropsite>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_dock.xml</select>
       <constructed>interface/complete/building/complete_dock.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryDecay disable=""/>
+  <TerritoryInfluence disable=""/>
   <Vision>
     <Range>40</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_4x4_dock.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml	(revision 22181)
@@ -1,68 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>300</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>200</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="31" depth="29"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Elephant</List>
     <BuffHeal>1</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>3000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Elephant Stables</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Icon>structures/elephant_stables.png</Icon>
     <Tooltip>Train elephant units.</Tooltip>
     <VisibleClasses datatype="tokens">City ElephantStables</VisibleClasses>
   </Identity>
   <Loot>
     <wood>0</wood>
     <stone>50</stone>
     <metal>50</metal>
   </Loot>
   <Obstruction>
     <Static width="29" depth="27"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_support_elephant
       units/{civ}_elephant_archer_b
       units/{civ}_champion_elephant
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_elephant_stables.xml</constructed>
       <select>interface/select/building/sel_elephant_stables.xml</select>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>38</Radius>
-    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </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 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml	(revision 22181)
@@ -1,74 +1,69 @@
 <?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>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>
     </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>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml	(revision 22181)
@@ -1,116 +1,112 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Armour>
     <Hack op="add">5</Hack>
     <Pierce op="add">5</Pierce>
     <Crush op="add">3</Crush>
   </Armour>
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>16.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>72.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>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
       <RangeOverlay>
         <LineTexture>outline_border.png</LineTexture>
         <LineTextureMask>outline_border_mask.png</LineTextureMask>
         <LineThickness>0.175</LineThickness>
       </RangeOverlay>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
   </BuildingAI>
   <BuildRestrictions>
     <Category>Fortress</Category>
     <Distance>
       <FromClass>Fortress</FromClass>
       <MinDistance>80</MinDistance>
     </Distance>
   </BuildRestrictions>
   <Capturable>
     <CapturePoints>4000</CapturePoints>
     <RegenRate>10.0</RegenRate>
   </Capturable>
   <Cost>
     <PopulationBonus>10</PopulationBonus>
     <BuildTime>500</BuildTime>
     <Resources>
       <wood>0</wood>
       <stone>1000</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0.075</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Siege</List>
-    <BuffHeal>0</BuffHeal>
     <LoadingRange>6</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>4200</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x6</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Fortress</GenericName>
     <Tooltip>Train heroes, champions, and siege weapons. Research siege weapon improvements.</Tooltip>
     <Classes datatype="tokens">Defensive Fortress GarrisonFortress</Classes>
     <VisibleClasses datatype="tokens">City</VisibleClasses>
     <Icon>structures/fortress.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>100</xp>
     <wood>0</wood>
     <stone>65</stone>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       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_polybolos_packed
       units/{civ}_mechanical_siege_ram
       units/{civ}_mechanical_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       attack_soldiers_will
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_fortress.xml</select>
       <constructed>interface/complete/building/complete_fortress.xml</constructed>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>100</Radius>
-    <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
     <Range>80</Range>
   </Vision>
   <VisualActor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml	(revision 22181)
@@ -1,77 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Armour>
     <Hack>10</Hack>
     <Pierce>40</Pierce>
     <Crush>5</Crush>
     <Foundation>
       <Hack>3</Hack>
       <Pierce>8</Pierce>
       <Crush>2</Crush>
     </Foundation>
   </Armour>
   <BuildRestrictions>
     <Category>Kennel</Category>
   </BuildRestrictions>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <wood>50</wood>
       <stone>50</stone>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="8.0" depth="7.0"/>
     <Height>5.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>5</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Dog</List>
     <BuffHeal>1</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>500</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_2x2</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Kennel</GenericName>
     <Classes datatype="tokens">Kennel</Classes>
     <VisibleClasses datatype="tokens">Town</VisibleClasses>
     <Tooltip>Train war dogs.</Tooltip>
     <Icon>structures/kennel.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
     <stone>10</stone>
   </Loot>
   <Obstruction>
     <Static width="7.5" depth="6.75"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_war_dog_b
     </Entities>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_kennel.xml</constructed>
       <select>interface/select/building/sel_kennel.xml</select>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>20</Radius>
     <Weight>30000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml	(revision 22180)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml	(revision 22181)
@@ -1,77 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Auras datatype="tokens">
     structures/workshop_repair
   </Auras>
-  <BuildRestrictions>
-    <Category>Barracks</Category>
-  </BuildRestrictions>
   <Cost>
     <BuildTime>200</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="30.0" depth="30.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>2</Max>
-    <EjectHealth>0.1</EjectHealth>
-    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Siege</List>
-    <BuffHeal>0</BuffHeal>
-    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Siege Workshop</GenericName>
     <Icon>structures/siege_workshop.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Tooltip>Build siege engines to destroy your opponents buildings. Research siege technologies to improve the effectiveness of these weapons.</Tooltip>
     <VisibleClasses datatype="tokens">City Workshop</VisibleClasses>
   </Identity>
   <Loot>
     <wood>75</wood>
   </Loot>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
       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_polybolos_packed
       units/{civ}_mechanical_siege_ram
       units/{civ}_mechanical_siege_tower
     </Entities>
     <Technologies datatype="tokens">
       siege_attack
       siege_armor
       siege_cost_metal
       siege_cost_wood
       siege_bolt_accuracy
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_barracks.xml</constructed>
       <select>interface/select/building/sel_barracks.xml</select>
     </SoundGroups>
   </Sound>
   <TerritoryInfluence>
-    <Root>false</Root>
     <Radius>38</Radius>
-    <Weight>40000</Weight>
   </TerritoryInfluence>
   <VisualActor>
     <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>