From bc35dbaac6d237cf59abe7f07b98676103f495c3 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Sat, 3 Mar 2007 20:45:20 +0000
Subject: [PATCH] This was SVN commit r4941.

---
 .../units/romans/cavalry_spearman_a.xml       |  2 +-
 .../units/romans/cavalry_spearman_b.xml       |  2 +-
 .../units/romans/cavalry_spearman_e.xml       |  2 +-
 .../units/romans/hero_marcellus_horse.xml     |  5 +++-
 .../actors/units/romans/hero_marcellus_r.xml  |  4 +--
 .../units/romans/infantry_javelinist_a.xml    |  3 +-
 .../units/romans/infantry_javelinist_b.xml    |  3 +-
 .../units/romans/infantry_javelinist_e.xml    |  3 +-
 .../units/romans/infantry_slinger_a.xml       | 29 -------------------
 .../units/romans/infantry_slinger_b.xml       | 27 -----------------
 .../units/romans/infantry_slinger_e.xml       | 28 ------------------
 11 files changed, 12 insertions(+), 96 deletions(-)
 delete mode 100644 binaries/data/mods/official/art/actors/units/romans/infantry_slinger_a.xml
 delete mode 100644 binaries/data/mods/official/art/actors/units/romans/infantry_slinger_b.xml
 delete mode 100644 binaries/data/mods/official/art/actors/units/romans/infantry_slinger_e.xml

diff --git a/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_a.xml
index 5a7e0a374f..d7e484b030 100644
--- a/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_a.xml
@@ -7,7 +7,7 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="10"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
         <animation file="quadraped/horse_gallop.psa" name="run" speed="8"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="100"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_b.xml
index c508ac5538..6969a6ee9e 100644
--- a/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_b.xml
@@ -7,7 +7,7 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="10"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
         <animation file="quadraped/horse_gallop.psa" name="run" speed="8"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="100"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_e.xml
index 969425d2b3..18cb40152a 100644
--- a/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/cavalry_spearman_e.xml
@@ -7,7 +7,7 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="10"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
         <animation file="quadraped/horse_gallop.psa" name="run" speed="8"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="100"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="100"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_horse.xml b/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_horse.xml
index d95eba8a5c..8ac2540368 100644
--- a/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_horse.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_horse.xml
@@ -7,8 +7,11 @@
     <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
+        <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="100"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="100"/>
         <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="20"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="18"/>
         <animation file="quadraped/horse_attack_a.psa" name="melee" speed="150"/>
         <animation file="quadraped/horse_attack_b.psa" name="melee" speed="150"/>
       </animations>
diff --git a/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_r.xml b/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_r.xml
index afe23dafc3..7afa9c5978 100644
--- a/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_r.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/hero_marcellus_r.xml
@@ -6,8 +6,8 @@
   <group>
     <variant frequency="1" name="Base">
       <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="100"/>
-        <animation file="biped/cavalryidle.psa" name="Walk" speed="100"/>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="20"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="20"/>
         <animation file="biped/rider_gallop.psa" name="run" speed="8"/>
         <animation event="0.5" file="biped/rider_sword_shield_atk_a.psa" name="melee" speed="90"/>
         <animation event="0.5" file="biped/rider_spear_shield_atk_a.psa" name="melee" speed="100"/>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_a.xml
index 732ed3b5bd..a98c49b310 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_a.xml
@@ -8,7 +8,7 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
@@ -22,7 +22,6 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="250"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="250"/>
       </animations>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_b.xml
index 1e3f059cdd..0caa919169 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_b.xml
@@ -8,7 +8,7 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
@@ -22,7 +22,6 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="250"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="250"/>
       </animations>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_e.xml
index 0bb583c261..2ec6b122cf 100644
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/romans/infantry_javelinist_e.xml
@@ -8,7 +8,7 @@
       <animations>
         <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="100"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="20"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="20"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="5"/>
         <animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="10"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="10"/>
@@ -22,7 +22,6 @@
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_03.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_04.psa" name="Death" speed="250"/>
-        <animation file="infantry/general/death/inf_05.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="250"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="250"/>
       </animations>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_a.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_a.xml
deleted file mode 100644
index c2c7760d32..0000000000
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_a.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="Attack" speed="100"/>
-      </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
-      <props>
-        <prop actor="props/temp/rome_sign_infantry_slinger_a.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_a.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_head_rome.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
-        <prop actor=""/>
-      </props>
-      <texture>skeletal/plac_rome_a.dds</texture>
-    </variant>
-  </group>
-
-</actor>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_b.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_b.xml
deleted file mode 100644
index a8caabd10d..0000000000
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_b.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="Attack" speed="100"/>
-      </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
-      <props>
-        <prop actor="props/temp/rome_sign_infantry_slinger_b.xml" attachpoint="head_extra"/>
-        <prop actor="props/units/heads/placeholder_head_rome.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
-      </props>
-      <texture>skeletal/plac_rome_b.dds</texture>
-    </variant>
-  </group>
-
-</actor>
diff --git a/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_e.xml b/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_e.xml
deleted file mode 100644
index f2ce2b591c..0000000000
--- a/binaries/data/mods/official/art/actors/units/romans/infantry_slinger_e.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations>
-        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="200"/>
-        <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="20"/>
-        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="150"/>
-        <animation file="infantry/general/dude/dudechop.psa" name="Chop" speed="150"/>
-        <animation file="infantry/general/dude/dudedeath_sword.psa" name="Death" speed="200"/>
-        <animation file="infantry/general/dude/dudedecay_sword.psa" name="Corpse" speed="100"/>
-        <animation event="0.5" file="biped/inf_sling_atk_a.psa" name="Attack" speed="100"/>
-      </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
-      <props>
-        <prop actor="props/temp/rome_sign_infantry_slinger_e.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_e.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_head_rome.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/sling.xml" attachpoint="r_hand"/>
-      </props>
-      <texture>skeletal/plac_rome_e.dds</texture>
-    </variant>
-  </group>
-
-</actor>