#New Persian Markets by Enrique!

Updates to Oasis 3, 4, and 5, which add the SB2 as the Persian starting
structure.

This was SVN commit r10644.

binaries/data/mods/public/art/actors/structures/persians/market.xml

@@ -1,18 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-
   <castshadow/>
-
   <group>
     <variant frequency="100" name="Base">
-      <mesh>structural/pers_market.dae</mesh>
       <props>
-        <prop actor="props/structures/persians/market.xml" attachpoint="root"/>
+        <prop actor="props/structures/decals/dirt_5x5.xml" attachpoint="root"/>
       </props>
       <texture>structural/pers_struct.dds</texture>
     </variant>
   </group>
-
+  <group>
+    <variant frequency="1" name="Bazaar A">
+      <mesh>structural/pers_market_a.dae</mesh>
+    </variant>
+    <variant frequency="1" name="Bazaar B">
+      <mesh>structural/pers_market_b.dae</mesh>
+    </variant>
+  </group>
   <material>player_trans.xml</material>
-
 </actor>

binaries/data/mods/public/art/actors/structures/persians/sb2.xml

@@ -4,6 +4,9 @@
   <group>
     <variant frequency="100" name="sb2">
       <mesh>structural/pers_sb2.dae</mesh>
+      <props>
+        <prop actor="fauna/elephant_asian.xml" attachpoint="root"/>
+      </props>
       <texture>structural/pers_struct.dds</texture>
     </variant>
   </group>

binaries/data/mods/public/art/actors/units/iberians/cavalry_javelinist_a_r.xml

@@ -16,7 +16,7 @@
         <prop actor="props/units/heads/head_iber_adv.xml" attachpoint="head"/>
         <prop actor="props/units/heads/iber_helmet_isp_b.xml" attachpoint="helmet"/>
         <prop actor="props/units/weapons/jav_ammo.xml" attachpoint="l_hand"/>
-        <prop actor="props/units/weapons/jav.xml" attachpoint="r_hand"/>
+        <prop actor="props/units/weapons/jav_loaded.xml" attachpoint="r_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/iberian_buckler_adv.xml" attachpoint="shield"/>

binaries/data/mods/public/art/actors/units/persians/infantry_archer_e.xml

@@ -62,6 +62,11 @@
         <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
       </props>
     </variant>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
     <variant name="gather_tree">
       <props>
         <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>

binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml

@@ -8,7 +8,6 @@
   <TrainingQueue>
     <Entities datatype="tokens">
       units/pers_champion_cavalry
-	  units/pers_war_elephant
     </Entities>
   </TrainingQueue>
   <VisualActor>

binaries/data/mods/public/simulation/templates/structures/pers_market.xml

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_market">
+  <Footprint>
+    <Square width="26.0" depth="26.0"/>
+    <Height>8.0</Height>
+  </Footprint>
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Bazaar</SpecificName>
     <History>Traders from all distant parts of the huge empire met, exchanged and sold goods in the huge bazaars present in almost every big city. Babylon and Susa were the largest and most frequented trade centres.</History>
   </Identity>
+  <Obstruction>
+    <Static width="24.0" depth="24.0"/>
+  </Obstruction>
   <VisualActor>
     <Actor>structures/persians/market.xml</Actor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>

binaries/data/mods/public/simulation/templates/structures/pers_sb2.xml

@@ -18,11 +18,12 @@
   </Health>
   <Identity>
     <Civ>pers</Civ>
-	<GenericName>Persian Special</GenericName>
-    <SpecificName>Special</SpecificName>
+	<GenericName>Persian Special Building</GenericName>
+    <SpecificName>Special Building</SpecificName>
     <History>Special Persian building</History>
     <Icon>structures/palace.png</Icon>
-	<Tooltip>Special building</Tooltip>
+	<Tooltip>Special Building.
+Train War Elephants and Kardakes mercenaries.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
@@ -33,6 +34,8 @@
   </TerritoryInfluence>
   <TrainingQueue>
     <Entities datatype="tokens">
+	  units/pers_kardakes
+	  units/pers_kardakes_skirmishers
 	  units/pers_war_elephant
     </Entities>
   </TrainingQueue>

binaries/data/mods/public/simulation/templates/structures/pers_stables.xml

@@ -7,7 +7,7 @@
     </Resources>
   </Cost>
   <Footprint>
-    <Square width="19.0" depth="17.0"/>
+    <Square width="20.0" depth="18.0"/>
     <Height>5.0</Height>
   </Footprint>
   <Identity>
@@ -19,7 +19,7 @@
     <Icon>structures/pers_stable.png</Icon>
   </Identity>
   <Obstruction>
-    <Static width="17.0" depth="15.0"/>
+    <Static width="17.5" depth="15.5"/>
   </Obstruction>
   <TrainingQueue>
     <Entities datatype="tokens">