From 672f4572063513cd4f1ec152a52fe44700bcfae5 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Fri, 11 Jan 2008 18:12:50 +0000
Subject: [PATCH] This was SVN commit r5545.

---
 .../props/units/heads/head_numid_all.xml      | 25 ++++++++++++++
 .../carthaginians/cavalry_javelinist_a.xml    | 34 +++++++++++++++++--
 .../carthaginians/cavalry_javelinist_a_r.xml  | 24 ++++++-------
 .../carthaginians/cavalry_javelinist_b.xml    | 12 +++----
 .../carthaginians/cavalry_javelinist_b_r.xml  |  3 +-
 .../units/carthaginians/super_unit_2.xml      | 11 +-----
 .../skins/skeletal/horse_kart_cjv_b_1.dds     |  2 +-
 .../skins/skeletal/horse_kart_cjv_b_3.dds     |  2 +-
 .../units/cart_cavalry_javelinist_a.xml       |  6 ++--
 .../units/cart_cavalry_javelinist_b.xml       |  6 ++--
 .../units/cart_cavalry_javelinist_e.xml       |  6 ++--
 11 files changed, 86 insertions(+), 45 deletions(-)
 create mode 100644 binaries/data/mods/official/art/actors/props/units/heads/head_numid_all.xml

diff --git a/binaries/data/mods/official/art/actors/props/units/heads/head_numid_all.xml b/binaries/data/mods/official/art/actors/props/units/heads/head_numid_all.xml
new file mode 100644
index 0000000000..49636209ff
--- /dev/null
+++ b/binaries/data/mods/official/art/actors/props/units/heads/head_numid_all.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="numidian-face-trimbeard-longhair">
+      <mesh>props/head_longhair.pmd</mesh>
+      <texture>props/head/numid_face_a.dds</texture>
+    </variant>
+    <variant frequency="1" name="numidian-face-goatee-longhair">
+      <mesh>props/head_longhair.pmd</mesh>
+      <texture>props/head/numid_face_b.dds</texture>
+    </variant>
+    <variant frequency="1" name="numidian-face-goatee">
+      <mesh>props/head_goatee.pmd</mesh>
+      <texture>props/head/numid_face_b.dds</texture>
+    </variant>
+    <variant frequency="1" name="numidian-face-beard-wide">
+      <mesh>props/head_beard_wide.pmd</mesh>
+      <texture>props/head/numid_face_c.dds</texture>
+    </variant>
+  </group>
+
+</actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a.xml
index 933e8c1869..16dd36d063 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a.xml
@@ -4,17 +4,45 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
-        <animation file="quadraped/horse_gallop.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/horse_gallop.psa" name="Run" speed="8"/>
+        <animation file="quadraped/horse_walk.psa" name="Walk" speed="17"/>
+        <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"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
         <prop actor="units/carthaginians/cavalry_javelinist_a_r.xml" attachpoint="rider"/>
       </props>
-      <texture>skeletal/horse_dun_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Horse-Texture-Plain">
+      <texture>skeletal/horse_kart_cjv_b_1.dds</texture>
+    </variant>
+    <variant frequency="1" name="Horse-Texture-Snipe">
+      <texture>skeletal/horse_kart_cjv_b_2.dds</texture>
+    </variant>
+    <variant frequency="1" name="Horse-Texture-Boots">
+      <texture>skeletal/horse_kart_cjv_b_3.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="horse-color-gray">
+      <colour>238 232 204</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-ruddish">
+      <colour>254 200 160</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-sandy">
+      <colour>254 214 129</colour>
+    </variant>
+  </group>
+
+  <material>objectcolor.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a_r.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a_r.xml
index 2f5cc6f45f..d4bd1329ae 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_a_r.xml
@@ -6,24 +6,22 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/cavalryidle.psa" name="Idle" speed="0"/>
-        <animation file="biped/cavalryidle.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="infantry/general/dude/dudeattack.psa" name="Attack" speed="100"/>
-        <animation event="0.5" file="infantry/general/dude/dudeattack1.psa" name="Attack" speed="100"/>
+        <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
+        <animation file="biped/cavalryidle.psa" name="Walk" speed="50"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation event=".5" file="biped/rider_javelin_atk_a.psa" load="0" name="Melee" speed="50"/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
-        <prop actor="props/temp/kart_sign_cavalry_javelinist_a.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_a.xml" attachpoint="helmet"/>
-        <prop actor="props/units/heads/placeholder_hele_kart.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_numid_all.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
+        <prop actor="props/units/shields/numidian_round_1.xml" attachpoint="shield"/>
       </props>
-      <texture>skeletal/plac_kart_a.dds</texture>
+      <texture>skeletal/kart_cjv_a_1.dds</texture>
     </variant>
   </group>
 
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b.xml
index 9410c8a7d0..c33b2c6ac3 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b.xml
@@ -32,14 +32,14 @@
   </group>
 
   <group>
-    <variant frequency="1" name="horse-color-palamino">
-      <colour>210 193 123</colour>
+    <variant frequency="1" name="horse-color-gray">
+      <colour>238 232 204</colour>
     </variant>
-    <variant frequency="1" name="horse-color-strawberryroan">
-      <colour>254 117 16</colour>
+    <variant frequency="1" name="horse-color-ruddish">
+      <colour>254 200 160</colour>
     </variant>
-    <variant frequency="1" name="horse-color-dun">
-      <colour>194 132 1</colour>
+    <variant frequency="1" name="horse-color-sandy">
+      <colour>254 214 129</colour>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b_r.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b_r.xml
index 5590268fda..57e129b440 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b_r.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_b_r.xml
@@ -13,10 +13,9 @@
       </animations>
       <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
-        <prop actor="props/units/heads/head_numid_basic.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/head_numid_all.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/shields/numidian_round_1.xml" attachpoint="shield"/>
       </props>
       <texture>skeletal/kart_cjv_b_1.dds</texture>
     </variant>
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml b/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml
index 929a7fa08f..f6b52cf133 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/super_unit_2.xml
@@ -10,17 +10,8 @@
   </group>
 
   <group>
-    <variant frequency="1" name="Blanket-1-hide-gray">
-      <texture>skeletal/kart_su2_ele_a.dds</texture>
-    </variant>
     <variant frequency="1" name="Blanket-1-hide-brown">
-      <texture>skeletal/kart_su2_ele_b.dds</texture>
-    </variant>
-    <variant frequency="2" name="Blanket-2-hide-gray">
-      <texture>skeletal/kart_su2_ele_c.dds</texture>
-    </variant>
-    <variant frequency="2" name="Blanket-2-hide-brown">
-      <texture>skeletal/kart_su2_ele_d.dds</texture>
+      <texture>skeletal/kart_su2_ele_a.dds</texture>
     </variant>
   </group>
 
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_1.dds
index aaae880ca1..6a4075d33f 100644
--- a/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_1.dds
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_1.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8f3e5bd2daf70b421a38e2bad1af7fcbebdf58a4b12150056eb17239b0ee25f
+oid sha256:0051ee2e1a47b3d2d858006410a4f14b64d25012662cddda3b4d512e9db9865e
 size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_3.dds b/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_3.dds
index 75a90f4582..837bf657c2 100644
--- a/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_3.dds
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/horse_kart_cjv_b_3.dds
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:63f83619d473602fbc31a381cc5b30e5155d846dee66f38d6726149a21be5e5e
+oid sha256:ad62ef6a867389d0a7cdfd0dbf30e955b2d646432c48d081be1f7ee60530ef84
 size 22000
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_a.xml b/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_a.xml
index e2f5fad974..570909882c 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_a.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_cavalry_javelinist_b"
->
+<Entity	Parent="cart_cavalry_javelinist_b">
 
 	<Traits>
 	
@@ -13,5 +11,7 @@
 		</Promotion>
 	
 	</Traits>
+	
+	<Actor>units/carthaginians/cavalry_javelinist_a.xml</Actor>
 
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_b.xml b/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_b.xml
index 70f20ad74b..40811db5ac 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_b.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="template_unit_cavalry_ranged_javelinist"
->
+<Entity	Parent="template_unit_cavalry_ranged_javelinist">
+
 	<Traits>
 	
 		<Id>
@@ -24,4 +23,5 @@
 	</Traits>
 
 	<Actor>units/carthaginians/cavalry_javelinist_b.xml</Actor>
+	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_e.xml b/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_e.xml
index fd9a728399..dcd3856ca9 100644
--- a/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/official/entities/units/cart_cavalry_javelinist_e.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="cart_cavalry_javelinist_a"
->
+<Entity	Parent="cart_cavalry_javelinist_a">
 
+	<Actor>units/carthaginians/cavalry_javelinist_e.xml</Actor>
+	
 </Entity>
\ No newline at end of file