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 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 19691)
@@ -1,62 +1,61 @@
 <?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>100</food>
-      <wood>0</wood>
-      <stone>0</stone>
+      <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">
       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>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack>attack/weapon/sword.xml</attack>
       <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>16.5</WalkSpeed>
     <Run>
       <Speed>26.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>16.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 19691)
@@ -1,32 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
       <Pierce>35</Pierce>
       <Crush>0</Crush>
       <MaxRange>80.0</MaxRange>
       <MinRange>20.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>0.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>45</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml	(revision 19691)
@@ -1,48 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>56.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>36.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Spread>0.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>45</BuildTime>
-    <Resources>
-      <food>100</food>
-      <wood>100</wood>
-      <metal>75</metal>
-    </Resources>
-  </Cost>
   <Footprint>
     <Circle radius="3.0"/>
     <Height>3.0</Height>
   </Footprint>
   <Health>
     <Max>1500</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
     <GenericName>Hero Cavalry Skirmisher</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>17.0</WalkSpeed>
     <Run>
       <Speed>28.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>16.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml	(revision 19691)
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
-    <Hack>11</Hack>
-    <Pierce>10</Pierce>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>24.0</Hack>
       <Pierce>52.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>3500</RepeatTime>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Hero Cavalry Spearman</GenericName>
   </Identity>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml	(revision 19691)
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Armour>
-    <Hack>11</Hack>
-    <Pierce>9</Pierce>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">1</Pierce>
   </Armour>
   <Attack>
     <Melee>
      <Hack>26.0</Hack>
      <Pierce>0.0</Pierce>
      <Crush>0.0</Crush>
      <MaxRange>6.0</MaxRange>
      <PrepareTime>500</PrepareTime>
-     <RepeatTime>1000</RepeatTime>
+     <RepeatTime>750</RepeatTime>
      <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
   </Attack>
+  <Cost>
+    <Resources>
+      <wood>150</wood>
+      <metal op="add">50</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
 </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 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml	(revision 19691)
@@ -1,41 +1,42 @@
 <?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>50</food>
-      <metal>200</metal>
+      <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>attack/weapon/sword.xml</attack>
       <death>actor/human/death/{gender}_death.xml</death>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml	(revision 19691)
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
       <Pierce>8.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>80</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>75.0</ProjectileSpeed>
       <PrepareTime>200</PrepareTime>
       <RepeatTime>300</RepeatTime>
       <Spread>0.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <wood>200</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <GenericName>Hero Archer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml	(revision 19691)
@@ -1,35 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
       <Hack>0</Hack>
       <Pierce>60.0</Pierce>
       <Crush>0</Crush>
       <MaxRange>32.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>62.5</ProjectileSpeed>
       <PrepareTime>600</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Spread>0.5</Spread>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <BuildTime>35</BuildTime>
-    <Resources>
-      <wood>200</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelin</VisibleClasses>
     <GenericName>Hero Skirmisher</GenericName>
     <Formations datatype="tokens">
       formations/skirmish
     </Formations>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml	(revision 19691)
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack>17</Hack>
-    <Pierce>17</Pierce>
-    <Crush>25</Crush>
+    <Hack op="add">9</Hack>
+    <Pierce op="add">9</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>4.0</Hack>
       <Pierce>20.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>3.0</Multiplier>
         </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
     <GenericName>Hero Pikeman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
     <Run>
       <Speed>17.5</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml	(revision 19691)
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack>12</Hack>
-    <Pierce>12</Pierce>
+    <Hack op="add">4</Hack>
+    <Pierce op="add">4</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>12.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <PrepareTime>450</PrepareTime>
+      <RepeatTime>900</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>3.0</Multiplier>
         </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Hero Spearman</GenericName>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>9</WalkSpeed>
     <Run>
       <Speed>18.75</Speed>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml	(revision 19691)
@@ -1,33 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry">
   <Armour>
-    <Hack>12</Hack>
-    <Pierce>12</Pierce>
+    <Hack op="add">4</Hack>
+    <Pierce op="add">4</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>22.0</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Human Siege</PreferredClasses>
     </Melee>
   </Attack>
+  <Cost>
+    <Resources>
+      <wood>150</wood>
+      <metal op="add">50</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Swordsman</GenericName>
   </Identity>
   <UnitMotion>
     <WalkSpeed>9.5</WalkSpeed>
     <Run>
       <Speed>20.0</Speed>
       <Range>600.0</Range>
       <RangeMin>8.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml	(revision 19690)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml	(revision 19691)
@@ -1,69 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>4.0</Hack>
     <Pierce>8.0</Pierce>
     <Crush>4.0</Crush>
   </Armour>
   <Auras datatype="tokens">
     units/heroes/hero_garrison
     units/heroes/maur_hero_chanakya_1
     units/heroes/maur_hero_chanakya_2
   </Auras>
   <Cost>
     <Population>2</Population>
-    <BuildTime>60</BuildTime>
+    <BuildTime>40</BuildTime>
     <Resources>
-      <food>100</food>
-      <metal>250</metal>
+      <food>200</food>
+      <wood>150</wood>
+      <metal>200</metal>
     </Resources>
   </Cost>
   <Heal>
     <Range>20</Range>
     <HP>6</HP>
     <Rate>2000</Rate>
     <UnhealableClasses datatype="tokens"/>
     <HealableClasses datatype="tokens">Human</HealableClasses>
   </Heal>
   <Health>
     <Max>1000</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <Classes datatype="tokens">Human Organic</Classes>
     <VisibleClasses datatype="tokens">Healer Hero Support</VisibleClasses>
     <GenericName>Acharya Chanakya</GenericName>
     <SpecificName>Acharya Chāṇakya</SpecificName>
     <Icon>units/maur_hero_chanakya.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
       <Texture>
         <MainTexture>star/256x256.png</MainTexture>
         <MainTextureMask>star/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>
   <UnitMotion>
     <WalkSpeed>9</WalkSpeed>
     <Run>
       <Speed>12.0</Speed>
       <Range>200.0</Range>
       <RangeMin>0.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
   <VisualActor>
     <Actor>units/mauryans/hero_chanakya.xml</Actor>
   </VisualActor>
 </Entity>