From de18ea4fe13db76e7b66627f6efd467a1a4a2e1c Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Tue, 19 Feb 2008 17:31:01 +0000
Subject: [PATCH] This was SVN commit r5643.

---
 .../props/units/shields/iber_scutum_isp.xml   |  47 ++++++++
 .../units/iberians/infantry_spearman_a.xml    | 101 ++++++++++++++---
 .../units/iberians/infantry_spearman_b.xml    | 103 ++++++++++++++++--
 .../units/hele_infantry_spearman_e.xml        |   2 -
 .../scenarios/cantabrian_generated_mythos.xml |   4 +-
 5 files changed, 228 insertions(+), 29 deletions(-)
 create mode 100644 binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_isp.xml

diff --git a/binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_isp.xml b/binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_isp.xml
new file mode 100644
index 0000000000..e4528a7adb
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/shields/iber_scutum_isp.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant name="Base">
+      <props>
+        <prop actor="props/units/shields/scutum_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="shield-scutum-b">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <texture>props/shield/iber_oval_b.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-scutum-c">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <texture>props/shield/iber_oval_c.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-scutum-d">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <texture>props/shield/iber_oval_d.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-scutum-e">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <texture>props/shield/iber_oval_e.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-scutum-f">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <texture>props/shield/iber_oval_f.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-scutum-g">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <texture>props/shield/iber_oval_g.dds</texture>
+    </variant>
+    <variant frequency="1" name="shield-scutum-k">
+      <mesh>props/shield/scutum_c_f.pmd</mesh>
+      <texture>props/shield/iber_oval_k.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_a.xml
index 7d5351f285..882f72e68f 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_a.xml
@@ -4,27 +4,102 @@
   <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/sword/attack/isw_s_off_05.psa" name="Idle" speed="1"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="12"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="12"/>
         <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/forage.psa" name="gather_fruit" speed="75"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <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_b.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/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="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="death" speed="300"/>
+        <animation file=""/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
       <props>
-        <prop actor="props/temp/iber_sign_infantry_spearman_a.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_a.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/iber_scutum_isp.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
       </props>
-      <texture>skeletal/plac_iber_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Iberian-Tunic">
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
+      <texture>skeletal/iber_isw_a_1.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/iber_scutum_isp.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_b.xml
index d46d2a4af5..43cc6926b4 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/infantry_spearman_b.xml
@@ -4,26 +4,105 @@
   <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/sword/attack/isw_s_off_05.psa" name="Idle" speed="1"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="12"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="12"/>
         <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/forage.psa" name="gather_fruit" speed="75"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <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_b.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/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="300"/>
+        <animation file="infantry/general/death/inf_02.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_03.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_04.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_06.psa" name="death" speed="300"/>
+        <animation file="infantry/general/death/inf_07.psa" name="death" speed="300"/>
+        <animation file=""/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
-        <prop actor="props/temp/iber_sign_infantry_spearman_b.xml" attachpoint="head_extra"/>
-        <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/iber_scutum_isp.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
       </props>
-      <texture>skeletal/plac_iber_b.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Iberian-Tunic-gold">
+      <texture>skeletal/iber_isw_b_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="Iberian-Tunic-brown">
+      <texture>skeletal/iber_isw_b_2.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/iber_scutum_isp.xml" attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="gather_wood">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_stone">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="gather_metal">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml b/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
index 971efda0c4..b93917ad69 100644
--- a/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/hele_infantry_spearman_e.xml
@@ -5,9 +5,7 @@
 	<Traits>
 
 		<Id>
-
 			<Icon_Cell>5</Icon_Cell>
-
 		</Id>
 
 		<Armour>
diff --git a/binaries/data/mods/official/maps/scenarios/cantabrian_generated_mythos.xml b/binaries/data/mods/official/maps/scenarios/cantabrian_generated_mythos.xml
index f90989ad7b..1e6b0aa1e6 100644
--- a/binaries/data/mods/official/maps/scenarios/cantabrian_generated_mythos.xml
+++ b/binaries/data/mods/official/maps/scenarios/cantabrian_generated_mythos.xml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed4109458b2b161770567bc127e9feca2e6f3cbeafdc988726b273136e429554
-size 1345149
+oid sha256:e2e2c1dc1116665e6c352420185892f03e1706f61c859f19065c83eb2fac5fba
+size 1345157