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 24495)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 24496)
@@ -1,82 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Capture>
       <AttackName>Capture</AttackName>
       <Capture>10</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
   </Attack>
   <Auras datatype="tokens">
     units/heroes/hero_garrison
   </Auras>
   <Cost>
-    <Population>2</Population>
-    <BuildTime>40</BuildTime>
+    <Population>0</Population>
+    <BuildTime>50</BuildTime>
     <Resources>
       <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Identity>
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
     <Icon>technologies/laurel_wreath.png</Icon>
     <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>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>10</Hack>
         <Pierce>20</Pierce>
         <Crush>15</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
       <Texture>
         <MainTexture>256x256/star.png</MainTexture>
         <MainTextureMask>256x256/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
       <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_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
     <Category>Hero</Category>
+    <MatchLimit>1</MatchLimit>
   </TrainingRestrictions>
   <Vision>
     <Range>100</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 24495)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 24496)
@@ -1,59 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Cost>
-    <BuildTime>50</BuildTime>
     <Resources>
       <food>300</food>
       <wood>200</wood>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="3.0" depth="6.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>1200</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FastMoving</Classes>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Hero Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Position>
     <TurnRate>4</TurnRate>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>10</Hack>
         <Pierce>8</Pierce>
         <Crush>25</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Selectable>
     <Overlay>
       <Shape>
         <Circle radius="3.0"/>
       </Shape>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/death/death_horse.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</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 24495)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml	(revision 24496)
@@ -1,74 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Attack replace="">
     <Melee>
       <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0</Pierce>
         <Crush>50.0</Crush>
       </Damage>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Cost>
-    <Population>3</Population>
-    <BuildTime>60</BuildTime>
     <Resources>
       <food>500</food>
       <metal>500</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="4.5" depth="9.0"/>
     <Height>9.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant Melee</VisibleClasses>
   </Identity>
   <Position>
     <TurnRate>2</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>
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 24495)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 24496)
@@ -1,41 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Cost>
-    <BuildTime>40</BuildTime>
     <Resources>
       <food>200</food>
       <wood>200</wood>
       <metal>150</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Hero</GenericName>
   </Identity>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>8</Hack>
         <Pierce>8</Pierce>
         <Crush>25</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Selectable>
     <Overlay>
       <Shape>
         <Circle radius="2.0"/>
       </Shape>
       <Texture>
         <MainTexture>128x128/star.png</MainTexture>
         <MainTextureMask>128x128/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
 </Entity>