Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml	(revision 25058)
@@ -1,68 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>35</Pierce>
       </Damage>
       <MaxRange>45</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100</Speed>
         <Spread>2</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>2</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>2</Population>
     <BuildTime>20</BuildTime>
     <Resources>
-      <wood>125</wood>
-      <metal>50</metal>
+      <wood>120</wood>
+      <metal>60</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>20</Max>
     <List datatype="tokens">Support Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
   </Health>
   <Identity>
     <GenericName>Light Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
     <VisibleClasses datatype="tokens">Ranged Warship Bireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>75</xp>
-    <wood>25</wood>
-    <metal>15</metal>
+    <xp>80</xp>
+    <wood>24</wood>
+    <metal>12</metal>
   </Loot>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.55</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>90</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml	(revision 25058)
@@ -1,88 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
       <AttackName>Harpoon</AttackName>
       <Damage>
         <Hack>10</Hack>
       </Damage>
       <MaxRange>5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">!SeaCreature</RestrictedClasses>
     </Melee>
   </Attack>
   <Cost>
-    <BuildTime>20</BuildTime>
+    <BuildTime>15</BuildTime>
     <Resources>
       <wood>50</wood>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>1</Max>
   </GarrisonHolder>
   <Health>
-    <Max>200</Max>
+    <Max>120</Max>
   </Health>
   <Identity>
     <GenericName>Fishing Boat</GenericName>
     <SelectionGroupName>template_unit_ship_fishing</SelectionGroupName>
     <Tooltip>Fish the waters for food.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">FishingBoat</VisibleClasses>
   </Identity>
   <Loot>
-    <xp>1</xp>
     <wood>10</wood>
   </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>1.8</food.fish>
     </Rates>
     <Capacities>
       <food>40</food>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <order_walk>actor/ship/boat_move.xml</order_walk>
       <order_attack>actor/ship/boat_move.xml</order_attack>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>2.0</BarWidth>
     <BarHeight>0.333</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml	(revision 25058)
@@ -1,59 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Cost>
     <BuildTime>20</BuildTime>
     <Resources>
       <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>15</Max>
     <List datatype="tokens">Support Cavalry</List>
   </GarrisonHolder>
   <Health>
-    <Max>400</Max>
+    <Max>240</Max>
   </Health>
   <Identity>
     <GenericName>Merchantman</GenericName>
     <SelectionGroupName>template_unit_ship_merchant</SelectionGroupName>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>25</xp>
-    <wood>15</wood>
+    <metal>20</xp>
   </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>2</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
     <GarrisonGainMultiplier>0.2</GarrisonGainMultiplier>
   </Trader>
   <TreasureCollecter>
     <MaxDistance>12</MaxDistance>
   </TreasureCollecter>
   <UnitAI>
     <DefaultStance>passive</DefaultStance>
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.35</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>50</Range>
   </Vision>
   <VisionSharing>
     <Bribable>true</Bribable>
   </VisionSharing>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml	(revision 25058)
@@ -1,71 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
         <Crush>150</Crush>
       </Damage>
       <MaxRange>80</MaxRange>
       <MinRange>40</MinRange>
       <PrepareTime>2000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>40</Speed>
         <Spread>6</Spread>
         <Gravity>20</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Ship Structure</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>StoneThrower</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
-    <Population>3</Population>
+    <Population>5</Population>
     <BuildTime>30</BuildTime>
     <Resources>
-      <wood>350</wood>
-      <metal>200</metal>
-      <stone>350</stone>
+      <wood>600</wood>
+      <metal>300</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>50</Max>
     <List datatype="tokens">Support Soldier Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
   </Health>
   <Identity>
     <GenericName>Heavy Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
     <VisibleClasses datatype="tokens">Ranged Warship Quinquereme</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>150</xp>
-    <wood>40</wood>
-    <metal>30</metal>
+    <xp>200</xp>
+    <wood>120</wood>
+    <metal>60</metal>
   </Loot>
   <Position>
     <TurnRate>2</TurnRate>
   </Position>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>110</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml	(revision 25058)
@@ -1,71 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
         <Pierce>35</Pierce>
       </Damage>
       <MaxRange>55</MaxRange>
       <MinRange>0</MinRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>100</Speed>
         <Spread>2</Spread>
         <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Ship Human</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>3</DefaultArrowCount>
     <MaxArrowCount>13</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Infantry Cavalry</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>3</Population>
     <BuildTime>25</BuildTime>
     <Resources>
-      <wood>150</wood>
-      <metal>150</metal>
+      <wood>200</wood>
+      <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>30</Max>
     <List datatype="tokens">Support Soldier Siege</List>
   </GarrisonHolder>
   <Health>
     <Max>1400</Max>
   </Health>
   <Identity>
     <GenericName>Medium Warship</GenericName>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
     <VisibleClasses datatype="tokens">Ranged Warship Trireme</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot>
-    <xp>100</xp>
-    <wood>30</wood>
+    <xp>140</xp>
+    <wood>40</wood>
     <metal>20</metal>
   </Loot>
   <Position>
     <TurnRate>2</TurnRate>
   </Position>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>90</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/ship_trireme.xml	(revision 25058)
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="36.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
   </GarrisonHolder>
   <Health>
     <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Pontos</SpecificName>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/celts/warship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/ship_trireme.xml	(revision 25058)
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="36.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
   </GarrisonHolder>
   <Health>
     <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Pontos</SpecificName>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/celts/warship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/ship_trireme.xml	(revision 25058)
@@ -1,28 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="36.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
   </GarrisonHolder>
   <Health>
     <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Ponti</SpecificName>
     <Tooltip>Transport many soldiers across the sea.</Tooltip>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/iberians/warship.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/ship_trireme.xml	(revision 25058)
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
-  <Cost>
-    <Resources>
-      <wood op="add">50</wood>
-      <metal op="add">50</metal>
-    </Resources>
-  </Cost>
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Identity>
     <Civ>kush</Civ>
     <Classes datatype="tokens">KushTrireme</Classes>
     <GenericName>Ptolemaic Mercenary Trireme</GenericName>
     <SpecificName>shry ʿȝ</SpecificName>
     <Icon>units/ptol_ship_trireme.png</Icon>
   </Identity>
   <VisualActor>
     <Actor>structures/kushites/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/ship_trireme.xml	(revision 25058)
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_trireme">
   <Cost>
     <BuildTime>40</BuildTime>
   </Cost>
   <Footprint>
     <Square width="17.0" depth="45.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>40</Max>
   </GarrisonHolder>
   <Health>
     <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
     <Icon>units/maur_ship_trireme.png</Icon>
   </Identity>
+  <Loot>
+    <xp op="add">20</xp>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/mauryas/trireme.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml	(revision 25057)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_juggernaut.xml	(revision 25058)
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship_quinquereme">
   <Cost>
     <Population>5</Population>
     <BuildTime>60</BuildTime>
     <Resources>
-      <wood>400</wood>
-      <metal>300</metal>
-      <stone>350</stone>
+      <wood>800</wood>
+      <metal>400</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="48.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>100</Max>
   </GarrisonHolder>
   <Health>
     <Max>4000</Max>
   </Health>
   <Identity>
     <Civ>ptol</Civ>
     <Classes datatype="tokens">Juggernaut</Classes>
     <GenericName>Juggernaut</GenericName>
     <SpecificName>Tessarakonterēs</SpecificName>
     <Icon>units/rome_ship_quinquereme.png</Icon>
   </Identity>
   <Loot>
-    <xp>200</xp>
-    <wood>50</wood>
-    <metal>50</metal>
+    <xp>400</xp>
+    <wood>160</wood>
+    <metal>80</metal>
   </Loot>
   <TrainingRestrictions>
     <Category>Juggernaut</Category>
   </TrainingRestrictions>
   <VisualActor>
     <Actor>structures/romans/quinquereme.xml</Actor>
   </VisualActor>
 </Entity>