Added a base with flowers and playercolor to mauryan pillars.

Added contributor Paperkat merchant ship.

This was SVN commit r13317.

binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar.xml

@@ -11,6 +11,8 @@
 	   </textures>
 	    <props>
         <prop actor="props/structures/mauryans/ashoka_lion.xml" attachpoint="ashoka_lion"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_flowers.xml" attachpoint="root"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_struct.xml" attachpoint="root"/>
 		</props>
     </variant>
     <variant name="ashoka pillar big">
@@ -23,6 +25,9 @@
 	  <props>
 		<prop actor="props/structures/mauryans/ashoka_pillar_big_lions.xml" attachpoint="root"/>
 <prop actor="props/structures/mauryans/ashoka_pillar_big_chakra.xml" attachpoint="root"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_flowers.xml" attachpoint="root"/>
+<prop actor="props/structures/mauryans/ashoka_pillar_big_base_struct.xml" attachpoint="root"/>
+
 	  </props>
     </variant>
   </group>

binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar_big_base_flowers.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="ashoka pillar base flowers">
+      <mesh>props/ashoka_pillar_big_base_flowers.dae</mesh>
+	  <textures>
+	  <texture file="props/structs_nature.png" name="baseTex"/>
+	  <texture file="props/structs_nature_spec.png" name="specTex"/>
+		<texture file="props/structs_nature_norm.png" name="normTex"/>
+	  </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/props/structures/mauryans/ashoka_pillar_big_base_struct.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="ashoka pillar base struct">
+      <mesh>props/ashoka_pillar_big_base_struct.dae</mesh>
+	  <textures>
+	  <texture file="structural/maur_struct.png" name="baseTex"/>
+	  <texture file="structural/maur_struct_spec.png" name="specTex"/>
+		<texture file="structural/maur_struct_norm.png" name="normTex"/>
+	  </textures>
+    </variant>
+  </group>
+  <material>player_trans_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/structures/mauryans/merchant_ship.xml

@@ -5,20 +5,21 @@
     <variant frequency="1" name="Mauryan Merchant">
       <animations>
       </animations>
-      <mesh>structural/maur_merchant.dae</mesh>
+      <mesh>structural/maur_merch_ship.dae</mesh>
       <props>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-        <prop actor="props/special/eyecandy/basket_celt_a.xml" attachpoint="wrld_basket_a1"/>
-		<prop actor="props/special/eyecandy/basket_celt_a.xml" attachpoint="wrld_basket_a2"/>
-		<prop actor="props/special/eyecandy/basket_celt_a.xml" attachpoint="wrld_basket_a3"/>
-		<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a004"/>
+        <prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a1"/>
+<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a2"/>
+<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a3"/>
+<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a4"/>
+<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a5"/>
+<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="wrld_barrel_a6"/>
       </props>
     </variant>
   </group>
   <group>
     <variant frequency="1" name="Blue Eye">
       <textures>
-	  <texture file="structural/maur_bireme.png" name="baseTex"/>
+	  <texture file="structural/maur_merch_ship.png" name="baseTex"/>
 	 </textures>
     </variant>
   </group>

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

@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
-  <Cost>
-    <BuildTime>80</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>0</wood>
-      <stone>100</stone>
-      <metal>100</metal>
-    </Resources>
-  </Cost>
-  <Footprint replace="">
-    <Circle radius="2.5"/>
-    <Height>5.0</Height>
-  </Footprint>
-  <GarrisonHolder disable=""/>
-  <Health>
-    <Max>1000</Max>
-    <SpawnEntityOnDeath>rubble/rubble_2x2</SpawnEntityOnDeath>
-  </Health>
-  <Identity>
-    <Civ>maur</Civ>
-	<GenericName>Edict Pillar of Ashoka</GenericName>
-    <SpecificName>Śāsana Stambha Aśokā</SpecificName>
-    <Icon>structures/monument.png</Icon>
-    <Tooltip>.</Tooltip>
-    <History>.</History>
-  </Identity>
-  <Obstruction>
-    <Static width="1.5" depth="1.5"/>
-  </Obstruction>
-  <RallyPoint disable=""/>
-  <Sound>
-    <SoundGroups>
-      <select>interface/select/building/sel_iber_monument.xml</select>
-      <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
-      <death>attack/destruction/building_collapse_large.xml</death>
-    </SoundGroups>
-  </Sound>
-  <TerritoryInfluence>
-    <Root>true</Root>
-  </TerritoryInfluence>
-  <VisualActor>
-    <Actor>props/structures/mauryans/ashoka_pillar.xml</Actor>
-    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
-  </VisualActor>
-</Entity>
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_special">
+  <Cost>
+    <BuildTime>80</BuildTime>
+    <Resources>
+      <food>0</food>
+      <wood>0</wood>
+      <stone>100</stone>
+      <metal>100</metal>
+    </Resources>
+  </Cost>
+  <Footprint replace="">
+    <Square width="7.0" depth="7.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <GarrisonHolder disable=""/>
+  <Health>
+    <Max>1000</Max>
+    <SpawnEntityOnDeath>rubble/rubble_2x2</SpawnEntityOnDeath>
+  </Health>
+  <Identity>
+    <Civ>maur</Civ>
+	<GenericName>Edict Pillar of Ashoka</GenericName>
+    <SpecificName>Śāsana Stambha Aśokā</SpecificName>
+    <Icon>structures/monument.png</Icon>
+    <Tooltip>.</Tooltip>
+    <History>.</History>
+  </Identity>
+  <Obstruction>
+    <Static width="4" depth="4"/>
+  </Obstruction>
+  <RallyPoint disable=""/>
+  <Sound>
+    <SoundGroups>
+      <select>interface/select/building/sel_iber_monument.xml</select>
+      <constructed>interface/complete/building/complete_iber_monument.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+    </SoundGroups>
+  </Sound>
+  <TerritoryInfluence>
+    <Root>true</Root>
+  </TerritoryInfluence>
+  <VisualActor>
+    <Actor>props/structures/mauryans/ashoka_pillar.xml</Actor>
+    <FoundationActor>structures/fndn_2x2.xml</FoundationActor>
+  </VisualActor>
+</Entity>