Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/successors/upgrade_mace_silvershields.json	(revision 18025)
@@ -1,13 +1,13 @@
 {
 	"genericName": "Silver Shields Regiment",
 	"description": "The Silver Shields, or Argyraspidai, were the elite heavy infantry arm of the Macedonian army.",
 	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 1000},
 	"requirements": {"all": [{"tech": "phase_city"}, {"civ": "mace"}]},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "shields_generic_silver.png",
 	"researchTime": 40,
-	"tooltip": "Upgrade Shield Bearer Champion Infantry to Silver Shields, with greater attack, health, and armor.",
+	"tooltip": "Upgrade Shield Bearer Champion Infantry to Silver Shields, with greater health and armor.",
 	"modifications": [{"value": "Promotion/RequiredXp", "replace": 0}],
 	"affects": ["Champion Infantry"],
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json	(revision 18025)
@@ -1,17 +1,17 @@
 {
 	"genericName": "Unlock Champion Units",
 	"specificName": {
 		"mace": "Ágēma",
 		"spart": "Ágēma",
 		"athen": "Ágēma",
 		"rome": "Regio Cohors"
 	},
 	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
-	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 500},
+	"cost": {"food": 0, "wood": 0, "stone": 0, "metal": 1000},
 	"requirements": {"tech": "phase_city"},
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "helmet_corinthian_crest.png",
-	"researchTime": 40,
+	"researchTime": 90,
 	"tooltip": "Unlock the ability to train Champions at the barracks.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 18025)
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
-    <Hack>8</Hack>
-    <Pierce>6</Pierce>
+    <Hack>7</Hack>
+    <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
-    <BuildTime>15</BuildTime>
+    <BuildTime>40</BuildTime>
     <Resources>
-      <food>200</food>
+      <food>250</food>
       <wood>0</wood>
       <stone>0</stone>
-      <metal>75</metal>
+      <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Circle radius="2.5"/>
     <Height>5.0</Height>
   </Footprint>
   <Health>
     <Max>270</Max>
   </Health>
   <Identity>
     <GenericName>Champion Cavalry</GenericName>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <Formations datatype="tokens">
       formations/wedge
     </Formations>
   </Identity>
   <Position>
     <Anchor>pitch</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>arrow/256x256.png</MainTexture>
         <MainTextureMask>arrow/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <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>10.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>96</Range>
   </Vision>
 </Entity>
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml	(revision 18025)
@@ -1,42 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
-    <Hack>9</Hack>
-    <Pierce>8</Pierce>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>12.0</Hack>
       <Pierce>26.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>3500</RepeatTime>
     </Melee>
     <Charge>
       <Hack>7.5</Hack>
       <Pierce>120.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
   <Cost>
-    <BuildTime>16</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Champion Cavalry Spearman</GenericName>
   </Identity>
   <UnitMotion>
     <WalkSpeed>25.0</WalkSpeed>
     <Run>
       <Speed>40.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml	(revision 18025)
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Armour>
-    <Hack>9</Hack>
-    <Pierce>7</Pierce>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>13.0</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>6.0</MaxRange>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Melee>
     <Charge>
       <Hack>60.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PreferredClasses datatype="tokens">Siege</PreferredClasses>
     </Charge>
   </Attack>
   <Cost>
-    <BuildTime>16</BuildTime>
     <Resources>
       <wood>75</wood>
-      <metal>100</metal>
+      <metal>125</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
   <UnitMotion>
     <WalkSpeed>23.0</WalkSpeed>
     <Run>
       <Speed>40.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml	(revision 18025)
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Armour>
-    <Hack>6</Hack>
-    <Pierce>6</Pierce>
+    <Hack>5</Hack>
+    <Pierce>5</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Cost>
-    <BuildTime>13</BuildTime>
+    <BuildTime>30</BuildTime>
     <Resources>
-      <food>100</food>
+      <food>125</food>
       <wood>0</wood>
       <stone>0</stone>
-      <metal>50</metal>
+      <metal>75</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Champion Infantry</GenericName>
   </Identity>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>arrow/128x128.png</MainTexture>
         <MainTextureMask>arrow/128x128_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <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>
   <UnitMotion>
     <WalkSpeed>8.5</WalkSpeed>
     <Run>
       <Speed>17.5</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
   <Vision>
     <Range>84</Range>
   </Vision>
 </Entity>
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml	(revision 18025)
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack>15</Hack>
-    <Pierce>15</Pierce>
+    <Hack op="add">8</Hack>
+    <Pierce op="add">8</Pierce>
     <Crush>20</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>1.0</Hack>
       <Pierce>5.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
       <RepeatTime>1500</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
     </Melee>
     <Charge>
       <Hack>6.0</Hack>
       <Pierce>24.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>8.0</MaxRange>
       <MinRange>0.0</MinRange>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
     </Charge>
   </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Spear Pike</VisibleClasses>
     <GenericName>Champion Pikeman</GenericName>
     <History>Pike, or sarissa, infantry were developed by Philip II of Macedon based on the hoplite of the Greek city-states. The Macedonian pikemen, or phalangites, wielded an extra long spear (sarissa) approximatly 4 to 7 meters (13–21 feet) in length. Because of it's length and weight, the pike required the use of both hands, so the shield was slung over the pikeman's shoulder with a leather strap. Front-line pikemen of the age were generally highly-armored, while those in the back lines were lightly armored. Such pike-wielding troops were employed by numerous states, from Carthage to Syria, and were used to fix enemy infantry in position while the army's cavalry worked to turn the enemy flanks.</History>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/syntagma
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
     <Run>
       <Speed>13.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml	(revision 18025)
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>10</Pierce>
+    <Hack op="add">3</Hack>
+    <Pierce op="add">3</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>6.0</Hack>
       <Pierce>5.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>750</RepeatTime>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
     </Melee>
     <Charge>
       <Hack>15.0</Hack>
       <Pierce>40.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
       <Bonuses>
           <BonusCavMelee>
             <Classes>Cavalry</Classes>
             <Multiplier>3.0</Multiplier>
           </BonusCavMelee>
       </Bonuses>
     </Charge>
   </Attack>
   <Cost>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Champion Spearman</GenericName>
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <Tooltip>Counters: 3x vs. Cavalry.</Tooltip>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>11.5</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
+      <Speed>23.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml	(revision 18025)
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>10</Pierce>
+    <Hack op="add">2</Hack>
+    <Pierce op="add">2</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>11.0</Hack>
       <Pierce>0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <RepeatTime>750</RepeatTime>
     </Melee>
     <Charge>
       <Hack>18.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <MinRange>0.0</MinRange>
     </Charge>
   </Attack>
   <Cost>
     <Resources>
       <wood>75</wood>
-      <metal>75</metal>
+      <metal>100</metal>
     </Resources>
   </Cost>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Champion Swordsman</GenericName>
     <Formations datatype="tokens">
       formations/phalanx
       formations/testudo
     </Formations>
   </Identity>
   <UnitMotion>
     <WalkSpeed>12.5</WalkSpeed>
     <Run>
       <Speed>16.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml	(revision 18025)
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_archer">
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
 	<GenericName>Scythian Archer</GenericName>
     <SpecificName>Toxótēs Skythikós</SpecificName>
     <History>The Athenian employed Scythian archers as city police and auxillary troops.</History>
     <Icon>units/athen_champion_ranged.png</Icon>
   </Identity>
-  <Looter disable=""/>
   <VisualActor>
     <Actor>units/athenians/champion_unit_ranged.xml</Actor>
   </VisualActor>
 </Entity>
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	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml	(revision 18025)
@@ -1,23 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Armour>
-    <Hack>2</Hack>
-    <Pierce>4</Pierce>
+    <Hack op="add">-3</Hack>
+    <Pierce op="add">-3</Pierce>
   </Armour>
   <Cost>
+    <BuildTime op="mul">0.5</BuildTime>
     <Resources>
       <food>0</food>
-      <metal>80</metal>
+      <metal op="mul">2</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Naked Fanatic</GenericName>
     <SpecificName>Gaesata</SpecificName>
     <History>A fanatic Celtic warrior, devoted to war and his Celtic liege lord. These bloodthirsty young men roamed Gaul in search of battle.</History>
     <Icon>units/celt_fanatic.png</Icon>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.5</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.5</Speed>
+      <Range>600.0</Range>
+      <RangeMin>5.0</RangeMin>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/celts/fanatic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml	(revision 18025)
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_javelinist">
   <Attack>
     <Ranged>
       <Pierce>5</Pierce>
       <Crush>15</Crush>
-      <MaxRange>48</MaxRange>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Leial Zalduneria</SpecificName>
     <Icon>units/iber_champion_cavalry.png</Icon>
     <SelectionGroupName>units/iber_champion_cavalry</SelectionGroupName>
     <History>Elite warriors known as The Devoted were adept warriors who could be either infantry or cavalry. Adding to their already considerable skill, The Devoted were renowned for the experience in foreign wars, often in the service of the Carthaginians. Considering that Iberian troops were commonly used as cannon fodder gives some idea of just how good these fierce warriors had to be in order to survive. These cavalrymen skirmish with flaming javelins, giving them a rare siege ability.</History>
     <Tooltip>Special: Flaming javelins. Good vs. Buildings.</Tooltip>
   </Identity>
   <VisualActor>
     <Actor>units/iberians/champion_unit_2.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml	(revision 18025)
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Macedonian Shield Bearer</GenericName>
     <SpecificName>Hypaspistḗs</SpecificName>
-    <History>The Hypaspistai, or "shield bearers", were the flower of the Macedonian infantry. They were the most battle hardened veterans  within the army and followed Philip II and Alexander the Great into over a dozen full scale engagements. These heavily armed and opulently armored units acted as an intermediary between the phalanx and the cavalry arm, many times charging headlong with Alexander into a breech in the enemy lines. Sometimes they fought as slow pikemen, like the Pezhetairoi with 6 meter "sarissas", and other times they fought as Hoplites with large aspides and 2.5 meter-long spears, or "dorata". In later times they became known as the Argyraspidai, or "Silver Shields" when Alexander bestowed upon them armor and shields plated in pure silver, and played a decisive role in the early Diadochoi Wars of Alexander's "Successors."</History>
+    <History>The Hypaspistai, or "shield bearers", were the flower of the Macedonian infantry. They were the most battle hardened veterans within the army and followed Philip II and Alexander the Great into over a dozen full scale engagements. These heavily armed and opulently armored units acted as an intermediary between the phalanx and the cavalry arm, many times charging headlong with Alexander into a breech in the enemy lines. Sometimes they fought as slow pikemen, like the Pezhetairoi with 6 meter "sarissas", and other times they fought as Hoplites with large aspides and 2.5 meter-long spears, or "dorata". In later times they became known as the Argyraspidai, or "Silver Shields" when Alexander bestowed upon them armor and shields plated in pure silver, and played a decisive role in the early Diadochoi Wars of Alexander's "Successors."</History>
     <Icon>units/macedonian_hypaspist.png</Icon>
 	<SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName>
 	<RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/mace_champion_infantry_e</Entity>
-    <RequiredXp>9999</RequiredXp>
+    <RequiredXp>2000</RequiredXp>
   </Promotion>
   <VisualActor>
     <Actor>units/macedonians/mace_champion_hypaspist.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml	(revision 18025)
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_champion_infantry_a">
+  <Armour>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">1</Pierce>
+  </Armour>
   <Health>
-    <Max>220</Max>
+    <Max op="mul">1.1</Max>
   </Health>
   <Identity>
     <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
     <Icon>units/macedonian_argyraspidai.png</Icon>
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
     <Actor>units/macedonians/mace_champion_argyraspis.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_thorakites.xml	(revision 18025)
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <metal op="mul">2</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
 	<GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
     <History>Thōrakitai were soldiers similar to Thyreophóroi. The literal translation of the term is curassiers, which suggests that they may have worn a short Celtic mail shirt or possibly a thorax. Thorakitai were used in armies of the Hellenistic Period in a variety of tactical situations. They were a type of armored but mobile infantry who did not require a rigid formation to be effective in combat. From their name we can deduce that most wore armor and helmet. They bore a thureos (or thyreos), an oblong shield, and were armed with sword, javelins and spear, which were used according to their tactical use. It seems that the thorakitai were heavily armored thureophoroi, able to bear spears and do battle in a phalanx as well as irregularly attack the enemy in situations when such an action was required for tactical reasons, like to exploit or challenge rough terrain. Thorakitai are mentioned in the army of the Achaian League and in the army of the Seleucids. The Seleucid Thorakitai were used in the storming of the Elburz Range in 210 BC under Antiochus III. They were used with the lighter troops to climb the cliffs and fight hand to hand with the enemy who might have not been dislodged by the lighter troops in the assault. There is a tomb illustration from Sidon showing what could well be a thorakites. The fragmentary inscription indicates that he was an Anatolian.</History>
     <Icon>units/mace_thorakites.png</Icon>
-	<RequiredTechnology>phase_town</RequiredTechnology>
+	<RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/macedonians/thorakites.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_thureophoros.xml	(revision 18025)
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
-  <Armour>
-    <Hack>3</Hack>
-    <Pierce>6</Pierce>
-  </Armour>
+  <Cost>
+    <Resources>
+      <food>0</food>
+      <metal op="mul">2</metal>
+    </Resources>
+  </Cost>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
     <GenericName>Heavy Skirmisher</GenericName>
     <SpecificName>Thyreophóros</SpecificName>
     <History>Thyreophóroi were a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a link between the heavier pikemen and the cavalry wings.</History>
     <Icon>units/mace_thureophoros.png</Icon>
-	<RequiredTechnology>phase_village</RequiredTechnology>
+	<RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed>11</WalkSpeed>
-    <Run>
-      <Speed>17.6</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/macedonians/thureophoros.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml	(revision 18025)
@@ -1,32 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
     <Square width="5.5" depth="10.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>maur</Civ>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>War Chariot</GenericName>
     <SpecificName>Rath</SpecificName>
     <SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
     <Icon>units/maur_champion_chariot.png</Icon>
     <Tooltip>Deals Trample Damage.</Tooltip>
   </Identity>
-  <Loot>
-    <xp>200</xp>
-    <food>0</food>
-    <wood>20</wood>
-    <stone>0</stone>
-    <metal>20</metal>
-  </Loot>
   <ResourceGatherer>
     <MaxDistance>5.0</MaxDistance>
     <Capacities>
       <food>50</food>
     </Capacities>
   </ResourceGatherer>
   <VisualActor>
     <Actor>units/mauryans/chariot_a.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml	(revision 18025)
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Armour>
-    <Hack>6</Hack>
-    <Pierce>6</Pierce>
+    <Hack op="add">-4</Hack>
+    <Pierce op="add">-4</Pierce>
   </Armour>
   <Attack>
     <Melee>
       <Hack>0</Hack>
       <Crush>10.5</Crush>
     </Melee>
     <Charge>
       <Hack>0.0</Hack>
       <Crush>21.0</Crush>
     </Charge>
   </Attack>
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Warrior</GenericName>
     <SpecificName>Yōddha</SpecificName>
     <SelectionGroupName>units/maur_champion_infantry</SelectionGroupName>
     <Icon>units/maur_champion_maceman.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>units/mauryans/champion_maceman.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thrace_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thrace_swordsman.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thrace_swordsman.xml	(revision 18025)
@@ -1,43 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
-  <Armour>
-    <Hack>6</Hack>
-    <Pierce>5</Pierce>
-    <Crush>5</Crush>
-  </Armour>
-  <Attack>
-    <Melee>
-      <Hack>16.5</Hack>
-    </Melee>
-    <Charge>
-      <Hack>32.0</Hack>
-    </Charge>
-  </Attack>
-  <Health>
-    <Max>120</Max>
-  </Health>
   <Identity>
     <Civ>merc</Civ>
     <GenericName>Thracian Mercenary Swordsman</GenericName>
     <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
     <Rank>Elite</Rank>
     <Icon>units/sele_infantry_swordsman.png</Icon>
     <History>Thracian tribesmen who wield the fearsome rhomphaia polearm weapon in combat. They were ubiquitous mercenary swordsmen and skirmishers throughout Hellenistic times, sometimes even serving in two opposing armies.</History>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
-  <Looter disable=""/>
   <Promotion disable=""/>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
     <WalkSpeed>8</WalkSpeed>
     <Run>
       <Speed>13.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>units/mercenaries/thracian_swordsman.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml	(revision 18025)
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
     <Civ>rome</Civ>
     <Lang>latin</Lang>
     <GenericName>Marian Legionaire</GenericName>
     <SpecificName>Marian Legionarius</SpecificName>
     <Icon>units/rome_champion_legion_marian.png</Icon>
 	<SelectionGroupName>units/rome_legionnaire_marian</SelectionGroupName>
   </Identity>
   <Promotion>
     <Entity>units/rome_legionnaire_imperial</Entity>
     <RequiredXp>150</RequiredXp>
   </Promotion>
-  <UnitMotion>
-    <WalkSpeed>9</WalkSpeed>
-    <Run>
-      <Speed>18.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/romans/champion_unit_3.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml	(revision 18025)
@@ -1,33 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry_archer">
   <Footprint replace="">
     <Square width="7.5" depth="15.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <GenericName>Scythed Chariot</GenericName>
     <SpecificName>Drepanèphoros</SpecificName>
     <History>Expensive "suicide" unit. Mostly used to rush into infantry and cavalry formations to slaughter a bunch of enemies with scythes ("Trample Damage" aura) before getting destroyed themselves.</History>
     <Icon>units/pers_cavalry_archer.png</Icon>
     <RequiredTechnology>successors/unlock_traditional_army</RequiredTechnology>
   </Identity>
-  <Loot>
-    <xp>200</xp>
-    <food>0</food>
-    <wood>20</wood>
-    <stone>0</stone>
-    <metal>20</metal>
-  </Loot>
   <ResourceGatherer>
     <MaxDistance>5.0</MaxDistance>
     <Capacities>
       <food>50</food>
     </Capacities>
   </ResourceGatherer>
   <VisualActor>
     <Actor>units/persians/cavalry_archer_e.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml	(revision 18025)
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
 	  structures/spart_syssiton
       structures/spart_theatron
       -structures/{civ}_wallset_stone
     </Entities>
   </Builder>
-  <Cost>
-    <BuildTime>8</BuildTime>
-  </Cost>
   <Identity>
     <Civ>spart</Civ>
     <Lang>greek</Lang>
 	<GenericName>Skiritai Commando</GenericName>
     <SpecificName>Ékdromos Skirítēs</SpecificName>
     <Rank>Elite</Rank>
     <History>Skiritae were some of the most reliable allied soldiers serving in the Spartan military.  They always had the honor of remaining on the left flank of a Spartan phalanx and (Thucydides 5.67) were deployed to face the any problem which could come to bear the army.  (Xenophon 4.2.1-4)</History>
     <Icon>units/spart_champion_infantry_sword.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion disable=""/>
   <ResourceGatherer>
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
   <VisualActor>
     <Actor>units/spartans/champion_infantry_sword.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_champion_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_champion_spearman.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_champion_spearman.xml	(revision 18025)
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>gaia</Civ>
     <Lang>greek</Lang>
 	<GenericName>Theban Sacred Band Hoplite</GenericName>
     <SpecificName>Hieròs Lókhos tôn Thebôn</SpecificName>
     <History>The Sacred Band of Thebes was a troop of picked soldiers, consisting of 150 pederastic male couples which formed the elite force of the Theban army in the 4th century BC. It is said to have been organised by the Theban commander Gorgidas in 378 BC and to have played a crucial role in the Battle of Leuctra.</History>
     <Icon>units/thebes_sacred_band_hoplitai.png</Icon>
   </Identity>
-  <Vision>
-    <Range>66</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/champion_sacred_band.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml	(revision 18025)
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>gaia</Civ>
     <Lang>greek</Lang>
 	<GenericName>Theban Sacred Band Hoplite</GenericName>
     <SpecificName>Hieros Lochos Hoplites</SpecificName>
     <Tooltip>Champion Spearman.</Tooltip>
     <Icon>units/thebes_sacred_band_hoplitai.png</Icon>
   </Identity>
-  <Vision>
-    <Range>66</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/champion_sacred_band.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml	(revision 18025)
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
     <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Thespian Black Cloak</GenericName>
     <SpecificName>Melanochitones</SpecificName>
     <History>The Thespians were among the 700 or so soldiers to stay behind and hold the pass at Thermopylae to delay the Persians long enough for the rest of the Greek army to withdraw. This heroic deed made the Thespians "friends forever" to the Spartans.</History>
     <Icon>units/thespian_melanochitones.png</Icon>
   </Identity>
-  <Vision>
-    <Range>66</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/thespian.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml	(revision 18024)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/thrace_black_cloak.xml	(revision 18025)
@@ -1,39 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
-  <Attack>
-    <Melee>
-      <Hack>24.5</Hack>
-    </Melee>
-    <Charge>
-      <Hack>50.0</Hack>
-    </Charge>
-  </Attack>
   <Cost>
+    <BuildTime op="mul">0.5</BuildTime>
     <Resources>
       <food>0</food>
-      <metal>125</metal>
+      <metal op="mul">3</metal>
     </Resources>
   </Cost>
   <Identity>
     <Civ>gaia</Civ>
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiaphoros</SpecificName>
     <History>Thracian tribesmen who wield the fiercesome rhomphaia polearm weapon in combat. They were ubiquitous mercenary swordsmen throughout Hellenistic times, sometimes even serving in two opposing armies.</History>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
-    <RequiredTechnology>phase_city</RequiredTechnology>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed>9.5</WalkSpeed>
-    <Run>
-      <Speed>18.0</Speed>
-    </Run>
-  </UnitMotion>
-  <Vision>
-    <Range>88</Range>
-  </Vision>
   <VisualActor>
     <Actor>units/hellenes/thracian_blackcloak.xml</Actor>
   </VisualActor>
 </Entity>