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 24442)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 24443)
@@ -1,108 +1,106 @@
 <?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>
+        <Hack>1000</Hack>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Cost>
     <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>
   <Position>
     <TurnRate>4</TurnRate>
   </Position>
   <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_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 24442)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml	(revision 24443)
@@ -1,131 +1,129 @@
 <?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>
+        <Hack>1000</Hack>
       </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>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_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 24442)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml	(revision 24443)
@@ -1,111 +1,109 @@
 <?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>
+        <Hack>1000</Hack>
       </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>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>