From 3f7f7bf66f7e8e3ab6521b98f5a9d55546068799 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Tue, 22 Nov 2011 03:14:27 +0000
Subject: [PATCH] Agrianian Peltasts.

New "Taka" shield meshes.

This was SVN commit r10571.
---
 .../props/units/shields/hele_pelta_a.xml      |  15 +-
 .../props/units/shields/hele_pelta_e.xml      |  10 +-
 .../props/units/shields/mace_pelta_a.xml      |  24 +++
 .../props/units/shields/pers_taka_a.xml       |   4 +-
 .../props/units/shields/pers_taka_b.xml       |   8 +-
 .../props/units/shields/pers_taka_e.xml       |   4 +-
 .../props/units/shields/taka_a_back.xml       |  17 ++
 .../macedonians/infantry_javelinist_a.xml     | 163 +++++++++++++++++
 .../macedonians/infantry_javelinist_b.xml     | 162 +++++++++++++++++
 .../macedonians/infantry_javelinist_e.xml     | 168 ++++++++++++++++++
 .../units/persians/infantry_javelinist_a.xml  |   2 +-
 .../units/persians/infantry_javelinist_b.xml  |   2 +-
 .../units/persians/infantry_javelinist_e.xml  |   2 +-
 .../art/meshes/props/shield/taka_back.dae     |   3 +
 .../art/meshes/props/shield/taka_front.dae    |   3 +
 .../textures/skins/skeletal/mace_ijv_b.png    |   3 +
 .../textures/skins/skeletal/mace_ijv_e.png    |   3 +
 ...mplate_unit_infantry_ranged_javelinist.xml |   2 +-
 .../units/cart_champion_infantry.xml          |   4 +-
 .../units/celt_champion_cavalry_brit.xml      |   4 +-
 .../units/celt_champion_cavalry_gaul.xml      |   2 +-
 .../units/celt_champion_infantry_brit.xml     |   2 +-
 .../units/celt_champion_infantry_gaul.xml     |   2 +-
 .../templates/units/celt_fanatic.xml          |   8 +-
 .../units/hele_champion_ranged_polis.xml      |   2 +-
 .../units/mace_infantry_javelinist_a.xml      |  35 ++++
 .../units/mace_infantry_javelinist_b.xml      |  36 ++++
 .../units/mace_infantry_javelinist_e.xml      |  33 ++++
 28 files changed, 687 insertions(+), 36 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/units/shields/mace_pelta_a.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/shields/taka_a_back.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_a.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_b.xml
 create mode 100644 binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml
 create mode 100644 binaries/data/mods/public/art/meshes/props/shield/taka_back.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/shield/taka_front.dae
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_b.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_e.png
 create mode 100644 binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_a.xml
 create mode 100644 binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
 create mode 100644 binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_e.xml

diff --git a/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_a.xml b/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_a.xml
index dc7ad93818..ca6c3e2126 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_a.xml
@@ -1,17 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="1" name="pelta-small">
       <mesh>props/shield/pelta_a_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/pelta_a_back.xml" attachpoint="back"/>
       </props>
     </variant>
+    <variant frequency="1" name="pelta-big">
+      <mesh>props/shield/taka_front.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
+      </props>
+    </variant>
   </group>
-
   <group>
     <variant frequency="1" name="pelta-l">
       <texture>props/shield/hele_pelta_l.dds</texture>
@@ -23,7 +26,5 @@
       <texture>props/shield/hele_pelta_f.dds</texture>
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_e.xml b/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_e.xml
index 935ddda335..2813f5d02d 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/hele_pelta_e.xml
@@ -1,17 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/shield/pelta_a_f.pmd</mesh>
+      <mesh>props/shield/taka_front.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pelta_a_back.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="pelta-h">
       <texture>props/shield/hele_pelta_h.dds</texture>
@@ -23,5 +20,4 @@
       <texture>props/shield/hele_pelta_k.dds</texture>
     </variant>
   </group>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/mace_pelta_a.xml b/binaries/data/mods/public/art/actors/props/units/shields/mace_pelta_a.xml
new file mode 100644
index 0000000000..ced89fd06a
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/shields/mace_pelta_a.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/taka_front.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="pelta-l">
+      <texture>props/shield/hele_pelta_l.dds</texture>
+    </variant>
+    <variant frequency="1" name="pelta-e">
+      <texture>props/shield/hele_pelta_e.dds</texture>
+    </variant>
+    <variant frequency="1" name="pelta-f">
+      <texture>props/shield/hele_pelta_f.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_a.xml b/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_a.xml
index b0017f3cf5..39f84caf49 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_a.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_a.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/shield/pelta_a_f.pmd</mesh>
+      <mesh>props/shield/taka_front.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pelta_a_back.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_b.xml b/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_b.xml
index 74a20ec8bb..17de2bebfd 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_b.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_b.xml
@@ -2,7 +2,13 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="base">
+    <variant frequency="1" name="taka large">
+      <mesh>props/shield/taka_front.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="take small">
       <mesh>props/shield/pelta_a_f.pmd</mesh>
       <props>
         <prop actor="props/units/shields/pelta_a_back.xml" attachpoint="back"/>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_e.xml b/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_e.xml
index 4850b7ad27..3b9d9ebed8 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/pers_taka_e.xml
@@ -3,9 +3,9 @@
   <castshadow/>
   <group>
     <variant frequency="1" name="base">
-      <mesh>props/shield/pelta_a_f.pmd</mesh>
+      <mesh>props/shield/taka_front.dae</mesh>
       <props>
-        <prop actor="props/units/shields/pelta_a_back.xml" attachpoint="back"/>
+        <prop actor="props/units/shields/taka_a_back.xml" attachpoint="root"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/taka_a_back.xml b/binaries/data/mods/public/art/actors/props/units/shields/taka_a_back.xml
new file mode 100644
index 0000000000..463b6b3bfb
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/shields/taka_a_back.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/shield/taka_back.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="back-i">
+      <texture>props/shield/hele_pelta_i.dds</texture>
+    </variant>
+    <variant frequency="1" name="back-d">
+      <texture>props/shield/hele_pelta_d.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_a.xml
new file mode 100644
index 0000000000..7d2ca4e51b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_a.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="105"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="95"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="85"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_c.dae" name="Idle" speed="100"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Walk" speed="40"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Walk" speed="45"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="75"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
+        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
+        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
+        <animation file="biped/inf_salute_c.psa" name="Promotion" speed="288"/>
+      </animations>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/hele_pelta_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
+      </props>
+      <texture>skeletal/mace_ijv_b.png</texture>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_tree">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ruins">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="carry_food">
+      <props>
+        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_meat">
+      <props>
+        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_wood">
+      <props>
+        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_stone">
+      <props>
+        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_metal">
+      <props>
+        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_b.xml
new file mode 100644
index 0000000000..90e651643b
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_b.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="105"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="95"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="85"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_c.dae" name="Idle" speed="100"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Walk" speed="40"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Walk" speed="45"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="75"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
+        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
+        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
+        <animation file="biped/inf_salute_c.psa" name="Promotion" speed="288"/>
+      </animations>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/hele_pelta_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
+      </props>
+      <texture>skeletal/mace_ijv_b.png</texture>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_tree">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ruins">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="carry_food">
+      <props>
+        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_meat">
+      <props>
+        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_wood">
+      <props>
+        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_stone">
+      <props>
+        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_metal">
+      <props>
+        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml
new file mode 100644
index 0000000000..1502ba7b2d
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/units/macedonians/infantry_javelinist_e.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="105"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="110"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="105"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="95"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="85"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_c.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_d.dae" name="Idle" speed="120"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Walk" speed="40"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Walk" speed="45"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
+        <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
+        <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="75"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_food" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_meat" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_wood" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_stone" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="carry_metal" speed="120"/>
+        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ruins" speed="250"/>
+        <animation event="0.6" file="infantry/general/dude/dudebuild.psa" name="Build" speed="300"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
+        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
+        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="600"/>
+        <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
+        <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
+        <animation file="biped/inf_salute_c.psa" name="Promotion" speed="288"/>
+      </animations>
+      <mesh>skeletal/m_tunic_long.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_su3.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/hele_pelta_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/cape_hd.xml" attachpoint="shoulders"/>
+      </props>
+      <texture>skeletal/mace_ijv_e.png</texture>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="Melee">
+      <props>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+      </props>
+    </variant>
+    <variant name="gather_tree">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ruins">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="r_hand"/>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop attachpoint="shield"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="carry_food">
+      <props>
+        <prop actor="props/units/shuttle_basket.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_meat">
+      <props>
+        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_wood">
+      <props>
+        <prop actor="props/units/shuttle_wood.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_stone">
+      <props>
+        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+    <variant name="carry_metal">
+      <props>
+        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
+        <prop attachpoint="helmet"/>
+        <prop attachpoint="shield"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_a.xml b/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_a.xml
index 8938ea06ba..a65dec7403 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_a.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_a.xml
@@ -62,7 +62,7 @@
       <props>
         <prop attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_tree">
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_b.xml
index 2aef63f36e..affa9a9513 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_b.xml
@@ -54,7 +54,7 @@
       <props>
         <prop attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_tree">
diff --git a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_e.xml b/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_e.xml
index f774a6877d..b8ce2e2f6c 100644
--- a/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_e.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/infantry_javelinist_e.xml
@@ -55,7 +55,7 @@
       <props>
         <prop attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/jav_iron.xml" attachpoint="projectile"/>
+        <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
       </props>
     </variant>
     <variant name="gather_tree">
diff --git a/binaries/data/mods/public/art/meshes/props/shield/taka_back.dae b/binaries/data/mods/public/art/meshes/props/shield/taka_back.dae
new file mode 100644
index 0000000000..68ebc42ec5
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/shield/taka_back.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26c8ec4ed052130bd424c233839d92e21b4312e46e30ad352d7ee75190c53001
+size 8697
diff --git a/binaries/data/mods/public/art/meshes/props/shield/taka_front.dae b/binaries/data/mods/public/art/meshes/props/shield/taka_front.dae
new file mode 100644
index 0000000000..73896dac80
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/shield/taka_front.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca7b9680f6a19e09e0d6069bca704b0f74460e2da0b84e24853e5dc0ffc2a215
+size 8679
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_b.png b/binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_b.png
new file mode 100644
index 0000000000..c5db5f26de
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_b.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72a52120c54b1588f7eeaef07f893c9c6aacdce178a299518b7a74fcdb50e2f6
+size 89183
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_e.png b/binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_e.png
new file mode 100644
index 0000000000..74759b1885
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/mace_ijv_e.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dd96fa350dd6ced91534ce06f22467b2ab48a6b94a9f909e3d7add54e79c852
+size 104659
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index 9f11d07799..ca96d8fe4d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -25,7 +25,7 @@
   <Identity>
     <GenericName>Skirmisher</GenericName>
     <Rollover>These were the skirmishers. These lightly armoured units would advance quickly, throw a hail of javelins and then retreat back to their ranks. Grab another spear and repeat. They would do well against any unit that wasn't wearing proper armour, but more poorly if they fought hand to hand vs a well armoured unit. They didn't always have to throw their spears either. They used these light small spears in hand to hand similar to a quarterstaff. Also note that the development of the pilum was a key transition. The pilum was a weapon with a long steel shaft that would sink into a shield and was nearly impossible to remove. This rendered the shield useless. They also weighted and balanced them to make them accurately hit with a punch.</Rollover>
-    <Tooltip>Counters Spearmen and Cavalry Archers.</Tooltip>
+    <Tooltip>Counters Spearmen and Cavalry Archers. Special bonus against Elephants and Chariots.</Tooltip>
   </Identity>
   <Loot>
     <wood>5</wood>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
index 88e40fd0dc..c741c3f9ba 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
@@ -4,9 +4,7 @@
     <Civ>cart</Civ>
 	<GenericName>Sacred Band Pikeman</GenericName>
     <SpecificName>Mašal</SpecificName>
-    <History>The Sacred Band was a group of elite troops dedicated to the service of Tanit, patron goddess of Carthage. In addition to providing crack troops, the unit trained Carthaginians aspiring to command Punic mercenary armies. Specially picked troops carried the unit standard emblazoned with the symbols of the goddess into battle.</History>
-	<Tooltip>Champion Infantry Pikeman.
-Bonused vs. Melee units. Poor vs. Ranged units.</Tooltip>
+    <History>The Sacred Band was a group of elite troops dedicated to the service of the Phoenician god Ba'al. In addition to providing crack troops, the unit trained Carthaginians aspiring to command Punic mercenary armies. Specially picked troops carried the unit standard emblazoned with the symbols of Carthage into battle.</History>
     <Icon>units/cart_champion_infantry.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_brit.xml b/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_brit.xml
index e94293ddd1..08e82d3f4d 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_brit.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_brit.xml
@@ -24,8 +24,8 @@
     <Civ>celt</Civ>
 	<GenericName>Chariot</GenericName>
     <SpecificName>Carbanto</SpecificName>
-    <Tooltip>Brythonic Champion Cavalry.
-Bonus vs. Infantry. High trample damage.</Tooltip>
+    <Tooltip>Brythonic Champion Chariot.
+Counters Infantry. High trample damage.</Tooltip>
     <History>The Britons were one of the last European peoples to use two-horse chariots in combat. They had two iron-rimmed wheels and a flat riding platform that typically carried a driver and a warrior. Useless as shock weapons against tightly packed troops, they were useful for running down individual soldiers and as a stable mount to launch javelins from. The heads of defeated opponents often adorned the chassis to show the warrior's prowess.</History>
     <Icon>units/celt_champion_cavalry_brit.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_gaul.xml b/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_gaul.xml
index 030a4c8a60..c83656b3d6 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_gaul.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_champion_cavalry_gaul.xml
@@ -7,7 +7,7 @@
     <Civ>celt</Civ>
     <SpecificName>Gallic Brihent</SpecificName>
     <Tooltip>Gallic Champion Cavalry.
-Bonus vs. Ranged Units.</Tooltip>
+Counters Ranged Units.</Tooltip>
     <History>In Gaul we know of heavy cavalry, possibly predecessors to later knights. They used a Celtic lance overhand, a good shield, and wore good armor. Vercingetorix was famous for having a number of them, but their use long precedes him. Heavy Celtic horsemen are found in graves as early as the 600s, with scale coats. Later, with the advent of mail, their armor would largely change to this. They would be experienced, aristocratic or noblemen, or their retainers equipped in kind. Each man would probably have several personal attendants. Some would be powerful noblemen, such as chiefs and kings. In battle, they would be on par with much of the best heavy cavalry in western Europe, due to superior armor, such as mail armor with additional layers of mail over the vital organs, weapons such as high-quality iron spearheads, swords, and a thong of javelins, giving them versatility, and years of experience and training. Their historical use saw them capable of breaking even well-defended positions, or acting to great effect in flanking manuevers.</History>
     <Icon>units/celt_champion_cavalry_gaul.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_brit.xml b/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_brit.xml
index f70ea32ec0..40ed491b43 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_brit.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_brit.xml
@@ -16,7 +16,7 @@
     <Civ>celt</Civ>
     <SpecificName>Delamokludda</SpecificName>
     <Tooltip>Brythonic Champion Swordsman.
-Bonus vs. All Spear Units (infantry and cavalry).</Tooltip>
+Counters Spear Units.</Tooltip>
     <History>Two-handed swordsmen from Briton. These men are veteran soldiers who offer their lives in service to their Brythonic lords.</History>
     <Icon>units/celt_champion_infantry_brit.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_gaul.xml b/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_gaul.xml
index 8b6bd0e233..af64169745 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_gaul.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_champion_infantry_gaul.xml
@@ -14,7 +14,7 @@
     <Civ>celt</Civ>
     <SpecificName>Gallic Solduros</SpecificName>
     <Tooltip>Gallic Champion Swordsman.
-Bonus vs. Spearmen and Cavalry.</Tooltip>
+Counters Spearmen and Cavalry.</Tooltip>
     <History>The sword among Celts varies in reputation and commonality. Shortswords, essentially truly just long, broad-bladed daggers, were common, but cheaply made, and most likely the swords refered to as bending after a hard strike, and needing bent back into place. The iron construction of longswords, such as used here, was greatly superior, but also much more expensive. The longsword was primarily a weapon of aristocracy and experienced professional soldiers, who could either afford the weapon, have it made for them by their lord as a reward for service, passed down to them by family, or looted from the field.</History>
     <Icon>units/celt_champion_infantry_gaul.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_fanatic.xml b/binaries/data/mods/public/simulation/templates/units/celt_fanatic.xml
index 9706760849..f18b706ffa 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_fanatic.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_fanatic.xml
@@ -21,15 +21,15 @@
   <Identity>
     <Civ>celt</Civ>
     <SpecificName>Celtic Fanatic</SpecificName>
-    <Tooltip>Mercenary Swordsman.
-Bonus vs. All Spear Units (infantry and cavalry). Low armour.</Tooltip>
+    <Tooltip>Mercenary Champion Swordsman.
+Counters Spear Units. Low armour.</Tooltip>
     <History>A Celtic fanatic warrior, devoted to war and his Gallic lord.</History>
     <Icon>units/celt_fanatic.png</Icon>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>10.0</WalkSpeed>
+    <WalkSpeed>11.0</WalkSpeed>
     <Run>
-      <Speed>20.0</Speed>
+      <Speed>22.0</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_champion_ranged_polis.xml b/binaries/data/mods/public/simulation/templates/units/hele_champion_ranged_polis.xml
index 70f4de262b..4560a248ac 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_champion_ranged_polis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_champion_ranged_polis.xml
@@ -23,7 +23,7 @@ Bonused vs. Support Units and Ranged Units. Weak vs. Melee Units. Fast Move Spee
     <Icon>units/hele_champion_ranged_polis.png</Icon>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>10.0</WalkSpeed>
+    <WalkSpeed>11.0</WalkSpeed>
     <Run>
       <Speed>20.0</Speed>
     </Run>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_a.xml
new file mode 100644
index 0000000000..e852d3378b
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_a.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_infantry_javelinist_b">
+  <Armour>
+    <Hack>4.0</Hack>
+    <Pierce>4.0</Pierce>
+    <Crush>4.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>36.0</Pierce>
+      <MaxRange>48.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>100</Max>
+  </Health>
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/mace_infantry_javelinist_e</Entity>
+  </Promotion>
+  <ResourceGatherer>
+    <BaseSpeed>0.75</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>10.5</WalkSpeed>
+    <Run>
+      <Speed>20.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/macedonians/infantry_javelinist_a.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
new file mode 100644
index 0000000000..f7930c776c
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_b.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_ranged_javelinist">
+  <Attack>
+    <Ranged>
+      <MaxRange>44.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Cost>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>hele</Civ>
+	<SelectionGroupName>units/mace_infantry_javelinist_b</SelectionGroupName>
+	<GenericName>Agrianian Peltast</GenericName>
+    <SpecificName>Peltastes Agrianikoi</SpecificName>
+    <History>Peltasts were javelinists originating in Thrace but their form of combat was widely copied by the Hellenes, Macedonians, and Persians. Equipped with a small oval or crescent shield, a peltast would charge at enemy formations whilst hurling his javelins then fall back to avoid close combat. They wore no armor and were at a significant disadvantage against heavy infantry and cavalry, relying on their speed and skill for survival. Agrianians are a Thracian tribe who sold their services to the Macedonians as mercenaries and added a much needed ranged and skirmishing ability to Macedonian armies.</History>
+    <Icon>units/hele_infantry_javelinist.png</Icon>
+  </Identity>
+  <Promotion>
+    <Entity>units/mace_infantry_javelinist_a</Entity>
+  </Promotion>
+  <UnitMotion>
+    <WalkSpeed>11.0</WalkSpeed>
+    <Run>
+      <Speed>20.0</Speed>
+    </Run>
+  </UnitMotion>
+  <Vision>
+    <Range>66</Range>
+  </Vision>
+  <VisualActor>
+    <Actor>units/macedonians/infantry_javelinist_b.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_e.xml
new file mode 100644
index 0000000000..7cf500b468
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_javelinist_e.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace_infantry_javelinist_a">
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>6.0</Pierce>
+    <Crush>5.0</Crush>
+  </Armour>
+  <Attack>
+    <Ranged>
+      <Pierce>37.0</Pierce>
+      <MaxRange>52.0</MaxRange>
+    </Ranged>
+  </Attack>
+  <Health>
+    <Max>110</Max>
+  </Health>
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <ResourceGatherer>
+    <BaseSpeed>0.5</BaseSpeed>
+  </ResourceGatherer>
+  <UnitMotion>
+    <WalkSpeed>10.0</WalkSpeed>
+    <Run>
+      <Speed>20.0</Speed>
+    </Run>
+  </UnitMotion>
+  <VisualActor>
+    <Actor>units/macedonians/infantry_javelinist_e.xml</Actor>
+  </VisualActor>
+</Entity>