Changeset 9919 for ps

Timestamp:

07/25/11 10:56:54 (13 years ago)

Author:

michael

Message:

Unit actor work. Updated some portraits. Started work on a samnite shield, but the collada files are being goofy (looks like the normals are flipped, but they aren't).

Location:

ps/trunk/binaries/data/mods/public

Files:

• art/actors/props/units/shields/samn_scutum_adv.xml (added)
• art/actors/props/units/shields/samn_scutum_back.xml (added)
• art/actors/props/units/weapons/spartan_sword.xml (added)
• art/actors/units/carthaginians/cavalry_javelinist_a_r.xml (modified) (2 diffs)
• art/actors/units/carthaginians/cavalry_javelinist_b_r.xml (modified) (2 diffs)
• art/actors/units/carthaginians/cavalry_javelinist_e_r.xml (modified) (2 diffs)
• art/actors/units/carthaginians/infantry_archer_a.xml (modified) (9 diffs)
• art/actors/units/carthaginians/infantry_archer_b.xml (modified) (1 diff)
• art/actors/units/carthaginians/infantry_archer_e.xml (modified) (9 diffs)
• art/actors/units/carthaginians/infantry_spearman_b.xml (modified) (1 diff)
• art/actors/units/carthaginians/infantry_spearman_e.xml (modified) (2 diffs)
• art/actors/units/celts/boudicca_horse.xml (modified) (3 diffs)
• art/actors/units/celts/boudicca_r.xml (modified) (4 diffs)
• art/actors/units/celts/boudicca_r2.xml (modified) (1 diff)
• art/actors/units/celts/brennus.xml (modified) (1 diff)
• art/actors/units/celts/britomartus.xml (modified) (1 diff)
• art/actors/units/celts/caradoc.xml (modified) (1 diff)
• art/actors/units/celts/champion_unit_4_d.xml (modified) (1 diff)
• art/actors/units/celts/champion_unit_4_h.xml (modified) (4 diffs)
• art/actors/units/celts/champion_unit_4_h2.xml (modified) (4 diffs)
• art/actors/units/celts/champion_unit_4_r.xml (modified) (5 diffs)
• art/actors/units/celts/cynvelin_horse.xml (modified) (1 diff)
• art/actors/units/celts/cynvelin_r.xml (modified) (1 diff)
• art/actors/units/celts/vercingetorix_horse.xml (modified) (1 diff)
• art/actors/units/celts/vercingetorix_r.xml (modified) (1 diff)
• art/meshes/props/shield/samn_scutum_back.dae (added)
• art/meshes/props/shield/samn_scutum_front.dae (added)
• art/meshes/props/sword_spartan_1.dae (added)
• art/textures/skins/props/shield/thureos_white.png (added)
• art/textures/skins/props/shield/towershield_wood_white.dds (added)
• art/textures/ui/session/portraits/units/cart_cavalry_javelinist.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_cavalry_spearman.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_cavalry_swordsman.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_champion_cavalry.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_champion_infantry.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_hero_hamilcar.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_hero_hannibal.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_hero_maharbal.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_infantry_archer.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_infantry_javelinist.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_infantry_slinger.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_infantry_spearman.png (modified) ( previous)
• art/textures/ui/session/portraits/units/cart_infantry_swordsman.png (modified) ( previous)
• art/textures/ui/session/portraits/units/iber_infantry_javelinist.png (added)
• art/textures/ui/session/portraits/units/thespian_melanochitones.png (modified) ( previous)
• simulation/templates/structures/cart_civil_centre.xml (modified) (1 diff)
• simulation/templates/units/iber_infantry_javelinist_b.xml (modified) (1 diff)

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_javelinist_a_r.xml

@@ -9 +9 @@
         <animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
         <animation event="0.59" file="biped/rider_javelin_atk_a.psa" load="0" name="Melee" speed="50"/>
-        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="100"/>
-        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="100"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="350"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="350"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
       </animations>
@@ -34 +34 @@
       </props>
     </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
   </group>
   <material>player_trans.xml</material>

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_javelinist_b_r.xml

@@ -9 +9 @@
         <animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
         <animation event="0.59" file="biped/rider_javelin_atk_a.psa" load="0" name="Melee" speed="50"/>
-        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="100"/>
-        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="100"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="350"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="350"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
       </animations>
@@ -33 +33 @@
       </props>
     </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
   </group>
   <material>player_trans.xml</material>

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/cavalry_javelinist_e_r.xml

@@ -9 +9 @@
         <animation file="biped/rider_gallop.psa" name="Run" speed="40"/>
         <animation event="0.59" file="biped/rider_javelin_atk_a.psa" load="0" name="Melee" speed="50"/>
-        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="100"/>
-        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="100"/>
+        <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="350"/>
+        <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="350"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
       </animations>
@@ -34 +34 @@
       </props>
     </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop actor="props/units/weapons/spartan_sword.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
   </group>
   <material>player_trans.xml</material>

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/infantry_archer_a.xml

@@ -8 +8 @@
         <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="Melee" speed="90"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="125"/>
         <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"/>
@@ -53 +53 @@
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -58 +59 @@
       <props>
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
-        <prop attachpoint="r_hand"/>
+        <prop actor="" attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -66 +68 @@
         <prop attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -73 +76 @@
         <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -79 +83 @@
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -85 +90 @@
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -91 +97 @@
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -97 +104 @@
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/infantry_archer_b.xml

@@ -8 +8 @@
         <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="Melee" speed="90"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="130"/>
         <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"/>

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/infantry_archer_e.xml

@@ -8 +8 @@
         <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="Melee" speed="90"/>
-        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="120"/>
         <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"/>
@@ -54 +54 @@
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -60 +61 @@
         <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -67 +69 @@
         <prop attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -74 +77 @@
         <prop attachpoint="l_hand"/>
         <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -80 +84 @@
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -86 +91 @@
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -92 +98 @@
         <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
         <prop attachpoint="r_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>
@@ -98 +105 @@
         <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
         <prop attachpoint="l_hand"/>
+        <prop attachpoint="shield"/>
       </props>
     </variant>

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_b.xml

@@ -10 +10 @@
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="50"/>
         <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="110"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="111"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="122"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="135"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="125"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="130"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="38"/>

ps/trunk/binaries/data/mods/public/art/actors/units/carthaginians/infantry_spearman_e.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
@@ -10 +10 @@
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="50"/>
         <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="110"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="111"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="122"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="117"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="110"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="115"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="38"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/boudicca_horse.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
@@ -9 +7 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="35"/>
         <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"/>
@@ -22 +20 @@
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/boudicca_r.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
@@ -9 +7 @@
         <animation file="female/f_cav_idle_01.dae" name="Idle" speed="50"/>
         <animation file="female/f_cav_idle_01.dae" name="Walk" speed="50"/>
-        <animation file="female/f_cav_run_01.dae" name="Run" speed="8"/>
+        <animation file="female/f_cav_run_01.dae" name="Run" speed="30"/>
         <animation file="female/f_cav_death_01.dae" name="Death" speed="230"/>
         <animation event=".5" file="female/f_cav_jav_atk_01.dae" load="0" name="melee" speed="50"/>
@@ -21 +19 @@
     </variant>
   </group>
-
   <group>
     <variant name="Melee">
@@ -31 +28 @@
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/boudicca_r2.xml

@@ -7 +7 @@
         <animation file="female/f_chariot_idle_01.dae" name="Idle" speed="10"/>
         <animation file="female/f_chariot_idle_01.dae" name="Walk" speed="20"/>
-        <animation file="female/f_chariot_run_01.dae" name="Run" speed="10"/>
+        <animation file="female/f_chariot_run_01.dae" name="Run" speed="5"/>
         <animation file="female/f_death_01.dae" name="Death" speed="100"/>
         <animation event="0.6" file="female/f_jav_atk_01.dae" load="0" name="melee" speed="120"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/brennus.xml

@@ -13 +13 @@
         <animation file="biped/inf_sword_ready_d.dae" name="Idle" speed="100"/>
         <animation file="biped/dudewalk_swordshield.psa" name="Walk" speed="120"/>
-        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="6"/>
+        <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="100"/>
         <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Attack" speed="100"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/britomartus.xml

@@ -7 +7 @@
         <animation file="biped/inf_sword_ready_a.dae" name="Idle" 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="5"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_a.psa" name="Attack" speed="100"/>
         <animation event="0.5" file="biped/inf_spear_shield_atk_b.psa" name="Attack" speed="100"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/caradoc.xml

@@ -7 +7 @@
         <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="100"/>
         <animation file="biped/inf_sword_ready_e.dae" name="Idle" speed="85"/>
-        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="130"/>
         <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
         <animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/champion_unit_4_d.xml

@@ -7 +7 @@
         <animation file="biped/cav_chariot_rider_idle_a.dae" name="Idle" speed="20"/>
         <animation file="biped/cav_chariot_rider_idle_a.dae" name="Walk" speed="20"/>
-        <animation file="biped/cav_chariot_rider_run_a.dae" name="Run" speed="5"/>
+        <animation file="biped/cav_chariot_rider_run_a.dae" name="Run" speed="2"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="200"/>
       </animations>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/champion_unit_4_h.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <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="50"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="30"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
         <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="105"/>
         <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="95"/>
@@ -17 +15 @@
     </variant>
   </group>
-
   <group>
     <variant frequency="5" name="horse1-plain">
@@ -29 +26 @@
     </variant>
   </group>
-
   <group>
     <variant frequency="2" name="horse1-black">
@@ -50 +46 @@
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/champion_unit_4_h2.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <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="50"/>
-        <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="30"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="100"/>
         <animation event=".5" file="quadraped/horse_attack_a.psa" name="Melee" speed="105"/>
         <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="95"/>
@@ -17 +15 @@
     </variant>
   </group>
-
   <group>
     <variant frequency="5" name="horse2-plain">
@@ -29 +26 @@
     </variant>
   </group>
-
   <group>
     <variant frequency="2" name="horse2-black">
@@ -50 +46 @@
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/champion_unit_4_r.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
@@ -10 +8 @@
         <animation event="0.4" file="infantry/javelin/attack/ijv_off_01.psa" load="0" name="Melee" speed="60"/>
         <animation file="biped/cav_chariot_driver_idle_a.dae" name="Walk" speed="10"/>
-        <animation file="biped/cav_chariot_driver_run_a.dae" name="Run" speed="10"/>
+        <animation file="biped/cav_chariot_driver_run_a.dae" name="Run" speed="5"/>
         <animation file="infantry/general/death/inf_01.psa" name="Death" speed="200"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="200"/>
@@ -28 +26 @@
     </variant>
   </group>
-
   <group>
     <variant frequency="1" name="chainmail-1">
@@ -34 +31 @@
     </variant>
   </group>
-
   <group>
     <variant frequency="100" name="Idle">
@@ -50 +46 @@
     </variant>
   </group>
-
   <material>player_trans.xml</material>
-
 </actor>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/cynvelin_horse.xml

@@ -7 +7 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="30"/>
         <animation event="" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
         <animation event="" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/cynvelin_r.xml

@@ -7 +7 @@
         <animation file="biped/cavalryidle.psa" name="Idle" speed="25"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="25"/>
-        <animation file="cavalry/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/rider_gallop.psa" name="Run" speed="30"/>
         <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
         <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/vercingetorix_horse.xml

@@ -7 +7 @@
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
         <animation file="quadraped/horse_walk.psa" name="Walk" speed="120"/>
-        <animation file="quadraped/horse_gallop.psa" name="Run" speed="50"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="35"/>
         <animation event="" file="quadraped/horse_attack_a.psa" name="Melee" speed="20"/>
         <animation event="" file="quadraped/horse_attack_b.psa" name="Melee" speed="20"/>

ps/trunk/binaries/data/mods/public/art/actors/units/celts/vercingetorix_r.xml

@@ -7 +7 @@
         <animation file="biped/cavalryidle.psa" name="Idle" speed="25"/>
         <animation file="biped/cavalryidle.psa" name="Walk" speed="25"/>
-        <animation file="cavalry/rider_gallop.psa" name="Run" speed="10"/>
+        <animation file="cavalry/rider_gallop.psa" name="Run" speed="35"/>
         <animation event="0.5" file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="400"/>
         <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="400"/>

ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart_civil_centre.xml

@@ -12 +12 @@
     <Entities datatype="tokens">
       units/cart_infantry_spearman_b
-      units/cart_infantry_slinger_b
+      units/cart_infantry_archer_b
       units/cart_cavalry_javelinist_b
     </Entities>

ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_infantry_javelinist_b.xml

@@ -6 +6 @@
     <SpecificName>Caetrati Lusitano</SpecificName>
     <History>Iberians, especially the Lusitanians, were good at ranged combat and ambushing enemy columns. They throw heavy iron javelins and sometimes even add burning pitch to them, making them good as a cheap siege weapon.</History>
-    <Icon>units/cart_cavalry_javelinist.png</Icon>
+    <Icon>units/iber_infantry_javelinist.png</Icon>
   </Identity>
   <Promotion>