From f7eb3ef742f1950f6cdcdf60de554a0776fb2f36 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Mon, 26 Nov 2007 06:57:52 +0000
Subject: [PATCH] This was SVN commit r5487.

---
 .../props/units/heads/head_indian_a.xml       | 15 ++++
 .../actors/props/units/heads/head_pers_a.xml  |  9 --
 .../actors/props/units/heads/samnite_test.xml | 30 +++++++
 .../carthaginians/cavalry_swordsman_b.xml     | 25 +++++-
 .../carthaginians/cavalry_swordsman_b_r.xml   | 26 +++---
 .../carthaginians/cavalry_swordsman_e.xml     | 25 +++++-
 .../carthaginians/cavalry_swordsman_e_r.xml   | 27 +++---
 .../carthaginians/infantry_javelinist_a.xml   | 84 ++++++++++++++++---
 .../carthaginians/infantry_javelinist_b.xml   | 83 ++++++++++++++++--
 .../carthaginians/infantry_javelinist_e.xml   | 84 ++++++++++++++++---
 .../units/carthaginians/super_unit_2.xml      |  4 +-
 .../actors/units/persians/super_unit_2.xml    | 31 ++++++-
 .../units/persians/super_unit_2_mahout.xml    | 29 +++++++
 .../skins/props/head/indian_face_a.dds        |  3 +
 .../skins/props/head/indian_face_b.dds        |  3 +
 .../skins/skeletal/horse_kart_csw_b_1.dds     |  3 +
 .../textures/skins/skeletal/kart_csw_b_1.dds  |  3 +
 .../textures/skins/skeletal/kart_csw_e_1.dds  |  3 +
 .../textures/skins/skeletal/kart_ijv_a_1.dds  |  3 +
 .../textures/skins/skeletal/kart_ijv_b_1.dds  |  3 +
 .../textures/skins/skeletal/kart_ijv_e_1.dds  |  3 +
 .../skins/skeletal/pers_su2_ele_01.dds        |  3 +
 .../skins/skeletal/pers_su2_ele_02.dds        |  3 +
 .../skins/skeletal/pers_su2_ele_03.dds        |  3 +
 .../skins/skeletal/pers_su2_ele_04.dds        |  3 +
 .../skins/skeletal/pers_su2_ele_05.dds        |  3 +
 .../skins/skeletal/pers_su2_ele_06.dds        |  3 +
 .../skins/skeletal/pers_su2_ele_07.dds        |  3 +
 .../skins/skeletal/pers_su2_mahout_1.dds      |  3 +
 .../units/cart_cavalry_spearman_a.xml         |  6 +-
 .../units/cart_cavalry_spearman_b.xml         |  4 +-
 .../units/cart_cavalry_spearman_e.xml         |  6 +-
 .../units/cart_cavalry_swordsman_a.xml        |  5 +-
 .../units/cart_cavalry_swordsman_b.xml        |  4 +-
 .../units/cart_cavalry_swordsman_e.xml        |  7 +-
 .../units/cart_infantry_javelinist_a.xml      |  7 +-
 .../units/cart_infantry_javelinist_b.xml      |  4 +-
 .../units/cart_infantry_javelinist_e.xml      |  7 +-
 .../entities/units/pers_super_cavalry.xml     | 38 ++++++++-
 .../official/maps/scenarios/persian-units.pmp |  2 +-
 .../official/maps/scenarios/persian-units.xml |  4 +-
 41 files changed, 506 insertions(+), 108 deletions(-)
 create mode 100644 binaries/data/mods/official/art/actors/props/units/heads/head_indian_a.xml
 create mode 100644 binaries/data/mods/official/art/actors/props/units/heads/samnite_test.xml
 create mode 100644 binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml
 create mode 100644 binaries/data/mods/official/art/textures/skins/props/head/indian_face_a.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/props/head/indian_face_b.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_csw_b_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_b_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_e_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_a_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_b_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_e_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_01.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_02.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_03.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_04.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_05.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_06.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_07.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_mahout_1.dds

diff --git a/binaries/data/mods/official/art/actors/props/units/heads/head_indian_a.xml b/binaries/data/mods/official/art/actors/props/units/heads/head_indian_a.xml
new file mode 100644
index 0000000000..c0a6aa107b
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/heads/head_indian_a.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="head-turban-1">
+      <mesh>props/dude_head.pmd</mesh>
+      <texture>props/head/indian_face_b.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml b/binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml
index bf87644fa7..4b83892ceb 100644
--- a/binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml
+++ b/binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml
@@ -3,15 +3,6 @@
 
   <castshadow/>
 
-  <group>
-    <variant frequency="1" name="head_beard_small">
-      <mesh>props/head_beard_small.pmd</mesh>
-    </variant>
-    <variant frequency="1" name="beard-large">
-      <mesh>props/head_beard_large.pmd</mesh>
-    </variant>
-  </group>
-
   <group>
     <variant frequency="1" name="face-beard-small-a">
       <mesh>props/head_beard_small.pmd</mesh>
diff --git a/binaries/data/mods/official/art/actors/props/units/heads/samnite_test.xml b/binaries/data/mods/official/art/actors/props/units/heads/samnite_test.xml
new file mode 100644
index 0000000000..ad9952c42b
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/heads/samnite_test.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base"/>
+  </group>
+
+  <group>
+    <variant frequency="3" name="plume">
+      <mesh>props/helmet/samn_helmet_a.pmd</mesh>
+    </variant>
+    <variant frequency="2" name="plume_feathers_top">
+      <mesh>props/helmet/samn_helmet_b.pmd</mesh>
+    </variant>
+    <variant frequency="1" name="plume_feathers_all">
+      <mesh>props/helmet/samn_helmet_c.pmd</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="texture">
+      <texture>props/helmet/hele_b1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b.xml
index f0d0cc6d73..f9dba6807b 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b.xml
@@ -4,17 +4,36 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
         <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_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="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
         <prop actor="units/carthaginians/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
       </props>
-      <texture>skeletal/horse_dun_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="horse-color-bay">
+      <colour>203 90 52</colour>
+      <texture>skeletal/horse_kart_csw_b_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="horse-color-red-chestnut">
+      <colour>207 132 109</colour>
+      <texture>skeletal/horse_kart_csw_b_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="horse-color-black">
+      <colour>60 60 60</colour>
+      <texture>skeletal/horse_kart_csw_b_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b_r.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b_r.xml
index 811dd99812..eb31d542c0 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b_r.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_b_r.xml
@@ -6,24 +6,26 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="0"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="infantry/general/dude/dudeattack.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="infantry/general/dude/dudeattack1.psa" name="Attack" speed="100"/>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
-        <prop actor="props/temp/kart_sign_cavalry_swordsman_b.xml" attachpoint="head_extra"/>
-        <prop actor="props/units/heads/placeholder_hele_kart.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
       </props>
-      <texture>skeletal/plac_kart_b.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Texture">
+      <texture>skeletal/kart_csw_b_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e.xml
index 3e5f4cbb88..ee9f15a3c0 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e.xml
@@ -4,17 +4,36 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
         <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_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="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
         <prop actor="units/carthaginians/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
       </props>
-      <texture>skeletal/horse_dun_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="horse-color-bay">
+      <colour>203 90 52</colour>
+      <texture>skeletal/horse_kart_csw_b_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="horse-color-red-chestnut">
+      <colour>207 132 109</colour>
+      <texture>skeletal/horse_kart_csw_b_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="horse-color-black">
+      <colour>60 60 60</colour>
+      <texture>skeletal/horse_kart_csw_b_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml
index 6171527e0f..6f126e11ca 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_swordsman_e_r.xml
@@ -6,25 +6,26 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="0"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="infantry/general/dude/dudeattack.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="infantry/general/dude/dudeattack1.psa" name="Attack" speed="100"/>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
-        <prop actor="props/temp/kart_sign_cavalry_swordsman_e.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_hele_kart.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
       </props>
-      <texture>skeletal/plac_kart_e.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Texture">
+      <texture>skeletal/kart_csw_e_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_a.xml
index f9d9a38c13..3bbf390ddc 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_a.xml
@@ -6,23 +6,87 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" name="Attack" speed="100"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
-        <prop actor="props/temp/kart_sign_infantry_javelinist_a.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_a.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_hele_kart.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
       </props>
-      <texture>skeletal/plac_kart_a.dds</texture>
+      <texture>skeletal/kart_ijv_a_1.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_b.xml
index a4f139640b..1cfceb9fcf 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_b.xml
@@ -6,22 +6,87 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" name="Attack" speed="100"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
-        <prop actor="props/temp/kart_sign_infantry_javelinist_b.xml" attachpoint="head_extra"/>
-        <prop actor="props/units/heads/placeholder_hele_kart.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
       </props>
-      <texture>skeletal/plac_kart_b.dds</texture>
+      <texture>skeletal/kart_ijv_b_1.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_e.xml
index 30982d9f3d..3dfa49ccff 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/infantry_javelinist_e.xml
@@ -6,23 +6,87 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
+        <animation file="biped/inf_arch_atk_a.psa" name="Idle" speed="1"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
         <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" name="Attack" speed="100"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="300"/>
       </animations>
       <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
-        <prop actor="props/temp/kart_sign_infantry_javelinist_e.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_hele_kart.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
       </props>
-      <texture>skeletal/plac_kart_e.dds</texture>
+      <texture>skeletal/kart_ijv_e_1.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml
index 1a50ec1203..929a7fa08f 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml
@@ -16,10 +16,10 @@
     <variant frequency="1" name="Blanket-1-hide-brown">
       <texture>skeletal/kart_su2_ele_b.dds</texture>
     </variant>
-    <variant frequency="1" name="Blanket-2-hide-gray">
+    <variant frequency="2" name="Blanket-2-hide-gray">
       <texture>skeletal/kart_su2_ele_c.dds</texture>
     </variant>
-    <variant frequency="1" name="Blanket-2-hide-brown">
+    <variant frequency="2" name="Blanket-2-hide-brown">
       <texture>skeletal/kart_su2_ele_d.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
index b935ac66b5..d5c18e4552 100644
--- a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
@@ -5,17 +5,40 @@
 
   <group>
     <variant frequency="100" name="Mesh">
+      <animations>
+        <animation file="quadraped/horseidle.psa" name="Idle" speed="100"/>
+        <animation file="quadraped/horse_walk.psa" name="walk" speed="100"/>
+        <animation file="quadraped/horse_walk.psa" name="run " speed="100"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="100"/>
+      </animations>
       <mesh>skeletal/elephant.pmd</mesh>
     </variant>
   </group>
 
   <group>
-    <variant frequency="1" name="hide-brown">
-      <texture>skeletal/animal_elephant.dds</texture>
+    <variant frequency="1" name="elephant-hide-gray-1">
+      <texture>skeletal/pers_su2_ele_01.dds</texture>
     </variant>
-    <variant frequency="1" name="hide-gray">
-      <texture>skeletal/animal_elephant2.dds</texture>
+    <variant frequency="1" name="elephant-hide-brown-1">
+      <texture>skeletal/pers_su2_ele_02.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-gray-2">
+      <texture>skeletal/pers_su2_ele_03.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-brown-2">
+      <texture>skeletal/pers_su2_ele_04.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-gray-3">
+      <texture>skeletal/pers_su2_ele_05.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-gray-4">
+      <texture>skeletal/pers_su2_ele_06.dds</texture>
+    </variant>
+    <variant frequency="1" name="elephant-hide-brown-4">
+      <texture>skeletal/pers_su2_ele_07.dds</texture>
     </variant>
   </group>
 
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml
new file mode 100644
index 0000000000..2454a0d96e
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
+        <animation file="biped/cavalryidle.psa" name="Run" speed="8"/>
+      </animations>
+      <mesh>skeletal/m_tights.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_indian_a.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/axe_single.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Mahout-Texture-1">
+      <texture>skeletal/pers_su2_mahout_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/textures/skins/props/head/indian_face_a.dds b/binaries/data/mods/official/art/textures/skins/props/head/indian_face_a.dds
new file mode 100644
index 0000000000..600138ac26
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/props/head/indian_face_a.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb2992e241a652fa1938238b4f4db2b8e561d666017813b9d4368e112cd61cda
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/props/head/indian_face_b.dds b/binaries/data/mods/official/art/textures/skins/props/head/indian_face_b.dds
new file mode 100644
index 0000000000..314239ba78
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/props/head/indian_face_b.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcd191c81ae20167cfb833b227a5b47a9cb246a08897c65e5ac98b438285fdd8
+size 5616
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_csw_b_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_csw_b_1.dds
new file mode 100644
index 0000000000..49d360b242
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_csw_b_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c451d6ca11d3508e6fafd62ee877cbbabd896988849b3921992790c92e584bfd
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_b_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_b_1.dds
new file mode 100644
index 0000000000..c9037bd546
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_b_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c81db6d1b70ce94779126ba74237caded91c7116d980f372579a43a6267d536e
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_e_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_e_1.dds
new file mode 100644
index 0000000000..e80313b23d
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/kart_csw_e_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28078b3ce33d278110f8b7081bedbf9fe4681879728609d5449832ccec910034
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_a_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_a_1.dds
new file mode 100644
index 0000000000..1910c7fd30
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_a_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f466866ea93becd56434255dc30184a2dfcd65ee2e60f9a565b16ee1f8539c3
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_b_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_b_1.dds
new file mode 100644
index 0000000000..918493eb09
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_b_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6fa9ea3c9e30f442cbb3efb08daacc352e0519ee0da0ff4ad6efb6c15d8ce63
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_e_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_e_1.dds
new file mode 100644
index 0000000000..2345e42c74
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/kart_ijv_e_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc29f45b7e7a67868dd5e917e9e3e4569839401d918cdeaea7406b5bef8c09ce
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_01.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_01.dds
new file mode 100644
index 0000000000..95b47c7caf
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_01.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3fe2d6f261736afb9eb91b1ff019f9736de1167602a03efa2500dc6ba45f2c0
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_02.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_02.dds
new file mode 100644
index 0000000000..bfd075fb05
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_02.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5011429e83af07d816faf844e63020060cde15d03fbfd5cfb8e10832046486ef
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_03.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_03.dds
new file mode 100644
index 0000000000..af2f4e1e63
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_03.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:241bfe9bbd743b5b639914e8efeb7606211df2d9a57db4df56eb5ad9e051e270
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_04.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_04.dds
new file mode 100644
index 0000000000..974a79a0bc
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_04.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8bff34422a2a60eeed63e57f53eb044fc83762ce165e8e032a3477583e6c1112
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_05.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_05.dds
new file mode 100644
index 0000000000..cd30ab9e37
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_05.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:22c3c9327da27cd21ba8ad11c5791806b29e2471871fce3b4e09972de03fca8b
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_06.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_06.dds
new file mode 100644
index 0000000000..ea2381b930
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_06.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98ed7f514cd7492e333ec0f211152e3e7000d6b24d1e79936bba51c999a49041
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_07.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_07.dds
new file mode 100644
index 0000000000..a341a2e934
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_ele_07.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e17412c83a200b9ac6db60567a7e849bca17fa60c2a6a8147d0cb9675718409
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_mahout_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_mahout_1.dds
new file mode 100644
index 0000000000..32c2661203
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_su2_mahout_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a52fa5a4f693aa656010496752440b8d259db06c0ab8dcde61c04d1c22640144
+size 22000
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_spearman_a.xml b/binaries/data/mods/official/entities/units/cart_cavalry_spearman_a.xml
index ff3b61fab1..a4c6cf6c49 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_spearman_a.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_spearman_a.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_cavalry_spearman_b"
->
+<Entity	Parent="cart_cavalry_spearman_b">
 
 	<Traits>
 
@@ -13,5 +11,7 @@
 		</Promotion>
 			
 	</Traits>
+	
+	<Actor>units/carthaginians/cavalry_spearman_a.xml</Actor>
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_spearman_b.xml b/binaries/data/mods/official/entities/units/cart_cavalry_spearman_b.xml
index fc7fab2581..ee63d28e7e 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_spearman_b.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_cavalry_melee_spearman"
->
+<Entity	Parent="template_unit_cavalry_melee_spearman">
 
 	<Traits>
 	
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_spearman_e.xml b/binaries/data/mods/official/entities/units/cart_cavalry_spearman_e.xml
index 29264c60cd..348bdbaad3 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_spearman_e.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_cavalry_spearman_a"
->
+<Entity	Parent="cart_cavalry_spearman_a">
+
+	<Actor>units/carthaginians/cavalry_spearman_e.xml</Actor>
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_a.xml b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_a.xml
index 0b600344a9..4b54be6175 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_a.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_cavalry_swordsman_b"
->
+<Entity	Parent="cart_cavalry_swordsman_b">
 
 	<Traits>
 
@@ -13,5 +11,6 @@
 		</Promotion>
 		
 	</Traits>
+	<Actor>units/carthaginians/cavalry_swordsman_a.xml</Actor>
 	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_b.xml b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_b.xml
index ff5e436188..8ba61c2b25 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_b.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_cavalry_melee_swordsman"
->
+<Entity	Parent="template_unit_cavalry_melee_swordsman">
 	<Traits>
 	
 		<Id>
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml
index 39555065ad..be8e3b2434 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_swordsman_e.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_cavalry_swordsman_a"
->
+<Entity	Parent="cart_cavalry_swordsman_a">
+
+
+	<Actor>units/carthaginians/cavalry_swordsman_b.xml</Actor>
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/cart_infantry_javelinist_a.xml b/binaries/data/mods/official/entities/units/cart_infantry_javelinist_a.xml
index 8921cb9d0d..67cc99b795 100644
--- a/binaries/data/mods/official/entities/units/cart_infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/entities/units/cart_infantry_javelinist_a.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_infantry_javelinist_b"
->
+<Entity	Parent="cart_infantry_javelinist_b">
 	<Traits>
 
 		<Promotion>
@@ -12,4 +10,7 @@
 		</Promotion>
 		
 	</Traits>
+	
+	<Actor>units/carthaginians/infantry_javelinist_a.xml</Actor>
+
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/cart_infantry_javelinist_b.xml b/binaries/data/mods/official/entities/units/cart_infantry_javelinist_b.xml
index 0e9db12118..70ab507534 100644
--- a/binaries/data/mods/official/entities/units/cart_infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/entities/units/cart_infantry_javelinist_b.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_infantry_ranged_javelinist"
->
+<Entity	Parent="template_unit_infantry_ranged_javelinist">
 	<Traits>
 	
 		<Id>
diff --git a/binaries/data/mods/official/entities/units/cart_infantry_javelinist_e.xml b/binaries/data/mods/official/entities/units/cart_infantry_javelinist_e.xml
index 37782b2a34..119b5acad2 100644
--- a/binaries/data/mods/official/entities/units/cart_infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/entities/units/cart_infantry_javelinist_e.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_infantry_javelinist_a"
->
+<Entity	Parent="cart_infantry_javelinist_a">
+
+	<Actor>units/carthaginians/infantry_javelinist_e.xml</Actor>
+
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/pers_super_cavalry.xml b/binaries/data/mods/official/entities/units/pers_super_cavalry.xml
index 41c244ac49..f600c801fd 100644
--- a/binaries/data/mods/official/entities/units/pers_super_cavalry.xml
+++ b/binaries/data/mods/official/entities/units/pers_super_cavalry.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_super_cavalry"
->
+<Entity	Parent="template_unit_super_cavalry">
 	<Traits>
 	
 		<Id>
@@ -15,8 +13,42 @@
 		
 		</Id>
 		
+		<Creation>
+			<Resource>
+ 				<Food>300</Food>
+				<Metal>200</Metal>
+ 			</Resource>
+		</Creation>		
+		<Armour>
+			<Hack>10.0</Hack>
+			<Pierce>15.0</Pierce>
+			<Crush>20.0</Crush>
+		</Armour>
+		<Health>
+			<Max>500</Max>
+		</Health>
+		
 	</Traits>
 
+	<Actions>
+ 		<Attack>
+			<Melee>
+				<Hack>25.0</Hack>
+				<Crush>30.0</Crush>
+			</Melee>
+			<Charge>
+				<Hack>75.0</Hack>
+				<Crush>90.0</Crush>
+			</Charge>		
+ 		</Attack>
+		
+		<Move>
+			<Speed>7.0</Speed>
+			<Run>
+				<Speed>14.0</Speed>
+			</Run>
+		</Move>
+	</Actions>
 	<Actor>units/persians/super_unit_2.xml</Actor>
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/maps/scenarios/persian-units.pmp b/binaries/data/mods/official/maps/scenarios/persian-units.pmp
index 691b93ed97..9a4dd4204d 100644
--- a/binaries/data/mods/official/maps/scenarios/persian-units.pmp
+++ b/binaries/data/mods/official/maps/scenarios/persian-units.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1caecbb1e3d45f952a061747ffe6d83cd13c40357cf29343c3422e3b259988f
+oid sha256:cba9b00330edf558346da944c7129a0d03224c355b6d084fdeb39446f658121a
 size 208108
diff --git a/binaries/data/mods/official/maps/scenarios/persian-units.xml b/binaries/data/mods/official/maps/scenarios/persian-units.xml
index 8221a4d657..f891e8db54 100644
--- a/binaries/data/mods/official/maps/scenarios/persian-units.xml
+++ b/binaries/data/mods/official/maps/scenarios/persian-units.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8bb20f0806a53035fbefd755007f527bd4463ccb86aa79ecf0afedc3e378e6a6
-size 11317
+oid sha256:90f2f335ebbc8747a4011cb173a95e9b1e01484d5710b0927fa901596340c008
+size 14158