From 3537614b42953ef774330bb01e44ac894aeea597 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Wed, 8 Aug 2007 01:44:55 +0000
Subject: [PATCH] This was SVN commit r5286.

---
 .../actors/props/units/heads/head_pers_a.xml  | 23 +++++
 .../actors/props/units/shields/pers_tower.xml | 20 +++-
 .../actors/units/hellenes/super_unit_2.xml    |  2 +-
 .../units/persians/infantry_spearman_e.xml    | 99 ++++++++++++++++---
 .../actors/units/persians/super_unit_1.xml    |  5 +-
 .../units/romans/infantry_spearman_a.xml      |  2 +-
 .../units/romans/infantry_spearman_b.xml      |  2 +-
 .../units/romans/infantry_spearman_e.xml      |  2 +-
 .../skins/props/shield/pers_rect_a.dds        |  4 +-
 .../skins/props/shield/pers_rect_b.dds        |  4 +-
 .../skins/props/shield/pers_rect_c.dds        |  4 +-
 .../skins/props/shield/pers_rect_e.dds        |  4 +-
 .../textures/skins/skeletal/pers_isp_e_1.dds  |  3 +
 .../textures/skins/skeletal/pers_isp_e_2.dds  |  3 +
 .../units/pers_infantry_spearman_e.xml        |  9 +-
 .../mods/official/maps/scenarios/desert.pmp   |  4 +-
 .../mods/official/maps/scenarios/desert.xml   |  4 +-
 17 files changed, 159 insertions(+), 35 deletions(-)
 create mode 100644 binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_2.dds

diff --git a/binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml b/binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml
new file mode 100644
index 0000000000..f2095840a2
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/heads/head_pers_a.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="mesh">
+      <mesh>props/head_beard_small.pmd</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="pers-face-a">
+      <texture>props/head/pers_face_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="pers-face-b">
+      <texture>props/head/pers_face_b.dds</texture>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/props/units/shields/pers_tower.xml b/binaries/data/mods/official/art/actors/props/units/shields/pers_tower.xml
index 527c0762ee..10f07c813b 100644
--- a/binaries/data/mods/official/art/actors/props/units/shields/pers_tower.xml
+++ b/binaries/data/mods/official/art/actors/props/units/shields/pers_tower.xml
@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
+  <castshadow/>
+
   <group>
     <variant frequency="100" name="Mesh">
       <mesh>props/shield/spara_a_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/pers_tower_back.xml" attachpoint="back"/>
       </props>
-      <texture>props/shield/pers_rect_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant name="spara-texture-a">
+      <texture>props/shield/pers_rect_a.dds</texture>
+    </variant>
+    <variant name="spara-texture-b">
+      <texture>props/shield/pers_rect_b.dds</texture>
+    </variant>
+    <variant name="spara-texture-c">
+      <texture>props/shield/pers_rect_c.dds</texture>
+    </variant>
+    <variant name="spara-texture-e">
+      <texture>props/shield/pers_rect_e.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml
index f490c2c770..adcde384f8 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/super_unit_2.xml
@@ -9,7 +9,7 @@
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="120"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="6"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="8"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="8"/>
diff --git a/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml
index 5dc8f23ed4..17501ea9dc 100644
--- a/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/infantry_spearman_e.xml
@@ -6,25 +6,98 @@
   <group>
     <variant frequency="100" 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/spear/idle/isp_01.psa" name="Idle" speed="200"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="150"/>
         <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 event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Attack" speed="100"/>
+        <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_03.psa" name="Death" speed="200"/>
+        <animation file="infantry/general/death/inf_04.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_pants_c.pmd</mesh>
       <props>
-        <prop actor="props/temp/pers_sign_infantry_spearman_e.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_head_pers.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
       </props>
-      <texture>skeletal/plac_pers_e.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Clothing-emerald">
+      <texture>skeletal/pers_isp_e_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="Clothing-gold">
+      <texture>skeletal/pers_isp_e_2.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/shields/gerron_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="" attachpoint="shield"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/persians/super_unit_1.xml b/binaries/data/mods/official/art/actors/units/persians/super_unit_1.xml
index 8ed2528f54..ca46398d7e 100644
--- a/binaries/data/mods/official/art/actors/units/persians/super_unit_1.xml
+++ b/binaries/data/mods/official/art/actors/units/persians/super_unit_1.xml
@@ -9,7 +9,8 @@
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="120"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_01.psa" name="Melee" speed="100"/>
+        <animation file="infantry/sword/attack/isw_s_def_06.psa" name="Melee" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="6"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="8"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="8"/>
@@ -23,7 +24,7 @@
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
-        <prop actor="props/units/heads/placeholder_head_pers.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
         <prop actor="props/units/shields/gerron_b.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear_ball.xml" attachpoint="r_hand"/>
         <prop actor="props/temp/quiver.xml" attachpoint="back"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml
index 8df49eefa8..7d43298e56 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_a.xml
@@ -16,7 +16,7 @@
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="melee" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="melee" speed="100"/>
         <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="300"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml
index d1aca3ef91..920586e9f0 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_b.xml
@@ -15,7 +15,7 @@
         <animation file="infantry/general/chop.psa" name="gather_wood" speed="150"/>
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.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/dude/dudedeath_sword.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="death" speed="300"/>
         <animation file="infantry/general/death/inf_03.psa" name="death" speed="300"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml
index 7a4567da7c..ca1cd61e8e 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_spearman_e.xml
@@ -17,7 +17,7 @@
         <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
         <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="melee" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="melee" speed="100"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="melee" speed="100"/>
         <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="300"/>
         <animation file="infantry/general/death/inf_02.psa" name="death" speed="300"/>
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_a.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_a.dds
index df5e94a94e..3ba11b7af6 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_a.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_a.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:927affa9c2f59eff41e329420f127d751d682cc43be5d618b4e1bc5c2d9cce05
-size 8320
+oid sha256:32295f6a1c6df2e2435efee5dbbbd125444078b6db3e9cf9f09d74810666038a
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_b.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_b.dds
index a4f93f5b12..7af4f923bd 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_b.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_b.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8b00baa108b70a78dee5380f24b42d71dad40578ae1bf7937101ec5fedfb2c58
-size 8320
+oid sha256:6a861eeab9519eb146dfd49d96ca41d4019e726677117bbfd0283c2c09fb9285
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_c.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_c.dds
index 014be53523..bf529a64a8 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_c.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_c.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f4ec0aeea81603ff8d7c6144194fb4cb3420dfec0adec1ee6aabf442ca5ab2a
-size 8320
+oid sha256:26cb8d00d3f4cb0f2b85abbddae3f790a8030386cbd29c261d2f56d6c77f667d
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_e.dds b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_e.dds
index 352af36403..511ccb778f 100644
--- a/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_e.dds
+++ b/binaries/data/mods/official/art/textures/skins/props/shield/pers_rect_e.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ea311de41efbb67a4253952daa428302bfb0e6f0afa0805790a33962d3d36f6
-size 8320
+oid sha256:6db72320b3ae0ad82a07c0e697fbe590e1466a30b3d8368619e9daba64f4f466
+size 11088
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_1.dds
new file mode 100644
index 0000000000..6f7ee1eeb8
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31f34974e77d3d90b83d1407c80cc936a9ce547b4a86d82f340cc1f2d747eafe
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_2.dds b/binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_2.dds
new file mode 100644
index 0000000000..2be061d476
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/pers_isp_e_2.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c505974cd04b8fd2d4f192e4f86e3cfef32cc92064d9ea00ce00727cec87658
+size 22000
diff --git a/binaries/data/mods/official/entities/units/pers_infantry_spearman_e.xml b/binaries/data/mods/official/entities/units/pers_infantry_spearman_e.xml
index 39fbfb2bc8..2ebbbc2680 100644
--- a/binaries/data/mods/official/entities/units/pers_infantry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/pers_infantry_spearman_e.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="pers_infantry_spearman_a"
->
+<Entity Parent="pers_infantry_spearman_a">
+
+
+
+	<Actor>units/persians/infantry_spearman_e.xml</Actor>
+
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/maps/scenarios/desert.pmp b/binaries/data/mods/official/maps/scenarios/desert.pmp
index 55c89abe5a..c01cc39462 100644
--- a/binaries/data/mods/official/maps/scenarios/desert.pmp
+++ b/binaries/data/mods/official/maps/scenarios/desert.pmp
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:457c9354645155e64f179766b82c54bbaf208654da5de8fbb2c67bfa4c705f9d
-size 208102
+oid sha256:f49480e9abd074c37646853aed384c24c14831e0cd872c868a09588b06e0eb02
+size 208130
diff --git a/binaries/data/mods/official/maps/scenarios/desert.xml b/binaries/data/mods/official/maps/scenarios/desert.xml
index 036162288d..6d5c6f6f23 100644
--- a/binaries/data/mods/official/maps/scenarios/desert.xml
+++ b/binaries/data/mods/official/maps/scenarios/desert.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd5672e5c3b719a48d54cfadc5c93f14e3144d4f109a3a405f9b0513b1cdb14c
-size 83644
+oid sha256:ba18c5f5a5d03f21781a7082faa0a866803d7359cbe0ebf5a2542ead39c9c7ad
+size 84030