Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml	(revision 22325)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml	(revision 22326)
@@ -1,87 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
     <Hack>5</Hack>
     <Pierce>10</Pierce>
     <Crush>5</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
     <BuildTime>20</BuildTime>
     <Resources>
       <food>0</food>
       <wood>50</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Decay>
     <SinkingAnim>true</SinkingAnim>
     <DelayTime>0.0</DelayTime>
     <SinkRate>0.5</SinkRate>
     <SinkAccel>7.0</SinkAccel>
   </Decay>
   <Footprint replace="">
     <Square width="6.0" depth="30.0"/>
     <Height>8.0</Height>
     <MaxSpawnDistance>10</MaxSpawnDistance>
   </Footprint>
   <Health>
     <Unhealable>true</Unhealable>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Ship</GenericName>
     <Formations disable=""/>
     <VisibleClasses datatype="tokens">Mechanical Ship</VisibleClasses>
   </Identity>
   <Loot>
     <xp>60</xp>
     <food>0</food>
     <wood>50</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Position>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>3.0</TurnRate>
   </Position>
   <Repairable>
     <RepairTimeRatio>4.0</RepairTimeRatio>
   </Repairable>
   <ResourceGatherer>
     <MaxDistance>4.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Capacities>
       <food>40</food>
       <wood>20</wood>
       <stone>20</stone>
       <metal>20</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>circle/256x256.png</MainTexture>
         <MainTextureMask>circle/256x256_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_warship.xml</trained>
       <select>actor/ship/ship_select_01.xml</select>
       <order_walk>actor/ship/warship_move_01.xml</order_walk>
       <order_attack>actor/ship/warship_move_01.xml</order_attack>
       <order_gather>actor/ship/warship_move_01.xml</order_gather>
       <death>actor/ship/warship_death.xml</death>
     </SoundGroups>
   </Sound>
+  <StatusBars>
+    <BarWidth>6.0</BarWidth>
+    <BarHeight>0.5</BarHeight>
+    <HeightOffset>6.0</HeightOffset>
+  </StatusBars>
   <UnitMotion>
     <PassabilityClass>ship</PassabilityClass>
   </UnitMotion>
   <Vision>
     <Range>90</Range>
   </Vision>
 </Entity>
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 22325)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml	(revision 22326)
@@ -1,78 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>35.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>45.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>75.0</Speed>
         <Spread>2.0</Spread>
         <Gravity>9.81</Gravity>
         <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>
     </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">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Dog</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
     <Max>800</Max>
   </Health>
   <Identity>
     <GenericName>Light Warship</GenericName>
     <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Loot>
     <xp>75</xp>
     <wood>25</wood>
     <metal>15</metal>
   </Loot>
   <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">1.55</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml	(revision 22325)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml	(revision 22326)
@@ -1,61 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>10.0</Crush>
       <MaxRange>8.0</MaxRange>
       <PrepareTime>50</PrepareTime>
       <RepeatTime>100</RepeatTime>
     </Melee>
   </Attack>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <DeathDamage>
     <Shape>Circular</Shape>
     <Range>30</Range>
     <FriendlyFire>true</FriendlyFire>
     <Hack>300.0</Hack>
     <Pierce>300.0</Pierce>
     <Crush>300.0</Crush>
   </DeathDamage>
   <Footprint>
     <Square width="8.0" depth="24.0"/>
     <Height>8.0</Height>
   </Footprint>
   <Health>
     <Max>500</Max>
     <RegenRate>-6</RegenRate>
     <DamageVariants>
       <lightdamage>0.85</lightdamage>
       <mediumdamage>0.65</mediumdamage>
       <heavydamage>0.35</heavydamage>
     </DamageVariants>
   </Health>
   <Identity>
     <GenericName>Fire Ship</GenericName>
     <VisibleClasses datatype="tokens">Fireship Melee Warship</VisibleClasses>
     <Tooltip>Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly.</Tooltip>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Loot disable=""/>
   <Repairable disable=""/>
   <ResourceGatherer disable=""/>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.6</WalkSpeed>
   </UnitMotion>
   <Vision>
     <Range>60</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 22325)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml	(revision 22326)
@@ -1,69 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Armour>
     <Hack>2</Hack>
     <Pierce>5</Pierce>
     <Crush>2</Crush>
   </Armour>
   <Attack>
     <Melee>
       <Hack>10.0</Hack>
       <Pierce>0.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">!SeaCreature</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="4.0" depth="10.0"/>
     <Height>6.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>1</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Identity>
     <Classes datatype="tokens">FishingBoat -ConquestCritical</Classes>
     <Formations disable=""/>
     <GenericName>Fishing Boat</GenericName>
     <Tooltip>Fish the waters for food.</Tooltip>
   </Identity>
   <Loot>
     <xp>1</xp>
     <wood>10</wood>
     <metal>0</metal>
   </Loot>
   <ResourceGatherer>
     <MaxDistance>6.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <food.fish>1.8</food.fish>
       <treasure disable=""/>
     </Rates>
   </ResourceGatherer>
   <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 22325)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml	(revision 22326)
@@ -1,71 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Armour>
     <Hack>2</Hack>
     <Pierce>5</Pierce>
     <Crush>2</Crush>
   </Armour>
   <Cost>
     <Resources>
       <wood>0</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
   <GarrisonHolder>
     <Max>15</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Dog</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
     <Max>400</Max>
   </Health>
   <Identity>
     <Classes datatype="tokens">-ConquestCritical</Classes>
     <Formations disable=""/>
     <GenericName>Merchantman</GenericName>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures.</Tooltip>
     <VisibleClasses datatype="tokens">Trader Bribable</VisibleClasses>
   </Identity>
   <Loot>
     <xp>25</xp>
     <wood>15</wood>
     <metal>0</metal>
   </Loot>
   <ResourceGatherer>
     <MaxDistance>12.0</MaxDistance>
     <Capacities>
       <food>75</food>
       <wood>75</wood>
       <stone>50</stone>
       <metal>50</metal>
     </Capacities>
   </ResourceGatherer>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <Trader>
     <GainMultiplier>0.75</GainMultiplier>
   </Trader>
   <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 22325)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml	(revision 22326)
@@ -1,89 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>10.0</Pierce>
       <Crush>100.0</Crush>
       <MaxRange>72.0</MaxRange>
       <MinRange>10.0</MinRange>
       <PrepareTime>2000</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Delay>0</Delay>
       <Splash>
         <Shape>Circular</Shape>
         <Range>10</Range>
         <FriendlyFire>false</FriendlyFire>
         <Hack>0.0</Hack>
         <Pierce>15.0</Pierce>
         <Crush>35.0</Crush>
       </Splash>
       <Projectile>
         <Speed>37.5</Speed>
         <Spread>4.0</Spread>
         <Gravity>9.81</Gravity>
         <LaunchPoint y="3"/>
       </Projectile>
       <PreferredClasses datatype="tokens">Ship Structure</PreferredClasses>
     </Ranged>
   </Attack>
   <BuildingAI>
     <DefaultArrowCount>1</DefaultArrowCount>
     <MaxArrowCount>10</MaxArrowCount>
     <GarrisonArrowMultiplier>1</GarrisonArrowMultiplier>
     <GarrisonArrowClasses>Catapult</GarrisonArrowClasses>
   </BuildingAI>
   <Cost>
     <Population>3</Population>
     <BuildTime>30</BuildTime>
     <Resources>
       <wood>350</wood>
       <metal>200</metal>
       <stone>350</stone>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="12.0" depth="48.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>50</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Dog Siege Elephant</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </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</VisibleClasses>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>150</xp>
     <wood>40</wood>
     <metal>30</metal>
   </Loot>
   <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <attack_ranged>attack/siege/ballist_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <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 22325)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml	(revision 22326)
@@ -1,78 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
       <Hack>0.0</Hack>
       <Pierce>35.0</Pierce>
       <Crush>0.0</Crush>
       <MaxRange>55.0</MaxRange>
       <MinRange>0.0</MinRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
         <Speed>75.0</Speed>
         <Spread>2.0</Spread>
         <Gravity>9.81</Gravity>
         <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>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="10.0" depth="40.0"/>
     <Height>8.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>30</Max>
     <EjectHealth>0</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">FemaleCitizen Infantry Healer Dog</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry Dog Siege Elephant</List>
     <BuffHeal>0</BuffHeal>
     <LoadingRange>10</LoadingRange>
     <Pickup>true</Pickup>
   </GarrisonHolder>
   <Health>
     <Max>1400</Max>
   </Health>
   <Identity>
     <GenericName>Medium Warship</GenericName>
     <VisibleClasses datatype="tokens">Ranged Warship</VisibleClasses>
     <RequiredTechnology>phase_town</RequiredTechnology>
     <Tooltip>Garrison units for transport and to increase firepower.</Tooltip>
   </Identity>
   <Loot>
     <xp>100</xp>
     <wood>30</wood>
     <metal>20</metal>
   </Loot>
   <ResourceGatherer disable=""/>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_metal.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/arrowfly.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <StatusBars>
-    <BarWidth>6.0</BarWidth>
-    <BarHeight>0.5</BarHeight>
-    <HeightOffset>6.0</HeightOffset>
-  </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">1.8</WalkSpeed>
   </UnitMotion>
 </Entity>