From fcceffb3dd672ea110344a5f248a3ca69ea6091e Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Wed, 21 Mar 2018 20:15:12 +0000
Subject: [PATCH] Add new death anims for elephant drivers it was looking weird
 before.

Variant files made by me.

This was SVN commit r21601.
---
 .../capes/rider/elephant_driver_african.xml   | 28 ++++++
 ...t_driver.xml => elephant_driver_asian.xml} |  5 +-
 .../units/carthaginians/elephantry_c_r.xml    | 99 +++++++++----------
 .../hero_elephantry_hannibal_d.xml            | 13 +--
 .../kushites/hero_elephantry_arakamani_r.xml  | 11 +--
 .../actors/units/ptolemies/elephantry_c_r.xml | 11 +--
 .../ptolemies/hero_elephantry_ptolemy_I_r.xml | 11 +--
 .../actors/units/seleucids/elephantry_c_r.xml |  7 +-
 .../hero_elephantry_seleucus_victor_r.xml     | 11 +--
 .../new/death_rider_elephant_african.dae      |  3 +
 .../biped/new/death_rider_elephant_asian.dae  |  3 +
 .../rider/elephantry/african_turret_death.xml |  7 ++
 .../rider/elephantry/asian_turret_death.xml   |  7 ++
 .../biped/rider/elephantry/turret_idle.xml    |  6 ++
 14 files changed, 128 insertions(+), 94 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_african.xml
 rename binaries/data/mods/public/art/actors/props/units/capes/rider/{elephant_driver.xml => elephant_driver_asian.xml} (79%)
 create mode 100644 binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_african.dae
 create mode 100644 binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_asian.dae
 create mode 100644 binaries/data/mods/public/art/variants/biped/rider/elephantry/african_turret_death.xml
 create mode 100644 binaries/data/mods/public/art/variants/biped/rider/elephantry/asian_turret_death.xml
 create mode 100644 binaries/data/mods/public/art/variants/biped/rider/elephantry/turret_idle.xml

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
new file mode 100644
index 0000000000..383383e4e8
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_african.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="elephant-driver-cape">
+      <animations>
+        <animation file="biped/new/pike_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/new/hoplite_idle_relax.dae" name="Walk" id="walk1" speed="30"/>
+        <animation file="biped/new/hoplite_idle_relax.dae" name="Walk" id="walk2" speed="32"/>
+        <animation file="biped/new/hoplite_idle_relax.dae" name="Run" id="run1" speed="4"/>
+        <animation file="biped/new/hoplite_idle_relax.dae" name="Run" id="run2" speed="4"/>
+        <animation file="biped/new/hoplite_idle_relax.dae" name="Run" id="run3" speed="4"/>
+        <animation file="biped/new/hoplite_idle_relax.dae" name="promotion" speed="80"/>
+        <animation event="0.5" file="biped/new/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"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant file="biped/attack_capture.xml"/>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver.xml b/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_asian.xml
similarity index 79%
rename from binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver.xml
rename to binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_asian.xml
index 20fbb9db72..a7f4f8df91 100644
--- a/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver.xml
+++ b/binaries/data/mods/public/art/actors/props/units/capes/rider/elephant_driver_asian.xml
@@ -4,8 +4,9 @@
   <group>
     <variant frequency="1" name="elephant-driver-cape">
       <animations>
-        <animation file="biped/new/death_a.dae" name="Death" id="death1" speed="60"/>
-        <animation file="biped/new/death_b.dae" name="Death" id="death2" speed="60"/>
+        <animation file="biped/new/pike_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/new/hoplite_idle_relax.dae" name="Walk" id="walk1" speed="30"/>
         <animation file="biped/new/hoplite_idle_relax.dae" name="Walk" id="walk2" speed="32"/>
         <animation file="biped/new/hoplite_idle_relax.dae" name="Run" id="run1" speed="4"/>
diff --git a/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml
index b81c15c36f..6855d9ea08 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/elephantry_c_r.xml
@@ -1,51 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <animations>
-        <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
-      </animations>
-      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/shields/kart_round_su1.xml" attachpoint="shield_arm"/>
-        <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/heads/kart_thracian_su1.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Carth-Sacred Band-ShortSleeve">
-      <textures>
-        <texture file="skeletal/kart_su1_sacredband_1.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Carth-Sacred Band-LongSleeve">
-      <textures>
-        <texture file="skeletal/kart_su1_sacredband_2.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="1" name="Carth-Sacred Band-LongSleeve-dirty">
-      <textures>
-        <texture file="skeletal/kart_su1_sacredband_4.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="Carth-Sacred Band-Brown">
-      <textures>
-        <texture file="skeletal/kart_su1_sacredband_3.dds" name="baseTex"/>
-      </textures>
-    </variant>
-    <variant frequency="2" name="Carth-Sacred Band-Yellow">
-      <textures>
-        <texture file="skeletal/kart_su1_sacredband_5.dds" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml"/>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/kart_round_su1.xml" attachpoint="shield_arm"/>
+        <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
+        <prop actor="props/units/heads/kart_thracian_su1.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/new/head_pers_a.xml" attachpoint="head"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Carth-Sacred Band-ShortSleeve">
+      <textures>
+        <texture file="skeletal/kart_su1_sacredband_1.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Carth-Sacred Band-LongSleeve">
+      <textures>
+        <texture file="skeletal/kart_su1_sacredband_2.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Carth-Sacred Band-LongSleeve-dirty">
+      <textures>
+        <texture file="skeletal/kart_su1_sacredband_4.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="Carth-Sacred Band-Brown">
+      <textures>
+        <texture file="skeletal/kart_su1_sacredband_3.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="Carth-Sacred Band-Yellow">
+      <textures>
+        <texture file="skeletal/kart_su1_sacredband_5.dds" name="baseTex"/>
+      </textures>
+    </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_d.xml b/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_d.xml
index 358138980e..285a111ed0 100644
--- a/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_d.xml
+++ b/binaries/data/mods/public/art/actors/units/carthaginians/hero_elephantry_hannibal_d.xml
@@ -3,15 +3,12 @@
   <castshadow/>
   <group>
     <variant>
-      <animations>
-        <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
-      </animations>
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/weapons/spear_long.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/heads/kart_hero_hannibal.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_kart_hannibal.xml" attachpoint="head"/>
-        <prop actor="props/units/capes/rider/elephant_driver.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/elephant_driver_asian.xml" attachpoint="root"/>
       </props>
       <textures>
         <texture file="skeletal/kart_hero_hannibal.dds" name="baseTex"/>
@@ -19,9 +16,13 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml"/>
+    <variant file="biped/rider/elephantry/asian_turret_death.xml">
+      <props>
+        <prop actor="props/units/capes/rider/elephant_driver_asian.xml" attachpoint="root"/>
+      </props>
+    </variant>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/hero_elephantry_arakamani_r.xml b/binaries/data/mods/public/art/actors/units/kushites/hero_elephantry_arakamani_r.xml
index 9ee8ab0ebe..6f1350ca5d 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/hero_elephantry_arakamani_r.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/hero_elephantry_arakamani_r.xml
@@ -3,9 +3,6 @@
   <castshadow/>
   <group>
     <variant>
-      <animations>
-        <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
-      </animations>
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/helmets/kush_skull_cap_cavalry_crown.xml" attachpoint="head"/>
@@ -21,13 +18,9 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml">
-      <props>
-        <prop actor="props/units/capes/rider/elephant_driver.xml" attachpoint="root"/>
-      </props>
-    </variant>
+    <variant file="biped/rider/elephantry/asian_turret_death.xml"/>
   </group>
   <material>player_trans_parallax_spec.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_r.xml
index bf604d8566..7dbee356a0 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_r.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_r.xml
@@ -3,16 +3,13 @@
   <castshadow/>
   <group>
     <variant>
-      <animations>
-        <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
-      </animations>
       <mesh>skeletal/new/m_armor_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/ptol_thureophoros_e.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/shields/ptol_pike_e.xml" attachpoint="shield_arm"/>
         <prop actor="props/units/weapons/sarissa.xml" attachpoint="weapon_R"/>
-        <prop actor="props/units/capes/pikeman.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/elephant_driver_african.xml" attachpoint="root"/>
       </props>
       <textures>
         <texture file="skeletal/ptol_isp_e_1.png" name="baseTex"/>
@@ -21,11 +18,11 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml">
+    <variant file="biped/rider/elephantry/african_turret_death.xml">
       <props>
-        <prop actor="props/units/capes/pikeman.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/elephant_driver_african.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/hero_elephantry_ptolemy_I_r.xml b/binaries/data/mods/public/art/actors/units/ptolemies/hero_elephantry_ptolemy_I_r.xml
index 17a3dc54a9..f8748f82f4 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/hero_elephantry_ptolemy_I_r.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/hero_elephantry_ptolemy_I_r.xml
@@ -3,16 +3,13 @@
   <castshadow/>
   <group>
     <variant>
-      <animations>
-        <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
-      </animations>
       <mesh>skeletal/new/armor/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/shields/ptol_ptolemy_I.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_long.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/heads/sele_perseus_brass.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/new/head_kart_hannibal.xml" attachpoint="head"/>
-        <prop actor="props/units/capes/rider/elephant_driver.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/elephant_driver_asian.xml" attachpoint="root"/>
       </props>
       <textures>
         <texture file="skeletal/mace_su1_hypaspist_1.dds" name="baseTex"/>
@@ -20,11 +17,11 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml">
+    <variant file="biped/rider/elephantry/asian_turret_death.xml">
       <props>
-        <prop actor="props/units/capes/rider/elephant_driver.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/elephant_driver_asian.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml
index b1c151f60d..3351c6d8aa 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/elephantry_c_r.xml
@@ -3,9 +3,6 @@
   <castshadow/>
   <group>
     <variant>
-      <animations>
-        <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
-      </animations>
       <mesh>skeletal/new/armor/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/new/head_hele_b.xml" attachpoint="head"/>
@@ -62,9 +59,9 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml"/>
+    <variant file="biped/rider/elephantry/asian_turret_death.xml"/>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml b/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml
index d189278d0f..f094240a15 100644
--- a/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml
+++ b/binaries/data/mods/public/art/actors/units/seleucids/hero_elephantry_seleucus_victor_r.xml
@@ -3,14 +3,11 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="Base">
-      <animations>
-        <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
-      </animations>
       <mesh>skeletal/new/m_tunic_long.dae</mesh>
       <props>
         <prop actor="props/units/weapons/spear_long.xml" attachpoint="weapon_R"/>
         <prop actor="props/units/heads/new/head_kart_hannibal.xml" attachpoint="head"/>
-        <prop actor="props/units/capes/rider/elephant_driver.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/elephant_driver_asian.xml" attachpoint="root"/>
         <prop actor="props/units/helmets/sele_seleucus_nikator_01.xml" attachpoint="helmet"/>
       </props>
       <textures>
@@ -19,11 +16,11 @@
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="Idle"/>
+    <variant file="biped/rider/elephantry/turret_idle.xml"/>
     <variant file="biped/attack_capture.xml"/>
-    <variant file="biped/death_infantry.xml">
+    <variant file="biped/rider/elephantry/asian_turret_death.xml">
       <props>
-        <prop actor="props/units/capes/rider/elephant_driver.xml" attachpoint="root"/>
+        <prop actor="props/units/capes/rider/elephant_driver_asian.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
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
new file mode 100644
index 0000000000..b7d95e98c2
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_african.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8fcfb69a16fa9049a6919f69acf595bfe9dbf84e06d117605ac9b26941565afe
+size 551166
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
new file mode 100644
index 0000000000..a8b269146c
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/biped/new/death_rider_elephant_asian.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09a497ec8f5e6f68166935841a8d682a5a68d58244d9acd622b938408a2c9954
+size 551794
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
new file mode 100644
index 0000000000..7c814d4263
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/rider/elephantry/african_turret_death.xml
@@ -0,0 +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"/>
+  </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
new file mode 100644
index 0000000000..062581758d
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/rider/elephantry/asian_turret_death.xml
@@ -0,0 +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"/>
+  </animations>
+</variant>
diff --git a/binaries/data/mods/public/art/variants/biped/rider/elephantry/turret_idle.xml b/binaries/data/mods/public/art/variants/biped/rider/elephantry/turret_idle.xml
new file mode 100644
index 0000000000..6d31c5dc8f
--- /dev/null
+++ b/binaries/data/mods/public/art/variants/biped/rider/elephantry/turret_idle.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<variant frequency="1" name="Idle">
+  <animations>
+    <animation file="biped/new/inf_sarissa_rest.dae" name="Idle" speed="25"/>
+  </animations>
+</variant>