From 7d143cfd364af29d0d359758947cfa1f5ed6c512 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Tue, 13 Mar 2018 22:03:31 +0000
Subject: [PATCH] Add the new tower to ptol elephants as well.

This was SVN commit r21543.
---
 .../units/elephant/ptol_turret_small.xml      | 56 +++++++++++++++++++
 .../units/kushites/infantry_swordsman_e.xml   |  2 +-
 .../actors/units/ptolemies/elephantry_c_m.xml |  5 +-
 .../actors/units/ptolemies/elephantry_c_r.xml | 33 +++++++++++
 4 files changed, 93 insertions(+), 3 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/units/elephant/ptol_turret_small.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_r.xml

diff --git a/binaries/data/mods/public/art/actors/props/units/elephant/ptol_turret_small.xml b/binaries/data/mods/public/art/actors/props/units/elephant/ptol_turret_small.xml
new file mode 100644
index 0000000000..beea62b2ac
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/elephant/ptol_turret_small.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/elephant/tower_small.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Carthaginian elephant champion howdah gray">
+      <props>
+        <prop actor="props/units/shields/ptol_hero_1.xml" attachpoint="shield1"/>
+        <prop actor="props/units/shields/ptol_hero_1.xml" attachpoint="shield2"/>
+      </props>
+      <textures>
+        <texture file="props/ptol_howdah_a.png" name="baseTex"/>
+        <texture file="props/ptol_howdah_a_norm.png" name="normTex"/>
+        <texture file="props/ptol_howdah_a_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Carthaginian elephant champion howdah brown">
+      <props>
+        <prop actor="props/units/shields/ptol_hero_2.xml" attachpoint="shield1"/>
+        <prop actor="props/units/shields/ptol_hero_2.xml" attachpoint="shield2"/>
+      </props>
+      <textures>
+        <texture file="props/ptol_howdah_b.png" name="baseTex"/>
+        <texture file="props/ptol_howdah_b_norm.png" name="normTex"/>
+        <texture file="props/ptol_howdah_b_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Carthaginian elephant champion howdah white">
+      <props>
+        <prop actor="props/units/shields/ptol_hero_1.xml" attachpoint="shield1"/>
+        <prop actor="props/units/shields/ptol_hero_1.xml" attachpoint="shield2"/>
+      </props>
+      <textures>
+        <texture file="props/ptol_howdah_c.png" name="baseTex"/>
+        <texture file="props/ptol_howdah_a_norm.png" name="normTex"/>
+        <texture file="props/ptol_howdah_a_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Carthaginian elephant champion howdah white 2">
+      <props>
+        <prop actor="props/units/shields/ptol_hero_2.xml" attachpoint="shield1"/>
+        <prop actor="props/units/shields/ptol_hero_2.xml" attachpoint="shield2"/>
+      </props>
+      <textures>
+        <texture file="props/kush_howdah_01.png" name="baseTex"/>
+        <texture file="props/ptol_howdah_a_norm.png" name="normTex"/>
+        <texture file="props/ptol_howdah_a_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_e.xml
index 6fd3e51d74..42771c96b9 100644
--- a/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/kushites/infantry_swordsman_e.xml
@@ -96,7 +96,7 @@
   <group>
     <variant frequency="1" name="beja-shield">
       <props>
-        <prop actor="props/units/shields/kush_beja_rhino.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/kush_beja_big_reinforced_rhino.xml" attachpoint="shield"/>
       </props>
     </variant>
     <variant frequency="1" name="numidian-shield">
diff --git a/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_m.xml b/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_m.xml
index 8171817f61..0e2ee61642 100644
--- a/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_m.xml
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_m.xml
@@ -6,8 +6,9 @@
       <mesh>skeletal/elephant_african_forest.dae</mesh>
       <props>
         <prop actor="units/ptolemies/elephantry_c_d.xml" attachpoint="rider"/>
-        <prop actor="props/units/turret_ptol_champ_ele.xml" attachpoint="turret"/>
-        <prop actor="units/seleucids/elephantry_c_r.xml" attachpoint="turret"/>
+        <prop actor="props/units/elephant/ptol_turret_small.xml" attachpoint="turret"/>
+        <prop actor="props/units/elephant/cushion.xml" attachpoint="turret"/>
+        <prop actor="units/ptolemies/elephantry_c_r.xml" attachpoint="turret"/>
       </props>
     </variant>
   </group>
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
new file mode 100644
index 0000000000..bf604d8566
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/ptolemies/elephantry_c_r.xml
@@ -0,0 +1,33 @@
+<?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/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"/>
+      </props>
+      <textures>
+        <texture file="skeletal/ptol_isp_e_1.png" name="baseTex"/>
+        <texture file="skeletal/ptol_isp_e_1_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_capture.xml"/>
+    <variant file="biped/death_infantry.xml">
+      <props>
+        <prop actor="props/units/capes/pikeman.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans_spec.xml</material>
+</actor>