From ea66f950e7b8eb88e823772f810ca824c6c25274 Mon Sep 17 00:00:00 2001
From: Mythos_Ruler <michael@wildfiregames.com>
Date: Thu, 5 Apr 2012 04:01:53 +0000
Subject: [PATCH] Making M_s look better. Removed 2nd special building for S_s.

This was SVN commit r11437.
---
 .../structures/spartans/trireme_mainsail.xml  |  5 +++-
 .../props/units/shields/mace_argyraspides.xml | 10 ++------
 .../units/shields/mace_aspis_demetrius.xml    | 14 +++++++++++
 .../props/units/shields/mace_hypaspist.xml    | 14 ++++-------
 .../props/units/shields/mace_pez_adv.xml      | 13 +++++++++++
 .../props/units/shields/mace_pez_basic.xml    | 13 +++++++++++
 .../props/units/shields/mace_pez_elite.xml    | 17 ++++++++++++++
 .../macedonians/cavalry_javelinist_a_r.xml    |  4 ++--
 .../macedonians/cavalry_javelinist_e_r.xml    |  2 +-
 .../units/macedonians/champion_cavalry.xml    |  1 +
 .../actors/units/macedonians/demetrius.xml    | 23 ++++++++++++-------
 .../units/macedonians/infantry_spearman_a.xml |  2 +-
 .../units/macedonians/infantry_spearman_b.xml |  2 +-
 .../units/macedonians/infantry_spearman_e.xml |  2 +-
 .../skins/props/shield/mace_round_a1.png      |  3 +++
 .../skins/props/shield/mace_round_b1.png      |  3 +++
 .../skins/props/shield/mace_round_c1.png      |  3 +++
 .../props/shield/mace_round_c_silver.png      |  3 +++
 .../skins/props/shield/mace_round_d.png       |  3 +++
 .../skins/props/shield/mace_round_e.png       |  3 +++
 .../skins/props/shield/mace_round_f.png       |  3 +++
 .../skins/props/shield/mace_round_g.png       |  3 +++
 .../art/textures/skins/props/spart_sail_d.png |  3 +++
 binaries/data/mods/internal/civs/spart.json   | 13 ++---------
 .../maps/scenarios/Median Oasis III.pmp       |  3 +++
 .../maps/scenarios/Median Oasis III.xml       |  3 +++
 .../templates/structures/spart_syssiton.xml   |  4 ++--
 .../units/spart_infantry_javelinist_b.xml     |  1 -
 .../units/spart_infantry_spearman_b.xml       |  1 -
 29 files changed, 126 insertions(+), 48 deletions(-)
 create mode 100644 binaries/data/mods/internal/art/actors/props/units/shields/mace_aspis_demetrius.xml
 create mode 100644 binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_adv.xml
 create mode 100644 binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_basic.xml
 create mode 100644 binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_elite.xml
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_a1.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_b1.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c1.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c_silver.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_d.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_e.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_f.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_g.png
 create mode 100644 binaries/data/mods/internal/art/textures/skins/props/spart_sail_d.png
 create mode 100644 binaries/data/mods/internal/maps/scenarios/Median Oasis III.pmp
 create mode 100644 binaries/data/mods/internal/maps/scenarios/Median Oasis III.xml

diff --git a/binaries/data/mods/internal/art/actors/props/structures/spartans/trireme_mainsail.xml b/binaries/data/mods/internal/art/actors/props/structures/spartans/trireme_mainsail.xml
index 334165094f..40cd4d39f7 100644
--- a/binaries/data/mods/internal/art/actors/props/structures/spartans/trireme_mainsail.xml
+++ b/binaries/data/mods/internal/art/actors/props/structures/spartans/trireme_mainsail.xml
@@ -13,9 +13,12 @@
     <variant frequency="1" name="sail_dokana">
       <texture>props/spart_sail_b.png</texture>
     </variant>
-    <variant frequency="1" name="sail_lamda">
+    <variant frequency="2" name="sail_lamda">
       <texture>props/spart_sail_c.png</texture>
     </variant>
+    <variant frequency="1" name="sail_gorgon">
+      <texture>props/spart_sail_d.png</texture>
+    </variant>
   </group>
   <material>player_trans.xml</material>
 </actor>
diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/mace_argyraspides.xml b/binaries/data/mods/internal/art/actors/props/units/shields/mace_argyraspides.xml
index fa26ce3691..816f1e2066 100644
--- a/binaries/data/mods/internal/art/actors/props/units/shields/mace_argyraspides.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_argyraspides.xml
@@ -10,14 +10,8 @@
     </variant>
   </group>
   <group>
-    <variant frequency="4" name="Argyraspis (A)">
-      <texture>props/shield/mace_silver_a.dds</texture>
-    </variant>
-    <variant frequency="3" name="Argyraspis (B)">
-      <texture>props/shield/mace_silver_b.dds</texture>
-    </variant>
-    <variant frequency="2" name="Argyraspis (C)">
-      <texture>props/shield/mace_silver_c.dds</texture>
+    <variant frequency="1" name="Silver Shield C">
+      <texture>props/shield/mace_round_c_silver.png</texture>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/mace_aspis_demetrius.xml b/binaries/data/mods/internal/art/actors/props/units/shields/mace_aspis_demetrius.xml
new file mode 100644
index 0000000000..39f1459d01
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_aspis_demetrius.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/aspis_sm_f.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_back_purple.xml" attachpoint="root"/>
+      </props>
+      <texture>props/shield/mace_round_c1.png</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/mace_hypaspist.xml b/binaries/data/mods/internal/art/actors/props/units/shields/mace_hypaspist.xml
index 0d88c02a0e..4a0b90a79d 100644
--- a/binaries/data/mods/internal/art/actors/props/units/shields/mace_hypaspist.xml
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_hypaspist.xml
@@ -9,17 +9,11 @@
     </variant>
   </group>
   <group>
-    <variant frequency="3" name="shield-b">
-      <texture>props/shield/hele_round_b.dds</texture>
+    <variant frequency="1" name="shield mace a">
+      <texture>props/shield/mace_round_a1.png</texture>
     </variant>
-    <variant frequency="3" name="shield-q">
-      <texture>props/shield/hele_round_q.dds</texture>
-    </variant>
-    <variant frequency="3" name="shield-v">
-      <texture>props/shield/hele_round_v.dds</texture>
-    </variant>
-    <variant frequency="2" name="shield-w">
-      <texture>props/shield/hele_round_w.dds</texture>
+    <variant frequency="1" name="shield mace b">
+      <texture>props/shield/mace_round_b1.png</texture>
     </variant>
   </group>
   <material>player_trans.xml</material>
diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_adv.xml b/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_adv.xml
new file mode 100644
index 0000000000..339af463cb
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_adv.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_m_f.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
+      </props>
+      <texture>props/shield/mace_round_e.png</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_basic.xml b/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_basic.xml
new file mode 100644
index 0000000000..e08f314a6a
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_basic.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_m_f.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
+      </props>
+      <texture>props/shield/mace_round_f.png</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_elite.xml b/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_elite.xml
new file mode 100644
index 0000000000..9e98be5472
--- /dev/null
+++ b/binaries/data/mods/internal/art/actors/props/units/shields/mace_pez_elite.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant frequency="1" name="base">
+      <mesh>props/shield/round_m_f.dae</mesh>
+      <props>
+        <prop actor="props/units/shields/mace_round_back.xml" attachpoint="back"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="shield d">
+      <texture>props/shield/mace_round_d.png</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>
diff --git a/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_a_r.xml b/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_a_r.xml
index e0308cd57c..5b85ba38c6 100644
--- a/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_a_r.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_a_r.xml
@@ -12,7 +12,7 @@
         <animation event="0.5" file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="300"/>
         <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
       </animations>
-      <mesh>skeletal/m_tunic_b.pmd</mesh>
+      <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
         <prop actor="props/units/heads/hele_straw.xml" attachpoint="helmet"/>
@@ -21,7 +21,7 @@
         <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
         <prop actor="props/units/cape_hd_cav.xml" attachpoint="shoulders"/>
       </props>
-      <texture>skeletal/hele_iar_e.dds</texture>
+      <texture>skeletal/mace_bronzeshield_2.png</texture>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_e_r.xml b/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_e_r.xml
index 831e51c3c9..cd323feca8 100644
--- a/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_e_r.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/cavalry_javelinist_e_r.xml
@@ -20,7 +20,7 @@
         <prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
         <prop actor="props/units/cape_hd_cav.xml" attachpoint="shoulders"/>
       </props>
-      <texture>skeletal/mace_bronzeshield_2.png</texture>
+      <texture>skeletal/spart_phalangite_officer.dds</texture>
     </variant>
   </group>
   <group>
diff --git a/binaries/data/mods/internal/art/actors/units/macedonians/champion_cavalry.xml b/binaries/data/mods/internal/art/actors/units/macedonians/champion_cavalry.xml
index fb00a33c3c..5972f045ea 100644
--- a/binaries/data/mods/internal/art/actors/units/macedonians/champion_cavalry.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/champion_cavalry.xml
@@ -14,6 +14,7 @@
       <mesh>skeletal/horse.pmd</mesh>
       <props>
         <prop actor="units/macedonians/champion_cavalry_r.xml" attachpoint="rider"/>
+        <prop actor="props/units/horse_back_blanket.xml" attachpoint="rider"/>
       </props>
     </variant>
   </group>
diff --git a/binaries/data/mods/internal/art/actors/units/macedonians/demetrius.xml b/binaries/data/mods/internal/art/actors/units/macedonians/demetrius.xml
index e2b57c3734..d07a77d93e 100644
--- a/binaries/data/mods/internal/art/actors/units/macedonians/demetrius.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/demetrius.xml
@@ -4,23 +4,30 @@
   <group>
     <variant frequency="100" name="Base">
       <animations>
-        <animation file="biped/not used/inf_phalanx_b.psa" name="Idle" speed="100"/>
-        <animation file="biped/inf_phalanx_walk_a.psa" name="Walk" speed="130"/>
-        <animation event="0.5" file="biped/inf_phalanx_atk_a.psa" name="Attack" speed="200"/>
-        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="100"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="90"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="85"/>
+        <animation file="biped/inf_sword_ready_a.dae" name="Idle" speed="50"/>
+        <animation file="biped/inf_sword_ready_b.dae" name="Idle" speed="110"/>
+        <animation file="biped/walk_spearshield.psa" name="Walk" speed="120"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="40"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_def_06.psa" name="Attack" speed="111"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_em_04.psa" name="Attack" speed="80"/>
+        <animation event="0.5" file="infantry/sword/attack/isw_s_off_05.psa" name="Attack" speed="80"/>
+        <animation event="0.5" file="biped/not used/inf_2sword_attack_e.psa" name="Attack" speed="50"/>
+        <animation event="0.5" file="biped/not used/inf_2sword_attack_d.psa" name="Attack" speed="80"/>
         <animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
-        <animation file="infantry/general/death/inf_03.psa" name="Death" speed="500"/>
-        <animation file="infantry/general/death/inf_04.psa" name="Death" speed="400"/>
         <animation file="infantry/general/death/inf_06.psa" name="Death" speed="500"/>
         <animation file="infantry/general/death/inf_07.psa" name="Death" speed="400"/>
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
         <prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
-        <prop actor="props/units/weapons/spear_long.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/falcata.xml" attachpoint="r_hand"/>
         <prop actor="props/units/heads/hele_demetrius.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/hele_round_demetrius.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/mace_aspis_demetrius.xml" attachpoint="shield"/>
         <prop actor="props/units/hero_star.xml" attachpoint="root"/>
+        <prop actor="props/units/cape_hd.xml" attachpoint="shoulders"/>
       </props>
       <texture>skeletal/hele_demetrius.dds</texture>
     </variant>
diff --git a/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_a.xml b/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_a.xml
index 3d761ad74a..cc7d2009da 100644
--- a/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_a.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_a.xml
@@ -31,7 +31,7 @@
       </animations>
       <mesh>skeletal/m_tunic_short.dae</mesh>
       <props>
-        <prop actor="props/units/shields/mace_round_su3.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/mace_pez_adv.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/sarissa.xml" attachpoint="r_hand"/>
       </props>
     </variant>
diff --git a/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_b.xml b/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_b.xml
index fe854007ee..f26b6df102 100644
--- a/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_b.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_b.xml
@@ -30,7 +30,7 @@
       <props>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
         <prop actor="props/units/heads/hele_hoplite_b.xml" attachpoint="helmet"/>
-        <prop actor="props/units/shields/mace_round_su3.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/mace_pez_basic.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/sarissa.xml" attachpoint="r_hand"/>
       </props>
       <texture>skeletal/hele_tunic.dds</texture>
diff --git a/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_e.xml b/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_e.xml
index 7e521eb4ab..02a8ec4b25 100644
--- a/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_e.xml
+++ b/binaries/data/mods/internal/art/actors/units/macedonians/infantry_spearman_e.xml
@@ -33,7 +33,7 @@
       <props>
         <prop actor="props/units/heads/hele_mace_frontranker.xml" attachpoint="helmet"/>
         <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
-        <prop actor="props/units/shields/mace_round_su3.xml" attachpoint="shield"/>
+        <prop actor="props/units/shields/mace_pez_elite.xml" attachpoint="shield"/>
         <prop actor="props/units/weapons/sarissa.xml" attachpoint="r_hand"/>
       </props>
       <texture>skeletal/hele_pezhetairoi_2.dds</texture>
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_a1.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_a1.png
new file mode 100644
index 0000000000..665f2d1aaa
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_a1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:acf00cb712876e6e3bd1aad0d6ca19fdc93a1f454c6e98d7bd946061002613a6
+size 37851
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_b1.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_b1.png
new file mode 100644
index 0000000000..0f4449b8d0
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_b1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec11c85c47a7408f543d9b0882239ee2dcccdab20887add4b4739e111f5871b3
+size 34887
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c1.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c1.png
new file mode 100644
index 0000000000..1cd195da9e
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85952b72d1f2cc0f9add5f3fe35a4b3b6d514fa5bdb448bc0d3a3e486e698c60
+size 38761
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c_silver.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c_silver.png
new file mode 100644
index 0000000000..23e28b4a8a
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_c_silver.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:973eb39505c39f538b25a115bc725f2ca7c798eb858116c499f9e92d5c5f2c0a
+size 29514
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_d.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_d.png
new file mode 100644
index 0000000000..0f5f07d711
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_d.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00ec41507fd392744939a3a776c336932bfecd2bc6338bf076bb78df9675226a
+size 28828
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_e.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_e.png
new file mode 100644
index 0000000000..0888830474
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_e.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fe09fd40f60054dfe6776057f08497358932536a61cea37ab2a9ad7e16e9ec2
+size 40672
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_f.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_f.png
new file mode 100644
index 0000000000..6e1da14f5e
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_f.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00c4aa713c975a2e1c6f4285917b5ac2f920bffaff6b0d78cd33a3224da7c041
+size 7799
diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_g.png b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_g.png
new file mode 100644
index 0000000000..eb9c8ff2e2
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/shield/mace_round_g.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51a8afb5bb57a0f1d9b77aa32796e958db8c922a0750998733b77235ea868fd8
+size 38318
diff --git a/binaries/data/mods/internal/art/textures/skins/props/spart_sail_d.png b/binaries/data/mods/internal/art/textures/skins/props/spart_sail_d.png
new file mode 100644
index 0000000000..b2fa4da4dc
--- /dev/null
+++ b/binaries/data/mods/internal/art/textures/skins/props/spart_sail_d.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:340b079eeb4c36265ef174c49ce592567fbb0f81b4de1c1b61ec0f2f52fe9bf3
+size 391839
diff --git a/binaries/data/mods/internal/civs/spart.json b/binaries/data/mods/internal/civs/spart.json
index 260e9dbc9c..634e6488c0 100644
--- a/binaries/data/mods/internal/civs/spart.json
+++ b/binaries/data/mods/internal/civs/spart.json
@@ -78,19 +78,10 @@
 			"Name":"Syssiton",
 			"Class":"",
 			"Emblem":"",
-			"History":"The Syssiton was the Mess Hall for full-blooded Spartiates.",
+			"History":"The Syssiton was the Mess Hall for full-blooded Spartiates. Every Spartan peer, even kings, belonged to one.",
 			"Requirements":"",
 			"Phase":"",
-			"Special":"Train champion units and research technologies related to champions."
-		},
-		{
-			"Name":"Gerousia",
-			"Class":"",
-			"Emblem":"",
-			"History":"The Gerousia is the elected Spartiate citizen assembly.",
-			"Requirements":"",
-			"Phase":"",
-			"Special":"Train heroes and research technologies related to heroes."
+			"Special":"Train heroes and champion units and research technologies related to them."
 		}
 	],
 	"StartEntities":
diff --git a/binaries/data/mods/internal/maps/scenarios/Median Oasis III.pmp b/binaries/data/mods/internal/maps/scenarios/Median Oasis III.pmp
new file mode 100644
index 0000000000..845eeb208a
--- /dev/null
+++ b/binaries/data/mods/internal/maps/scenarios/Median Oasis III.pmp	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6deb5eeb5d6b31200015b6da7dfd97a53350a858e4ff1f2d00b0f79516c9a0a6
+size 1025812
diff --git a/binaries/data/mods/internal/maps/scenarios/Median Oasis III.xml b/binaries/data/mods/internal/maps/scenarios/Median Oasis III.xml
new file mode 100644
index 0000000000..f5779e8d3b
--- /dev/null
+++ b/binaries/data/mods/internal/maps/scenarios/Median Oasis III.xml	
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:115ac7826b55d43c9b4a38909e7666e75caf729ae248e77735e784290a84d2da
+size 868327
diff --git a/binaries/data/mods/internal/simulation/templates/structures/spart_syssiton.xml b/binaries/data/mods/internal/simulation/templates/structures/spart_syssiton.xml
index cca297f346..41c627bf66 100644
--- a/binaries/data/mods/internal/simulation/templates/structures/spart_syssiton.xml
+++ b/binaries/data/mods/internal/simulation/templates/structures/spart_syssiton.xml
@@ -19,8 +19,8 @@
     <Civ>spart</Civ>
 	<GenericName>Military Mess Hall</GenericName>
     <SpecificName>Syssíton</SpecificName>
-    <Tooltip>Train champion units.</Tooltip>
-    <History>The Syssítia was where full-blooded Spartans were barracked and dined together.</History>
+    <Tooltip>Train heroes and champion units.</Tooltip>
+    <History>The Syssítia was where full-blooded Spartans were barracked and dined together, even Spartan kings.</History>
     <Icon>structures/gymnasion.png</Icon>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/internal/simulation/templates/units/spart_infantry_javelinist_b.xml b/binaries/data/mods/internal/simulation/templates/units/spart_infantry_javelinist_b.xml
index db578a9456..7e2684ba2d 100644
--- a/binaries/data/mods/internal/simulation/templates/units/spart_infantry_javelinist_b.xml
+++ b/binaries/data/mods/internal/simulation/templates/units/spart_infantry_javelinist_b.xml
@@ -6,7 +6,6 @@
       -structures/{civ}_wall_gate
       -structures/{civ}_wall_tower
 	  structures/spart_syssiton
-	  structures/spart_gerousia
     </Entities>
   </Builder>
   <Identity>
diff --git a/binaries/data/mods/internal/simulation/templates/units/spart_infantry_spearman_b.xml b/binaries/data/mods/internal/simulation/templates/units/spart_infantry_spearman_b.xml
index c8a3e8f365..7844cb2f36 100644
--- a/binaries/data/mods/internal/simulation/templates/units/spart_infantry_spearman_b.xml
+++ b/binaries/data/mods/internal/simulation/templates/units/spart_infantry_spearman_b.xml
@@ -17,7 +17,6 @@
       -structures/{civ}_wall_gate
       -structures/{civ}_wall_tower
 	  structures/spart_syssiton
-	  structures/spart_gerousia
     </Entities>
   </Builder>
   <Cost>