From 2ac337846745584f1c8bb3ea8711b4c37f09eb23 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sat, 7 Mar 2009 06:00:48 +0000
Subject: [PATCH] #New spears.

This was SVN commit r6729.
---
 .../art/actors/temp/mace_su1_hypaspist.xml    |   2 +-
 .../units/romans/infantry_spearman_a.xml      |   4 +-
 .../units/romans/infantry_spearman_b.xml      |   4 +-
 .../units/romans/infantry_spearman_e.xml      |   4 +-
 .../actors/props/units/weapons/sarissa.xml    |  21 ++
 .../props/units/weapons/spear_hoplite.xml     |  13 +
 .../props/units/weapons/spear_lance.xml       |  13 +
 .../units/hellenes/infantry_spearman_a.xml    | 268 ++++++++--------
 .../units/hellenes/infantry_spearman_e.xml    | 294 +++++++++---------
 .../actors/units/hellenes/super_unit_1.xml    |   8 +-
 .../actors/units/hellenes/super_unit_3.xml    | 100 +++---
 .../actors/units/hellenes/super_unit_4_r.xml  |   2 +-
 .../public/art/meshes/props/sarissa_a.dae     |   3 +
 .../public/art/meshes/props/sarissa_b.dae     |   3 +
 .../public/art/meshes/props/spear_hoplite.dae |   3 +
 .../public/art/meshes/props/spear_lance.dae   |   3 +
 16 files changed, 402 insertions(+), 343 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/units/weapons/sarissa.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/weapons/spear_hoplite.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/weapons/spear_lance.xml
 create mode 100644 binaries/data/mods/public/art/meshes/props/sarissa_a.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/sarissa_b.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/spear_hoplite.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/spear_lance.dae

diff --git a/binaries/data/mods/internal/art/actors/temp/mace_su1_hypaspist.xml b/binaries/data/mods/internal/art/actors/temp/mace_su1_hypaspist.xml
index 5d41df735b..a4a41f6fe1 100644
--- a/binaries/data/mods/internal/art/actors/temp/mace_su1_hypaspist.xml
+++ b/binaries/data/mods/internal/art/actors/temp/mace_su1_hypaspist.xml
@@ -20,7 +20,7 @@
       <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
         <prop actor="props/units/shields/mace_round_hypaspist.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/heads/mace_su1.xml" attachpoint="helmet"/>
       </props>
diff --git a/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_a.xml b/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_a.xml
index 4c1dcfad49..5abf6f3cbc 100644
--- a/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_a.xml
+++ b/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_a.xml
@@ -28,7 +28,7 @@
         <prop actor="props/units/heads/rome_etrusco_a.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/rome_head_veteran.xml" attachpoint="head"/>
         <prop actor="props/units/shields/rome_scutum_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
       </props>
       <texture>skeletal/rome_isp_a.dds</texture>
     </variant>
@@ -38,7 +38,7 @@
     <variant frequency="1" name="Idle"/>
     <variant name="Melee">
       <props>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_b.xml b/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_b.xml
index 19596ffbc6..542dd4a08e 100644
--- a/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_b.xml
+++ b/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_b.xml
@@ -28,7 +28,7 @@
         <prop actor="props/units/heads/rome_etrusco_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/rome_head_veteran.xml" attachpoint="head"/>
         <prop actor="props/units/shields/rome_scutum_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
       </props>
       <texture>skeletal/rome_isw_e.dds</texture>
     </variant>
@@ -38,7 +38,7 @@
     <variant frequency="1" name="Idle"/>
     <variant name="Melee">
       <props>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_e.xml b/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_e.xml
index eb43b19772..df88101703 100644
--- a/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_e.xml
+++ b/binaries/data/mods/internal/art/actors/units/romans/infantry_spearman_e.xml
@@ -31,7 +31,7 @@
         <prop actor="props/units/heads/rome_etrusco_e.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/rome_head_veteran.xml" attachpoint="head"/>
         <prop actor="props/units/shields/rome_scutum_e.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
@@ -47,7 +47,7 @@
     <variant frequency="1" name="Idle"/>
     <variant name="Melee">
       <props>
-        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="gather_wood">
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/sarissa.xml b/binaries/data/mods/public/art/actors/props/units/weapons/sarissa.xml
new file mode 100644
index 0000000000..63bda0a1c4
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/sarissa.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant name="Base">
+      <texture>props/prop_weap.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="sarissa_a">
+      <mesh>props/sarissa_a.dae</mesh>
+    </variant>
+    <variant frequency="1" name="sarissa_b">
+      <mesh>props/sarissa_b.dae</mesh>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/spear_hoplite.xml b/binaries/data/mods/public/art/actors/props/units/weapons/spear_hoplite.xml
new file mode 100644
index 0000000000..1aeb773c69
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/spear_hoplite.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant name="Base">
+      <mesh>props/spear_hoplite.dae</mesh>
+      <texture>props/prop_weap.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/spear_lance.xml b/binaries/data/mods/public/art/actors/props/units/weapons/spear_lance.xml
new file mode 100644
index 0000000000..6d85908fe8
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/spear_lance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant name="Base">
+      <mesh>props/spear_lance.dae</mesh>
+      <texture>props/prop_weap.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml
index 33c12a62fc..535f691595 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="Base">
-      <animations>
-        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
-        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="13"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="100"/>
-        <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
-        <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
-        <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"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-      </animations>
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/shields/hele_round_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Helmet-Corinthians">
-      <props>
-        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/hele_hoplite_a.xml" attachpoint="helmet"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="Helmet-Later">
-      <props>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/hele_hoplite_a2.xml" attachpoint="helmet"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Armour-a">
-      <texture>skeletal/hele_isp_a.dds</texture>
-    </variant>
-    <variant frequency="1" name="Armour-b">
-      <texture>skeletal/hele_csw_e.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="100" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="13"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="100"/>
+        <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
+        <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
+        <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"/>
+        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/hele_round_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Helmet-Corinthians">
+      <props>
+        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_hoplite_a.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Helmet-Later">
+      <props>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_hoplite_a2.xml" attachpoint="helmet"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Armour-a">
+      <texture>skeletal/hele_isp_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="Armour-b">
+      <texture>skeletal/hele_csw_e.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml
index 7d115d5f97..b8b4466afb 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml
@@ -1,147 +1,147 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="Base">
-      <animations>
-        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
-        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="13"/>
-        <animation file="infantry/general/chop.psa" name="gather_wood" speed="150"/>
-        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
-        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
-        <animation file="infantry/general/forage.psa" name="gather_meat" speed="100"/>
-        <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="250"/>
-        <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"/>
-      </animations>
-      <props>
-        <prop actor="props/units/shields/hele_round_e.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="3" name="Helmet-Corinthian-Varieties">
-      <props>
-        <prop actor="props/units/heads/hele_hoplite_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant frequency="1" name="Helmets-Illyrian-Chalcidean-Varieties">
-      <props>
-        <prop actor="props/units/heads/hele_hoplite_e2.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="2" name="armour-var-a">
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <texture>skeletal/hele_isp_e_a.dds</texture>
-    </variant>
-    <variant frequency="1" name="armour-var-c">
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <texture>skeletal/hele_isp_e_c.dds</texture>
-    </variant>
-    <variant frequency="1" name="armour-var-d">
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <texture>skeletal/hele_isp_e_d.dds</texture>
-    </variant>
-    <variant frequency="4" name="armour-var-f">
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <texture>skeletal/hele_isp_e_f.dds</texture>
-    </variant>
-    <variant frequency="1" name="armour-var-g">
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <texture>skeletal/hele_isp_e_g.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant name="Melee">
-      <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </props>
-    </variant>
-    <variant name="gather_meat">
-      <props>
-        <prop attachpoint="helmet"/>
-        <prop attachpoint="r_hand"/>
-        <prop attachpoint="shield"/>
-        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-      </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"/>
-        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
-        <prop attachpoint=""/>
-      </props>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="20"/>
+        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
+        <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="13"/>
+        <animation file="infantry/general/chop.psa" name="gather_wood" speed="150"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="400"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="100"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="100"/>
+        <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="250"/>
+        <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"/>
+      </animations>
+      <props>
+        <prop actor="props/units/shields/hele_round_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="3" name="Helmet-Corinthian-Varieties">
+      <props>
+        <prop actor="props/units/heads/hele_hoplite_e.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="Helmets-Illyrian-Chalcidean-Varieties">
+      <props>
+        <prop actor="props/units/heads/hele_hoplite_e2.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="armour-var-a">
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <texture>skeletal/hele_isp_e_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="armour-var-c">
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <texture>skeletal/hele_isp_e_c.dds</texture>
+    </variant>
+    <variant frequency="1" name="armour-var-d">
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <texture>skeletal/hele_isp_e_d.dds</texture>
+    </variant>
+    <variant frequency="4" name="armour-var-f">
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <texture>skeletal/hele_isp_e_f.dds</texture>
+    </variant>
+    <variant frequency="1" name="armour-var-g">
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <texture>skeletal/hele_isp_e_g.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+      </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"/>
+        <prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
+        <prop attachpoint=""/>
+      </props>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml
index bdeab0ccb3..064a7eae7b 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_1.xml
@@ -20,7 +20,7 @@
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_hele_h.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
         <prop actor="props/units/cape_m_long.xml" attachpoint="shoulders"/>
       </props>
       <texture>skeletal/hele_spartitiate_a.dds</texture>
@@ -46,17 +46,17 @@
     <variant frequency="100" name="Idle"/>
     <variant name="Melee">
       <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="Walk">
       <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
       </props>
     </variant>
     <variant name="Run">
       <props>
-        <prop actor="props/units/weapons/spear_reverse.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml
index 3becafbba6..b746705a6a 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_3.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="1" name="Base">
-      <animations>
-        <animation file="biped/inf_phalanx_c.psa" name="Idle" speed="200"/>
-        <animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="17"/>
-        <animation file="biped/inf_phalanx_walk_a.psa" name="run" speed="18"/>
-        <animation event="0.5" file="biped/inf_phalanx_atk_a.psa" name="melee" speed="500"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="death" speed="165"/>
-        <animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
-      </animations>
-      <mesh>skeletal/m_tunic_short.dae</mesh>
-      <props>
-        <prop actor="props/units/shields/mace_round_su3.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/spear_long.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="5" name="Armour-Linen-Linothorax">
-      <props>
-        <prop actor="props/units/heads/hele_su3.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-      </props>
-      <texture>skeletal/hele_pezhetairoi_3.dds</texture>
-    </variant>
-    <variant frequency="5" name="Armour-Reinforced Linothorax">
-      <props>
-        <prop actor="props/units/heads/hele_su3.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-      </props>
-      <texture>skeletal/hele_pezhetairoi.dds</texture>
-    </variant>
-    <variant frequency="2" name="Armour-Bronze Cuirass">
-      <props>
-        <prop actor="props/units/heads/hele_mace_frontranker.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-      </props>
-      <texture>skeletal/hele_pezhetairoi_2.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="Base">
+      <animations>
+        <animation file="biped/inf_phalanx_c.psa" name="Idle" speed="200"/>
+        <animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="17"/>
+        <animation file="biped/inf_phalanx_walk_a.psa" name="run" speed="18"/>
+        <animation event="0.5" file="biped/inf_phalanx_atk_a.psa" name="melee" speed="500"/>
+        <animation file="infantry/general/dude/dudedeath_sword.psa" name="death" speed="165"/>
+        <animation file="infantry/general/death/inf_06.psa" name="death" speed="200"/>
+      </animations>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_su3.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/sarissa.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="5" name="Armour-Linen-Linothorax">
+      <props>
+        <prop actor="props/units/heads/hele_su3.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+      </props>
+      <texture>skeletal/hele_pezhetairoi_3.dds</texture>
+    </variant>
+    <variant frequency="5" name="Armour-Reinforced Linothorax">
+      <props>
+        <prop actor="props/units/heads/hele_su3.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+      </props>
+      <texture>skeletal/hele_pezhetairoi.dds</texture>
+    </variant>
+    <variant frequency="2" name="Armour-Bronze Cuirass">
+      <props>
+        <prop actor="props/units/heads/hele_mace_frontranker.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+      </props>
+      <texture>skeletal/hele_pezhetairoi_2.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml
index 2a2a508c33..8b6e122850 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/super_unit_4_r.xml
@@ -16,7 +16,7 @@
       <props>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/heads/hele_cav_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/spear_long.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear_lance.xml" attachpoint="r_hand"/>
         <prop actor="props/units/cape_m_med.xml" attachpoint="shoulders"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/public/art/meshes/props/sarissa_a.dae b/binaries/data/mods/public/art/meshes/props/sarissa_a.dae
new file mode 100644
index 0000000000..78e14af7c1
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/sarissa_a.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9876a551fc58fde400c3aa1e4a9d0a156631d83918d6e6af8a307dbbb615ea16
+size 10859
diff --git a/binaries/data/mods/public/art/meshes/props/sarissa_b.dae b/binaries/data/mods/public/art/meshes/props/sarissa_b.dae
new file mode 100644
index 0000000000..3eeab719be
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/sarissa_b.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd29fd14a981dbac3a141170b5483e62b7f28aab72ba32a3c4f2df20a6c393c0
+size 10862
diff --git a/binaries/data/mods/public/art/meshes/props/spear_hoplite.dae b/binaries/data/mods/public/art/meshes/props/spear_hoplite.dae
new file mode 100644
index 0000000000..4fc90e6c4e
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/spear_hoplite.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2ac88c198419748cd05bd42fbfba9e2514c607dfe1547e8751ee14397e33abf
+size 13102
diff --git a/binaries/data/mods/public/art/meshes/props/spear_lance.dae b/binaries/data/mods/public/art/meshes/props/spear_lance.dae
new file mode 100644
index 0000000000..68ce9eb6c1
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/spear_lance.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:087f11450b30d43bf056d693eec64447968c85dc0044842295e5a267fd66817b
+size 11233