From 03e07ed0a87c909a239355db65d3144041efc8b4 Mon Sep 17 00:00:00 2001
From: Alexandermb <alexandermb@wildfiregames.com>
Date: Sat, 2 Nov 2019 04:25:42 +0000
Subject: [PATCH] Fix of variants following 80e13ea74a

This was SVN commit r23127.
---
 .../units/iberians/hero_infantry_swordsman_caros.xml   |  4 ++--
 .../art/actors/units/mauryas/infantry_swordsman_c.xml  |  2 +-
 .../actors/units/ptolemies/infantry_swordsman_a.xml    | 10 +++-------
 .../actors/units/ptolemies/infantry_swordsman_b.xml    | 10 +++-------
 .../actors/units/ptolemies/infantry_swordsman_e.xml    | 10 +++-------
 5 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml
index f99cbb57ae..6c7ad9516b 100644
--- a/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml
+++ b/binaries/data/mods/public/art/actors/units/iberians/hero_infantry_swordsman_caros.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_swordsman_shield_fast_relax.xml">
+    <variant>
       <mesh>skeletal/new/m_hero_caros.dae</mesh>
       <props>
         <prop actor="props/units/helmets/old/iber_helmet_hero_01.xml" attachpoint="helmet"/>
@@ -17,7 +17,7 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/base_swordsman_shield_fast.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/death_infantry.xml"/>
diff --git a/binaries/data/mods/public/art/actors/units/mauryas/infantry_swordsman_c.xml b/binaries/data/mods/public/art/actors/units/mauryas/infantry_swordsman_c.xml
index d2b4bb4aab..f03331a15f 100644
--- a/binaries/data/mods/public/art/actors/units/mauryas/infantry_swordsman_c.xml
+++ b/binaries/data/mods/public/art/actors/units/mauryas/infantry_swordsman_c.xml
@@ -18,7 +18,7 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shield_fast_relax.xml"/>
+    <variant file="biped/base_swordsman_shield_fast.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/death_infantry.xml"/>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_a.xml
index 93cfb617c3..8eadcfa649 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_a.xml
@@ -7,7 +7,7 @@
         <prop actor="props/units/heads/new/head_lime.xml" attachpoint="head"/>
         <prop actor="props/units/shields/ptol_thureos_galatian_a.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/csword.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/capes/swordsman_shield_relax_celt.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/cape_long_gaul.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
@@ -56,7 +56,7 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shield_relax_celt.xml"/>
+    <variant file="biped/base_swordsman_shield_relax_celt.xml" name="Swordsman-Shield-Relax"/>
     <variant file="biped/carry_food.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
@@ -77,11 +77,7 @@
     <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/swordsman_shield_relax_celt.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/death_cape_gaul.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_b.xml
index e09aa363b2..5894cedfcf 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_b.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_celt.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/csword.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/shields/ptol_thureos_galatian_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/capes/swordsman_shield_relax_celt.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/cape_long_gaul.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
@@ -35,7 +35,7 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shield_relax_celt.xml"/>
+    <variant file="biped/base_swordsman_shield_relax_celt.xml" name="Swordsman-Shield-Relax"/>
     <variant file="biped/carry_food.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
@@ -56,11 +56,7 @@
     <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/swordsman_shield_relax_celt.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/death_cape_gaul.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_e.xml
index 8a186ddb2c..4370fbfda3 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/infantry_swordsman_e.xml
@@ -8,7 +8,7 @@
         <prop actor="props/units/heads/new/head_celt.xml" attachpoint="head"/>
         <prop actor="props/units/shields/ptol_thureos_galatian_e.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/csword.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/capes/swordsman_shield_relax_celt.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/cape_long_gaul.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
@@ -175,7 +175,7 @@
     </variant>
   </group>
   <group>
-    <variant file="biped/base_swordsman_shield_relax_celt.xml"/>
+    <variant file="biped/base_swordsman_shield_relax_celt.xml" name="Swordsman-Shield-Relax"/>
     <variant file="biped/carry_food.xml"/>
     <variant file="biped/carry_meat.xml"/>
     <variant file="biped/carry_wood.xml"/>
@@ -196,11 +196,7 @@
     <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/swordsman_shield_relax_celt.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/death_cape_gaul.xml"/>
   </group>
   <material>player_trans_spec.xml</material>
 </actor>