From 7b1213265022c3b0e4217114e1a4477b88d4d0ab Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Wed, 9 Nov 2011 07:58:40 +0000
Subject: [PATCH] New "sagaris" battle axe prop.

Tweaking Persian units.

Added Persians to "Oasis III."

This was SVN commit r10490.
---
 .../actors/props/units/weapons/axe_sagaris.xml  | 17 +++++++++++++++++
 .../units/persians/cavalry_javelinist_a_r.xml   | 14 ++++++++++----
 .../units/persians/cavalry_javelinist_b.xml     | 17 ++++++++++++++++-
 .../units/persians/cavalry_spearman_b.xml       |  1 +
 .../units/persians/cavalry_swordsman_a_r.xml    | 14 +++++++-------
 .../units/persians/cavalry_swordsman_b.xml      |  8 +-------
 .../units/persians/cavalry_swordsman_b_r.xml    |  2 +-
 .../units/persians/cavalry_swordsman_e_r.xml    |  3 ++-
 .../public/art/meshes/props/ax_sagaris_a.dae    |  3 +++
 .../public/art/meshes/props/ax_sagaris_b.dae    |  3 +++
 .../art/meshes/props/shield/per_back_curved.dae |  4 ++--
 .../skins/skeletal/horse_pers_csw_b.dds         |  3 +++
 .../textures/skins/skeletal/pers_cjv_a_1.png    |  3 +++
 .../textures/skins/skeletal/pers_cjv_a_2.png    |  3 +++
 .../textures/skins/skeletal/pers_cjv_a_3.png    |  3 +++
 .../textures/skins/skeletal/pers_csw_a_01.dds   |  3 +++
 .../textures/skins/skeletal/pers_csw_a_02.dds   |  3 +++
 .../mods/public/maps/scenarios/Oasis II.xml     |  4 ++--
 .../mods/public/maps/scenarios/Oasis III.xml    |  4 ++--
 19 files changed, 85 insertions(+), 27 deletions(-)
 create mode 100644 binaries/data/mods/public/art/actors/props/units/weapons/axe_sagaris.xml
 create mode 100644 binaries/data/mods/public/art/meshes/props/ax_sagaris_a.dae
 create mode 100644 binaries/data/mods/public/art/meshes/props/ax_sagaris_b.dae
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_b.dds
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_1.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_2.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_3.png
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_01.dds
 create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_02.dds

diff --git a/binaries/data/mods/public/art/actors/props/units/weapons/axe_sagaris.xml b/binaries/data/mods/public/art/actors/props/units/weapons/axe_sagaris.xml
new file mode 100644
index 0000000000..88a22fb6d7
--- /dev/null
+++ b/binaries/data/mods/public/art/actors/props/units/weapons/axe_sagaris.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <texture>props/prop_weap.dds</texture>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="sagaris battle axe - Bloody">
+      <mesh>props/ax_sagaris_b.dae</mesh>
+    </variant>
+    <variant frequency="1" name="sagaris battle axe - Clean">
+      <mesh>props/ax_sagaris_a.dae</mesh>
+    </variant>
+  </group>
+</actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
index 52d9ae5009..ad801f2705 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_a_r.xml
@@ -14,18 +14,24 @@
       </animations>
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
-        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
-        <prop actor="props/units/heads/floppy_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
         <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
         <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="loaded-r_hand"/>
         <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
+        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
   <group>
-    <variant frequency="1" name="quilted corselet 1">
-      <texture>skeletal/pers_isp_a_new_1.png</texture>
+    <variant frequency="1" name="quilted corselet pink">
+      <texture>skeletal/pers_cjv_a_1.png</texture>
+    </variant>
+    <variant frequency="1" name="quilted corselet white">
+      <texture>skeletal/pers_cjv_a_2.png</texture>
+    </variant>
+    <variant frequency="1" name="quilted corselet yellow">
+      <texture>skeletal/pers_cjv_a_3.png</texture>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml
index 33f6a2b172..69501b248b 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_javelinist_b.xml
@@ -27,7 +27,7 @@
         <prop actor="units/persians/cavalry_javelinist_b_r.xml" attachpoint="rider"/>
         <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
       </props>
-      <texture>skeletal/horse_black_a.dds</texture>
+      <texture>skeletal/horse_pers_csw_b.dds</texture>
     </variant>
   </group>
   <group>
@@ -38,4 +38,19 @@
       </props>
     </variant>
   </group>
+  <group>
+    <variant frequency="1" name="horse-color-black">
+      <colour>41 41 41</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-biege">
+      <colour>247 213 111</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-gray">
+      <colour>253 253 253</colour>
+    </variant>
+    <variant frequency="1" name="horse-color-brown">
+      <colour>211 123 44</colour>
+    </variant>
+  </group>
+  <material>objectcolor.xml</material>
 </actor>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml
index 15334fe0e4..a1a0428faa 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_spearman_b.xml
@@ -25,6 +25,7 @@
       <mesh>skeletal/horse.pmd</mesh>
       <props>
         <prop actor="units/persians/cavalry_spearman_b_r.xml" attachpoint="rider"/>
+        <prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
index 2214fcc1de..34c0e5f7a7 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_a_r.xml
@@ -13,20 +13,20 @@
       </animations>
       <mesh>skeletal/m_pants.dae</mesh>
       <props>
-        <prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/axe_single.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/thracian_cap_01.xml" attachpoint="helmet"/>
+        <prop actor="props/units/shields/pers_pelta_e_reverse.xml" attachpoint="back"/>
+        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/pers_buckler_1.xml" attachpoint="shield"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="Rider-Texture-1">
-      <texture>skeletal/pers_csw_a.dds</texture>
+      <texture>skeletal/pers_csw_a_01.dds</texture>
     </variant>
     <variant frequency="1" name="Rider-Texture-2">
-      <texture>skeletal/pers_csw_a_1.dds</texture>
-    </variant>
-    <variant frequency="1" name="Rider-Texture-3">
-      <texture>skeletal/pers_csw_a_2.dds</texture>
+      <texture>skeletal/pers_csw_a_02.dds</texture>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml
index bfa70e074c..424677e9b1 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b.xml
@@ -31,13 +31,7 @@
   </group>
   <group>
     <variant frequency="1" name="horse-texture-1">
-      <texture>skeletal/horse_pers_csw_b_1.dds</texture>
-    </variant>
-    <variant frequency="1" name="horse-texture-2">
-      <texture>skeletal/horse_pers_csw_b_2.dds</texture>
-    </variant>
-    <variant frequency="1" name="horse-texture-3">
-      <texture>skeletal/horse_pers_csw_b_3.dds</texture>
+      <texture>skeletal/horse_pers_csw_b.dds</texture>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
index 3349e7398d..415bd5ac4e 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_b_r.xml
@@ -14,7 +14,7 @@
       <mesh>skeletal/m_pants_celt.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_pers_tiara.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/axe_single.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="r_hand"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
index 7d58b71a0a..4b8de675b9 100644
--- a/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
+++ b/binaries/data/mods/public/art/actors/units/persians/cavalry_swordsman_e_r.xml
@@ -16,7 +16,8 @@
       <props>
         <prop actor="props/units/heads/head_pers_a.xml" attachpoint="head"/>
         <prop actor="props/units/heads/pers_conical_plume.xml" attachpoint="helmet"/>
-        <prop actor="props/units/weapons/axe_single.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/axe_sagaris.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/shields/pers_pelta_a_b_reverse.xml" attachpoint="back"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/public/art/meshes/props/ax_sagaris_a.dae b/binaries/data/mods/public/art/meshes/props/ax_sagaris_a.dae
new file mode 100644
index 0000000000..43faf7e544
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/ax_sagaris_a.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99dcc8c963d9f488f038eaef54fd0bab6058f56900354cc6a24ac96f3a340016
+size 34947
diff --git a/binaries/data/mods/public/art/meshes/props/ax_sagaris_b.dae b/binaries/data/mods/public/art/meshes/props/ax_sagaris_b.dae
new file mode 100644
index 0000000000..1211bc83a1
--- /dev/null
+++ b/binaries/data/mods/public/art/meshes/props/ax_sagaris_b.dae
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c4c54527254f721a03a449af0b2116d5a28840efebd5281cdd7c20ff9ab3c808
+size 34947
diff --git a/binaries/data/mods/public/art/meshes/props/shield/per_back_curved.dae b/binaries/data/mods/public/art/meshes/props/shield/per_back_curved.dae
index ae3a01ebd4..ccc3491a3f 100644
--- a/binaries/data/mods/public/art/meshes/props/shield/per_back_curved.dae
+++ b/binaries/data/mods/public/art/meshes/props/shield/per_back_curved.dae
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e77d74ff2d2e17c4c8e4c2b97517b8fe8b83f86ac4efceb6c5f4b7e9fd805f62
-size 10622
+oid sha256:14da7ced900a7fc6e502f4ce78f575157e624ecbe7f89bcb04bf5dae6dccaaa1
+size 10255
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_b.dds b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_b.dds
new file mode 100644
index 0000000000..103f72212a
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/horse_pers_csw_b.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cb05d6417c720b42b734a5207041737013d6b2e0f361e48f7c8da9c57d62003
+size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_1.png b/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_1.png
new file mode 100644
index 0000000000..1950289b15
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:609556ca0a9abbc4a033ed20c03881a647b6b6fa7721af4c723030e007e53407
+size 122211
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_2.png b/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_2.png
new file mode 100644
index 0000000000..9e3178ab7a
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1584cf48bf8b66ed59c90eca4cc92fdcef8dc6231ceb3f8547c8896f0d5fc7e
+size 108124
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_3.png b/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_3.png
new file mode 100644
index 0000000000..fbc096aea5
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers_cjv_a_3.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8abe96ac92f824bfd912225bb571e6ebae17598d0b0c2f4830c97e1366ff9659
+size 120281
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_01.dds b/binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_01.dds
new file mode 100644
index 0000000000..535f12d399
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_01.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15479c95407c6cefd76ad35f49ad795526e7ec2f276d87ff3e9ea8dc256bde49
+size 87536
diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_02.dds b/binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_02.dds
new file mode 100644
index 0000000000..c2372b348a
--- /dev/null
+++ b/binaries/data/mods/public/art/textures/skins/skeletal/pers_csw_a_02.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:924937dc7d2e2c9a4d0526fb5fdbea23feb814daed39425876736aa351adcc1e
+size 87536
diff --git a/binaries/data/mods/public/maps/scenarios/Oasis II.xml b/binaries/data/mods/public/maps/scenarios/Oasis II.xml
index d8aa955843..eff0743d3b 100644
--- a/binaries/data/mods/public/maps/scenarios/Oasis II.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Oasis II.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d6e67218f8d0a99b992e332f76f267047daba785ce6581097c61248ec9f18aa
-size 200603
+oid sha256:dad2647e5a2d029757cfd5af0d1a4245b04adcbdd5b9ab7a4b343d2c55b50473
+size 200261
diff --git a/binaries/data/mods/public/maps/scenarios/Oasis III.xml b/binaries/data/mods/public/maps/scenarios/Oasis III.xml
index a098f87ef1..d92034d998 100644
--- a/binaries/data/mods/public/maps/scenarios/Oasis III.xml	
+++ b/binaries/data/mods/public/maps/scenarios/Oasis III.xml	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3321aed1c2e4ebf04209468e90ccbe6aef5d9bf8da99bdf611ba657eeba8642
-size 200446
+oid sha256:d47f8d1b2e16255454e0975dc7a116f52b1c2231d9b30a3e64f8f93b64575854
+size 200278