From e2d2789c1b50b55778469ebd657232dd376e9015 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Fri, 21 Dec 2007 20:01:34 +0000
Subject: [PATCH] This was SVN commit r5523.

---
 .../props/units/shields/celt_scutum_b.xml     | 66 +++++++++----------
 .../props/units/shields/iber_scutum_su1.xml   | 29 ++++++++
 .../actors/units/iberians/super_unit_1.xml    | 28 ++++----
 .../actors/units/persians/super_unit_2.xml    | 10 +--
 .../units/persians/super_unit_2_mahout.xml    |  7 +-
 .../units/persians/super_unit_2_raja.xml      |  7 +-
 .../art/animation/quadraped/elephant_idle.psa |  3 +
 .../quadraped/elephant_rider_idle.psa         |  3 +
 .../art/animation/quadraped/elephant_walk.psa |  3 +
 .../art/meshes/skeletal/elephant_propped.pmd  |  3 +
 .../art/meshes/test/elephaunt_propped.pmd     |  3 +
 .../skins/props/shield/iber_oval_i.dds        |  2 +-
 .../skeletal/high/256_iber_su1_devotio_1.dds  |  3 +
 .../skins/skeletal/iber_su1_devotio_1.dds     |  3 +
 14 files changed, 113 insertions(+), 57 deletions(-)
 create mode 100644 binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_su1.xml
 create mode 100644 binaries/data/mods/official/art/animation/quadraped/elephant_idle.psa
 create mode 100644 binaries/data/mods/official/art/animation/quadraped/elephant_rider_idle.psa
 create mode 100644 binaries/data/mods/official/art/animation/quadraped/elephant_walk.psa
 create mode 100644 binaries/data/mods/official/art/meshes/skeletal/elephant_propped.pmd
 create mode 100644 binaries/data/mods/official/art/meshes/test/elephaunt_propped.pmd
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_su1_devotio_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/iber_su1_devotio_1.dds

diff --git a/binaries/data/mods/official/art/actors/props/units/shields/celt_scutum_b.xml b/binaries/data/mods/official/art/actors/props/units/shields/celt_scutum_b.xml
index 8c6331bc61..ba066f24db 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/celt_scutum_b.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/celt_scutum_b.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <group>
-    <variant name="Base">
-      <mesh>props/shield/scutum_c_f.pmd</mesh>
-      <props>
-        <prop actor="props/units/shields/scutum_back.xml" attachpoint="back"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant name="A">
-      <texture>props/shield/celt_oval1_a.dds</texture>
-    </variant>
-    <variant name="B">
-      <texture>props/shield/celt_oval1_b.dds</texture>
-    </variant>
-    <variant name="C">
-      <texture>props/shield/celt_oval1_c.dds</texture>
-    </variant>
-    <variant name="D">
-      <texture>props/shield/celt_oval1_d.dds</texture>
-    </variant>
-    <variant name="E">
-      <texture>props/shield/celt_oval1_e.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <group>
+    <variant name="Base">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/scutum_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="A">
+      <texture>props/shield/celt_oval1_a.dds</texture>
+    </variant>
+    <variant name="B">
+      <texture>props/shield/celt_oval1_b.dds</texture>
+    </variant>
+    <variant name="C">
+      <texture>props/shield/celt_oval1_c.dds</texture>
+    </variant>
+    <variant name="D">
+      <texture>props/shield/celt_oval1_d.dds</texture>
+    </variant>
+    <variant name="E">
+      <texture>props/shield/celt_oval1_e.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_su1.xml b/binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_su1.xml
new file mode 100644
index 0000000000..91dab4b983
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_su1.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant name="Base">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <props>
+        <prop actor="props/units/shields/scutum_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="shield-scutum-h">
+      <texture>props/shield/iber_oval_h.dds</texture>
+    </variant>
+    <variant name="shield-scutum-i">
+      <texture>props/shield/iber_oval_i.dds</texture>
+    </variant>
+    <variant name="shield-scutum-j">
+      <texture>props/shield/iber_oval_j.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/iberians/super_unit_1.xml b/binaries/data/mods/official/art/actors/units/iberians/super_unit_1.xml
index 40e3e42fad..3f90fae493 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/super_unit_1.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/super_unit_1.xml
@@ -4,24 +4,28 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation file="infantry/general/dude/dudeattack.psa" name="Attack" speed="100"/>
-        <animation file="infantry/general/dude/dudeattack1.psa" name="Attack" speed="100"/>
+        <animation file="infantry/sword/attack/isw_s_off_05.psa" name="idle" speed="1"/>
+        <animation file="biped/dudewalk_swordshield.psa" name="walk" speed="18"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="run" speed="8"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="melee" speed="150"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="melee" speed="150"/>
+        <animation file="infantry/general/death/inf_01.psa" name="death" speed="200"/>
+        <animation file="infantry/general/death/inf_02.psa" name="death" speed="200"/>
+        <animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
+        <animation file="infantry/general/death/inf_07.psa" name="death" speed="200"/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
-        <prop actor="props/temp/placeholder_helmet_e.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/iber_scutum_su1.xml" attachpoint="shield"/>
       </props>
-      <texture>skeletal/iberians-test.dds</texture>
+      <texture>skeletal/iber_su1_devotio_1.dds</texture>
     </variant>
   </group>
 
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
index a5a6af13ef..5885a46a77 100644
--- a/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2.xml
@@ -6,12 +6,12 @@
   <group>
     <variant frequency="100" name="Mesh">
       <animations>
-        <animation file="quadraped/horseidle.psa" name="Idle" speed="100"/>
-        <animation file="quadraped/horse_walk.psa" name="walk" speed="100"/>
-        <animation file="quadraped/horse_walk.psa" name="run " speed="100"/>
-        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="100"/>
+        <animation file="quadraped/elephant_idle.psa" name="Idle" speed="100"/>
+        <animation file="quadraped/elephant_walk.psa" name="walk" speed="15"/>
+        <animation file="quadraped/elephant_walk.psa" name="run " speed="20"/>
+        <animation file="quadraped/elephant_idle.psa" name="melee" speed="100"/>
       </animations>
-      <mesh>test/elephaunt propped.pmd</mesh>
+      <mesh>skeletal/elephant_propped.pmd</mesh>
       <props>
         <prop actor="units/persians/super_unit_2_mahout.xml" attachpoint="rider1"/>
         <prop actor="units/persians/super_unit_2_raja.xml" attachpoint="rider2"/>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml
index f5f9f91d30..88182d9391 100644
--- a/binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_mahout.xml
@@ -6,9 +6,10 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
-        <animation file="biped/cavalryidle.psa" name="Run" speed="8"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Walk" speed="18"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Run" speed="8"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="melee" speed="50"/>
       </animations>
       <mesh>skeletal/m_tights.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml
index 8d994438a8..57ad2e2bde 100644
--- a/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_2_raja.xml
@@ -6,9 +6,10 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
-        <animation file="biped/cavalryidle.psa" name="Run" speed="8"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Walk" speed="18"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="Run" speed="8"/>
+        <animation file="quadraped/elephant_rider_idle.psa" name="melee" speed="50"/>
       </animations>
       <props>
         <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
diff --git a/binaries/data/mods/official/art/animation/quadraped/elephant_idle.psa b/binaries/data/mods/official/art/animation/quadraped/elephant_idle.psa
new file mode 100644
index 0000000000..e01ddf4dfe
--- /dev/null
+++ b/binaries/data/mods/official/art/animation/quadraped/elephant_idle.psa
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:053e4561d416c1aac6222bbde2fb4b7dea00ff807dbc2b4e71c9065b0bd3f7d2
+size 151293
diff --git a/binaries/data/mods/official/art/animation/quadraped/elephant_rider_idle.psa b/binaries/data/mods/official/art/animation/quadraped/elephant_rider_idle.psa
new file mode 100644
index 0000000000..7ac5cf9577
--- /dev/null
+++ b/binaries/data/mods/official/art/animation/quadraped/elephant_rider_idle.psa
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f74e7c38fc592052e6e0d1510e4f099d4eb028a67764407392f5b0e01f541e76
+size 122649
diff --git a/binaries/data/mods/official/art/animation/quadraped/elephant_walk.psa b/binaries/data/mods/official/art/animation/quadraped/elephant_walk.psa
new file mode 100644
index 0000000000..729347d9e4
--- /dev/null
+++ b/binaries/data/mods/official/art/animation/quadraped/elephant_walk.psa
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea14e3a2bb626c22480a8b0475f5c5ad1193ee598ec5b211ef9597045ff0b065
+size 151293
diff --git a/binaries/data/mods/official/art/meshes/skeletal/elephant_propped.pmd b/binaries/data/mods/official/art/meshes/skeletal/elephant_propped.pmd
new file mode 100644
index 0000000000..3544e3a588
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/skeletal/elephant_propped.pmd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:968d03ab519379b72c9aae1afc5c33680bff8f50bfe892d43bc72f28616fc020
+size 22838
diff --git a/binaries/data/mods/official/art/meshes/test/elephaunt_propped.pmd b/binaries/data/mods/official/art/meshes/test/elephaunt_propped.pmd
new file mode 100644
index 0000000000..d479eef9cb
--- /dev/null
+++ b/binaries/data/mods/official/art/meshes/test/elephaunt_propped.pmd
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5365f5618ea8325d6409cd2101aef560ca70bc23f8cad5d641538e3f7e967055
+size 18826
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_i.dds b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_i.dds
index 4a9c23a214..2b75593957 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_i.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/iber_oval_i.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c79dbff0f851c80502bfc4847fce321968e463d69eadc1fadfeb5af396f8afc
+oid sha256:db20474979168000c1c6bf621bf80f0abd8248d9bd066b90f5adb9e5e776ef5e
 size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_su1_devotio_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_su1_devotio_1.dds
new file mode 100644
index 0000000000..8f1965d40d
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_su1_devotio_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9d77604af5aac0f070e15ca6233b9706df0a165157ea98721f4324a288beaa1
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/iber_su1_devotio_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/iber_su1_devotio_1.dds
new file mode 100644
index 0000000000..60c0fcfd41
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/iber_su1_devotio_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ffc863e8dc481f46c46c7bd41f73bd9f12489f4ae1317acb002a8946c1da87e
+size 22000