diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml
index 34601d483e..fd7a3eb7d9 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a.xml
@@ -1,67 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
-      </animations>
-      <mesh>skeletal/horse.pmd</mesh>
-      <props>
-        <prop actor="units/celts/cavalry_javelinist_a_r.xml" attachpoint="rider"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="7" name="feet">
-      <texture>skeletal/horse_celt_feet_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="blaze">
-      <texture>skeletal/horse_celt_blaze_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="face">
-      <texture>skeletal/horse_celt_face_a.dds</texture>
-    </variant>
-    <variant frequency="7" name="star">
-      <texture>skeletal/horse_celt_star_a.dds</texture>
-    </variant>
-    <variant frequency="3" name="dapple">
-      <texture>skeletal/horse_celt_dapple_a.dds</texture>
-    </variant>
-    <variant frequency="2" name="snip">
-      <texture>skeletal/horse_celt_snip_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="stripe">
-      <texture>skeletal/horse_celt_stripe_a.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="2" name="black">
-      <colour>81 81 85</colour>
-    </variant>
-    <variant frequency="2" name="chocolate">
-      <colour>98 68 58</colour>
-    </variant>
-    <variant frequency="2" name="chestnut">
-      <colour>248 132 86</colour>
-    </variant>
-    <variant frequency="2" name="roan">
-      <colour>242 219 164</colour>
-    </variant>
-    <variant frequency="2" name="liver">
-      <colour>172 95 68</colour>
-    </variant>
-    <variant frequency="2" name="brown">
-      <colour>255 148 89</colour>
-    </variant>
-  </group>
-
-  <material>objectcolor.xml</material>
-
-</actor>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/celts/cavalry_javelinist_a_r.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="7" name="feet">
+      <texture>skeletal/horse_celt_feet_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="blaze">
+      <texture>skeletal/horse_celt_blaze_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="face">
+      <texture>skeletal/horse_celt_face_a.dds</texture>
+    </variant>
+    <variant frequency="7" name="star">
+      <texture>skeletal/horse_celt_star_a.dds</texture>
+    </variant>
+    <variant frequency="3" name="dapple">
+      <texture>skeletal/horse_celt_dapple_a.dds</texture>
+    </variant>
+    <variant frequency="2" name="snip">
+      <texture>skeletal/horse_celt_snip_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="stripe">
+      <texture>skeletal/horse_celt_stripe_a.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="black">
+      <colour>81 81 85</colour>
+    </variant>
+    <variant frequency="2" name="chocolate">
+      <colour>98 68 58</colour>
+    </variant>
+    <variant frequency="2" name="chestnut">
+      <colour>248 132 86</colour>
+    </variant>
+    <variant frequency="2" name="roan">
+      <colour>242 219 164</colour>
+    </variant>
+    <variant frequency="2" name="liver">
+      <colour>172 95 68</colour>
+    </variant>
+    <variant frequency="2" name="brown">
+      <colour>255 148 89</colour>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a_r.xml
index a34643c8c9..a31269608a 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_a_r.xml
@@ -1,60 +1,61 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-      </animations>
-      <mesh>skeletal/m_pants_b.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_01.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_02.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_03.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_04.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_05.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_06.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_07.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_08.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_09.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_10.dds</texture>
-    </variant>
-    <variant name="1">
-      <texture>skeletal/celt_ijv_a_11.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+        <animation event=".5" file="biped/rider_javelin_atk_a.psa" load="0" name="Melee" speed="50"/>
+      </animations>
+      <mesh>skeletal/m_pants_b.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_01.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_02.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_03.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_04.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_05.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_06.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_07.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_08.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_09.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_10.dds</texture>
+    </variant>
+    <variant name="1">
+      <texture>skeletal/celt_ijv_a_11.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml
index e8835d204a..f964c7c906 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b.xml
@@ -7,6 +7,7 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
       </animations>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b_r.xml
index 88711a0ac4..ad538cbae5 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_b_r.xml
@@ -9,6 +9,7 @@
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation event=".5" file="biped/rider_javelin_atk_a.psa" load="0" name="Melee" speed="50"/>
       </animations>
       <mesh>skeletal/m_pants_b.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml
index b4afa1d2db..3968d07882 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e.xml
@@ -1,67 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
-      </animations>
-      <mesh>skeletal/horse.pmd</mesh>
-      <props>
-        <prop actor="units/celts/cavalry_javelinist_e_r.xml" attachpoint="rider"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="7" name="feet">
-      <texture>skeletal/horse_celt_feet_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="blaze">
-      <texture>skeletal/horse_celt_blaze_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="face">
-      <texture>skeletal/horse_celt_face_a.dds</texture>
-    </variant>
-    <variant frequency="7" name="star">
-      <texture>skeletal/horse_celt_star_a.dds</texture>
-    </variant>
-    <variant frequency="3" name="dapple">
-      <texture>skeletal/horse_celt_dapple_a.dds</texture>
-    </variant>
-    <variant frequency="2" name="snip">
-      <texture>skeletal/horse_celt_snip_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="stripe">
-      <texture>skeletal/horse_celt_stripe_a.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="2" name="black">
-      <colour>81 81 85</colour>
-    </variant>
-    <variant frequency="2" name="chocolate">
-      <colour>98 68 58</colour>
-    </variant>
-    <variant frequency="2" name="chestnut">
-      <colour>248 132 86</colour>
-    </variant>
-    <variant frequency="2" name="roan">
-      <colour>242 219 164</colour>
-    </variant>
-    <variant frequency="2" name="liver">
-      <colour>172 95 68</colour>
-    </variant>
-    <variant frequency="2" name="brown">
-      <colour>255 148 89</colour>
-    </variant>
-  </group>
-
-  <material>objectcolor.xml</material>
-
-</actor>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/celts/cavalry_javelinist_e_r.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="7" name="feet">
+      <texture>skeletal/horse_celt_feet_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="blaze">
+      <texture>skeletal/horse_celt_blaze_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="face">
+      <texture>skeletal/horse_celt_face_a.dds</texture>
+    </variant>
+    <variant frequency="7" name="star">
+      <texture>skeletal/horse_celt_star_a.dds</texture>
+    </variant>
+    <variant frequency="3" name="dapple">
+      <texture>skeletal/horse_celt_dapple_a.dds</texture>
+    </variant>
+    <variant frequency="2" name="snip">
+      <texture>skeletal/horse_celt_snip_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="stripe">
+      <texture>skeletal/horse_celt_stripe_a.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="black">
+      <colour>81 81 85</colour>
+    </variant>
+    <variant frequency="2" name="chocolate">
+      <colour>98 68 58</colour>
+    </variant>
+    <variant frequency="2" name="chestnut">
+      <colour>248 132 86</colour>
+    </variant>
+    <variant frequency="2" name="roan">
+      <colour>242 219 164</colour>
+    </variant>
+    <variant frequency="2" name="liver">
+      <colour>172 95 68</colour>
+    </variant>
+    <variant frequency="2" name="brown">
+      <colour>255 148 89</colour>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e_r.xml
index ae1c448763..7b2515a31d 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_javelinist_e_r.xml
@@ -1,26 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-      </animations>
-      <mesh>skeletal/m_tights.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-      </props>
-      <texture>skeletal/celt_ijv_e_01.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+        <animation event=".5" file="biped/rider_javelin_atk_a.psa" load="0" name="Melee" speed="50"/>
+      </animations>
+      <mesh>skeletal/m_tights.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+      </props>
+      <texture>skeletal/celt_ijv_e_01.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml
index 5ab4097517..cf2cb73e9f 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a.xml
@@ -1,67 +1,69 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
-      </animations>
-      <mesh>skeletal/horse.pmd</mesh>
-      <props>
-        <prop actor="units/celts/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="7" name="feet">
-      <texture>skeletal/horse_celt_feet_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="blaze">
-      <texture>skeletal/horse_celt_blaze_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="face">
-      <texture>skeletal/horse_celt_face_a.dds</texture>
-    </variant>
-    <variant frequency="7" name="star">
-      <texture>skeletal/horse_celt_star_a.dds</texture>
-    </variant>
-    <variant frequency="3" name="dapple">
-      <texture>skeletal/horse_celt_dapple_a.dds</texture>
-    </variant>
-    <variant frequency="2" name="snip">
-      <texture>skeletal/horse_celt_snip_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="stripe">
-      <texture>skeletal/horse_celt_stripe_a.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="2" name="black">
-      <colour>81 81 85</colour>
-    </variant>
-    <variant frequency="2" name="chocolate">
-      <colour>98 68 58</colour>
-    </variant>
-    <variant frequency="2" name="chestnut">
-      <colour>248 132 86</colour>
-    </variant>
-    <variant frequency="2" name="roan">
-      <colour>242 219 164</colour>
-    </variant>
-    <variant frequency="2" name="liver">
-      <colour>172 95 68</colour>
-    </variant>
-    <variant frequency="2" name="brown">
-      <colour>255 148 89</colour>
-    </variant>
-  </group>
-
-  <material>objectcolor.xml</material>
-
-</actor>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/celts/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="7" name="feet">
+      <texture>skeletal/horse_celt_feet_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="blaze">
+      <texture>skeletal/horse_celt_blaze_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="face">
+      <texture>skeletal/horse_celt_face_a.dds</texture>
+    </variant>
+    <variant frequency="7" name="star">
+      <texture>skeletal/horse_celt_star_a.dds</texture>
+    </variant>
+    <variant frequency="3" name="dapple">
+      <texture>skeletal/horse_celt_dapple_a.dds</texture>
+    </variant>
+    <variant frequency="2" name="snip">
+      <texture>skeletal/horse_celt_snip_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="stripe">
+      <texture>skeletal/horse_celt_stripe_a.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="black">
+      <colour>81 81 85</colour>
+    </variant>
+    <variant frequency="2" name="chocolate">
+      <colour>98 68 58</colour>
+    </variant>
+    <variant frequency="2" name="chestnut">
+      <colour>248 132 86</colour>
+    </variant>
+    <variant frequency="2" name="roan">
+      <colour>242 219 164</colour>
+    </variant>
+    <variant frequency="2" name="liver">
+      <colour>172 95 68</colour>
+    </variant>
+    <variant frequency="2" name="brown">
+      <colour>255 148 89</colour>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml
index 88f23f30f7..174b36ba65 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_a_r.xml
@@ -1,60 +1,61 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-      </animations>
-      <mesh>skeletal/m_pants_c.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/celt_round_a.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>skeletal/celt_isw_a_02.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_03.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_04.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_05.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_06.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_07.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_08.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_09.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_10.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_11.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_a_01.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="20"/>
+      </animations>
+      <mesh>skeletal/m_pants_c.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_lime.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/celt_round_a.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant>
+      <texture>skeletal/celt_isw_a_02.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_03.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_04.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_05.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_06.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_07.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_08.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_09.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_10.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_11.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_a_01.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml
index 2795076ac3..89a13ca99e 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b.xml
@@ -1,67 +1,69 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
-      </animations>
-      <mesh>skeletal/horse.pmd</mesh>
-      <props>
-        <prop actor="units/celts/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="7" name="feet">
-      <texture>skeletal/horse_celt_feet_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="blaze">
-      <texture>skeletal/horse_celt_blaze_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="face">
-      <texture>skeletal/horse_celt_face_a.dds</texture>
-    </variant>
-    <variant frequency="7" name="star">
-      <texture>skeletal/horse_celt_star_a.dds</texture>
-    </variant>
-    <variant frequency="3" name="dapple">
-      <texture>skeletal/horse_celt_dapple_a.dds</texture>
-    </variant>
-    <variant frequency="2" name="snip">
-      <texture>skeletal/horse_celt_snip_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="stripe">
-      <texture>skeletal/horse_celt_stripe_a.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="2" name="black">
-      <colour>81 81 85</colour>
-    </variant>
-    <variant frequency="2" name="chocolate">
-      <colour>98 68 58</colour>
-    </variant>
-    <variant frequency="2" name="chestnut">
-      <colour>248 132 86</colour>
-    </variant>
-    <variant frequency="2" name="roan">
-      <colour>242 219 164</colour>
-    </variant>
-    <variant frequency="2" name="liver">
-      <colour>172 95 68</colour>
-    </variant>
-    <variant frequency="2" name="brown">
-      <colour>255 148 89</colour>
-    </variant>
-  </group>
-
-  <material>objectcolor.xml</material>
-
-</actor>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/celts/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="7" name="feet">
+      <texture>skeletal/horse_celt_feet_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="blaze">
+      <texture>skeletal/horse_celt_blaze_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="face">
+      <texture>skeletal/horse_celt_face_a.dds</texture>
+    </variant>
+    <variant frequency="7" name="star">
+      <texture>skeletal/horse_celt_star_a.dds</texture>
+    </variant>
+    <variant frequency="3" name="dapple">
+      <texture>skeletal/horse_celt_dapple_a.dds</texture>
+    </variant>
+    <variant frequency="2" name="snip">
+      <texture>skeletal/horse_celt_snip_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="stripe">
+      <texture>skeletal/horse_celt_stripe_a.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="black">
+      <colour>81 81 85</colour>
+    </variant>
+    <variant frequency="2" name="chocolate">
+      <colour>98 68 58</colour>
+    </variant>
+    <variant frequency="2" name="chestnut">
+      <colour>248 132 86</colour>
+    </variant>
+    <variant frequency="2" name="roan">
+      <colour>242 219 164</colour>
+    </variant>
+    <variant frequency="2" name="liver">
+      <colour>172 95 68</colour>
+    </variant>
+    <variant frequency="2" name="brown">
+      <colour>255 148 89</colour>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml
index 6de525eaed..2c40f472cf 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_b_r.xml
@@ -1,39 +1,40 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-      </animations>
-      <mesh>skeletal/m_pants_c.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/celt_round_b.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>skeletal/celt_isw_b_01.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_b_02.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_b_03.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_b_04.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="20"/>
+      </animations>
+      <mesh>skeletal/m_pants_c.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/celt_round_b.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant>
+      <texture>skeletal/celt_isw_b_01.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_b_02.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_b_03.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_b_04.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml
index 3ffcb94f87..89a9ce57e5 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e.xml
@@ -1,67 +1,70 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
-      </animations>
-      <mesh>skeletal/horse.pmd</mesh>
-      <props>
-        <prop actor="units/celts/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="7" name="feet">
-      <texture>skeletal/horse_celt_feet_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="blaze">
-      <texture>skeletal/horse_celt_blaze_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="face">
-      <texture>skeletal/horse_celt_face_a.dds</texture>
-    </variant>
-    <variant frequency="7" name="star">
-      <texture>skeletal/horse_celt_star_a.dds</texture>
-    </variant>
-    <variant frequency="3" name="dapple">
-      <texture>skeletal/horse_celt_dapple_a.dds</texture>
-    </variant>
-    <variant frequency="2" name="snip">
-      <texture>skeletal/horse_celt_snip_a.dds</texture>
-    </variant>
-    <variant frequency="5" name="stripe">
-      <texture>skeletal/horse_celt_stripe_a.dds</texture>
-    </variant>
-  </group>
-
-  <group>
-    <variant frequency="2" name="black">
-      <colour>81 81 85</colour>
-    </variant>
-    <variant frequency="2" name="chocolate">
-      <colour>98 68 58</colour>
-    </variant>
-    <variant frequency="2" name="chestnut">
-      <colour>248 132 86</colour>
-    </variant>
-    <variant frequency="2" name="roan">
-      <colour>242 219 164</colour>
-    </variant>
-    <variant frequency="2" name="liver">
-      <colour>172 95 68</colour>
-    </variant>
-    <variant frequency="2" name="brown">
-      <colour>255 148 89</colour>
-    </variant>
-  </group>
-
-  <material>objectcolor.xml</material>
-
-</actor>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
+        <animation name=""/>
+      </animations>
+      <mesh>skeletal/horse.pmd</mesh>
+      <props>
+        <prop actor="units/celts/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="7" name="feet">
+      <texture>skeletal/horse_celt_feet_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="blaze">
+      <texture>skeletal/horse_celt_blaze_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="face">
+      <texture>skeletal/horse_celt_face_a.dds</texture>
+    </variant>
+    <variant frequency="7" name="star">
+      <texture>skeletal/horse_celt_star_a.dds</texture>
+    </variant>
+    <variant frequency="3" name="dapple">
+      <texture>skeletal/horse_celt_dapple_a.dds</texture>
+    </variant>
+    <variant frequency="2" name="snip">
+      <texture>skeletal/horse_celt_snip_a.dds</texture>
+    </variant>
+    <variant frequency="5" name="stripe">
+      <texture>skeletal/horse_celt_stripe_a.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="black">
+      <colour>81 81 85</colour>
+    </variant>
+    <variant frequency="2" name="chocolate">
+      <colour>98 68 58</colour>
+    </variant>
+    <variant frequency="2" name="chestnut">
+      <colour>248 132 86</colour>
+    </variant>
+    <variant frequency="2" name="roan">
+      <colour>242 219 164</colour>
+    </variant>
+    <variant frequency="2" name="liver">
+      <colour>172 95 68</colour>
+    </variant>
+    <variant frequency="2" name="brown">
+      <colour>255 148 89</colour>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml
index ab9974ca38..bf614d1e74 100644
--- a/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/celts/cavalry_swordsman_e_r.xml
@@ -1,34 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
         <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
-      </animations>
-      <mesh>skeletal/m_pants_c.pmd</mesh>
-      <props>
-        <prop actor="props/units/heads/celt_helmet_a.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/celt_round_e.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
-  </group>
-
-  <group>
-    <variant>
-      <texture>skeletal/celt_isw_e_01.dds</texture>
-    </variant>
-    <variant>
-      <texture>skeletal/celt_isw_e_02.dds</texture>
-    </variant>
-  </group>
-
-  <material>player_trans.xml</material>
-
-</actor>
+        <animation event=".5" file="biped/rider_sword_shield_atk_a.psa" name="Melee" speed="20"/>
+      </animations>
+      <mesh>skeletal/m_pants_c.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/celt_helmet_a.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_celt.xml" attachpoint="head"/>
+        <prop actor="props/units/shields/celt_round_e.xml" attachpoint="shield"/>
+        <prop actor="props/units/weapons/csword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant>
+      <texture>skeletal/celt_isw_e_01.dds</texture>
+    </variant>
+    <variant>
+      <texture>skeletal/celt_isw_e_02.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_a.xml b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_a.xml
index 3500e366fd..a0414b2d54 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_a.xml
@@ -9,6 +9,8 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_b.xml b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_b.xml
index b6c7caafaf..1b10e0f43f 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_b.xml
@@ -9,6 +9,8 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml
index c54645f583..3846d796f0 100644
--- a/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/hellenes/cavalry_swordsman_e.xml
@@ -9,6 +9,8 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="28"/>
+        <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
diff --git a/binaries/data/mods/official/entities/template_unit_cavalry.xml b/binaries/data/mods/official/entities/template_unit_cavalry.xml
index 9d7c378277..57a8b1030d 100644
--- a/binaries/data/mods/official/entities/template_unit_cavalry.xml
+++ b/binaries/data/mods/official/entities/template_unit_cavalry.xml
@@ -78,5 +78,7 @@
 		</Move>
 		
 	</Actions>
+	
+	<Script File="scripts/entity_functions.js" />
 
 </Entity>
\ No newline at end of file