From d9f3e329f0fce2bb173c1ef25e9ac9bc4c48dcd9 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Tue, 8 Nov 2011 22:14:28 +0000
Subject: [PATCH] #Tweaked unit walking speeds.

This was SVN commit r10482.
---
 .../units/carthaginians/female_citizen.xml    | 14 +++----
 .../art/actors/units/celts/female_citizen.xml | 14 +++----
 .../actors/units/hellenes/female_citizen.xml  | 14 +++----
 .../actors/units/iberians/female_citizen.xml  | 14 +++----
 .../units/persians/cavalry_javelinist_a.xml   | 20 +++++++---
 .../units/persians/cavalry_javelinist_a_r.xml |  2 +-
 .../units/persians/cavalry_javelinist_b.xml   | 17 +++++++-
 .../units/persians/cavalry_javelinist_e.xml   | 25 +++++++++---
 .../units/persians/cavalry_javelinist_e_r.xml |  2 +-
 .../units/persians/cavalry_spearman_a.xml     | 39 +++++++++++--------
 .../units/persians/cavalry_spearman_a_r.xml   | 12 ++----
 .../units/persians/cavalry_spearman_b.xml     | 37 +++++++++++-------
 .../units/persians/cavalry_spearman_b_r.xml   |  9 ++---
 .../units/persians/cavalry_spearman_e.xml     | 28 +++++++++----
 .../units/persians/cavalry_spearman_e_r.xml   |  8 ++--
 .../units/persians/cavalry_swordsman_a.xml    | 20 +++++++---
 .../units/persians/cavalry_swordsman_b.xml    | 21 +++++++---
 .../units/persians/cavalry_swordsman_e.xml    | 32 +++++++++------
 .../actors/units/persians/female_citizen.xml  | 16 ++++----
 .../units/romans/hero_marcellus_horse.xml     | 19 ++++++---
 .../units/romans/hero_maximus_horse.xml       | 19 ++++++---
 .../actors/units/romans/hero_scipio_horse.xml | 19 ++++++---
 .../skins/skeletal/horse_pers_csw_a_1.dds     |  4 +-
 .../skins/skeletal/horse_pers_csw_a_2.dds     |  4 +-
 .../skins/skeletal/horse_pers_csw_a_3.dds     |  4 +-
 .../skins/skeletal/horse_pers_csw_e_1.dds     |  2 +-
 .../skins/skeletal/horse_pers_csw_e_2.dds     |  2 +-
 .../skins/skeletal/horse_pers_csw_e_3.dds     |  3 ++
 .../templates/template_unit_cavalry.xml       |  4 +-
 .../template_unit_cavalry_melee_swordsman.xml |  4 +-
 .../template_unit_cavalry_ranged_archer.xml   |  4 +-
 ...emplate_unit_cavalry_ranged_javelinist.xml |  2 +-
 .../template_unit_champion_cavalry.xml        |  4 +-
 ...plate_unit_champion_cavalry_javelinist.xml |  4 +-
 ...mplate_unit_champion_cavalry_swordsman.xml |  2 +-
 .../template_unit_champion_infantry.xml       |  4 +-
 ...late_unit_champion_infantry_javelinist.xml |  4 +-
 ...emplate_unit_champion_infantry_pikeman.xml |  4 +-
 ...mplate_unit_champion_infantry_spearman.xml |  4 +-
 ...plate_unit_champion_infantry_swordsman.xml |  4 +-
 .../templates/template_unit_hero.xml          |  2 +-
 .../templates/template_unit_hero_cavalry.xml  |  4 +-
 .../template_unit_hero_cavalry_javelinist.xml |  4 +-
 .../template_unit_hero_cavalry_spearman.xml   |  4 +-
 .../templates/template_unit_hero_infantry.xml |  4 +-
 .../template_unit_hero_infantry_pikeman.xml   |  4 +-
 .../template_unit_hero_infantry_spearman.xml  |  4 +-
 .../template_unit_hero_infantry_swordsman.xml |  4 +-
 .../template_unit_infantry_melee_spearman.xml |  4 +-
 ...template_unit_infantry_melee_swordsman.xml |  2 +-
 .../template_unit_infantry_ranged_archer.xml  |  2 +-
 ...mplate_unit_infantry_ranged_javelinist.xml |  2 +-
 .../template_unit_infantry_ranged_slinger.xml |  2 +-
 .../template_unit_support_female_citizen.xml  |  6 +--
 .../units/cart_infantry_spearman_a.xml        |  2 +-
 .../units/cart_infantry_spearman_e.xml        |  4 +-
 .../units/celt_infantry_spearman_a.xml        |  4 +-
 .../units/celt_infantry_spearman_b.xml        |  4 +-
 .../units/celt_infantry_spearman_e.xml        |  4 +-
 .../units/hele_infantry_spearman_a.xml        |  4 +-
 .../units/hele_infantry_spearman_e.xml        |  8 ++--
 .../units/iber_infantry_spearman_a.xml        |  4 +-
 .../units/iber_infantry_spearman_b.xml        |  4 +-
 .../units/iber_infantry_spearman_e.xml        |  6 +--
 .../templates/units/pers_champion_cavalry.xml | 18 ++++-----
 .../units/pers_champion_infantry.xml          |  4 ++
 .../units/pers_infantry_spearman_a.xml        | 11 ++++++
 .../units/pers_infantry_spearman_b.xml        |  4 ++
 .../units/pers_infantry_spearman_e.xml        | 11 ++++++
 69 files changed, 373 insertions(+), 231 deletions(-)
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_3.dds

diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml
index ca48484669..725b8030db 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/female_citizen.xml
@@ -5,13 +5,13 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
-        <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
-        <animation file="female/f_walk_01.dae" name="carry_food" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_meat" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_wood" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_stone" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_metal" speed="40"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_stone" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_metal" speed="25"/>
         <animation event="0.4" file="female/f_lumber_01.dae" name="gather_tree" speed="60"/>
         <animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
         <animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
diff --git a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
index db2fe33a98..26d4e4ed8e 100644
--- a/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/female_citizen.xml
@@ -5,13 +5,13 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
-        <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
-        <animation file="female/f_walk_01.dae" name="carry_food" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_meat" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_wood" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_stone" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_metal" speed="40"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_stone" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_metal" speed="25"/>
         <animation event="0.4" file="female/f_lumber_01.dae" name="gather_tree" speed="60"/>
         <animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
         <animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
index 3974759352..acf02300aa 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
@@ -5,13 +5,13 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
-        <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
-        <animation file="female/f_walk_01.dae" name="carry_food" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_meat" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_wood" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_stone" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_metal" speed="40"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_stone" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_metal" speed="25"/>
         <animation event="0.4" file="female/f_lumber_01.dae" name="gather_tree" speed="60"/>
         <animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
         <animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
index 6a460036bb..dd5c989127 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/female_citizen.xml
@@ -5,13 +5,13 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
-        <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
-        <animation file="female/f_walk_01.dae" name="carry_food" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_meat" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_wood" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_stone" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_metal" speed="40"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_stone" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_metal" speed="25"/>
         <animation event="0.4" file="female/f_lumber_01.dae" name="gather_tree" speed="60"/>
         <animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
         <animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a.xml
index 6af618fcfa..c73940f2f7 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a.xml
@@ -4,13 +4,23 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
         <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
index 0c6d9f11c7..52d9ae5009 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
@@ -15,7 +15,7 @@
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/thracian_cap_01.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/floppy_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml
index 7bf3386a3e..33f6a2b172 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml
@@ -4,8 +4,23 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e.xml
index 1bbb25b2c9..01e6b9d730 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e.xml
@@ -4,13 +4,23 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
         <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
@@ -21,11 +31,14 @@
   </group>
   <group>
     <variant name="horse -1">
-      <texture>skeletal/horse_pers_csw_e_2.dds</texture>
+      <texture>skeletal/horse_pers_csw_e_1.dds</texture>
     </variant>
     <variant name="horse -2">
       <texture>skeletal/horse_pers_csw_e_2.dds</texture>
     </variant>
+    <variant name="horse -3">
+      <texture>skeletal/horse_pers_csw_e_3.dds</texture>
+    </variant>
   </group>
   <group>
     <variant frequency="1" name="horse-color-black">
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_r.xml
index 6ca93c8f95..408b6a17da 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_e_r.xml
@@ -15,7 +15,7 @@
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/floppy_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/pers_conical_plume.xml" attachpoint="helmet"/>
         <prop actor="props/units/shields/pers_back_curved_iron.xml" attachpoint="back"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a.xml
index 3984dcf795..f07b99c2c1 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a.xml
@@ -1,36 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="70"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="48"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="45"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="60"/>
-        <animation file="quadraped/horse_death.psa" name="death" speed="220"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
         <prop actor="units/persians/cavalry_spearman_a_r.xml" attachpoint="rider"/>
+        <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="horse-texture-1">
-      <texture>skeletal/horse_pers_csp_e_1.dds</texture>
+      <texture>skeletal/horse_pers_csw_e_1.dds</texture>
     </variant>
     <variant frequency="1" name="horse-texture-2">
-      <texture>skeletal/horse_pers_csp_e_2.dds</texture>
+      <texture>skeletal/horse_pers_csw_e_2.dds</texture>
+    </variant>
+    <variant frequency="1" name="horse-texture-3">
+      <texture>skeletal/horse_pers_csw_e_3.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="horse-color-black">
       <colour>41 41 41</colour>
@@ -45,7 +54,5 @@
       <colour>211 123 44</colour>
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_r.xml
index f1277e7820..03c405c8f8 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_a_r.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
@@ -16,18 +14,16 @@
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/pers_conical.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/cape_hd_cav.xml" attachpoint="shoulders"/>
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="Rider-Texture-1">
-      <texture>skeletal/pers_csp_a_1.dds</texture>
+      <texture>skeletal/pers_su1_anusiya.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml
index 125048c014..15334fe0e4 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml
@@ -1,16 +1,25 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="20"/>
-        <animation file="quadraped/horse_gallop.psa" name="Walk" speed="17"/>
-        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="25"/>
-        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="20"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
@@ -19,13 +28,17 @@
       </props>
     </variant>
   </group>
-
   <group>
-    <variant name="horse-texture-1">
-      <texture>skeletal/horse_pers_csp_a_1.dds</texture>
+    <variant frequency="2" name="horse-texture-1">
+      <texture>skeletal/horse_pers_csw_e_1.dds</texture>
+    </variant>
+    <variant frequency="2" name="horse-texture-2">
+      <texture>skeletal/horse_pers_csw_e_2.dds</texture>
+    </variant>
+    <variant frequency="1" name="horse-texture-3">
+      <texture>skeletal/horse_pers_csw_e_3.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="horse-color-black">
       <colour>46 46 46</colour>
@@ -40,7 +53,5 @@
       <colour>211 123 44</colour>
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_r.xml
index 8a94a66b5e..384947c2da 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b_r.xml
@@ -1,8 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="Base">
       <animations>
@@ -16,11 +14,12 @@
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/thracian_cap_01.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/cape_hd_cav.xml" attachpoint="shoulders"/>
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="Rider-Texture-1">
       <texture>skeletal/pers_csp_b_1.dds</texture>
@@ -29,7 +28,5 @@
       <texture>skeletal/pers_csp_b_2.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e.xml
index 23aa798c32..65d3f65a1d 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e.xml
@@ -4,13 +4,22 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="70"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="48"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="45"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="60"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
@@ -22,10 +31,13 @@
   </group>
   <group>
     <variant frequency="1" name="horse-texture-1">
-      <texture>skeletal/horse_pers_csp_e_3.dds</texture>
+      <texture>skeletal/horse_pers_csw_e_1.dds</texture>
     </variant>
     <variant frequency="1" name="horse-texture-2">
-      <texture>skeletal/horse_pers_csp_e_4.dds</texture>
+      <texture>skeletal/horse_pers_csw_e_2.dds</texture>
+    </variant>
+    <variant frequency="1" name="horse-texture-3">
+      <texture>skeletal/horse_pers_csw_e_3.dds</texture>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_r.xml
index 4ee8e0328f..bcd74d43bc 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_e_r.xml
@@ -11,18 +11,18 @@
         <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
       </animations>
-      <mesh>skeletal/m_pants_armor.dae</mesh>
+      <mesh>skeletal/m_pants.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/pers_conical_plume.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/cape_olivegreen.xml" attachpoint="shoulders"/>
+        <prop actor="props/units/cape_hd_cav.xml" attachpoint="shoulders"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="Elite-Rider-Texture-01">
-      <texture>skeletal/pers_csp_e_1.dds</texture>
+      <texture>skeletal/pers_car_e_r.png</texture>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a.xml
index f8461bf2a3..077c058daf 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a.xml
@@ -4,12 +4,22 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="60"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="25"/>
-        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="30"/>
-        <animation file="quadraped/horse_gallop.psa" name="run" speed="8"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml
index 7cb16f4462..bfa70e074c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml
@@ -4,13 +4,22 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="50"/>
-        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e.xml
index 520bb8f8a7..5ca8d0bf0b 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e.xml
@@ -4,17 +4,22 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="75"/>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="200"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="200"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
-        <animation event="" file="quadraped/horse_attack_a.psa" name="Melee" speed="300"/>
-        <animation event="" file="quadraped/horse_attack_b.psa" name="Melee" speed="300"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="40"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
@@ -25,12 +30,15 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="horse-texture-1">
+    <variant frequency="2" name="horse-texture-1">
       <texture>skeletal/horse_pers_csw_e_1.dds</texture>
     </variant>
-    <variant frequency="1" name="horse-texture-2">
+    <variant frequency="2" name="horse-texture-2">
       <texture>skeletal/horse_pers_csw_e_2.dds</texture>
     </variant>
+    <variant frequency="1" name="horse-texture-3">
+      <texture>skeletal/horse_pers_csw_e_3.dds</texture>
+    </variant>
   </group>
   <group>
     <variant frequency="1" name="horse-color-black">
diff --git a/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml b/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
index 9624a48e45..c77b5380f9 100644
--- a/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/female_citizen.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
       <animations>
         <animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
-        <animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
-        <animation file="female/f_walk_01.dae" name="Run" speed="45"/>
-        <animation file="female/f_walk_01.dae" name="carry_food" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_meat" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_wood" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_stone" speed="40"/>
-        <animation file="female/f_walk_01.dae" name="carry_metal" speed="40"/>
+        <animation file="female/f_walk_01.dae" name="Walk" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="Run" speed="30"/>
+        <animation file="female/f_walk_01.dae" name="carry_food" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_meat" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_wood" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_stone" speed="25"/>
+        <animation file="female/f_walk_01.dae" name="carry_metal" speed="25"/>
         <animation event="0.4" file="female/f_lumber_01.dae" name="gather_tree" speed="60"/>
         <animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
         <animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_horse.xml b/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_horse.xml
index d81288cd19..e87eb59651 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_marcellus_horse.xml
@@ -4,12 +4,19 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="18"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_maximus_horse.xml b/binaries/data/mods/public/art/actors/units/romans/hero_maximus_horse.xml
index 4ec5309601..a5772b9c1f 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_maximus_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_maximus_horse.xml
@@ -4,12 +4,19 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="18"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
diff --git a/binaries/data/mods/public/art/actors/units/romans/hero_scipio_horse.xml b/binaries/data/mods/public/art/actors/units/romans/hero_scipio_horse.xml
index b00c8d3459..c792559e13 100644
--- a/binaries/data/mods/public/art/actors/units/romans/hero_scipio_horse.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/hero_scipio_horse.xml
@@ -4,12 +4,19 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="18"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="800"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="350"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="600"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="666"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="333"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="222"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="250"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="400"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="300"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="230"/>
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_1.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_1.dds
index 31926daba2..de320d264b 100644
--- a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_1.dds
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_1.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:80ce5b03641a0db993293d055025a40b111dfcf96f8f05ac61302a66c4b6c86f
-size 22000
+oid sha256:d7bb7708eb2c81b2ea750bf2121b79dca334b8e873eda1b85913881f3ab2e8c7
+size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_2.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_2.dds
index 8ea514fab6..85d60fefe5 100644
--- a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_2.dds
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_2.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a63bf8b0e4c1be994389c2d88457cc83b787f8712fcdff189eff6fe1d45d65d9
-size 22000
+oid sha256:111f991850a75e59b1a6e02b87a645604dcfaaf6866377723ac566a1507339be
+size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_3.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_3.dds
index f598444054..16468d6d9e 100644
--- a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_3.dds
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_a_3.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab72b8733c51be1e7dc75780a787c8da1ac7988be8bc2b4f323ff8abb1bfc986
-size 22000
+oid sha256:56a24294d90e89d6cc8da13d11659cf38a0ece7126fea2f69844bbc3e9153a88
+size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_1.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_1.dds
index 87b79f38d4..c87eda1c6b 100644
--- a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_1.dds
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_1.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dfef2613cc1394669e7b42c66f83ae5effd4b18a57dc73437fb90d99b379c400
+oid sha256:10ec5741c653af35941b2517a43e3c44f5e44f84474ebd1a3dcdfe4cffa50b02
 size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_2.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_2.dds
index a1a2a03f17..50195e24be 100644
--- a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_2.dds
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_2.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a830cfd0636605c5324d5f775007a8344399aa28f680a2f7ec7e3d199e81131
+oid sha256:49994d52894626b8fd53caf29ca3366b8437623100a82d00435a92bdf575ec7c
 size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_3.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_3.dds
new file mode 100644
index 0000000000..ec5e5d4b4f
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_e_3.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c456a6eb654d8b79496c6793146d555cfbd0ce04d13fb712db80813d1e43495a
+size 87536
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 26e7cf1f6b..5781222a38 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -74,9 +74,9 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>10.0</WalkSpeed>
+    <WalkSpeed>11.0</WalkSpeed>
     <Run>
-      <Speed>26.4</Speed>
+      <Speed>30.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
index 8b3b2cd096..8fa1de3e4f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -31,9 +31,9 @@
     <Tooltip>Bonused vs. Support Units and Infantry Archers.</Tooltip>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>10.2</WalkSpeed>
+    <WalkSpeed>11.5</WalkSpeed>
     <Run>
-      <Speed>27.6</Speed>
+      <Speed>30.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index df99bdc4fa..1d697d49a9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -33,9 +33,9 @@
     <Tooltip>Bonused vs. Infantry Spearman and Infantry Swordsman.</Tooltip>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>11.0</WalkSpeed>
+    <WalkSpeed>12.0</WalkSpeed>
     <Run>
-      <Speed>22.0</Speed>
+      <Speed>33.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
index c0072f2f52..6d07bd3364 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -35,7 +35,7 @@
   <UnitMotion>
     <WalkSpeed>12.0</WalkSpeed>
     <Run>
-      <Speed>32.4</Speed>
+      <Speed>33.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
index e757d6e1e7..00ffab4924 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -65,9 +65,9 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>9.5</WalkSpeed>
+    <WalkSpeed>10.0</WalkSpeed>
     <Run>
-      <Speed>24.0</Speed>
+      <Speed>30.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>10.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
index 38a94c8f36..9d4753d04d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -41,9 +41,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>10.5</WalkSpeed>
+    <WalkSpeed>11.5</WalkSpeed>
     <Run>
-      <Speed>28.8</Speed>
+      <Speed>30.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>10.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
index 0c8e39c0b4..dc6dc5b0aa 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -24,7 +24,7 @@
   <Cost>
     <BuildTime>16</BuildTime>
     <Resources>
-      <wood>80</wood>
+      <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
index ed1545c42b..6959c38828 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -54,9 +54,9 @@
     <Max>1500</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>6.0</WalkSpeed>
+    <WalkSpeed>7.0</WalkSpeed>
     <Run>
-      <Speed>15.6</Speed>
+      <Speed>21.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
index 88f0075163..2c58f0b74f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -39,9 +39,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>8.0</WalkSpeed>
+    <WalkSpeed>9.0</WalkSpeed>
     <Run>
-      <Speed>17.5</Speed>
+      <Speed>21.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index fb2c851399..c9b03191e6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -50,9 +50,9 @@
     <Max>1200</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>6.0</WalkSpeed>
+    <WalkSpeed>6.5</WalkSpeed>
     <Run>
-      <Speed>12.0</Speed>
+      <Speed>15.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
index 0c9c759cfe..d65e7bd699 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -45,9 +45,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>6.75</WalkSpeed>
+    <WalkSpeed>7.5</WalkSpeed>
     <Run>
-      <Speed>15.6</Speed>
+      <Speed>21.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
index 1b137a4ec7..cc0d42b982 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -47,9 +47,9 @@ Bonused vs. Spear units.</Tooltip>
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>7.25</WalkSpeed>
+    <WalkSpeed>8.0</WalkSpeed>
     <Run>
-      <Speed>16.8</Speed>
+      <Speed>22.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index 41d383a798..e6fc3814f9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -55,7 +55,7 @@
   <UnitMotion>
     <WalkSpeed>9.0</WalkSpeed>
     <Run>
-      <Speed>16.5</Speed>
+      <Speed>22.0</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index 35b8345293..d39e34effc 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -58,9 +58,9 @@
     <Max>2500</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>10.0</WalkSpeed>
+    <WalkSpeed>11.0</WalkSpeed>
     <Run>
-      <Speed>25.2</Speed>
+      <Speed>26.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>16.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
index 903400be43..7fbc4d3981 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -32,9 +32,9 @@
     <Type>hero</Type>
   </Minimap>
   <UnitMotion>
-    <WalkSpeed>10.5</WalkSpeed>
+    <WalkSpeed>11.5</WalkSpeed>
     <Run>
-      <Speed>28.8</Speed>
+      <Speed>30.8</Speed>
       <Range>1000.0</Range>
       <RangeMin>16.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index f295c134b1..399821470e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -31,9 +31,9 @@
     <metal>5</metal>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>9.5</WalkSpeed>
+    <WalkSpeed>10.5</WalkSpeed>
     <Run>
-      <Speed>24.0</Speed>
+      <Speed>30.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
index fc1d6bf426..37bd002e75 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -55,9 +55,9 @@
     <Max>1500</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>7.5</WalkSpeed>
+    <WalkSpeed>8.5</WalkSpeed>
     <Run>
-      <Speed>16.8</Speed>
+      <Speed>20.8</Speed>
       <Range>600.0</Range>
       <RangeMin>8.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
index eee5379ec6..bc54fce2a1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -30,9 +30,9 @@
     <Max>1200</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>6.0</WalkSpeed>
+    <WalkSpeed>7.0</WalkSpeed>
     <Run>
-      <Speed>12.0</Speed>
+      <Speed>15.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
index 35df0bf20b..540ca04949 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -23,9 +23,9 @@
     <Type>hero</Type>
   </Minimap>
   <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
+    <WalkSpeed>7.5</WalkSpeed>
     <Run>
-      <Speed>15.6</Speed>
+      <Speed>21.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
index 3cfa331696..6b070aa0fb 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -38,9 +38,9 @@
     <Max>1500</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed>8.0</WalkSpeed>
     <Run>
-      <Speed>16.8</Speed>
+      <Speed>24.0</Speed>
       <Range>600.0</Range>
       <RangeMin>8.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index 7825284c8f..e7ecb0bba5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -29,9 +29,9 @@
     <wood>5</wood>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed>7.5</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed>21.0</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index b05a06bd09..92779b4707 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -28,7 +28,7 @@
     <metal>5</metal>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>7.5</WalkSpeed>
+    <WalkSpeed>8.0</WalkSpeed>
     <Run>
       <Speed>19.2</Speed>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index eb2b46e40b..3d3c727a3a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -36,7 +36,7 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>8.0</WalkSpeed>
+    <WalkSpeed>8.5</WalkSpeed>
     <Run>
       <Speed>21.6</Speed>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index 25aa476bc3..18b24491a4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -31,7 +31,7 @@
     <wood>5</wood>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>8.2</WalkSpeed>
+    <WalkSpeed>9.0</WalkSpeed>
     <Run>
       <Speed>21.6</Speed>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index f9af0a73bb..fde27c0b12 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -31,7 +31,7 @@
     <stone>4</stone>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
+    <WalkSpeed>9.0</WalkSpeed>
     <Run>
       <Speed>22.8</Speed>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 41ea76852a..11149eb492 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -88,10 +88,10 @@
     <Max>500</Max>
   </Stamina>
   <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
+    <WalkSpeed>8.0</WalkSpeed>
     <Run>
-      <Speed>8.0</Speed>
-      <Range>150.0</Range>
+      <Speed>12.0</Speed>
+      <Range>200.0</Range>
       <RangeMin>0.0</RangeMin>
     </Run>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml
index 92f90463d9..e45d99c4fc 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_a.xml
@@ -30,7 +30,7 @@
   <UnitMotion>
     <WalkSpeed>7.0</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed>21.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml
index 6fce2d5d30..98bf7474e9 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_infantry_spearman_e.xml
@@ -26,9 +26,9 @@
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
-    <WalkSpeed>6.7</WalkSpeed>
+    <WalkSpeed>6.5</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed>19.5</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
index c8dedffa49..a731bd82e5 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_a.xml
@@ -28,9 +28,9 @@
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
-    <WalkSpeed>6.16</WalkSpeed>
+    <WalkSpeed>7.7</WalkSpeed>
     <Run>
-      <Speed>18.48</Speed>
+      <Speed>23.1</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
index acf2327000..e6d987742a 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_b.xml
@@ -23,9 +23,9 @@
     <Entity>units/celt_infantry_spearman_a</Entity>
   </Promotion>
   <UnitMotion>
-    <WalkSpeed>7.7</WalkSpeed>
+    <WalkSpeed>8.2</WalkSpeed>
     <Run>
-      <Speed>19.8</Speed>
+      <Speed>24.6</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
index 0b3b5e9694..ee90e42ab3 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_infantry_spearman_e.xml
@@ -26,9 +26,9 @@
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
-    <WalkSpeed>5.72</WalkSpeed>
+    <WalkSpeed>7.2</WalkSpeed>
     <Run>
-      <Speed>17.16</Speed>
+      <Speed>21.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
index 1f8ecbe938..eafd28866f 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_a.xml
@@ -28,9 +28,9 @@
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
-    <WalkSpeed>5.6</WalkSpeed>
+    <WalkSpeed>6.8</WalkSpeed>
     <Run>
-      <Speed>16.8</Speed>
+      <Speed>19.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
index e4b21b604f..77ebc242a3 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_infantry_spearman_e.xml
@@ -2,8 +2,8 @@
 <Entity parent="units/hele_infantry_spearman_a">
   <Armour>
     <Hack>7.0</Hack>
-    <Pierce>11.0</Pierce>
-    <Crush>7.0</Crush>
+    <Pierce>12.0</Pierce>
+    <Crush>8.0</Crush>
   </Armour>
   <Attack>
     <Melee>
@@ -26,9 +26,9 @@
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
-    <WalkSpeed>5.2</WalkSpeed>
+    <WalkSpeed>6.0</WalkSpeed>
     <Run>
-      <Speed>15.6</Speed>
+      <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml
index d6bfe05114..247edf636d 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_a.xml
@@ -28,9 +28,9 @@
     <BaseSpeed>0.75</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed>7.5</WalkSpeed>
     <Run>
-      <Speed>15.6</Speed>
+      <Speed>22.5</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_b.xml
index 62bee7fc6c..85b2479505 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_b.xml
@@ -19,9 +19,9 @@
     <Entity>units/iber_infantry_spearman_a</Entity>
   </Promotion>
   <UnitMotion>
-    <WalkSpeed>7.5</WalkSpeed>
+    <WalkSpeed>8.0</WalkSpeed>
     <Run>
-      <Speed>16.8</Speed>
+      <Speed>24.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml
index a0bf41c26a..b77dc7449f 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_e.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_infantry_spearman_a">
   <Armour>
-    <Hack>7.0</Hack>
+    <Hack>8.0</Hack>
     <Pierce>9.0</Pierce>
     <Crush>7.0</Crush>
   </Armour>
@@ -26,9 +26,9 @@
     <BaseSpeed>0.5</BaseSpeed>
   </ResourceGatherer>
   <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
+    <WalkSpeed>7.0</WalkSpeed>
     <Run>
-      <Speed>14.4</Speed>
+      <Speed>21.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
index f42a3e36c4..ec00e11511 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
@@ -2,8 +2,8 @@
 <Entity parent="template_unit_champion_cavalry_spearman">
   <Armour>
     <Hack>15.0</Hack>
-    <Pierce>12.0</Pierce>
-    <Crush>8.0</Crush>
+    <Pierce>15.0</Pierce>
+    <Crush>10.0</Crush>
   </Armour>
   <Attack>
     <Melee>
@@ -11,15 +11,15 @@
       <Pierce>15.0</Pierce>
     </Melee>
     <Charge>
-      <Hack>20.0</Hack>
-      <Pierce>60.0</Pierce>
-      <Crush>10.0</Crush>
+      <Hack>50.0</Hack>
+      <Pierce>50.0</Pierce>
+      <Crush>50.0</Crush>
     </Charge>
   </Attack>
   <Cost>
     <Resources>
-      <wood>80</wood>
-	  <metal>40</metal>
+      <wood>0</wood>
+	  <metal>100</metal>
     </Resources>
   </Cost>
   <Health>
@@ -33,9 +33,9 @@
     <History>Cataphracts were the crushing blow of the Persian cavalry. The development of the Persian cataphract is not well understood, as is the relationship between these men and future generations of cataphract cavalry. At best it seems the Persians adopted the catapharct from encounters with Iranian nomads like the Massagetes.</History>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
+    <WalkSpeed>9.0</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed>25.0</Speed>
       <Range>1000.0</Range>
       <RangeMin>10.0</RangeMin>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
index 07e8ebb23a..c7e71880d0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
@@ -2,6 +2,10 @@
 <Entity parent="template_unit_champion_infantry_spearman">
   <Cost>
     <BuildTime>5</BuildTime>
+    <Resources>
+      <wood>0</wood>
+	  <metal>80</metal>
+    </Resources>
   </Cost>
   <Identity>
     <Civ>pers</Civ>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml
index 9e11df5b56..b5309ae939 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_a.xml
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_infantry_spearman_b">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>7.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
   <Promotion>
     <Entity>units/pers_infantry_spearman_e</Entity>
   </Promotion>
+  <UnitMotion>
+    <WalkSpeed>7.0</WalkSpeed>
+    <Run>
+      <Speed>21.0</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_a.xml</Actor>
   </VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
index 882ba15377..6a0dc9aed9 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_b.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
+  <Armour>
+    <Pierce>7.0</Pierce>
+    <Crush>7.0</Crush>
+  </Armour>
   <Builder>
     <Entities datatype="tokens">
       structures/pers_stables
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml
index 8b17faf65d..fd3de10009 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_infantry_spearman_e.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_infantry_spearman_a">
+  <Armour>
+    <Hack>7.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>8.0</Crush>
+  </Armour>
+  <UnitMotion>
+    <WalkSpeed>6.5</WalkSpeed>
+    <Run>
+      <Speed>19.5</Speed>
+    </Run>
+  </UnitMotion>
   <VisualActor>
     <Actor>units/persians/infantry_spearman_e.xml</Actor>
   </VisualActor>