Move attack animations definitions for the Athenian civ to variation files too.

This was SVN commit r18059.

binaries/data/mods/public/art/actors/units/athenians/infantry_archer_a.xml

@@ -6,7 +6,6 @@
       <animations>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="102"/>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="95"/>
-        <animation event="0.81" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
@@ -30,13 +29,7 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_archer.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml

@@ -6,7 +6,6 @@
       <animations>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="97"/>
-        <animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
         <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="290"/>
@@ -22,13 +21,7 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_archer.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_archer_e.xml

@@ -5,7 +5,6 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
-        <animation event="0.81" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
@@ -23,13 +22,7 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop actor="props/units/weapons/bow_recurve.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_ranged_archer.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_a.xml

@@ -5,7 +5,6 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="75"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <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"/>
@@ -38,13 +37,7 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <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 file="biped/attack_ranged_javelinist.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml

@@ -5,7 +5,6 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="75"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <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"/>
@@ -24,13 +23,7 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <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 file="biped/attack_ranged_javelinist.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_e.xml

@@ -5,7 +5,6 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
         <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"/>
@@ -35,13 +34,7 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_ranged">
-      <props>
-        <prop actor="" 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 file="biped/attack_ranged_javelinist.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_a.xml

@@ -6,7 +6,6 @@
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="attack_ranged" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="36"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
@@ -26,6 +25,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_ranged_slinger.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml

@@ -6,7 +6,6 @@
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="attack_ranged" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="38"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="35"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
@@ -22,6 +21,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_ranged_slinger.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_e.xml

@@ -6,7 +6,6 @@
       <animations>
         <animation file="infantry/spear/idle/isp_01.psa" name="Idle" speed="200"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="attack_ranged" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="37"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="40"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
@@ -23,6 +22,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
+    <variant file="biped/attack_ranged_slinger.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_a.xml

@@ -7,7 +7,6 @@
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -44,11 +43,7 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
-    <variant name="attack_melee">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_hoplite.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml

@@ -7,7 +7,6 @@
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -32,12 +31,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant name="attack_melee">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-        <prop actor="props/units/shields/hele_round_b.xml" attachpoint="shield"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_hoplite.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_e.xml

@@ -7,7 +7,6 @@
         <animation file="biped/inf_hoplite_idle_a.psa" name="Idle" speed="200"/>
         <animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
         <animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
-        <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
         <animation file="biped/inf_salute_c.psa" name="Promotion" speed="450"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
@@ -41,11 +40,7 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
-    <variant name="attack_melee">
-      <props>
-        <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
-      </props>
-    </variant>
+    <variant file="biped/attack_melee_hoplite.xml"/>
     <variant file="biped/attack_capture.xml"/>
     <variant file="biped/attack_slaughter.xml"/>
     <variant file="biped/gather_tree.xml"/>

binaries/data/mods/public/art/variants/biped/attack_melee_hoplite.xml

@@ -0,0 +1,5 @@
+<variant name="attack_melee">
+  <animations>
+    <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
+  </animations>
+</variant>

binaries/data/mods/public/art/variants/biped/attack_ranged_archer.xml

@@ -0,0 +1,9 @@
+<variant name="attack_ranged">
+  <animations>
+    <animation event="0.81" file="biped/inf_arch_atk_a.psa" load="0.16" name="attack_ranged" speed="90"/>
+  </animations>
+  <props>
+    <prop actor="props/units/weapons/arrow_back.xml" attachpoint="loaded-r_hand"/>
+    <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
+  </props>
+</variant>

binaries/data/mods/public/art/variants/biped/attack_ranged_javelinist.xml

@@ -0,0 +1,10 @@
+<variant name="attack_ranged">
+  <animations>
+    <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="75"/>
+  </animations>
+  <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>

binaries/data/mods/public/art/variants/biped/attack_ranged_slinger.xml

@@ -0,0 +1,5 @@
+<variant name="attack_ranged">
+  <animations>
+    <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="attack_ranged" speed="30"/>
+  </animations>
+</variant>