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 24614)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml	(revision 24615)
@@ -1,63 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Cost>
     <Population>3</Population>
     <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>
+    <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
     <xp>300</xp>
     <food>30</food>
     <metal>20</metal>
   </Loot>
   <Position>
     <TurnRate>3</TurnRate>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>10</Hack>
         <Pierce>10</Pierce>
-        <Crush>25</Crush>
+        <Crush>20</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_champion_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml	(revision 24614)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml	(revision 24615)
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_elephant">
-  <Attack replace="">
+  <Attack>
+    <Capture disable=""/>
     <Melee>
       <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>20</Hack>
         <Pierce>0</Pierce>
-        <Crush>150.0</Crush>
+        <Crush>150</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee</VisibleClasses>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml	(revision 24614)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml	(revision 24615)
@@ -1,55 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
       <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>10.0</Pierce>
         <Crush>20.0</Crush>
       </Damage>
       <MaxRange>6.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
-      <Bonuses>
-        <BonusCav>
-          <Classes>Cavalry</Classes>
-          <Multiplier>1.5</Multiplier>
-        </BonusCav>
-      </Bonuses>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
-    <Tooltip>Counters: 1.5× vs Cavalry. Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>
   <Position>
     <TurnRate>3</TurnRate>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>3</Hack>
         <Pierce>4</Pierce>
         <Crush>5</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <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>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.5</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 24614)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 24615)
@@ -1,72 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
-  <Attack replace="">
+  <Attack>
+    <Capture disable=""/>
     <Melee>
       <AttackName>Trunk</AttackName>
       <Damage>
-        <Hack>20.0</Hack>
+        <Hack>40</Hack>
         <Pierce>0</Pierce>
-        <Crush>50.0</Crush>
+        <Crush>300</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>750</PrepareTime>
+      <RepeatTime>1500</RepeatTime>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
-      <food>500</food>
-      <metal>500</metal>
+      <food>600</food>
+      <metal>400</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
+    <GenericName>Hero Elephant</GenericName>
     <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
   </Identity>
+  <Loot>
+    <food>60</food>
+    <metal>40</metal>
+  </Loot>
   <Position>
     <TurnRate>3</TurnRate>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>10</Hack>
         <Pierce>10</Pierce>
         <Crush>25</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Selectable>
     <Overlay>
       <Shape>
         <Circle radius="5.0"/>
       </Shape>
     </Overlay>
   </Selectable>
   <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>
 </Entity>