From 65d2c26261ea0ede567d5fa1d6d8698e1bdc6922 Mon Sep 17 00:00:00 2001
From: Alexandermb <alexandermb@wildfiregames.com>
Date: Tue, 3 Sep 2019 15:21:14 +0000
Subject: [PATCH] Fix the issue with the formations and groups in actors And
 some corrections to variants.

This was SVN commit r22839.
---
 .../units/athenians/infantry_spearman_a.xml   | 21 +++++++------
 .../units/athenians/infantry_spearman_b.xml   | 21 +++++++------
 .../units/athenians/infantry_spearman_e.xml   | 21 +++++++------
 .../units/athenians/infantry_swordsman_c.xml  |  2 +-
 .../units/iberians/infantry_swordsman_a.xml   |  2 +-
 .../units/iberians/infantry_swordsman_b.xml   |  2 +-
 .../units/iberians/infantry_swordsman_c.xml   |  2 +-
 .../units/iberians/infantry_swordsman_e.xml   |  2 +-
 .../units/kushites/infantry_pikeman_a.xml     | 27 +++++++++-------
 .../units/kushites/infantry_pikeman_b.xml     | 27 +++++++++-------
 .../units/kushites/infantry_pikeman_e.xml     | 27 +++++++++-------
 .../units/macedonians/infantry_pikeman_a.xml  | 30 +++++++++---------
 .../units/macedonians/infantry_pikeman_b.xml  | 30 +++++++++---------
 .../units/macedonians/infantry_pikeman_e.xml  | 27 +++++++++-------
 .../units/ptolemies/infantry_pikeman_a.xml    | 27 +++++++++-------
 .../units/ptolemies/infantry_pikeman_b.xml    | 27 +++++++++-------
 .../units/ptolemies/infantry_pikeman_e.xml    | 27 +++++++++-------
 .../units/romans/infantry_spearman_a.xml      | 31 ++++++++++---------
 .../units/romans/infantry_spearman_b.xml      | 31 ++++++++++---------
 .../units/romans/infantry_spearman_e.xml      | 31 ++++++++++---------
 .../units/romans/infantry_swordsman_a.xml     | 27 +++++++++-------
 .../units/romans/infantry_swordsman_b.xml     | 27 +++++++++-------
 .../units/romans/infantry_swordsman_e.xml     | 27 +++++++++-------
 .../units/seleucids/infantry_pikeman_a.xml    | 27 +++++++++-------
 .../units/seleucids/infantry_pikeman_b.xml    | 27 +++++++++-------
 .../units/seleucids/infantry_pikeman_e.xml    | 31 +++++++++----------
 .../units/spartans/infantry_spearman_a.xml    | 21 +++++++------
 .../units/spartans/infantry_spearman_b.xml    | 21 +++++++------
 .../units/spartans/infantry_spearman_e.xml    | 21 +++++++------
 .../units/spartans/infantry_swordsman_c.xml   | 24 ++++++++------
 .../variants/biped/base_spearman_ready.xml    |  6 ++--
 .../biped/base_spearman_ready_fast.xml        |  6 ++--
 .../biped/base_spearman_ready_smallshield.xml |  6 ++--
 .../variants/biped/base_spearman_relax.xml    |  6 ++--
 .../biped/base_swordsman_shield_fast.xml      |  4 ++-
 .../base_swordsman_shield_fast_relax.xml      |  5 +--
 .../biped/base_swordsman_shield_ready.xml     |  4 ++-
 .../biped/base_swordsman_shield_relax.xml     |  4 ++-
 .../biped/base_swordsman_shieldarm.xml        |  4 ++-
 .../biped/base_swordsman_shieldarm_fast.xml   |  4 ++-
 .../biped/base_swordsman_shieldarm_relax.xml  | 15 +++++++++
 .../biped/base_swordsman_shieldsmall_fast.xml |  6 ++--
 .../base_swordsman_shieldsmall_relax.xml      | 15 +++++++++
 .../public/art/variants/biped/gather_ore.xml  |  6 ++--
 .../public/art/variants/biped/gather_rock.xml |  6 ++--
 45 files changed, 437 insertions(+), 328 deletions(-)
 create mode 100644 binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml
 create mode 100644 binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml

diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
index a5464af055..8ccbcd3145 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml
@@ -72,13 +72,12 @@
   </group>
   <group>
     <variant file="biped/base_hoplite.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/phalanx_front.xml"/>
+    <variant file="biped/formations/phalanx_mid.xml"/>
+    <variant file="biped/formations/phalanx_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -89,10 +88,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/phalanx_front.xml"/>
-    <variant file="biped/formations/phalanx_mid.xml"/>
-    <variant file="biped/formations/phalanx_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
index 4bfce2a557..669b8da484 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
@@ -31,13 +31,12 @@
   </group>
   <group>
     <variant file="biped/base_hoplite.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/phalanx_front.xml"/>
+    <variant file="biped/formations/phalanx_mid.xml"/>
+    <variant file="biped/formations/phalanx_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -48,10 +47,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/phalanx_front.xml"/>
-    <variant file="biped/formations/phalanx_mid.xml"/>
-    <variant file="biped/formations/phalanx_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
index 32534ecc04..f3319ae97d 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml
@@ -150,13 +150,12 @@
   </group>
   <group>
     <variant file="biped/base_hoplite.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/phalanx_front.xml"/>
+    <variant file="biped/formations/phalanx_mid.xml"/>
+    <variant file="biped/formations/phalanx_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -167,10 +166,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/phalanx_front.xml"/>
-    <variant file="biped/formations/phalanx_mid.xml"/>
-    <variant file="biped/formations/phalanx_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml
index f499a95dad..efc402cf23 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_swordsman_c.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_swordsman_shieldarm_fast.xml">
+    <variant file="biped/base_swordsman_shieldarm_relax.xml">
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/helmets/hele_su2.xml" attachpoint="helmet"/>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_a.xml
index 524205b860..46132e5992 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_a.xml
@@ -42,7 +42,7 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shieldsmall_fast.xml"/>
+    <variant file="biped/base_swordsman_shieldsmall_relax.xml"/>
     <variant file="biped/carry_food.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_b.xml
index 9cb5d1a0c4..a0b20c5441 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_b.xml
@@ -40,7 +40,7 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shieldsmall_fast.xml"/>
+    <variant file="biped/base_swordsman_shieldsmall_relax.xml"/>
     <variant file="biped/carry_food.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_c.xml
index 05ef018b0e..97c721a474 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_c.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_swordsman_shieldsmall_fast.xml">
+    <variant file="biped/base_swordsman_shieldsmall_relax.xml">
       <props>
         <prop actor="props/units/heads/new/head_iber_su1.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
diff --git a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_e.xml
index a77fd3d8e1..029227ebca 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/infantry_swordsman_e.xml
@@ -66,7 +66,7 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shieldsmall_fast.xml"/>
+    <variant file="biped/base_swordsman_shieldsmall_relax.xml"/>
     <variant file="biped/carry_food.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_a.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_a.xml
index bf2092ee1d..26c4746423 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_a.xml
@@ -67,13 +67,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -84,13 +86,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_b.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_b.xml
index 6ab9160042..15218db4f3 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_b.xml
@@ -61,13 +61,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -78,13 +80,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_e.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_e.xml
index 6c4a487b40..953f0bea96 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_pikeman_e.xml
@@ -110,13 +110,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -127,13 +129,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_a.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_a.xml
index 220349233b..2c3b29f49c 100644
--- a/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_a.xml
@@ -122,16 +122,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -142,13 +141,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_b.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_b.xml
index cf9a38ffe9..96ff0bebf3 100644
--- a/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_b.xml
@@ -17,16 +17,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -37,13 +36,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_e.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_e.xml
index d76a403b64..09ebeecf6c 100644
--- a/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_pikeman_e.xml
@@ -131,13 +131,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -148,13 +150,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_a.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_a.xml
index 3d0dbbd134..c2c71c724d 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_a.xml
@@ -78,13 +78,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -95,13 +97,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_b.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_b.xml
index 2a982dc16c..74684d993e 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_b.xml
@@ -26,13 +26,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -43,13 +45,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_e.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_e.xml
index e9d3ea31ba..a2d22b44bb 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_pikeman_e.xml
@@ -50,13 +50,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -67,13 +69,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml
index 86bde8341d..bfa19d1556 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_a.xml
@@ -74,13 +74,17 @@
   </group>
   <group>
     <variant file="biped/base_spearman_relax.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/anti_cavalry_front.xml"/>
+    <variant file="biped/formations/anti_cavalry_back.xml"/>
+    <variant file="biped/formations/testudo_top.xml"/>
+    <variant file="biped/formations/testudo_front.xml"/>
+    <variant file="biped/formations/testudo_front_left.xml"/>
+    <variant file="biped/formations/testudo_front_right.xml"/>
+    <variant file="biped/formations/testudo_left.xml"/>
+    <variant file="biped/formations/testudo_right.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -91,15 +95,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/anti_cavalry_front.xml"/>
-    <variant file="biped/formations/anti_cavalry_back.xml"/>
-    <variant file="biped/formations/testudo_top.xml"/>
-    <variant file="biped/formations/testudo_front.xml"/>
-    <variant file="biped/formations/testudo_front_left.xml"/>
-    <variant file="biped/formations/testudo_front_right.xml"/>
-    <variant file="biped/formations/testudo_left.xml"/>
-    <variant file="biped/formations/testudo_right.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml
index 49e7b5caac..5e6b8ac710 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_b.xml
@@ -55,13 +55,17 @@
   </group>
   <group>
     <variant file="biped/base_spearman_relax.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/anti_cavalry_front.xml"/>
+    <variant file="biped/formations/anti_cavalry_back.xml"/>
+    <variant file="biped/formations/testudo_top.xml"/>
+    <variant file="biped/formations/testudo_front.xml"/>
+    <variant file="biped/formations/testudo_front_left.xml"/>
+    <variant file="biped/formations/testudo_front_right.xml"/>
+    <variant file="biped/formations/testudo_left.xml"/>
+    <variant file="biped/formations/testudo_right.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -72,15 +76,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/anti_cavalry_front.xml"/>
-    <variant file="biped/formations/anti_cavalry_back.xml"/>
-    <variant file="biped/formations/testudo_top.xml"/>
-    <variant file="biped/formations/testudo_front.xml"/>
-    <variant file="biped/formations/testudo_front_left.xml"/>
-    <variant file="biped/formations/testudo_front_right.xml"/>
-    <variant file="biped/formations/testudo_left.xml"/>
-    <variant file="biped/formations/testudo_right.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml
index 1693a47b9e..3adca1a2f6 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_spearman_e.xml
@@ -42,13 +42,17 @@
   </group>
   <group>
     <variant file="biped/base_spearman_relax.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/anti_cavalry_front.xml"/>
+    <variant file="biped/formations/anti_cavalry_back.xml"/>
+    <variant file="biped/formations/testudo_top.xml"/>
+    <variant file="biped/formations/testudo_front.xml"/>
+    <variant file="biped/formations/testudo_front_left.xml"/>
+    <variant file="biped/formations/testudo_front_right.xml"/>
+    <variant file="biped/formations/testudo_left.xml"/>
+    <variant file="biped/formations/testudo_right.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -59,15 +63,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/anti_cavalry_front.xml"/>
-    <variant file="biped/formations/anti_cavalry_back.xml"/>
-    <variant file="biped/formations/testudo_top.xml"/>
-    <variant file="biped/formations/testudo_front.xml"/>
-    <variant file="biped/formations/testudo_front_left.xml"/>
-    <variant file="biped/formations/testudo_front_right.xml"/>
-    <variant file="biped/formations/testudo_left.xml"/>
-    <variant file="biped/formations/testudo_right.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml
index 915ea00ef2..d7ffd60a1a 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_a.xml
@@ -51,13 +51,15 @@
   </group>
   <group>
     <variant file="biped/base_swordsman_shield_relax.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/testudo_top.xml"/>
+    <variant file="biped/formations/testudo_front.xml"/>
+    <variant file="biped/formations/testudo_front_left.xml"/>
+    <variant file="biped/formations/testudo_front_right.xml"/>
+    <variant file="biped/formations/testudo_left.xml"/>
+    <variant file="biped/formations/testudo_right.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -68,13 +70,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/testudo_top.xml"/>
-    <variant file="biped/formations/testudo_front.xml"/>
-    <variant file="biped/formations/testudo_front_left.xml"/>
-    <variant file="biped/formations/testudo_front_right.xml"/>
-    <variant file="biped/formations/testudo_left.xml"/>
-    <variant file="biped/formations/testudo_right.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml
index afbd3283c7..f70028648c 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_b.xml
@@ -76,13 +76,15 @@
   </group>
   <group>
     <variant file="biped/base_swordsman_shield_relax.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/testudo_top.xml"/>
+    <variant file="biped/formations/testudo_front.xml"/>
+    <variant file="biped/formations/testudo_front_left.xml"/>
+    <variant file="biped/formations/testudo_front_right.xml"/>
+    <variant file="biped/formations/testudo_left.xml"/>
+    <variant file="biped/formations/testudo_right.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -93,13 +95,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/testudo_top.xml"/>
-    <variant file="biped/formations/testudo_front.xml"/>
-    <variant file="biped/formations/testudo_front_left.xml"/>
-    <variant file="biped/formations/testudo_front_right.xml"/>
-    <variant file="biped/formations/testudo_left.xml"/>
-    <variant file="biped/formations/testudo_right.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml
index 885774f935..8c82abbe26 100644
--- a/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/romans/infantry_swordsman_e.xml
@@ -93,13 +93,15 @@
   </group>
   <group>
     <variant file="biped/base_swordsman_shield_relax.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/testudo_top.xml"/>
+    <variant file="biped/formations/testudo_front.xml"/>
+    <variant file="biped/formations/testudo_front_left.xml"/>
+    <variant file="biped/formations/testudo_front_right.xml"/>
+    <variant file="biped/formations/testudo_left.xml"/>
+    <variant file="biped/formations/testudo_right.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -110,13 +112,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/testudo_top.xml"/>
-    <variant file="biped/formations/testudo_front.xml"/>
-    <variant file="biped/formations/testudo_front_left.xml"/>
-    <variant file="biped/formations/testudo_front_right.xml"/>
-    <variant file="biped/formations/testudo_left.xml"/>
-    <variant file="biped/formations/testudo_right.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_a.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_a.xml
index 1327669917..f72a1ec435 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_a.xml
@@ -64,13 +64,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -81,13 +83,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_b.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_b.xml
index 894b5c3f08..c5846cc592 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_b.xml
@@ -28,13 +28,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -45,13 +47,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_e.xml b/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_e.xml
index 6ba7b2e8cb..977000d0fb 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/infantry_pikeman_e.xml
@@ -80,13 +80,15 @@
   </group>
   <group>
     <variant file="biped/pikeman_base.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/syntagma_front.xml"/>
+    <variant file="biped/formations/syntagma_01.xml"/>
+    <variant file="biped/formations/syntagma_02.xml"/>
+    <variant file="biped/formations/syntagma_03.xml"/>
+    <variant file="biped/formations/syntagma_04.xml"/>
+    <variant file="biped/formations/syntagma_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -97,17 +99,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml">
-      <props>
-        <prop actor="props/units/capes/pikeman.xml" attachpoint="root"/>
-      </props>
-    </variant>
-    <variant file="biped/formations/syntagma_front.xml"/>
-    <variant file="biped/formations/syntagma_01.xml"/>
-    <variant file="biped/formations/syntagma_02.xml"/>
-    <variant file="biped/formations/syntagma_03.xml"/>
-    <variant file="biped/formations/syntagma_04.xml"/>
-    <variant file="biped/formations/syntagma_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml
index f48973c05e..959f401a8b 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_a.xml
@@ -48,13 +48,12 @@
   </group>
   <group>
     <variant file="biped/base_hoplite.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/phalanx_front.xml"/>
+    <variant file="biped/formations/phalanx_mid.xml"/>
+    <variant file="biped/formations/phalanx_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -65,10 +64,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/phalanx_front.xml"/>
-    <variant file="biped/formations/phalanx_mid.xml"/>
-    <variant file="biped/formations/phalanx_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml
index 5ec01744d3..0c264d5f63 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_b.xml
@@ -31,13 +31,12 @@
   </group>
   <group>
     <variant file="biped/base_hoplite.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/phalanx_front.xml"/>
+    <variant file="biped/formations/phalanx_mid.xml"/>
+    <variant file="biped/formations/phalanx_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -48,10 +47,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/phalanx_front.xml"/>
-    <variant file="biped/formations/phalanx_mid.xml"/>
-    <variant file="biped/formations/phalanx_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml
index ea380d305c..0dc2a9465b 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_spearman_e.xml
@@ -144,13 +144,12 @@
   </group>
   <group>
     <variant file="biped/base_hoplite.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
+    <variant file="biped/formations/phalanx_front.xml"/>
+    <variant file="biped/formations/phalanx_mid.xml"/>
+    <variant file="biped/formations/phalanx_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -161,10 +160,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-    <variant file="biped/formations/phalanx_front.xml"/>
-    <variant file="biped/formations/phalanx_mid.xml"/>
-    <variant file="biped/formations/phalanx_back.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml
index 776c396348..ee71c69b2c 100644
--- a/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/spartans/infantry_swordsman_c.xml
@@ -9,6 +9,7 @@
         <prop actor="props/units/heads/new/head_corinthian.xml" attachpoint="head"/>
         <prop actor="props/units/shields/aspis_spart_skiritai.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/xiphos.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/weapons/sheath_xiphos_e.xml" attachpoint="sheath_01_L"/>
       </props>
     </variant>
   </group>
@@ -35,17 +36,13 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shieldarm_fast.xml"/>
-    <variant file="biped/carry_food.xml"/>
-    <variant file="biped/carry_meat.xml"/>
-    <variant file="biped/carry_wood.xml"/>
-    <variant file="biped/carry_stone.xml"/>
-    <variant file="biped/carry_metal.xml"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/base_swordsman_shieldarm_relax.xml"/>
+    <variant file="biped/formations/phalanx_front.xml"/>
+    <variant file="biped/formations/phalanx_mid.xml"/>
+    <variant file="biped/formations/phalanx_back.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
+    <variant file="biped/death_infantry.xml"/>
     <variant file="biped/gather_tree.xml"/>
     <variant file="biped/gather_grain.xml"/>
     <variant file="biped/gather_fruit.xml"/>
@@ -56,7 +53,14 @@
     <variant file="biped/gather_praise.xml"/>
     <variant file="biped/build.xml"/>
     <variant file="biped/build_farm.xml"/>
-    <variant file="biped/death_infantry.xml"/>
+    <variant file="biped/carry_food.xml"/>
+    <variant file="biped/carry_meat.xml"/>
+    <variant file="biped/carry_wood.xml"/>
+    <variant file="biped/carry_stone.xml"/>
+    <variant file="biped/carry_metal.xml"/>
+  </group>
+  <group>
+    <variant name="Idle"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
index 439a08fc95..cb778e248c 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready.xml
@@ -6,9 +6,9 @@
     <animation file="biped/infantry/spearman/idle_ready.dae" name="Idle" id="idle3" speed="32"/>
     <animation file="biped/infantry/spearman/walk_ready.dae" name="Walk" id="walk1" speed="30"/>
     <animation file="biped/infantry/spearman/walk_ready.dae" name="Walk" id="walk2" speed="32"/>
-    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
index c3a6c0dee6..30ed309342 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_fast.xml
@@ -6,9 +6,9 @@
     <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle3" speed="32"/>
     <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" id="walk1" speed="12"/>
     <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" id="walk2" speed="13"/>
-    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/infantry/spearman/run_ready.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/spearman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
index f23d2f419f..f31b9d4fde 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_ready_smallshield.xml
@@ -6,9 +6,9 @@
     <animation file="biped/infantry/spearman/idle_ready_shieldsmall.dae" name="Idle" id="idle3" speed="32"/>
     <animation file="biped/infantry/spearman/walk_ready_shieldsmall.dae" name="Walk" id="walk1" speed="30"/>
     <animation file="biped/infantry/spearman/walk_ready_shieldsmall.dae" name="Walk" id="walk2" speed="28"/>
-    <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run2" speed="5"/>
-    <animation file="biped/infantry/spearman/run_ready_shieldsmall.dae" name="Run" id="run3" speed="6"/>
+    <animation file="biped/infantry/spearman/run_ready_shield_shieldsmall.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/spearman/run_ready_shield_shieldsmall.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/spearman/run_ready_shield_shieldsmall.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml b/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
index 19785d976f..096398be08 100644
--- a/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_spearman_relax.xml
@@ -6,9 +6,9 @@
     <animation file="biped/infantry/spearman/idle_relax.dae" name="Idle" id="idle3" speed="32"/>
     <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk1" speed="30"/>
     <animation file="biped/infantry/spearman/walk_relax.dae" name="Walk" id="walk2" speed="32"/>
-    <animation file="biped/infantry/spearman/run_relax.dae" name="Run" id="run1" speed="4"/>
-    <animation file="biped/infantry/spearman/run_relax.dae" name="Run" id="run2" speed="4"/>
-    <animation file="biped/infantry/spearman/run_relax.dae" name="Run" id="run3" speed="4"/>
+    <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/spearman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/spearman/attack_melee_a.dae" name="Attack_melee" id="attack1" speed="30"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="Attack_melee" id="attack2" speed="100"/>
     <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
index f23d1d2131..59ad9801d0 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast.xml
@@ -4,7 +4,9 @@
     <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" speed="100"/>
     <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" speed="90"/>
     <animation file="biped/infantry/swordsman/jog_ready_shield.dae" name="Walk" speed="12"/>
-    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
index 6daf2226c3..909db3ecb1 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_fast_relax.xml
@@ -5,8 +5,9 @@
     <animation file="biped/infantry/swordsman/idle_relax_shield.dae" name="idle" speed="90"/>
     <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="18"/>
     <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="20"/>
-    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" speed="8"/>
-    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
index c5c428583e..101b6e18d6 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_ready.xml
@@ -4,7 +4,9 @@
     <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" id="idle1" speed="100"/>
     <animation file="biped/infantry/swordsman/idle_ready_shield.dae" name="idle" id="idle2" speed="90"/>
     <animation file="biped/infantry/swordsman/walk_ready_shield.dae" name="Walk" speed="30"/>
-    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
index 9ded392197..d3f2b84d38 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shield_relax.xml
@@ -4,7 +4,9 @@
     <animation file="biped/infantry/swordsman/idle_relax_shield.dae" name="idle" speed="100"/>
     <animation file="biped/infantry/swordsman/idle_relax_shield.dae" name="idle" speed="90"/>
     <animation file="biped/infantry/swordsman/walk_relax_shield.dae" name="Walk" speed="30"/>
-    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_relax_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_a.dae" name="attack_melee" id="attack1" speed="120"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_b.dae" name="attack_melee" id="attack2" speed="100"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shield_c.dae" name="attack_melee" id="attack3" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
index d6efc1d0cc..b45de36d75 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm.xml
@@ -4,7 +4,9 @@
     <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="100"/>
     <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="90"/>
     <animation file="biped/infantry/swordsman/walk_ready_shieldarm.dae" name="Walk" speed="30"/>
-    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
index a3fc0722c9..8ad51d10a1 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_fast.xml
@@ -4,7 +4,9 @@
     <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="100"/>
     <animation file="biped/infantry/swordsman/idle_ready_shieldarm.dae" name="idle" speed="90"/>
     <animation file="biped/infantry/swordsman/jog_ready_shieldarm.dae" name="Walk" speed="12"/>
-    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_shieldarm.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml
new file mode 100644
index 0000000000..6e8d9cd32e
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldarm_relax.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base" frequency="1">
+  <animations>
+    <animation file="biped/infantry/swordsman/idle_relax_shieldarm.dae" name="idle" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shieldarm.dae" name="idle" speed="90"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shieldarm.dae" name="Walk" speed="12"/>
+    <animation file="biped/infantry/swordsman/run_relax_shieldarm.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_relax_shieldarm.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_relax_shieldarm.dae" name="Run" id="run3" speed="10"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldarm_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
index 0edcce14e8..56e701fb4e 100644
--- a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_fast.xml
@@ -3,8 +3,10 @@
   <animations>
     <animation file="biped/infantry/swordsman/idle_ready_shieldsmall.dae" name="idle" id="idle1" speed="100"/>
     <animation file="biped/infantry/swordsman/idle_ready_shieldsmall.dae" name="idle" id="idle2" speed="90"/>
-    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="12"/>
-    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" speed="8"/>
+    <animation file="biped/infantry/swordsman/jog_ready_shield.dae" name="Walk" speed="12"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_a.dae" name="attack_melee" id="attack1" speed="120"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_b.dae" name="attack_melee" id="attack2" speed="100"/>
     <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_c.dae" name="attack_melee" id="attack3" speed="80"/>
diff --git a/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml
new file mode 100644
index 0000000000..73cdb8a4ab
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/base_swordsman_shieldsmall_relax.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant name="Base" frequency="1">
+  <animations>
+    <animation file="biped/infantry/swordsman/idle_relax_shieldsmall.dae" name="idle" id="idle1" speed="100"/>
+    <animation file="biped/infantry/swordsman/idle_relax_shieldsmall.dae" name="idle" id="idle2" speed="90"/>
+    <animation file="biped/infantry/swordsman/jog_relax_shield.dae" name="Walk" speed="12"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run1" speed="8"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run2" speed="9"/>
+    <animation file="biped/infantry/swordsman/run_ready_shield.dae" name="Run" id="run3" speed="10"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_a.dae" name="attack_melee" id="attack1" speed="120"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_b.dae" name="attack_melee" id="attack2" speed="100"/>
+    <animation event="0.5" file="biped/infantry/swordsman/attack_melee_shieldsmall_c.dae" name="attack_melee" id="attack3" speed="80"/>
+    <animation file="biped/infantry/promotion.dae" name="promotion" speed="80"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_ore.xml b/binaries/data/mods/public/art/variants/biped/gather_ore.xml
index 68343fe82f..9598cb5562 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_ore.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_ore.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_ore">
   <animations>
-    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ore" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_ore" speed="120"/>
   </animations>
   <props>
-    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
-    <prop attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="helmet"/>
diff --git a/binaries/data/mods/public/art/variants/biped/gather_rock.xml b/binaries/data/mods/public/art/variants/biped/gather_rock.xml
index 8fcb6042d7..67e8289352 100644
--- a/binaries/data/mods/public/art/variants/biped/gather_rock.xml
+++ b/binaries/data/mods/public/art/variants/biped/gather_rock.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="gather_rock">
   <animations>
-    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_rock" speed="100"/>
+    <animation event="0.4" file="biped/gatherer/gather_mine.dae" name="gather_rock" speed="120"/>
   </animations>
   <props>
-    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_L"/>
-    <prop attachpoint="weapon_R"/>
+    <prop actor="props/units/tools/pick.xml" attachpoint="weapon_R"/>
+    <prop attachpoint="weapon_L"/>
     <prop attachpoint="shield"/>
     <prop attachpoint="shield_arm"/>
     <prop attachpoint="helmet"/>