From d7960fa775ce028e330859f75f33ed2f64a8a261 Mon Sep 17 00:00:00 2001
From: sanderd17 <sanderd17@wildfiregames.com>
Date: Sat, 25 Apr 2015 08:16:55 +0000
Subject: [PATCH] Try out some replacement animations for capturing on athenian
 infantry

This was SVN commit r16575.
---
 .../art/actors/units/athenians/infantry_archer_b.xml   | 10 +++++++++-
 .../actors/units/athenians/infantry_javelinist_b.xml   |  8 ++++++++
 .../art/actors/units/athenians/infantry_slinger_b.xml  |  9 +++++++++
 .../art/actors/units/athenians/infantry_spearman_b.xml |  8 ++++++++
 .../templates/units/athen_infantry_marine_archer_a.xml |  2 +-
 .../templates/units/athen_infantry_marine_archer_b.xml |  2 +-
 .../templates/units/athen_infantry_marine_archer_e.xml |  2 +-
 7 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
index 9c21fdb02e..fb8afc0b1a 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_archer_b.xml
@@ -6,8 +6,11 @@
       <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 event="0.4" file="infantry/sword/attack/isw_s_def_01.psa" name="attack_capture" speed="100"/>
+        <animation event="0.4" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_capture" speed="100"/>
+        <animation event="0.2" file="infantry/sword/attack/isw_s_em_04.psa" name="attack_capture" speed="100"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
+        <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/walk_spearshield.psa" name="carry_food" speed="120"/>
@@ -41,6 +44,11 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
+    <variant name="attack_capture">
+      <props>
+        <prop actor="props/units/tools/pitchfork.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
     <variant name="attack_ranged">
       <props>
         <prop actor="props/units/weapons/bow_short.xml" attachpoint="l_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
index e79efa18b9..de64416b68 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_javelinist_b.xml
@@ -5,6 +5,9 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
+        <animation event="0.4" file="infantry/sword/attack/isw_s_def_01.psa" name="attack_capture" speed="100"/>
+        <animation event="0.4" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_capture" speed="100"/>
+        <animation event="0.2" file="infantry/sword/attack/isw_s_em_04.psa" name="attack_capture" speed="100"/>
         <animation event="0.5" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="attack_ranged" speed="75"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
@@ -45,6 +48,11 @@
   </group>
   <group>
     <variant frequency="100" name="Idle"/>
+    <variant name="attack_capture">
+      <props>
+        <prop actor="props/units/tools/pitchfork.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
     <variant name="attack_ranged">
       <props>
         <prop attachpoint="r_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
index 255c0c53e3..0df08cdbb7 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_slinger_b.xml
@@ -11,6 +11,10 @@
         <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.4" file="infantry/sword/attack/isw_s_def_01.psa" name="attack_capture" speed="100"/>
+        <animation event="0.4" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_capture" speed="100"/>
+        <animation event="0.2" file="infantry/sword/attack/isw_s_em_04.psa" name="attack_capture" speed="100"/>
+
         <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="attack_ranged" speed="30"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="attack_slaughter" speed="100"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="38"/>
@@ -42,6 +46,11 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
+    <variant name="attack_capture">
+      <props>
+        <prop actor="props/units/tools/pitchfork.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
     <variant name="attack_slaughter">
       <props>
         <prop actor="props/units/weapons/knife.xml" attachpoint="r_hand"/>
diff --git a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
index c77fdc9e40..65d599645f 100644
--- a/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/athenians/infantry_spearman_b.xml
@@ -12,6 +12,9 @@
         <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.4" file="infantry/sword/attack/isw_s_def_01.psa" name="attack_capture" speed="100"/>
+        <animation event="0.4" file="infantry/sword/attack/isw_s_def_06.psa" name="attack_capture" speed="100"/>
+        <animation event="0.2" file="infantry/sword/attack/isw_s_em_04.psa" name="attack_capture" speed="100"/>
         <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_melee" speed="200"/>
         <animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="attack_slaughter" speed="200"/>
         <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="250"/>
@@ -52,6 +55,11 @@
   </group>
   <group>
     <variant frequency="1" name="Idle"/>
+    <variant name="attack_capture">
+      <props>
+        <prop actor="props/units/tools/pitchfork.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
     <variant name="attack_melee">
       <props>
         <prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml
index 501a8c8f3f..b00f0408a3 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_a.xml
@@ -27,6 +27,6 @@
     <Max>700</Max>
   </Stamina>
   <VisualActor>
-    <Actor>units/macedonians/infantry_archer_a.xml</Actor>
+    <Actor>units/athenians/infantry_archer_a.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
index 9f5fc02de1..7249c0077e 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml
@@ -28,6 +28,6 @@
     <Entity>units/athen_infantry_marine_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/macedonians/infantry_archer_b.xml</Actor>
+    <Actor>units/athenians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml
index 78b432497b..66bfa897f0 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_e.xml
@@ -31,6 +31,6 @@
     </Run>
   </UnitMotion>
   <VisualActor>
-    <Actor>units/macedonians/infantry_archer_e.xml</Actor>
+    <Actor>units/athenians/infantry_archer_e.xml</Actor>
   </VisualActor>
 </Entity>