Making M_s look better. Removed 2nd special building for S_s.

This was SVN commit r11437.

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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":

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>

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>

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>