From e68900e5c481a9d49922f534637f4c96461e750e Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Mon, 15 Nov 2010 00:18:03 +0000
Subject: [PATCH] New metal and stone shuttling. Test out on 'Resources Demo'
 map. Use spearman and cavjav.

This was SVN commit r8611.
---
 .../public/art/actors/props/units/shuttle_metal.xml   | 10 ++++++++++
 .../public/art/actors/props/units/shuttle_stone.xml   | 10 ++++++++++
 .../art/actors/structures/hellenes/wall_gate.xml      |  5 +++++
 .../art/actors/units/celts/cavalry_javelinist_b.xml   | 11 +++--------
 .../art/actors/units/celts/cavalry_javelinist_b_r.xml |  9 +++++++++
 .../art/actors/units/celts/infantry_spearman_b.xml    | 10 ++++------
 .../public/art/meshes/props/special/brontoburger.dae  |  2 +-
 .../public/art/meshes/props/special/metal_block.dae   |  3 +++
 .../public/art/meshes/props/special/stone_block.dae   |  3 +++
 9 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/units/shuttle_metal.xml
 create mode 100644 binaries/data/mods/public/art/actors/props/units/shuttle_stone.xml
 create mode 100644 binaries/data/mods/public/art/meshes/props/special/metal_block.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/special/stone_block.dae

diff --git a/binaries/data/mods/public/art/actors/props/units/shuttle_metal.xml b/binaries/data/mods/public/art/actors/props/units/shuttle_metal.xml
new file mode 100644
index 0000000000..12aac74250
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/shuttle_metal.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="carry metal">
+      <mesh>props/special/metal_block.dae</mesh>
+      <texture>props/helmet/rome-e-coolus-02.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/props/units/shuttle_stone.xml b/binaries/data/mods/public/art/actors/props/units/shuttle_stone.xml
new file mode 100644
index 0000000000..c61899d747
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/shuttle_stone.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="carry stone">
+      <mesh>props/special/stone_block.dae</mesh>
+      <texture>structural/foundation.dds</texture>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
index 17b3f95237..b208c7a346 100644
--- a/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
+++ b/binaries/data/mods/public/art/actors/structures/hellenes/wall_gate.xml
@@ -7,6 +7,11 @@
       <props>
         <prop actor="props/structures/hellenes/gate_props.xml" attachpoint="root"/>
         <prop actor="props/structures/hellenes/gate_door.xml" attachpoint="root"/>
+        <prop actor="units/hellenes/xenophon.xml" attachpoint="gar01"/>
+        <prop actor="units/hellenes/infantry_javelinist_a.xml" attachpoint="gar02"/>
+        <prop actor="units/hellenes/infantry_archer_e.xml" attachpoint="gar03"/>
+        <prop actor="units/hellenes/infantry_javelinist_b.xml" attachpoint="gar04"/>
+        <prop actor="units/hellenes/infantry_archer_e.xml" attachpoint="gar05"/>
       </props>
       <texture>structural/hele_struct_b.png</texture>
     </variant>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml
index 2c9e7a9307..f93f0a8014 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b.xml
@@ -1,14 +1,13 @@
-<?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_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="50"/>
+        <animation file="quadraped/horse_walk.psa" name="carry_meat" speed="120"/>
         <animation event=".5" file="quadraped/horse_idle_a.psa" name="Melee" speed="20"/>
         <animation file="quadraped/horse_death.psa" name="death" speed="240"/>
       </animations>
@@ -18,7 +17,6 @@
       </props>
     </variant>
   </group>
-
   <group>
     <variant frequency="7" name="feet">
       <texture>skeletal/horse_celt_feet_a.dds</texture>
@@ -42,7 +40,6 @@
       <texture>skeletal/horse_celt_stripe_a.dds</texture>
     </variant>
   </group>
-
   <group>
     <variant frequency="2" name="black">
       <colour>81 81 85</colour>
@@ -63,7 +60,5 @@
       <colour>255 148 89</colour>
     </variant>
   </group>
-
   <material>objectcolor.xml</material>
-
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml
index 1c91132b43..ef8266f842 100644
--- a/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/cavalry_javelinist_b_r.xml
@@ -20,5 +20,14 @@
       <texture>skeletal/celt_ijv_b_01.dds</texture>
     </variant>
   </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="carry_meat">
+      <props>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/shuttle_meat.xml" attachpoint="r_hand"/>
+      </props>
+    </variant>
+  </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml
index 0f59808c34..c6d2b9e34e 100644
--- a/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/infantry_spearman_b.xml
@@ -139,17 +139,15 @@
     <variant name="carry_stone">
       <props>
         <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="geology/gray1.xml" attachpoint="head"/>
+        <prop actor="props/units/shuttle_stone.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
       </props>
     </variant>
     <variant name="carry_metal">
       <props>
         <prop attachpoint="shield"/>
-        <prop attachpoint="r_hand"/>
-        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
-        <prop actor="geology/gray1.xml" attachpoint="head"/>
+        <prop actor="props/units/shuttle_metal.xml" attachpoint="r_hand"/>
+        <prop actor="" attachpoint="l_hand"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/meshes/props/special/brontoburger.dae b/binaries/data/mods/public/art/meshes/props/special/brontoburger.dae
index 7602b8c7e7..50bc8cb512 100644
--- a/binaries/data/mods/public/art/meshes/props/special/brontoburger.dae
+++ b/binaries/data/mods/public/art/meshes/props/special/brontoburger.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8557a08460666a2074d52522b8858bba8242adccba8409467879f5177ce549c5
+oid sha256:34b4174cb91834758d637eff24a20ec315bb0f6bb3d99684dee97f2c83172cd9
 size 20851
diff --git a/binaries/data/mods/public/art/meshes/props/special/metal_block.dae b/binaries/data/mods/public/art/meshes/props/special/metal_block.dae
new file mode 100644
index 0000000000..4fb90d466a
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/special/metal_block.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10a906b2f5d25dc45c4c9a095887d3233891a895d779ab3c7423c3bdb9729dc6
+size 6930
diff --git a/binaries/data/mods/public/art/meshes/props/special/stone_block.dae b/binaries/data/mods/public/art/meshes/props/special/stone_block.dae
new file mode 100644
index 0000000000..fa329d94cf
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/special/stone_block.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d4a9eedaceb94bd54e16e501fd892d914a502afb7e08665e2f091f97cc59de0
+size 6924