From 5512fdb9ef3dc29cef91ce71fe68db2c121c7554 Mon Sep 17 00:00:00 2001
From: Alexandermb <alexandermb@wildfiregames.com>
Date: Fri, 4 Oct 2019 19:29:07 +0000
Subject: [PATCH] Remove an unused elephant variant and replace african forest
 variant.

This was SVN commit r23041.
---
 .../actors/fauna/elephant_african_forest.xml  |  2 +-
 .../quadraped/base_elephant_african.xml       | 24 +++++++++----------
 .../quadraped/base_elephant_asian_armor.xml   | 16 -------------
 3 files changed, 13 insertions(+), 29 deletions(-)
 delete mode 100644 binaries/data/mods/public/art/variants/quadraped/base_elephant_asian_armor.xml

diff --git a/binaries/data/mods/public/art/actors/fauna/elephant_african_forest.xml b/binaries/data/mods/public/art/actors/fauna/elephant_african_forest.xml
index ea16311dcc..b62b35b244 100644
--- a/binaries/data/mods/public/art/actors/fauna/elephant_african_forest.xml
+++ b/binaries/data/mods/public/art/actors/fauna/elephant_african_forest.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant file="quadraped/base_elephant_asian_armor.xml">
+    <variant file="quadraped/base_elephant_african.xml">
       <mesh>skeletal/elephant_african_forest.dae</mesh>
       <textures>
         <texture file="skeletal/animal-elephant-base.dds" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/variants/quadraped/base_elephant_african.xml b/binaries/data/mods/public/art/variants/quadraped/base_elephant_african.xml
index 749c20553c..016708dcb7 100644
--- a/binaries/data/mods/public/art/variants/quadraped/base_elephant_african.xml
+++ b/binaries/data/mods/public/art/variants/quadraped/base_elephant_african.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<variant frequency="1" name="elephant-african-armor">
+<variant frequency="1" name="elephant-african">
   <animations>
-    <animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
-    <animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
-    <animation file="quadraped/elephant_african_idle_01.dae" name="Idle" speed="25"/>
-    <animation file="quadraped/elephant_african_idle_02.dae" name="Idle" speed="85"/>
-    <animation file="quadraped/elephant_african_idle_03.dae" name="Idle" speed="75"/>
-    <animation file="quadraped/elephant_african_idle_03.dae" name="Idle" speed="75"/>
-    <animation file="quadraped/elephant_african_walk.dae" name="Walk" speed="30"/>
-    <animation file="quadraped/elephant_african_walk.dae" name="Run" speed="20"/>
-    <animation event="0.5" file="quadraped/elephant_african_attack.dae" name="attack_melee" speed="75"/>
-    <animation file="quadraped/elephant_african_death.dae" id="death1" name="Death" speed="50"/>
-    <animation file="quadraped/elephant_african_death.dae" id="death2" name="Death" speed="50"/>
+    <animation file="quadraped/elephant_african_forest_idle_01.dae" name="Idle" speed="25"/>
+    <animation file="quadraped/elephant_african_forest_idle_01.dae" name="Idle" speed="25"/>
+    <animation file="quadraped/elephant_african_forest_idle_01.dae" name="Idle" speed="25"/>
+    <animation file="quadraped/elephant_african_forest_idle_02.dae" name="Idle" speed="85"/>
+    <animation file="quadraped/elephant_african_forest_idle_03.dae" name="Idle" speed="75"/>
+    <animation file="quadraped/elephant_african_forest_idle_03.dae" name="Idle" speed="75"/>
+    <animation file="quadraped/elephant_african_forest_walk.dae" name="Walk" speed="30"/>
+    <animation file="quadraped/elephant_african_forest_walk.dae" name="Run" speed="20"/>
+    <animation event="0.5" file="quadraped/elephant_forest_african_attack.dae" name="attack_melee" speed="75"/>
+    <animation file="quadraped/elephant_african_forest_death.dae" id="death1" name="Death" speed="50"/>
+    <animation file="quadraped/elephant_african_forest_death.dae" id="death2" name="Death" speed="50"/>
   </animations>
 </variant>
diff --git a/binaries/data/mods/public/art/variants/quadraped/base_elephant_asian_armor.xml b/binaries/data/mods/public/art/variants/quadraped/base_elephant_asian_armor.xml
deleted file mode 100644
index 7a66e4fa2b..0000000000
--- a/binaries/data/mods/public/art/variants/quadraped/base_elephant_asian_armor.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<variant frequency="1" name="elephant-asian-armor">
-  <animations>
-    <animation file="quadraped/elephant_asian_armor_idle_01.dae" frequency="1" name="Idle" speed="25"/>
-    <animation file="quadraped/elephant_asian_armor_idle_01.dae" frequency="1" name="Idle" speed="25"/>
-    <animation file="quadraped/elephant_asian_armor_idle_01.dae" frequency="1" name="Idle" speed="25"/>
-    <animation file="quadraped/elephant_asian_armor_idle_02.dae" frequency="1" name="Idle" speed="85"/>
-    <animation file="quadraped/elephant_asian_armor_idle_03.dae" frequency="1" name="Idle" speed="75"/>
-    <animation file="quadraped/elephant_asian_armor_idle_03.dae" frequency="1" name="Idle" speed="75"/>
-    <animation file="quadraped/elephant_asian_armor_walk.dae" name="Walk" speed="20"/>
-    <animation file="quadraped/elephant_asian_armor_walk.dae" name="Run" speed="20"/>
-    <animation event="0.5" file="quadraped/elephant_asian_armor_attack.dae" name="attack_melee" speed="75"/>
-    <animation file="quadraped/elephant_asian_armor_death.dae" id="death1" name="Death" speed="75"/>
-    <animation file="quadraped/elephant_asian_armor_death.dae" id="death2" name="Death" speed="75"/>
-  </animations>
-</variant>