From 55e77096ec752e48f2ae7f17ef20309030439f43 Mon Sep 17 00:00:00 2001
From: Alexandermb <alexandermb@wildfiregames.com>
Date: Fri, 10 May 2019 14:26:50 +0000
Subject: [PATCH] Removed duplicated gather meat unnecesary for cavalry riders.

Added gather meat position for carthaginian cavalry spearman italic,
they were standing above the horse when gathering meat

This was SVN commit r22269.
---
 .../units/capes/rider/spearman_relax_shield_reverse.xml     | 2 +-
 .../art/actors/units/carthaginians/cavalry_spearman_a_m.xml | 6 ++++++
 .../art/actors/units/carthaginians/cavalry_spearman_b_m.xml | 6 ++++++
 .../art/actors/units/carthaginians/cavalry_spearman_e_m.xml | 6 ++++++
 .../public/art/variants/biped/rider/gather_meat_cart.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_celt.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_hele.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_iber.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_kush.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_maur.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_pers.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_rome.xml    | 2 +-
 .../public/art/variants/biped/rider/gather_meat_spart.xml   | 2 +-
 13 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/props/units/capes/rider/spearman_relax_shield_reverse.xml b/binaries/data/mods/public/art/actors/props/units/capes/rider/spearman_relax_shield_reverse.xml
index d111658d1d..533a8e9d6d 100644
--- a/binaries/data/mods/public/art/actors/props/units/capes/rider/spearman_relax_shield_reverse.xml
+++ b/binaries/data/mods/public/art/actors/props/units/capes/rider/spearman_relax_shield_reverse.xml
@@ -17,7 +17,7 @@
     <variant frequency="1" name="Idle"/>
     <variant file="biped/rider/attack_slaughter_shield_hele.xml"/>
     <variant file="biped/rider/promotion_shield.xml" />
-    <variant file="biped/rider/gather_meat.xml"/>
+    <variant file="biped/gather_meat.xml"/>
     <variant file="biped/rider/death_shield.xml"/>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_a_m.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_a_m.xml
index 54cfbe34c3..75461fa44e 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_a_m.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_a_m.xml
@@ -26,6 +26,12 @@
     <variant frequency="1" name="Idle"/>
     <variant file="quadraped/base_horse_death.xml"/>
     <variant file="quadraped/base_horse_run.xml"/>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="" attachpoint="rider"/>
+        <prop actor="units/carthaginians/cavalry_spearman_a_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
   </group>
   <material>basic_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_b_m.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_b_m.xml
index 21e0289b67..f4af87f72f 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_b_m.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_b_m.xml
@@ -26,6 +26,12 @@
     <variant frequency="1" name="Idle"/>
     <variant file="quadraped/base_horse_death.xml"/>
     <variant file="quadraped/base_horse_run.xml"/>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="" attachpoint="rider"/>
+        <prop actor="units/carthaginians/cavalry_spearman_b_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
   </group>
   <material>basic_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_e_m.xml b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_e_m.xml
index 5e68374dd7..03751c52f4 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_e_m.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_spearman_e_m.xml
@@ -27,6 +27,12 @@
     <variant frequency="1" name="Idle"/>
     <variant file="quadraped/base_horse_death.xml"/>
     <variant file="quadraped/base_horse_run.xml"/>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="" attachpoint="rider"/>
+        <prop actor="units/carthaginians/cavalry_spearman_e_r.xml" attachpoint="rider_R"/>
+      </props>
+    </variant>
   </group>
   <material>basic_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml
index 8e778df4a2..4f0d8970d7 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_cart.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml
index 3c28371cc4..a87642606d 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_celt.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/csword.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml
index ddfd23b903..b64486c802 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_hele.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/xiphos.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml
index 8e778df4a2..4f0d8970d7 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_iber.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml
index d5ac7b42ba..8425798dcd 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_kush.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/kush_gladius.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml
index 074828b16f..0a25b0eb26 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_maur.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/longsword_mauryan.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml
index 8e778df4a2..4f0d8970d7 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_pers.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/falcata.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml
index c15ca6c48c..f03fcf1e5f 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_rome.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/rome_cav_gladius.xml" attachpoint="weapon_R"/>
   </props>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml
index 88ddb99a01..f9d81efe0c 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/gather_meat_spart.xml
@@ -1,4 +1,4 @@
-<variant file="biped/rider/gather_meat.xml">
+<variant file="biped/gather_meat.xml">
   <props>
     <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="weapon_R"/>
   </props>