Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 24226)
@@ -1,106 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Capture>
       <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>100.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Cost>
-    <Population>1</Population>
-    <BuildTime>15</BuildTime>
+    <BuildTime>16</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="3.0" depth="6.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
     <Classes datatype="tokens">Human FastMoving CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Soldier Cavalry</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Loot>
     <xp>130</xp>
     <food>10</food>
     <wood>5</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>3</Hack>
         <Pierce>1</Pierce>
         <Crush>15</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.meat>5</food.meat>
     </Rates>
     <Capacities>
       <food>20</food>
       <wood>20</wood>
       <stone>20</stone>
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>92</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 24226)
@@ -1,65 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Cost>
-    <Population>1</Population>
-    <BuildTime>30</BuildTime>
+    <BuildTime>27</BuildTime>
     <Resources>
       <food>150</food>
       <wood>80</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="3.0" depth="6.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>240</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FastMoving</Classes>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Champion Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>15</food>
     <wood>8</wood>
     <metal>10</metal>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>7</Hack>
         <Pierce>5</Pierce>
         <Crush>20</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>96</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(revision 24226)
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Cost>
     <Population>3</Population>
-    <BuildTime>30</BuildTime>
+    <BuildTime>36</BuildTime>
     <Resources>
       <food>300</food>
       <metal>200</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>750</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <GenericName>War Elephant</GenericName>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>30</food>
     <metal>20</metal>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>10</Hack>
         <Pierce>10</Pierce>
         <Crush>25</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>10.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.95</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 24226)
@@ -1,131 +1,131 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Capture>
       <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
       structures/{civ}/corral
       structures/{civ}/dock
       structures/{civ}/barracks
       structures/{civ}/arsenal
       structures/{civ}/forge
       structures/{civ}/temple
       structures/{civ}/market
       structures/{civ}/outpost
       structures/{civ}/sentry_tower
       structures/{civ}/defense_tower
       structures/{civ}/fortress
       structures/wallset_palisade
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/wonder
     </Entities>
   </Builder>
   <Cost>
-    <BuildTime>10</BuildTime>
+    <BuildTime>12</BuildTime>
     <Resources>
       <food>50</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>80</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">Human CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker Soldier Infantry</VisibleClasses>
     <GenericName>Infantry</GenericName>
     <Rank>Basic</Rank>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>5</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Promotion>
     <RequiredXp>100</RequiredXp>
   </Promotion>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>2</Hack>
         <Pierce>4</Pierce>
         <Crush>15</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.25</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.75</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.5</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.5</metal.ore>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <invalid_building_placement>interface/alarm/alarm_invalid_building_placement.xml</invalid_building_placement>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support.xml	(revision 24226)
@@ -1,41 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Cost>
-    <BuildTime>8</BuildTime>
-  </Cost>
   <Identity>
     <Classes datatype="tokens">Human Organic</Classes>
     <VisibleClasses datatype="tokens">Support</VisibleClasses>
     <GenericName>Support</GenericName>
   </Identity>
   <Loot>
     <xp>10</xp>
     <food>1</food>
     <wood>1</wood>
     <stone>1</stone>
     <metal>1</metal>
   </Loot>
   <Minimap>
     <Type>support</Type>
   </Minimap>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>1</Hack>
         <Pierce>1</Pierce>
         <Crush>1</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_worker.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
   </UnitAI>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 24226)
@@ -1,113 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Attack>
     <Melee>
       <AttackName>Dagger</AttackName>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Auras datatype="tokens">
     units/female_inspiration
   </Auras>
   <Builder>
     <Rate>1.0</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
       structures/{civ}/corral
       structures/{civ}/dock
       structures/{civ}/barracks
       structures/{civ}/arsenal
       structures/{civ}/forge
       structures/{civ}/temple
       structures/{civ}/market
       structures/{civ}/outpost
       structures/{civ}/sentry_tower
       structures/{civ}/defense_tower
       structures/{civ}/fortress
       structures/wallset_palisade
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/wonder
     </Entities>
   </Builder>
   <Cost>
+    <BuildTime>9</BuildTime>
     <Resources>
       <food>50</food>
     </Resources>
   </Cost>
   <Health>
     <Max>25</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FemaleCitizen</Classes>
     <VisibleClasses datatype="tokens">Citizen Worker</VisibleClasses>
     <GenericName>Female Citizen</GenericName>
     <SelectionGroupName>template_unit_support_female_citizen</SelectionGroupName>
     <Phenotype>female</Phenotype>
     <Formations disable=""/>
   </Identity>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fruit>1</food.fruit>
       <food.grain>0.5</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>0.7</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>0.35</stone.rock>
       <stone.ruins>2</stone.ruins>
       <metal.ore>0.35</metal.ore>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_female.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
       <gather_rock>resource/mining/pickaxe.xml</gather_rock>
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <invalid_building_placement>interface/alarm/alarm_invalid_building_placement.xml</invalid_building_placement>
     </SoundGroups>
   </Sound>
   <UnitAI>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <Vision>
     <Range>32</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml	(revision 24226)
@@ -1,61 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Cost>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>250</food>
     </Resources>
   </Cost>
   <Heal>
     <Range>12</Range>
     <RangeOverlay>
       <LineTexture>heal_overlay_range.png</LineTexture>
       <LineTextureMask>heal_overlay_range_mask.png</LineTextureMask>
       <LineThickness>0.35</LineThickness>
     </RangeOverlay>
     <Health>5</Health>
     <Interval>2000</Interval>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
   </Heal>
   <Health>
     <Max>85</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Healer</VisibleClasses>
     <GenericName>Healer</GenericName>
     <SelectionGroupName>template_unit_support_healer</SelectionGroupName>
     <Rank>Basic</Rank>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Heal units.</Tooltip>
   </Identity>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x128/plus.png</MainTexture>
         <MainTextureMask>128x128/plus_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml	(revision 24226)
@@ -1,92 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Builder>
     <Rate>0.5</Rate>
     <Entities datatype="tokens">
       structures/{civ}/civil_centre
       structures/{civ}/crannog
       structures/{civ}/military_colony
       structures/{civ}/house
       structures/{civ}/storehouse
       structures/{civ}/farmstead
       structures/{civ}/field
       structures/{civ}/corral
       structures/{civ}/dock
       structures/{civ}/barracks
       structures/{civ}/arsenal
       structures/{civ}/forge
       structures/{civ}/temple
       structures/{civ}/market
       structures/{civ}/outpost
       structures/{civ}/sentry_tower
       structures/{civ}/defense_tower
       structures/{civ}/fortress
       structures/wallset_palisade
       structures/{civ}/wallset_siege
       structures/{civ}/wallset_stone
       structures/{civ}/wonder
     </Entities>
   </Builder>
   <Cost>
     <Population>0</Population>
-    <BuildTime>20</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>0</stone>
       <metal>50</metal>
     </Resources>
   </Cost>
   <Health>
     <RegenRate>-0.25</RegenRate>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Slave Worker</VisibleClasses>
     <GenericName>Slave</GenericName>
     <SelectionGroupName>template_unit_support_slave</SelectionGroupName>
     <Tooltip>Gatherer with a finite life span. Bonused at mining and lumbering.</Tooltip>
   </Identity>
   <Loot>
     <xp>1</xp>
     <food>0</food>
-    <wood>1</wood>
-    <stone>1</stone>
-    <metal>1</metal>
   </Loot>
   <ResourceGatherer>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>0.5</food.fish>
       <food.fruit>0.5</food.fruit>
       <food.grain>0.35</food.grain>
       <food.meat>1</food.meat>
       <wood.tree>1.0</wood.tree>
       <wood.ruins>5</wood.ruins>
       <stone.rock>1.0</stone.rock>
       <stone.ruins>5</stone.ruins>
       <metal.ore>1.0</metal.ore>
       <treasure disable=""/>
     </Rates>
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_wood>resource/lumbering/lumbering.xml</gather_wood>
       <gather_stone>resource/mining/pickaxe.xml</gather_stone>
       <gather_metal>resource/mining/mining.xml</gather_metal>
       <trained>actor/singlesteps/steps_gravel_trained.xml</trained>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml	(revision 24225)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml	(revision 24226)
@@ -1,84 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support">
   <Auras datatype="tokens">
     units/elephant_worker
   </Auras>
   <Cost>
-    <BuildTime>20</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>150</food>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Worker Elephant</GenericName>
     <SpecificName>Karmākara Gaja</SpecificName>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
     <Icon>units/maur_support_elephant.png</Icon>
     <Formations disable=""/>
   </Identity>
   <Loot>
     <xp>50</xp>
     <food>25</food>
     <wood>10</wood>
     <stone>10</stone>
     <metal>10</metal>
   </Loot>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>5</Hack>
         <Pierce>8</Pierce>
         <Crush>10</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <ResourceDropsite>
     <Types>food wood stone metal</Types>
     <Sharable>false</Sharable>
   </ResourceDropsite>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>9.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>50</Range>
   </Vision>
   <VisualActor>
     <Actor>units/mauryas/support_elephant.xml</Actor>
   </VisualActor>
 </Entity>