Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -16,8 +16,8 @@
   </Attack>
   <Cost>
     <Resources>
-      <wood>30</wood>
-      <metal>20</metal>
+      <wood>40</wood>
+      <metal>10</metal>
     </Resources>
   </Cost>
   <Identity>
@@ -25,8 +25,8 @@
     <GenericName>Cavalry Swordsman</GenericName>
   </Identity>
   <Loot>
-    <wood>0</wood>
-    <metal>5</metal>
+    <wood>4</wood>
+    <metal>1</metal>
   </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -22,13 +22,6 @@
       </Texture>
     </Overlay>
   </Selectable>
-  <Loot>
-    <xp>150</xp>
-    <food>10</food>
-    <wood>10</wood>
-    <stone>0</stone>
-    <metal>20</metal>
-  </Loot>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -9,9 +9,8 @@
     <Population>1</Population>
     <BuildTime>30</BuildTime>
     <Resources>
-      <food>250</food>
-      <wood>0</wood>
-      <stone>0</stone>
+      <food>150</food>
+      <wood>80</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
@@ -29,6 +28,12 @@
       special/formations/wedge
     </Formations>
   </Identity>
+  <Loot>
+    <xp>200</xp>
+    <food>15</food>
+    <wood>8</wood>
+    <metal>10</metal>
+  </Loot>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -16,12 +16,6 @@
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
   <Health>
     <Max>300</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
     <GenericName>Champion Cavalry Skirmisher</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -23,11 +23,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>300</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -17,12 +17,6 @@
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>75</wood>
-      <metal>125</metal>
-    </Resources>
-  </Cost>
   <Health>
     <Max>300</Max>
   </Health>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -25,8 +25,8 @@
     <GenericName>War Elephant</GenericName>
   </Identity>
   <Loot>
+    <xp>300</xp>
     <food>30</food>
-    <wood>0</wood>
     <metal>20</metal>
   </Loot>
   <Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -8,10 +8,9 @@
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
-      <food>125</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>75</metal>
+      <food>80</food>
+      <wood>60</wood>
+      <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
@@ -21,6 +20,12 @@
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Champion Infantry</GenericName>
   </Identity>
+  <Loot>
+    <xp>150</xp>
+    <food>8</food>
+    <wood>6</wood>
+    <metal>8</metal>
+  </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>120</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -17,12 +17,6 @@
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-      <metal>75</metal>
-    </Resources>
-  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>120</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -16,12 +16,6 @@
       <RepeatTime>750</RepeatTime>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>75</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -24,11 +24,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -23,11 +23,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -17,12 +17,6 @@
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>75</wood>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -25,7 +25,8 @@
     <GenericName>Swordsman</GenericName>
   </Identity>
   <Loot>
-    <metal>5</metal>
+    <wood>4</wood>
+    <metal>1</metal>
   </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">1.05</WalkSpeed>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
@@ -4,13 +4,6 @@
     <Hack op="add">-4</Hack>
     <Pierce op="add">-4</Pierce>
   </Armour>
-  <Cost>
-    <BuildTime op="mul">0.75</BuildTime>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Naked Fanatic</GenericName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
-  <Cost>
-    <BuildTime op="mul">0.75</BuildTime>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">1.5</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -11,12 +11,6 @@
       </Damage>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">1.5</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman_hoplite">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>