From 8484a2b2e20dd1c1cd1f3d0bc44128dc90adaa1c Mon Sep 17 00:00:00 2001
From: Pureon <pureon@wildfiregames.com>
Date: Thu, 8 Mar 2012 23:52:46 +0000
Subject: [PATCH] New Roman and Hele trader units

This was SVN commit r11285.
---
 .../art/actors/units/hellenes/trader.xml      | 23 ++++++++++++++-----
 .../animation/mechanical/trader_cart_idle.dae |  3 +++
 .../animation/mechanical/trader_cart_move.dae |  3 +++
 .../art/meshes/skeletal/trader_cart.dae       |  3 +++
 .../templates/units/rome_support_trader.xml   |  7 +-----
 5 files changed, 27 insertions(+), 12 deletions(-)
 create mode 100644 binaries/data/mods/public/art/animation/mechanical/trader_cart_idle.dae
 create mode 100644 binaries/data/mods/public/art/animation/mechanical/trader_cart_move.dae
 create mode 100644 binaries/data/mods/public/art/meshes/skeletal/trader_cart.dae

diff --git a/binaries/data/mods/public/art/actors/units/hellenes/trader.xml b/binaries/data/mods/public/art/actors/units/hellenes/trader.xml
index 2406e12cc1..7332707dba 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/trader.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/trader.xml
@@ -1,15 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
+
   <castshadow/>
+
   <group>
-    <variant frequency="100" name="Base">
-      <mesh>skeletal/celt_trader.dae</mesh>
+    <variant frequency="100" name="Trader Cart">
+      <animations>
+        <animation file="mechanical/trader_cart_idle.dae" name="Idle" speed="100"/>
+        <animation file="mechanical/trader_cart_move.dae" name="Walk" speed="10"/>
+        <animation file="mechanical/trader_cart_move.dae" name="Run" speed="10"/>
+      </animations>
+      <mesh>skeletal/trader_cart.dae</mesh>
       <props>
-        <prop actor="units/hellenes/trader_r.xml" attachpoint="trader"/>
-        <prop actor="units/celts/trader_h.xml" attachpoint="donkey"/>
+        <prop actor="units/celts/boudicca_chariot_h1.xml" attachpoint="horse"/>
+        <prop actor="units/global/slave.xml" attachpoint="trader"/>
+        <prop actor="props/special/eyecandy/crate_a.xml" attachpoint="goodsa"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="goodsb"/>
       </props>
-      <texture>null_white.dds</texture>
+      <texture>structural/rome_ram.png</texture>
     </variant>
   </group>
+
   <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/public/art/animation/mechanical/trader_cart_idle.dae b/binaries/data/mods/public/art/animation/mechanical/trader_cart_idle.dae
new file mode 100644
index 0000000000..a4c449e782
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/mechanical/trader_cart_idle.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:219d2fb385329d3738d55d2d2d1f52637c957a5875ed874f60c87672fd88def5
+size 131683
diff --git a/binaries/data/mods/public/art/animation/mechanical/trader_cart_move.dae b/binaries/data/mods/public/art/animation/mechanical/trader_cart_move.dae
new file mode 100644
index 0000000000..02cfc0ecee
--- /dev/null
+++ b/binaries/data/mods/public/art/animation/mechanical/trader_cart_move.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86573cd6c2ed303cbd7720a3e6bea2929e21b29ba0d5d021c380eef82fdd82b9
+size 142752
diff --git a/binaries/data/mods/public/art/meshes/skeletal/trader_cart.dae b/binaries/data/mods/public/art/meshes/skeletal/trader_cart.dae
new file mode 100644
index 0000000000..8d4244ca89
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/skeletal/trader_cart.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:044cfc814a354b8f1a7c6c59cc0d9be1cffc493433810b334272f91b48823e67
+size 131683
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_support_trader.xml b/binaries/data/mods/public/simulation/templates/units/rome_support_trader.xml
index 7166d8e5be..2192d6877f 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_support_trader.xml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_trader">
-  <Footprint>
-    <Circle radius="1.5"/>
-    <Height>3.0</Height>
-  </Footprint>
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Plebean</SpecificName>
     <History>Plebians were the poor class in Roman society, underneath the patricians, often carrying out much local trading and business. While patricians financed large business ventures plebian merchants did the actual work. They traded far and wide, from Iberia to Syria, buying and selling everything from salt to wool to horses to metals to glass to slaves. Rome's extensive network of roads within Italy, many ports, and central location within the Mediterranean made it an ideal place to do business.</History>
-    <Icon>units/rome_support_trader.png</Icon>
   </Identity>
   <VisualActor>
-    <Actor>units/romans/trader.xml</Actor>
+    <Actor>units/hellenes/trader.xml</Actor>
   </VisualActor>
 </Entity>