From 06d6528beee69708a8526a5e9c264433eb69fbe5 Mon Sep 17 00:00:00 2001
From: Wijitmaker <jason@wildfiregames.com>
Date: Sat, 13 May 2006 04:50:38 +0000
Subject: [PATCH] # Updated celt actors to grant the ability to collect
 resources

This was SVN commit r3856.
---
 .../mods/official/art/actors/temp/global.xml  |   4 +-
 .../art/actors/units/celts/female_citizen.xml |  18 ++-
 .../units/celts/infantry_javelinist_a.xml     |  76 ++++++++++-
 .../units/celts/infantry_javelinist_b.xml     | 118 +++++++++++-------
 .../units/celts/infantry_javelinist_e.xml     |  81 ++++++++++--
 .../units/celts/infantry_spearman_a.xml       |  80 ++++++++++--
 .../units/celts/infantry_spearman_b.xml       | 104 +++++++++------
 .../units/celts/infantry_spearman_e.xml       |  81 ++++++++++--
 8 files changed, 439 insertions(+), 123 deletions(-)

diff --git a/binaries/data/mods/official/art/actors/temp/global.xml b/binaries/data/mods/official/art/actors/temp/global.xml
index 41b3faf21e..2aa8f39406 100644
--- a/binaries/data/mods/official/art/actors/temp/global.xml
+++ b/binaries/data/mods/official/art/actors/temp/global.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
 
+  <castshadow/>
+
   <group>
     <variant frequency="100" name="Base">
-      <animations/>
       <mesh>test/globaltest.pmd</mesh>
-      <props/>
       <texture>structural/global.dds</texture>
     </variant>
   </group>
diff --git a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
index 0cd8c4bd25..484f9c593c 100644
--- a/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/female_citizen.xml
@@ -6,11 +6,23 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/fem_idle.psa" name="Idle" speed="200"/>
+		<!-- Class Specific -->
+	    <animation file="biped/fem_idle.psa" name="Idle" speed="200"/>
         <animation file="biped/fem_walk.psa" name="Walk" speed="10"/>
+		<!-- Citzen Soldier Specific -->
+        <animation file="biped/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="biped/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="biped/mine.psa" name="gather_stone" speed="150"/>
         <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
+		<!-- Shared  -->
+        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>
         <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/f_dress.pmd</mesh>
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
index 44f0a48e8f..8e0c5409f8 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_a.xml
@@ -5,15 +5,31 @@
 
   <group>
     <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
+      <animations>
+		<!-- Class Specific -->
+	    <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.5" file="biped/inf_jav_atk_a.psa" load="0" name="Melee" speed="100"/>
         <animation file="biped/dudewalk.psa" name="Walk" speed="20"/>
+		<!-- Stamina Specific -->
+        <animation file="biped/inf_sword_shield_run_a.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_b.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_c.psa" name="Run" speed="10"/>
+		<!-- Citzen Soldier Specific -->
+        <animation file="biped/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="biped/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="biped/mine.psa" name="gather_stone" speed="150"/>
         <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
+		<!-- Shared  -->
+        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>
         <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_jav_atk_a.psa" load="0" name="Attack" speed="100"/>
-      </animations>
+      </animations>	
       <mesh>skeletal/m_pants_b.pmd</mesh>
       <props>
         <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
@@ -59,6 +75,54 @@
       <texture>skeletal/celt_ijv_a_11.dds</texture>
     </variant>
   </group>
+  
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+      </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"/>
+      </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"/>
+      </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="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>
 
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
index 15d707afc5..2c51e51339 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_b.xml
@@ -6,55 +6,30 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/idle.psa" name="Idle" speed="200"/>		
-        <animation file="biped/inf_idle_jav.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_a.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_b.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_c.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_d.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_e.psa" name="Idle" speed="200"/>
-		
-        <animation file="biped/inf_salute_a.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_b.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_c.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_d.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_e.psa" name="Ready" speed="200"/>		
-		
-        <animation file="biped/dudewalk.psa" name="Walk" speed="20"/>
-		
+		<!-- Class Specific -->
+	    <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.5" file="biped/inf_jav_atk_a.psa" load="0" name="Melee" speed="100"/>
+        <animation file="biped/dudewalk.psa" name="Walk" speed="20"/>
+		<!-- Stamina Specific -->
         <animation file="biped/inf_sword_shield_run_a.psa" name="Run" speed="10"/>
         <animation file="biped/inf_sword_shield_run_b.psa" name="Run" speed="10"/>
-        <animation file="biped/inf_sword_shield_run_c.psa" name="Run" speed="10"/>
-		
-        <animation event="0.5" file="biped/inf_jav_atk_a.psa" load="0" name="Ranged" speed="100"/>
-        <animation event="0.5" file="biped/inf_jav_atk_b.psa" load="0" name="Ranged" speed="100"/>
-        <animation event="0.5" file="biped/inf_jav_atk_c.psa" load="0" name="Ranged" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
-        <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="Charge" speed="100"/>		
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Charge" speed="100"/>
-		
-        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Mine" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Forage" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Gather" speed="150"/>		
-        <animation file="biped/dudechop.psa" name="Hoe" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Fish" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Hunt" speed="150"/>
-		
-        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
-        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>	
-		
-        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
-		
-      </animations>
+        <animation file="biped/inf_sword_shield_run_c.psa" name="Run" speed="10"/>
+		<!-- Citzen Soldier Specific -->
+        <animation file="biped/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="biped/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="biped/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
+		<!-- Shared  -->
+        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>
+        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
+      </animations>	
       <mesh>skeletal/m_pants_b.pmd</mesh>
       <props>
         <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
@@ -65,6 +40,55 @@
       <texture>skeletal/celt_ijv_b_01.dds</texture>
     </variant>
   </group>
+  
+  
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+      </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"/>
+      </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"/>
+      </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="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>
 
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
index b5af1603b8..0d743a29ae 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_javelinist_e.xml
@@ -6,14 +6,30 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk.psa" name="Walk" speed="20"/>
-        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_jav_atk_a.psa" load="0" name="Attack" speed="100"/>
-      </animations>
+		<!-- Class Specific -->
+	    <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
+        <animation event="0.5" file="biped/inf_jav_atk_a.psa" load="0" name="Melee" speed="100"/>
+        <animation file="biped/dudewalk.psa" name="Walk" speed="20"/>
+		<!-- Stamina Specific -->
+        <animation file="biped/inf_sword_shield_run_a.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_b.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_c.psa" name="Run" speed="10"/>
+		<!-- Citzen Soldier Specific -->
+        <animation file="biped/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="biped/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="biped/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
+		<!-- Shared  -->
+        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>
+        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
+      </animations>	
       <mesh>skeletal/m_tights.pmd</mesh>
       <props>
         <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
@@ -33,6 +49,55 @@
       <texture>skeletal/celt_ijv_e_02.dds</texture>
     </variant>
   </group>
+  
+  
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="projectile"/>
+      </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"/>
+      </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"/>
+      </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="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>
 
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml
index 0243cf58b3..e607d73dc8 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_a.xml
@@ -5,14 +5,31 @@
 
   <group>
     <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_idle_spear.psa" name="Idle" speed="200"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
-        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
-        <animation event="0.35" file="biped/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Attack" speed="100"/>
+      <animations>
+		<!-- Class Specific -->
+        <animation file="biped/inf_idle_spear.psa" name="Idle" speed="200"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
+		<!-- Stamina Specific -->
+        <animation file="biped/inf_sword_shield_run_a.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_b.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_c.psa" name="Run" speed="10"/>
+		<!-- Citzen Soldier Specific -->
+        <animation file="biped/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="biped/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="biped/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
+		<!-- Shared  -->
+        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>
+        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
@@ -58,6 +75,53 @@
       <texture>skeletal/celt_isw_a_01.dds</texture>
     </variant>
   </group>
+  
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="" attachpoint="l_hand"/>
+	    <prop actor="props/units/shields/celt_scutum_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear.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="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>
 
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml
index 26aa51cda8..20110b4400 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_b.xml
@@ -6,53 +6,30 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/idle.psa" name="Idle" speed="200"/>	  
+		<!-- Class Specific -->
         <animation file="biped/inf_idle_spear.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_a.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_b.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_c.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_d.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_salute_e.psa" name="Idle" speed="200"/>	
-		
-        <animation file="biped/inf_salute_a.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_b.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_c.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_d.psa" name="Ready" speed="200"/>
-        <animation file="biped/inf_salute_e.psa" name="Ready" speed="200"/>		
-		
-        <animation file="biped/dudewalk.psa" name="Walk" speed="20"/>		
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
-		
+        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
+		<!-- Stamina Specific -->
         <animation file="biped/inf_sword_shield_run_a.psa" name="Run" speed="10"/>
         <animation file="biped/inf_sword_shield_run_b.psa" name="Run" speed="10"/>
         <animation file="biped/inf_sword_shield_run_c.psa" name="Run" speed="10"/>
-		
-        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
-        <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="Charge" speed="100"/>
-        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Charge" speed="100"/>
-		
-        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Mine" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Forage" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Gather" speed="150"/>		
-        <animation file="biped/dudechop.psa" name="Hoe" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Fish" speed="150"/>
-        <animation file="biped/dudechop.psa" name="Hunt" speed="150"/>
-		
-        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
-        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>		
-        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>		
+		<!-- Citzen Soldier Specific -->
+        <animation file="biped/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="biped/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="biped/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
+		<!-- Shared  -->
+        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>
         <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>
-		
         <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
-
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
@@ -77,6 +54,53 @@
       <texture>skeletal/celt_isw_b_04.dds</texture>
     </variant>
   </group>
+  
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="" attachpoint="l_hand"/>        
+		<prop actor="props/units/shields/celt_scutum_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear.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="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>
 
diff --git a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml
index bb1dfbddc3..98cfdca7f8 100644
--- a/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/infantry_spearman_e.xml
@@ -5,15 +5,31 @@
 
   <group>
     <variant frequency="100" name="Base">
-      <animations>
-        <animation file="biped/inf_idle_spear.psa" name="Idle" speed="200"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
-        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
-        <animation event="0.35" file="biped/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="biped/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="biped/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"/>
+      <animations>
+		<!-- Class Specific -->
+        <animation file="biped/inf_idle_spear.psa" name="Idle" speed="200"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Melee" speed="100"/>
+		<!-- Stamina Specific -->
+        <animation file="biped/inf_sword_shield_run_a.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_b.psa" name="Run" speed="10"/>
+        <animation file="biped/inf_sword_shield_run_c.psa" name="Run" speed="10"/>
+		<!-- Citzen Soldier Specific -->
+        <animation file="biped/chop.psa" name="gather_wood" speed="100"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="150"/>
+        <animation file="biped/forage.psa" name="gather_fruit" speed="35"/>
+        <animation file="biped/mine.psa" name="gather_stone" speed="150"/>
+        <animation file="biped/dudebuild.psa" name="Build" speed="150"/>
+		<!-- Shared  -->
+        <animation file="biped/inf_death_a.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_b.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_c.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_d.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_e.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_f.psa" name="Death" speed="200"/>
+        <animation file="biped/inf_death_g.psa" name="Death" speed="200"/>
+        <animation file="biped/dudedecay_sword.psa" name="Corpse" speed="100"/>
       </animations>
       <mesh>skeletal/m_pants_c.pmd</mesh>
       <props>
@@ -33,6 +49,53 @@
       <texture>skeletal/celt_isw_e_02.dds</texture>
     </variant>
   </group>
+  
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop actor="props/units/shields/celt_scutum_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear.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="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>