From 761f0e5fdfd2d9589497b3403f0b647b9dd6de77 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Fri, 7 Mar 2008 07:14:59 +0000
Subject: [PATCH] This was SVN commit r5718.

---
 binaries/data/config/system.cfg               | 12 +++----
 .../carthaginians/cavalry_javelinist_e.xml    | 34 ++++++++++++++++--
 .../units/iberians/cavalry_spearman_a.xml     | 35 ++++++++++++++++---
 .../units/iberians/cavalry_spearman_a_r.xml   | 32 +++++++++--------
 .../units/iberians/cavalry_spearman_b.xml     | 29 +++++++++++++--
 .../units/iberians/cavalry_spearman_b_r.xml   | 30 ++++++++--------
 .../units/iberians/cavalry_spearman_e.xml     | 35 ++++++++++++++++---
 .../units/iberians/cavalry_spearman_e_r.xml   | 32 +++++++++--------
 .../skins/skeletal/high/256_iber_csp_e_1.dds  |  3 ++
 .../skins/skeletal/horse_iber_csp_a_1.dds     |  3 ++
 .../textures/skins/skeletal/iber_csp_e_1.dds  |  3 ++
 .../units/iber_cavalry_spearman_a.xml         |  9 ++---
 .../units/iber_cavalry_spearman_b.xml         |  6 ++--
 .../units/iber_cavalry_spearman_e.xml         |  7 ++--
 .../maps/scenarios/legionnaire-evolution.xml  |  3 ++
 15 files changed, 200 insertions(+), 73 deletions(-)
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_csp_e_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/horse_iber_csp_a_1.dds
 create mode 100644 binaries/data/mods/official/art/textures/skins/skeletal/iber_csp_e_1.dds
 create mode 100644 binaries/data/mods/official/maps/scenarios/legionnaire-evolution.xml

diff --git a/binaries/data/config/system.cfg b/binaries/data/config/system.cfg
index 4484828b43..11857f3e3f 100644
--- a/binaries/data/config/system.cfg
+++ b/binaries/data/config/system.cfg
@@ -11,7 +11,7 @@ noframebufferobject=false
 
 shadows=true
 vsync=false
-fancywater=false
+fancywater=true
 
 ; Specify the render path. This can be one of:
 ;   default       Automatically select one of the below, depending on system capabilities
@@ -19,23 +19,23 @@ fancywater=false
 ;   vertexshader  Use vertex shaders for transform and lighting where possible
 ; Using 'fixed' instead of 'default' may work around some graphics-related problems,
 ; but will reduce performance when a modern graphics card is available.
-renderpath=default
+renderpath=vertexshader
 
 ; Adjusts how OpenGL calculates mipmap level of detail. 0.0f is the default (blurry) value.
 ; Lower values sharpen/extend, and higher values blur/decrease. Clamped at -3.0 to 3.0.
 ; -1.0 to -1.5 recommended for good results.
-lodbias = -1.0
+lodbias = -0.5
 
 ; Language selection: (currently "english" or "pseudogreek")
 language=english
 
 ; Enable/disable windowed mode.
-windowed=true
+windowed=false
 
 ; You can specify these as well, but the default (keeping the current resolution) is
 ; probably best for most people.
-xres = 1024
-yres = 768
+xres = 1152
+yres = 864
 
 ; Logging settings:
 ;
diff --git a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_e.xml b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_e.xml
index 9f6237f14e..4c960efe6d 100644
--- a/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_e.xml
+++ b/binaries/data/mods/official/art/actors/units/carthaginians/cavalry_javelinist_e.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_e_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/iberians/cavalry_spearman_a.xml b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_a.xml
index 1cf427b902..3e51875a5f 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_a.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_a.xml
@@ -4,17 +4,44 @@
   <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_attack_a.psa" name="Idle" speed="70"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="48"/>
+        <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="45"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="60"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
-        <prop actor="units/iberians/cavalry_swordsman_a_r.xml" attachpoint="rider"/>
+        <prop actor="units/iberians/cavalry_spearman_a_r.xml" attachpoint="rider"/>
       </props>
-      <texture>skeletal/horse_brown_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="horse-texture-1">
+      <texture>skeletal/horse_iber_csp_a_1.dds</texture>
+    </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/official/art/actors/units/iberians/cavalry_spearman_a_r.xml b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_a_r.xml
index 633fd14ad2..3b72f06923 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_a_r.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_a_r.xml
@@ -4,27 +4,29 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" 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="18"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
-        <prop actor="props/temp/iber_sign_cavalry_swordsman_a.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_a.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
       </props>
-      <texture>skeletal/plac_iber_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Elite-Rider-Texture-01">
+      <texture>skeletal/iber_csp_a_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_b.xml b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_b.xml
index cca17cfbf5..bf8dffedbc 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_b.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_b.xml
@@ -7,14 +7,39 @@
     <variant frequency="100" name="Base">
       <animations>
         <animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
+        <animation file="quadraped/horse_attack_a.psa" name="Idle" speed="20"/>
         <animation file="quadraped/horse_gallop.psa" name="Walk" speed="17"/>
+        <animation file="quadraped/horse_attack_a.psa" name="melee" speed="25"/>
+        <animation file="quadraped/horse_attack_b.psa" name="melee" speed="20"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
-        <prop actor="units/iberians/cavalry_swordsman_b_r.xml" attachpoint="rider"/>
+        <prop actor="units/iberians/cavalry_spearman_b_r.xml" attachpoint="rider"/>
       </props>
-      <texture>skeletal/horse_brown_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant name="horse-texture-1">
+      <texture>skeletal/horse_iber_csp_a_1.dds</texture>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="horse-color-black">
+      <colour>46 46 46</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/official/art/actors/units/iberians/cavalry_spearman_b_r.xml b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_b_r.xml
index ffc6cec664..8180437fd2 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_b_r.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_b_r.xml
@@ -4,26 +4,28 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" 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="18"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
-        <prop actor="props/temp/iber_sign_cavalry_swordsman_b.xml" attachpoint="head_extra"/>
         <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
       </props>
-      <texture>skeletal/plac_iber_b.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Elite-Rider-Texture-01">
+      <texture>skeletal/iber_csp_b_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_e.xml b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_e.xml
index 217cd1675f..780b0fcf19 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_e.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_e.xml
@@ -4,17 +4,44 @@
   <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_attack_a.psa" name="Idle" speed="70"/>
+        <animation file="quadraped/horse_attack_b.psa" name="Idle" speed="48"/>
+        <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="45"/>
+        <animation event=".5" file="quadraped/horse_attack_b.psa" name="Melee" speed="60"/>
       </animations>
       <mesh>skeletal/horse.pmd</mesh>
       <props>
-        <prop actor="units/iberians/cavalry_swordsman_e_r.xml" attachpoint="rider"/>
+        <prop actor="units/iberians/cavalry_spearman_e_r.xml" attachpoint="rider"/>
       </props>
-      <texture>skeletal/horse_brown_a.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="horse-texture-1">
+      <texture>skeletal/horse_iber_csp_a_1.dds</texture>
+    </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/official/art/actors/units/iberians/cavalry_spearman_e_r.xml b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_e_r.xml
index 1bcffee679..acb6c52543 100644
--- a/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_e_r.xml
+++ b/binaries/data/mods/official/art/actors/units/iberians/cavalry_spearman_e_r.xml
@@ -4,27 +4,29 @@
   <castshadow/>
 
   <group>
-    <variant frequency="100" name="Base">
+    <variant frequency="1" 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="18"/>
+        <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
+        <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="100"/>
+        <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="100"/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <mesh>skeletal/m_tunic_a.pmd</mesh>
       <props>
-        <prop actor="props/temp/iber_sign_cavalry_swordsman_e.xml" attachpoint="head_extra"/>
-        <prop actor="props/temp/placeholder_helmet_e.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/placeholder_head_iber.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/test_towershield.xml" attachpoint="shield"/>
-        <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/heads/celt_helmet_b.xml" attachpoint="helmet"/>
+        <prop actor="props/units/weapons/spear.xml" attachpoint="r_hand"/>
       </props>
-      <texture>skeletal/plac_iber_e.dds</texture>
     </variant>
   </group>
 
+  <group>
+    <variant frequency="1" name="Elite-Rider-Texture-01">
+      <texture>skeletal/iber_csp_e_1.dds</texture>
+    </variant>
+  </group>
+
+  <material>player_trans.xml</material>
+
 </actor>
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_csp_e_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_csp_e_1.dds
new file mode 100644
index 0000000000..22ba6f9654
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/high/256_iber_csp_e_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d9fa0dc84f7bcfb16e5094d1ac783e6fe88e1344b84043795cc701842a7f1b8
+size 87536
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/horse_iber_csp_a_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/horse_iber_csp_a_1.dds
new file mode 100644
index 0000000000..8414b8a5ed
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/horse_iber_csp_a_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:454452c369dfbcb0b9b905fe1a566c2aec9119d91a04f036f63678f71a137ea5
+size 22000
diff --git a/binaries/data/mods/official/art/textures/skins/skeletal/iber_csp_e_1.dds b/binaries/data/mods/official/art/textures/skins/skeletal/iber_csp_e_1.dds
new file mode 100644
index 0000000000..c88cad60a9
--- /dev/null
+++ b/binaries/data/mods/official/art/textures/skins/skeletal/iber_csp_e_1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58b0e6a6a74c4821d8e504bf8e417e2a7782ef7935405afc9ef85dc3580e988f
+size 22000
diff --git a/binaries/data/mods/official/entities/units/iber_cavalry_spearman_a.xml b/binaries/data/mods/official/entities/units/iber_cavalry_spearman_a.xml
index 01265dd209..376ae936ff 100644
--- a/binaries/data/mods/official/entities/units/iber_cavalry_spearman_a.xml
+++ b/binaries/data/mods/official/entities/units/iber_cavalry_spearman_a.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="iber_cavalry_swordsman_b"
->
+<Entity	Parent="iber_cavalry_spearman_b">
+
 	<Traits>
 		
 		<Promotion>
 				
-			<Entity>iber_cavalry_swordsman_e</Entity>
+			<Entity>iber_cavalry_spearman_e</Entity>
 			
 		</Promotion>
 	
 	</Traits>
 	
+	<Actor>units/iberians/cavalry_spearman_a.xml</Actor>
+	
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/units/iber_cavalry_spearman_b.xml b/binaries/data/mods/official/entities/units/iber_cavalry_spearman_b.xml
index 531267701e..ab145404c9 100644
--- a/binaries/data/mods/official/entities/units/iber_cavalry_spearman_b.xml
+++ b/binaries/data/mods/official/entities/units/iber_cavalry_spearman_b.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity	Parent="template_unit_cavalry_melee_swordsman">
+<Entity	Parent="template_unit_cavalry_melee_spearman">
 	<Traits>
 	
 		<Id>
@@ -15,11 +15,11 @@
 		
 		<Promotion>
 				
-			<Entity>iber_cavalry_swordsman_a</Entity>
+			<Entity>iber_cavalry_spearman_a</Entity>
 			
 		</Promotion>
 		
 	</Traits>
 
-	<Actor>units/iberians/cavalry_swordsman_b.xml</Actor>
+	<Actor>units/iberians/cavalry_spearman_b.xml</Actor>
 </Entity>
diff --git a/binaries/data/mods/official/entities/units/iber_cavalry_spearman_e.xml b/binaries/data/mods/official/entities/units/iber_cavalry_spearman_e.xml
index 9d4b6785bc..a85a900368 100644
--- a/binaries/data/mods/official/entities/units/iber_cavalry_spearman_e.xml
+++ b/binaries/data/mods/official/entities/units/iber_cavalry_spearman_e.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
 
-<Entity
-	Parent="iber_cavalry_swordsman_a"
->
+<Entity	Parent="iber_cavalry_spearman_a">
+
+	<Actor>units/iberians/cavalry_spearman_e.xml</Actor>
+
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/maps/scenarios/legionnaire-evolution.xml b/binaries/data/mods/official/maps/scenarios/legionnaire-evolution.xml
new file mode 100644
index 0000000000..53a36feb4a
--- /dev/null
+++ b/binaries/data/mods/official/maps/scenarios/legionnaire-evolution.xml
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af07f7b3a532ceebf030f8cd2ee4a827f68c74fe031ef83eabf23f1542861498
+size 2441