Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml	(revision 18401)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml	(revision 18402)
@@ -1,82 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
   <Armour>
     <Hack>15</Hack>
     <Pierce>40</Pierce>
     <Crush>5</Crush>
   </Armour>
   <BuildRestrictions>
     <Category>Field</Category>
   </BuildRestrictions>
   <Capturable disable=""/>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
       <wood>100</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="28.0" depth="28.0"/>
     <Height>2.0</Height>
   </Footprint>
   <Health>
     <Max>250</Max>
     <SpawnEntityOnDeath>rubble/rubble_field</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Field</GenericName>
     <VisibleClasses datatype="tokens">Field</VisibleClasses>
     <Tooltip>Harvest vegetables for food. Max gatherers: 5.</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>
   <Loot>
     <xp>100</xp>
     <food>100</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>0</metal>
   </Loot>
   <Minimap>
     <Color r="119" g="82" b="46"/>
   </Minimap>
   <Obstruction>
     <Static width="22.0" depth="22.0"/>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <ProductionQueue disable=""/>
   <RallyPoint disable=""/>
   <ResourceSupply>
     <KillBeforeGather>false</KillBeforeGather>
     <Amount>Infinity</Amount>
     <Type>food.grain</Type>
     <MaxGatherers>5</MaxGatherers>
-	<!-- Note to people looking to change this: see the comments
-		 around line 260 in simulation/components/ResourceGatherer.js -->
+	<!--
+	     See the comment of the function GetTargetGatherRate
+	     of the ResourceGatherer component.
+	-->
     <DiminishingReturns>14</DiminishingReturns>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_field.xml</select>
       <constructed>interface/complete/building/complete_field.xml</constructed>
       <death>attack/destruction/building_collapse_large.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <TerritoryDecay>
     <DecayRate>Infinity</DecayRate>
   </TerritoryDecay>
   <Vision>
     <Range>0</Range>
   </Vision>
   <VisualActor>
     <Actor>structures/plot_field_3D_8x8.xml</Actor>
     <FoundationActor>structures/plot_field_found.xml</FoundationActor>
     <SelectionShape>
       <Footprint/>
     </SelectionShape>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml	(revision 18401)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml	(revision 18402)
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_ship">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>35.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>45.0</MaxRange>
       <MinRange>0.0</MinRange>
       <ProjectileSpeed>60.0</ProjectileSpeed>
       <PrepareTime>2000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Spread>1.5</Spread>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>2</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
 	<GarrisonArrowClasses>Infantry Ranged</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>2</Population>
     <BuildTime>20</BuildTime>
     <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
+      <wood>125</wood>
+      <metal>50</metal>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="8.0" depth="33.0"/>
     <Height>10.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>20</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Female Infantry Dog</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Dog</List>
     <BuffHeal>1</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
   </Health>
   <Identity>
     <GenericName>Light Warship</GenericName>
     <Classes datatype="tokens">Warship Light Bow Ranged</Classes>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison up to 20 units for transport. Garrison increases the firepower up to 10 arrows.</Tooltip>
   </Identity>
   <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
       <attack_impact>attack/impact/arrow_metal.xml</attack_impact>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>6.0</BarWidth>
     <BarHeight>0.5</BarHeight>
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed>14</WalkSpeed>
     <Run>
       <Speed>18.0</Speed>
     </Run>
   </UnitMotion>
 </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 18401)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml	(revision 18402)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_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>1600</Max>
+    <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Venetic Ponti</SpecificName>
     <Tooltip>Transport many soldiers across the sea.</Tooltip>
     <History>The ships of Gaul were described by Julias Caesar as:  flat bottoms to ride the shallows, exceptionally high bows and sterns, hulls were made entirely of oak, the foot wide cross-timbers were fastened with iron bolts as thick as a man's thumb, sails of raw hides or thin leather, adapted for sailing treacherous and stormy waters of the north atlantic.  Caesar could not injure them by ramming because they were so solidly built, and their height made it difficult to reach them with missiles or board them with grappling irons.</History>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
     <WalkSpeed>14</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 18401)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml	(revision 18402)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_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>1600</Max>
+    <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Venetic Ponti</SpecificName>
     <Tooltip>Transport many soldiers across the sea.</Tooltip>
     <History>The ships of Gaul were described by Julias Caesar as:  flat bottoms to ride the shallows, exceptionally high bows and sterns, hulls were made entirely of oak, the foot wide cross-timbers were fastened with iron bolts as thick as a man's thumb, sails of raw hides or thin leather, adapted for sailing treacherous and stormy waters of the north atlantic.  Caesar could not injure them by ramming because they were so solidly built, and their height made it difficult to reach them with missiles or board them with grappling irons.</History>
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
     <WalkSpeed>14</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 18401)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml	(revision 18402)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_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>1600</Max>
+    <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>
   <UnitMotion>
     <WalkSpeed>14</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/iberians/warship.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 18401)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml	(revision 18402)
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_mechanical_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>2200</Max>
+    <Max op="add">200</Max>
   </Health>
   <Identity>
     <Civ>maur</Civ>
     <SpecificName>Yudhpot</SpecificName>
     <VisibleClasses datatype="tokens">Melee</VisibleClasses>
     <Icon>units/maur_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
     <WalkSpeed>14</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/mauryans/trireme.xml</Actor>
   </VisualActor>
 </Entity>