From 46de7fe751f5b53601850bc0962159aab4fe77cd Mon Sep 17 00:00:00 2001
From: Alexandermb <alexandermb@wildfiregames.com>
Date: Sat, 5 Oct 2019 00:04:33 +0000
Subject: [PATCH] Replace death animation on turret elephant riders.

replace variant in elephant rider capes.

This was SVN commit r23047.
---
 .../units/capes/rider/elephant_driver_african.xml  | 14 ++------------
 .../units/capes/rider/elephant_driver_asian.xml    | 14 ++------------
 .../carthaginians/hero_elephantry_hannibal_r.xml   |  2 +-
 .../biped/new/death_rider_elephant_african.dae     |  3 ---
 .../biped/new/death_rider_elephant_asian.dae       |  3 ---
 .../rider/elephantry/{ => turret}/death_a.dae      |  0
 .../rider/elephantry/african_turret_death.xml      |  4 ++--
 .../biped/rider/elephantry/asian_turret_death.xml  |  4 ++--
 8 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_african.dae
 delete mode 100644 binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_asian.dae
 rename binaries/data/mods/public/art/animation/biped/rider/elephantry/{ => turret}/death_a.dae (100%)

diff --git a/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_african.xml b/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_african.xml
index 4c795ede9f..4eab00d874 100644
--- a/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_african.xml
+++ b/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_african.xml
@@ -3,18 +3,6 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="elephant-driver-cape">
-      <animations>
-        <animation file="biped/infantry/pikeman/idle_relax.dae" name="Idle" speed="30"/>
-        <animation file="biped/new/death_rider_elephant_african.dae" name="Death" id="death1" speed="120"/>
-        <animation file="biped/new/death_rider_elephant_african.dae" name="Death" id="death2" speed="120"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Walk" id="walk1" speed="30"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Walk" id="walk2" speed="32"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Run" id="run1" speed="4"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Run" id="run2" speed="4"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Run" id="run3" speed="4"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="promotion" speed="80"/>
-        <animation event="0.5" file="biped/infantry/hoplite/idle_relax.dae" name="Attack_melee" id="attack1" speed="30"/>
-      </animations>
       <mesh>props/new/capes/cape_hd_hoplite.dae</mesh>
       <textures>
         <texture file="props/cape_hd.dds" name="baseTex"/>
@@ -22,7 +10,9 @@
     </variant>
   </group>
   <group>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/rider/elephantry/african_turret_death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_asian.xml b/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_asian.xml
index 90c241be53..4eab00d874 100644
--- a/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_asian.xml
+++ b/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_asian.xml
@@ -3,18 +3,6 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="elephant-driver-cape">
-      <animations>
-        <animation file="biped/infantry/pikeman/idle_relax.dae" name="Idle" speed="30"/>
-        <animation file="biped/new/death_rider_elephant_asian.dae" name="Death" id="death1" speed="120"/>
-        <animation file="biped/new/death_rider_elephant_asian.dae" name="Death" id="death2" speed="120"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Walk" id="walk1" speed="30"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Walk" id="walk2" speed="32"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Run" id="run1" speed="4"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Run" id="run2" speed="4"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="Run" id="run3" speed="4"/>
-        <animation file="biped/infantry/hoplite/idle_relax.dae" name="promotion" speed="80"/>
-        <animation event="0.5" file="biped/infantry/hoplite/idle_relax.dae" name="Attack_melee" id="attack1" speed="30"/>
-      </animations>
       <mesh>props/new/capes/cape_hd_hoplite.dae</mesh>
       <textures>
         <texture file="props/cape_hd.dds" name="baseTex"/>
@@ -22,7 +10,9 @@
     </variant>
   </group>
   <group>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/rider/elephantry/african_turret_death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml b/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml
index fdba4b2571..d0b0d6e053 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_r.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="biped/base_elephant_rider_ready_shield_offhand.xml" frequency="1" name="Base">
+    <variant file="biped/base_elephant_driver_relax_shield.xml" frequency="1" name="Base">
       <mesh>skeletal/new/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_numid_all.xml" attachpoint="head"/>
diff --git a/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_african.dae b/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_african.dae
deleted file mode 100644
index 4005b10502..0000000000
--- a/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_african.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8a5e517b2e5cafc812c5e4ff6a268e073d9b4b156a678f5cf77575b7fd1f1a99
-size 554104
diff --git a/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_asian.dae b/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_asian.dae
deleted file mode 100644
index eefb654d2c..0000000000
--- a/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_asian.dae
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85d50023b54602b395d921f46dada5d043e51a67868dc1fea38e1b9a987f20d0
-size 554732
diff --git a/binaries/data/mods/public/art/animation/biped/rider/elephantry/death_a.dae b/binaries/data/mods/public/art/animation/biped/rider/elephantry/turret/death_a.dae
similarity index 100%
rename from binaries/data/mods/public/art/animation/biped/rider/elephantry/death_a.dae
rename to binaries/data/mods/public/art/animation/biped/rider/elephantry/turret/death_a.dae
diff --git a/binaries/data/mods/public/art/variants/biped/rider/elephantry/african_turret_death.xml b/binaries/data/mods/public/art/variants/biped/rider/elephantry/african_turret_death.xml
index 7c814d4263..3ba8e8d85a 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/elephantry/african_turret_death.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/elephantry/african_turret_death.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Death">
   <animations>
-    <animation file="biped/new/death_rider_elephant_african.dae" name="death" id="death1" speed="120"/>
-    <animation file="biped/new/death_rider_elephant_african.dae" name="death" id="death2" speed="120"/>
+    <animation file="biped/rider/elephantry/turret/death_a.dae" name="death" id="death1" speed="75"/>
+    <animation file="biped/rider/elephantry/turret/death_a.dae" name="death" id="death2" speed="75"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/elephantry/asian_turret_death.xml b/binaries/data/mods/public/art/variants/biped/rider/elephantry/asian_turret_death.xml
index 062581758d..3ba8e8d85a 100644
--- a/binaries/data/mods/public/art/variants/biped/rider/elephantry/asian_turret_death.xml
+++ b/binaries/data/mods/public/art/variants/biped/rider/elephantry/asian_turret_death.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <variant name="Death">
   <animations>
-    <animation file="biped/new/death_rider_elephant_asian.dae" name="death" id="death1" speed="120"/>
-    <animation file="biped/new/death_rider_elephant_asian.dae" name="death" id="death2" speed="120"/>
+    <animation file="biped/rider/elephantry/turret/death_a.dae" name="death" id="death1" speed="75"/>
+    <animation file="biped/rider/elephantry/turret/death_a.dae" name="death" id="death2" speed="75"/>
   </animations>
 </variant>