Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml	(revision 24802)
@@ -1,105 +1,106 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Capture>
       <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
       <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>1000</Hack>
       </Damage>
       <MaxRange>2</MaxRange>
     </Slaughter>
   </Attack>
   <Cost>
     <BuildTime>18</BuildTime>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="3.0" depth="6.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Identity>
     <GenericName>Cavalry</GenericName>
     <Rank>Basic</Rank>
     <Classes datatype="tokens">Human FastMoving CitizenSoldier</Classes>
     <VisibleClasses datatype="tokens">Citizen Soldier Cavalry</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
   </Identity>
   <Loot>
     <xp>130</xp>
     <food>10</food>
     <wood>5</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Position>
     <TurnRate>5</TurnRate>
   </Position>
   <Promotion>
     <RequiredXp>150</RequiredXp>
   </Promotion>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>3</Hack>
         <Pierce>1</Pierce>
         <Crush>15</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.meat>5</food.meat>
     </Rates>
     <Capacities>
       <food>20</food>
       <wood>20</wood>
       <stone>20</stone>
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <gather_meat>resource/gathering/gather_meat.xml</gather_meat>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
   </UnitMotion>
   <Vision>
     <Range>92</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml	(revision 24802)
@@ -1,47 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6.9</Hack>
         <Pierce>0</Pierce>
         <Crush>2.3</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>40</wood>
       <metal>10</metal>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Cavalry Axeman</GenericName>
     <VisibleClasses datatype="tokens">Axeman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>4</wood>
     <metal>1</metal>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>3</Hack>
         <Pierce>2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml	(revision 24802)
@@ -1,45 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
         <Crush>8</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Cavalry Maceman</GenericName>
     <VisibleClasses datatype="tokens">Maceman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>5</wood>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>4</Hack>
         <Pierce>2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml	(revision 24802)
@@ -1,49 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
       <AttackName>Spear</AttackName>
       <Damage>
         <Hack>4</Hack>
         <Pierce>3</Pierce>
         <Crush>0</Crush>
       </Damage>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>1.75</Multiplier>
         </BonusCavMelee>
       </Bonuses>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>625</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Cavalry Spearman</GenericName>
     <Tooltip>Counters: 1.75× vs Cavalry.</Tooltip>
     <VisibleClasses datatype="tokens">Spearman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>4</Hack>
         <Pierce>3</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
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	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml	(revision 24802)
@@ -1,47 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>6.5</Hack>
         <Pierce>0</Pierce>
         <Crush>0</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood>40</wood>
       <metal>10</metal>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Cavalry Swordsman</GenericName>
     <VisibleClasses datatype="tokens">Swordsman</VisibleClasses>
   </Identity>
   <Loot>
     <wood>4</wood>
     <metal>1</metal>
   </Loot>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>3</Hack>
         <Pierce>4</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml	(revision 24802)
@@ -1,34 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
   <Attack>
     <Ranged>
       <Damage>
         <Hack>0</Hack>
         <Pierce>9.0</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>16.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>3.0</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
     </Ranged>
   </Attack>
   <Health>
     <Max>100</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged</VisibleClasses>
     <GenericName>Ranged Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.835</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml	(revision 24802)
@@ -1,44 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>7</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>2.0</Spread>
         <Gravity>50.0</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Cavalry Archer</GenericName>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml	(revision 24802)
@@ -1,44 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>18</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>70.0</Speed>
         <Spread>4.0</Spread>
         <Gravity>35.0</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Cost>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <Identity>
     <GenericName>Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Javelineer</VisibleClasses>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
-  </UnitMotion>
 </Entity>
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 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml	(revision 24802)
@@ -1,62 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion">
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <food>150</food>
       <wood>80</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="3.0" depth="6.0"/>
     <Height>6.0</Height>
   </Footprint>
   <Health>
     <Max>240</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">FastMoving</Classes>
     <VisibleClasses datatype="tokens">Cavalry</VisibleClasses>
     <GenericName>Champion Cavalry</GenericName>
     <Formations datatype="tokens">
       special/formations/wedge
     </Formations>
     <RequiredTechnology>unlock_champion_cavalry</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>200</xp>
     <food>15</food>
     <wood>8</wood>
     <metal>10</metal>
   </Loot>
   <Position>
     <TurnRate>5</TurnRate>
   </Position>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>7</Hack>
         <Pierce>5</Pierce>
         <Crush>20</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">2</WalkSpeed>
+    <RunMultiplier>1.4</RunMultiplier>
   </UnitMotion>
   <Vision>
     <Range>96</Range>
   </Vision>
 </Entity>
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	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml	(revision 24802)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>14</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>0.8</Spread>
         <Gravity>50.0</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <WalkSpeed op="mul">0.835</WalkSpeed>
   </UnitMotion>
 </Entity>
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	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml	(revision 24802)
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>13.8</Hack>
         <Pierce>0</Pierce>
         <Crush>4.6</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Champion Cavalry Axeman</GenericName>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce op="add">2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml	(revision 24802)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>36</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>70.0</Speed>
         <Spread>1.6</Spread>
         <Gravity>35.0</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Champion Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <WalkSpeed op="mul">0.835</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml	(revision 24802)
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
         <Crush>16</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <GenericName>Champion Cavalry Maceman</GenericName>
     <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce op="add">1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </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 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml	(revision 24802)
@@ -1,47 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
       <AttackName>Spear</AttackName>
       <Damage>
         <Hack>8</Hack>
         <Pierce>6</Pierce>
         <Crush>0</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>1.75</Multiplier>
         </BonusCavMelee>
       </Bonuses>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <GenericName>Champion Cavalry Spearman</GenericName>
     <Tooltip>Counters: 1.75× vs Cavalry.</Tooltip>
     <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">1</Hack>
         <Pierce op="add">2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </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 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml	(revision 24802)
@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>13.0</Hack>
         <Pierce>0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Health>
     <Max>300</Max>
   </Health>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce op="add">4</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </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 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml	(revision 24802)
@@ -1,58 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero">
   <Cost>
     <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>5</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>
+    <RunMultiplier>1.4</RunMultiplier>
   </UnitMotion>
 </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 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml	(revision 24802)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>28</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100.0</Speed>
         <Spread>0.4</Spread>
         <Gravity>50.0</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Hero Cavalry Archer</GenericName>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <WalkSpeed op="mul">0.835</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml	(revision 24802)
@@ -1,36 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>27.6</Hack>
         <Pierce>0</Pierce>
         <Crush>9.2</Crush>
       </Damage>
-     <MaxRange>4</MaxRange>
+     <MaxRange>6</MaxRange>
      <PrepareTime>500</PrepareTime>
      <RepeatTime>1000</RepeatTime>
      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Hero Cavalry Axeman</GenericName>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Pierce op="add">1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml	(revision 24802)
@@ -1,50 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>60</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>70.0</Speed>
         <Spread>0.8</Spread>
         <Gravity>35.0</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
   <Identity>
     <GenericName>Hero Cavalry Javelineer</GenericName>
     <VisibleClasses datatype="tokens">Ranged Javelineer</VisibleClasses>
     <Formations datatype="tokens">
       special/formations/skirmish
     </Formations>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">-2</Hack>
         <Pierce op="add">-2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <WalkSpeed op="mul">0.835</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml	(revision 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml	(revision 24802)
@@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
         <Crush>32</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <GenericName>Hero Cavalry Maceman</GenericName>
     <VisibleClasses datatype="tokens">Melee Maceman</VisibleClasses>
   </Identity>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </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 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml	(revision 24802)
@@ -1,44 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
       <AttackName>Spear</AttackName>
       <Damage>
         <Hack>16</Hack>
         <Pierce>12</Pierce>
         <Crush>0</Crush>
       </Damage>
-      <MaxRange>4</MaxRange>
+      <MaxRange>6</MaxRange>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
           <Multiplier>1.75</Multiplier>
         </BonusCavMelee>
       </Bonuses>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1250</RepeatTime>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
   <Identity>
     <GenericName>Hero Cavalry Spearman</GenericName>
     <Tooltip>Counters: 1.75× vs Cavalry.</Tooltip>
     <VisibleClasses datatype="tokens">Melee Spearman</VisibleClasses>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">1</Hack>
         <Pierce op="add">2</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </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 24801)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml	(revision 24802)
@@ -1,43 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>26.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
-     <MaxRange>4</MaxRange>
+     <MaxRange>6</MaxRange>
      <PrepareTime>375</PrepareTime>
      <RepeatTime>750</RepeatTime>
      <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
   <Cost>
     <Resources>
       <wood op="add">-50</wood>
       <metal op="add">50</metal>
     </Resources>
   </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
   <Resistance>
     <Entity>
       <Damage>
         <Hack op="add">1</Hack>
         <Pierce op="add">1</Pierce>
       </Damage>
     </Entity>
   </Resistance>
   <Sound>
     <SoundGroups>
       <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>