Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 20747)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 20748)
@@ -1,68 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>10.0</Hack>
     <Pierce>20.0</Pierce>
     <Crush>15.0</Crush>
   </Armour>
   <Attack>
     <Capture>
       <Value>15</Value>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade SiegeWall StoneWall</RestrictedClasses>
     </Capture>
   </Attack>
   <Auras datatype="tokens">
     units/heroes/hero_garrison
   </Auras>
   <Cost>
     <Population>2</Population>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>600</Max>
   </Health>
   <Identity>
     <GenericName>Hero</GenericName>
     <Classes datatype="tokens">Organic Human</Classes>
     <VisibleClasses datatype="tokens">Hero Soldier</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>400</xp>
     <food>10</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
       <Texture>
         <MainTexture>star/256x256.png</MainTexture>
         <MainTextureMask>star/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
+      <select>voice/{lang}/civ/civ_{gender}_select.xml</select>
+      <trained>interface/alarm/alarm_create_infantry.xml</trained>
+      <order_heal>voice/{lang}/civ/civ_{gender}_heal.xml</order_heal>
+      <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>
+      <attack_melee>attack/weapon/sword.xml</attack_melee>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
+      <walk>actor/human/movement/walk.xml</walk>
+      <run>actor/human/movement/walk.xml</run>
       <death>actor/human/death/{gender}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>
   <Vision>
     <Range>88</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 20747)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 20748)
@@ -1,59 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>10</Hack>
     <Pierce>8</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <food>300</food>
       <wood>200</wood>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <GenericName>Hero Cavalry</GenericName>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <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>
+      <trained>interface/alarm/alarm_create_cav.xml</trained>
       <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">1.85</WalkSpeed>
     <Run>
       <Speed op="mul">1.85</Speed>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 20747)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 20748)
@@ -1,48 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Armour>
     <Hack>8</Hack>
     <Pierce>8</Pierce>
     <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
       <food>200</food>
       <wood>200</wood>
       <metal>150</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>2.5</Height>
   </Footprint>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Hero</GenericName>
   </Identity>
-  <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>
   <UnitMotion>
     <WalkSpeed op="mul">1.0</WalkSpeed>
     <Run>
       <Speed op="mul">1.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>