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 21284)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 21285)
@@ -1,107 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>3</Hack>
     <Pierce>1</Pierce>
     <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Value>2</Value>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <Hack>100.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>4.0</MaxRange>
     </Slaughter>
   </Attack>
   <Cost>
     <Population>1</Population>
-    <BuildTime>12</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="4" depth="6"/>
     <Height>7.5</Height>
   </Footprint>
   <Health>
     <Max>160</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">CitizenSoldier Human Organic</Classes>
     <VisibleClasses datatype="tokens">Cavalry Citizen Soldier</VisibleClasses>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
     <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>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <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>circle/128x128.png</MainTexture>
         <MainTextureMask>circle/128x128_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">1.95</WalkSpeed>
     <Run>
       <Speed op="mul">1.95</Speed>
     </Run>
   </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 21284)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 21285)
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>7</Hack>
     <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
-    <BuildTime>40</BuildTime>
+    <BuildTime>30</BuildTime>
     <Resources>
       <food>250</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>240</Max>
   </Health>
   <Identity>
     <GenericName>Champion Cavalry</GenericName>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>arrow/256x256.png</MainTexture>
         <MainTextureMask>arrow/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2.25</WalkSpeed>
     <Run>
       <Speed op="mul">2.25</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>96</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 21284)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 21285)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
     <Hack>5</Hack>
     <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
-    <BuildTime>30</BuildTime>
+    <BuildTime>20</BuildTime>
     <Resources>
       <food>125</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>75</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Champion Infantry</GenericName>
   </Identity>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>arrow/128x128.png</MainTexture>
         <MainTextureMask>arrow/128x128_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
       <order_walk>voice/{lang}/civ/civ_{gender}_walk.xml</order_walk>
       <order_attack>voice/{lang}/civ/civ_{gender}_attack.xml</order_attack>
       <order_gather>voice/{lang}/civ/civ_{gender}_gather.xml</order_gather>
       <order_repair>voice/{lang}/civ/civ_{gender}_repair.xml</order_repair>
       <order_garrison>voice/{lang}/civ/civ_{gender}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/human/death/{gender}_death.xml</death>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>84</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml	(revision 21284)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml	(revision 21285)
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Armour>
     <Hack op="add">-3</Hack>
     <Pierce op="add">-3</Pierce>
   </Armour>
   <Cost>
-    <BuildTime op="mul">0.5</BuildTime>
+    <BuildTime op="mul">0.75</BuildTime>
     <Resources>
       <food>0</food>
       <metal op="mul">2</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Naked Fanatic</GenericName>
     <SpecificName>Gaesata</SpecificName>
     <Icon>units/celt_fanatic.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <UnitMotion>
     <WalkSpeed op="mul">1.4</WalkSpeed>
     <Run>
       <Speed op="mul">1.4</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>units/gauls/infantry_spearman_c.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml	(revision 21284)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml	(revision 21285)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Cost>
-    <BuildTime op="mul">0.5</BuildTime>
+    <BuildTime op="mul">0.75</BuildTime>
     <Resources>
       <food>0</food>
       <metal op="mul">1.5</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiaphoros</SpecificName>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml</Actor>
   </VisualActor>
 </Entity>