#Updated Greek trading ship with cargo. Split up 3 dozen UI icons into their individual files. Began testing an idea discussed in the irc chat room.

This was SVN commit r8483.

binaries/data/mods/public/art/actors/geology/metalmine_savanna_slabs.xml

@@ -5,6 +5,9 @@
     <variant name="Mineral Slab 01">
       <mesh>gaia/geo_mineral_01.dae</mesh>
     </variant>
+    <variant name="Mineral Slab 02">
+      <mesh>gaia/geo_mineral_02.dae</mesh>
+    </variant>
   </group>
   <group>
     <variant>

binaries/data/mods/public/art/actors/props/structures/hellenes/merchantship_cargo.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/kyrenia_cargo.dae</mesh>
+      <texture>props/hele_props_a.dds</texture>
+    </variant>
+  </group>
+</actor>

binaries/data/mods/public/art/actors/props/structures/hellenes/merchantship_shield.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>props/kyrenia_shield.dae</mesh>
+      <texture>props/hele_props_b.dds</texture>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>

binaries/data/mods/public/art/actors/structures/hellenes/merchant_new.xml

@@ -10,4 +10,13 @@
       <texture>structural/kyrenia.dds</texture>
     </variant>
   </group>
+  <group>
+    <variant name="cargo">
+      <props>
+        <prop actor="props/structures/hellenes/merchantship_cargo.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/merchantship_shield.xml" attachpoint="root"/>
+        <prop actor="props/structures/hellenes/merchantship_sail.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
 </actor>

binaries/data/mods/public/art/actors/units/global/slave.xml

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Base">
+      <animations>
+        <animation file="infantry/general/dude/dudeidle.psa" name="Idle" speed="100"/>
+        <animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="Melee" speed="90"/>
+        <animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
+        <animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
+        <animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
+        <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
+        <animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
+        <animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
+        <animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
+        <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
+        <animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
+        <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_05.psa" name="Death" speed="600"/>
+        <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_a.pmd</mesh>
+      <props>
+        <prop actor="props/units/heads/head_hele_b.xml" attachpoint="head"/>
+        <prop actor="props/units/heads/hele_straw.xml" attachpoint="helmet"/>
+      </props>
+      <texture>skeletal/global_slave_1.dds</texture>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="gather_tree">
+      <props>
+        <prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_grain">
+      <props>
+        <prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_fruit">
+      <props>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+        <prop attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_meat">
+      <props>
+        <prop attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+        <prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
+      </props>
+    </variant>
+    <variant name="gather_rock">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="gather_ore">
+      <props>
+        <prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
+        <prop attachpoint="r_hand"/>
+      </props>
+    </variant>
+    <variant name="Build">
+      <props>
+        <prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
+        <prop attachpoint="l_hand"/>
+      </props>
+    </variant>
+  </group>
+  <material>player_trans.xml</material>
+</actor>

binaries/data/mods/public/simulation/templates/other/fence_long.xml

@@ -14,9 +14,9 @@
     <Max>100</Max>
   </Health>
   <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>1.0</Pierce>
-    <Crush>1.0</Crush>
+    <Hack>2.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>2.0</Crush>
   </Armour>
   <Loot>
     <xp>1</xp>

binaries/data/mods/public/simulation/templates/other/fence_short.xml

@@ -14,9 +14,9 @@
     <Max>50</Max>
   </Health>
   <Armour>
-    <Hack>1.0</Hack>
-    <Pierce>1.0</Pierce>
-    <Crush>1.0</Crush>
+    <Hack>2.0</Hack>
+    <Pierce>10.0</Pierce>
+    <Crush>2.0</Crush>
   </Armour>
   <Loot>
     <xp>1</xp>

binaries/data/mods/public/simulation/templates/other/fence_stone.xml

@@ -12,7 +12,7 @@
   </Health>
   <Armour>
     <Hack>5.0</Hack>
-    <Pierce>10.0</Pierce>
+    <Pierce>15.0</Pierce>
     <Crush>5.0</Crush>
   </Armour>
   <Loot>

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

@@ -17,6 +17,6 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/celts/market_newer.xml</Actor>
-    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>

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

@@ -14,4 +14,9 @@
   <VisualActor>
     <Actor>structures/hellenes/market.xml</Actor>
   </VisualActor>
+  <TrainingQueue>
+    <Entities datatype="tokens">
+      units/{civ}_support_slave
+    </Entities>
+  </TrainingQueue> 
 </Entity>

binaries/data/mods/public/simulation/templates/template_structure_resource_field.txt

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_structure_resource">
+  <Identity>
+    <GenericName>Field</GenericName>
+    <Tooltip>Assign a unit here to harvest grain.</Tooltip>
+    <History>Farming originated around 9500 BC in India and the Middle East. The history of agriculture is a central element of human history, as agricultural progress has been a crucial factor in worldwide socio-economic change. Wealth-building and militaristic specializations rarely seen in hunter-gatherer cultures are commonplace in agricultural and agro-industrial societies—when farmers became capable of producing food beyond the needs of their own families, others in the tribe/nation/empire were freed to devote themselves to projects other than food acquisition.</History>
+    <Icon>structures/field.png</Icon>
+  </Identity>
+  <Minimap>
+    <Colour r="119" g="82" b="46"/>
+  </Minimap>
+  <BuildRestrictions>
+    <Category>Field</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime>50</BuildTime>
+    <Resources>
+      <wood>50</wood>
+    </Resources>
+  </Cost>
+  <ResourceSupply>
+    <KillBeforeGather>false</KillBeforeGather>
+    <Amount>2000</Amount>
+    <Type>food.grain</Type>
+  </ResourceSupply>
+  <Health>
+    <Max>120</Max>
+  </Health>
+  <Armour>
+    <Hack>5.0</Hack>
+    <Pierce>40.0</Pierce>
+    <Crush>40.0</Crush>
+  </Armour>
+  <VisualActor>
+    <Actor>structures/plot_field_new.xml</Actor>
+    <FoundationActor>structures/plot_field_new.xml</FoundationActor>
+  </VisualActor>
+  <Footprint>
+    <Square width="28.0" depth="28.0"/>
+    <Height>8.0</Height>
+  </Footprint>
+  <Obstruction>
+    <Static width="12.0" depth="12.0"/>
+  </Obstruction>
+  <Vision>
+    <Range>28</Range>
+  </Vision>
+</Entity>

binaries/data/mods/public/simulation/templates/units/hele_support_slave.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_support_slave">
+  <Identity>
+    <Civ>hele</Civ>
+    <SpecificName>Doulos</SpecificName>
+    <History>Slavery played a major role in ancient Greek civilization. Slaves could be found everywhere. They worked not only as domestic servants, but as factory workers, shopkeepers, mineworkers, farm workers and as ship's crewmembers. There may have been as many, if not more, slaves than free people in ancient Greece. It is difficult for historians to determine exactly how many slaves there were during these times, because many did not appear any different from the poorer Greek citizens. There were many different ways in which a person could have become a slave in ancient Greece. They might have been born into slavery as the child of a slave. They might have been taken prisoner if their city was attacked in one of the many battles which took place during these times. They might have been exposed as an infant, meaning the parents abandoned their newborn baby upon a hillside or at the gates of the city to die or be claimed by a passerby.</History>
+  </Identity>
+  <VisualActor>
+    <Actor>units/global/slave.xml</Actor>
+  </VisualActor>
+</Entity>