Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml	(nonexistent)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive">
-  <Attack>
-    <Melee>
-      <AttackName>Fangs</AttackName>
-      <Damage>
-        <Hack>10.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>4.0</MaxRange>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
-</Entity>

Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/xml
\ No newline at end of property
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml	(revision 24689)
@@ -1,84 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Melee>
       <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
         <Crush>0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Cost>
     <BuildTime>15</BuildTime>
     <Population>0</Population>
     <Resources>
       <food>100</food>
     </Resources>
   </Cost>
   <Footprint replace="">
     <Square width="1.5" depth="3"/>
     <Height>1.5</Height>
   </Footprint>
   <Health>
     <Max>110</Max>
   </Health>
   <Identity>
     <GenericName>War Dog</GenericName>
     <Tooltip>Cannot attack Structures, Ships, or Siege Engines.</Tooltip>
     <Classes datatype="tokens">Human FastMoving</Classes>
     <VisibleClasses datatype="tokens">Dog Melee</VisibleClasses>
   </Identity>
   <Loot>
     <xp>100</xp>
     <food>10</food>
   </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>2</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <ResourceGatherer disable=""/>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x256/ellipse.png</MainTexture>
         <MainTextureMask>128x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <order_attack>voice/global/civ_dog_move.xml</order_attack>
       <order_walk>voice/global/civ_dog_move.xml</order_walk>
       <select>voice/global/civ_dog_bark.xml</select>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/fauna/death/death_animal_gen.xml</death>
       <trained>interface/complete/building/complete_kennel.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>2.5</HeightOffset>
   </StatusBars>
   <TrainingRestrictions>
     <Category>WarDog</Category>
   </TrainingRestrictions>
   <UnitMotion>
     <WalkSpeed op="mul">1.5</WalkSpeed>
     <RunMultiplier>2</RunMultiplier>
   </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml	(revision 24689)
@@ -1,26 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>3</Pierce>
-        <Crush>1</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <ResourceSupply>
     <Amount>100</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml	(revision 24689)
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
       <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>2.5</Hack>
         <Pierce>5.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>3.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
-  <Health>
-    <Max>50</Max>
-  </Health>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml	(revision 24689)
@@ -1,40 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <AttackName>Horn</AttackName>
       <Damage>
-        <Hack>20.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>20.0</Crush>
+        <Hack>20</Hack>
+        <Pierce>0</Pierce>
+        <Crush>20</Crush>
       </Damage>
-      <MaxRange>6.0</MaxRange>
+      <MaxRange>4</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="3.0" depth="6.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>160</Max>
+  </Health>
   <Identity>
     <GenericName>White Rhinoceros</GenericName>
     <SpecificName>Ceratotherium simum</SpecificName>
     <Icon>gaia/fauna_rhino.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>300</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/rhino.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml	(revision 24689)
@@ -1,52 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
       <AttackName>Tusks</AttackName>
       <Damage>
-        <Hack>15.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>15</Hack>
+        <Pierce>10</Pierce>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>4.0</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
+      <MaxRange>5</MaxRange>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="4.0" depth="8.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>120</Max>
+  </Health>
   <Identity>
     <GenericName>Walrus</GenericName>
     <SpecificName>Odobenus rosmarus</SpecificName>
     <Icon>gaia/fauna_walrus.png</Icon>
   </Identity>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>3</Hack>
-        <Pierce>4</Pierce>
-        <Crush>5</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <ResourceSupply>
     <Amount>300</Amount>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>256x256/ellipse.png</MainTexture>
         <MainTextureMask>256x256/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/walrus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_humpback.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
   <Footprint>
     <Square width="4.0" depth="16.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
     <GenericName>Humpback Whale</GenericName>
     <SpecificName>Megaptera novaeangliae</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Position>
     <Altitude>-4</Altitude>
   </Position>
   <VisualActor>
     <Actor>fauna/whale.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml	(revision 24689)
@@ -1,18 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
+<Entity parent="template_unit_fauna_wild_aggressive">
+  <Attack>
+    <Melee>
+      <AttackName>Fangs</AttackName>
+      <Damage>
+        <Hack>10</Hack>
+        <Pierce>10</Pierce>
+        <Crush>0</Crush>
+      </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>40</Max>
+  </Health>
   <Identity>
     <GenericName>Wolf</GenericName>
     <SpecificName>Canis lupus</SpecificName>
     <Icon>gaia/fauna_wolf.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/wolf.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit.xml	(revision 24689)
@@ -1,153 +1,153 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity>
   <AIProxy/>
   <Cost>
     <Population>1</Population>
     <BuildTime>1</BuildTime>
     <Resources>
       <food>0</food>
       <wood>0</wood>
       <stone>0</stone>
       <metal>0</metal>
     </Resources>
   </Cost>
   <Decay>
     <Active>false</Active>
     <SinkingAnim>false</SinkingAnim>
     <DelayTime>30.0</DelayTime>
     <SinkRate>0.01</SinkRate>
     <SinkAccel>0.0</SinkAccel>
   </Decay>
   <Footprint>
     <Circle radius="1.5"/>
     <Height>4.0</Height>
   </Footprint>
   <Garrisonable/>
   <Guard/>
   <Health>
     <DeathType>corpse</DeathType>
     <Max>100</Max>
     <RegenRate>0</RegenRate>
     <IdleRegenRate>0</IdleRegenRate>
     <Unhealable>false</Unhealable>
   </Health>
   <Identity>
     <Civ>gaia</Civ>
     <Classes datatype="tokens">Unit Organic ConquestCritical</Classes>
     <GenericName>Unit</GenericName>
     <Formations datatype="tokens">
       special/formations/null
       special/formations/box
       special/formations/column_closed
       special/formations/line_closed
       special/formations/column_open
       special/formations/line_open
       special/formations/flank
       special/formations/battle_line
     </Formations>
     <Phenotype datatype="tokens">male</Phenotype>
     <Undeletable>false</Undeletable>
   </Identity>
   <Looter/>
   <Minimap>
     <Type>unit</Type>
   </Minimap>
   <Obstruction>
     <Unit/>
     <Active>true</Active>
     <BlockMovement>true</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
     <BlockFoundation>false</BlockFoundation>
     <BlockConstruction>true</BlockConstruction>
     <DisableBlockMovement>false</DisableBlockMovement>
     <DisableBlockPathfinding>false</DisableBlockPathfinding>
     <DeleteUponConstruction>false</DeleteUponConstruction>
   </Obstruction>
   <OverlayRenderer/>
   <Ownership/>
   <Position>
     <Altitude>0</Altitude>
     <Anchor>pitch</Anchor>
     <Floating>false</Floating>
     <FloatDepth>0.0</FloatDepth>
     <TurnRate>8</TurnRate>
   </Position>
   <RangeOverlayManager/>
   <RangeOverlayRenderer/>
   <Resistance>
     <Entity>
       <Damage>
         <Hack>1</Hack>
         <Pierce>1</Pierce>
-        <Crush>15</Crush>
+        <Crush>1</Crush>
       </Damage>
     </Entity>
   </Resistance>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
     <BaseSpeed>1.0</BaseSpeed>
     <Rates>
       <treasure>1</treasure>
     </Rates>
     <Capacities>
       <food>10</food>
       <wood>10</wood>
       <stone>10</stone>
       <metal>10</metal>
     </Capacities>
   </ResourceGatherer>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x128/ellipse.png</MainTexture>
         <MainTextureMask>128x128/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <attacked>interface/alarm/alarm_attackplayer.xml</attacked>
       <attacked_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_gaia>
       <attacked_capture>interface/alarm/alarm_attackplayer.xml</attacked_capture>
       <attacked_capture_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_capture_gaia>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <BarWidth>2.0</BarWidth>
     <BarHeight>0.333</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <StatusEffectsReceiver/>
   <UnitAI>
     <DefaultStance>aggressive</DefaultStance>
     <FleeDistance>12.0</FleeDistance>
     <FormationController>false</FormationController>
     <CanGuard>true</CanGuard>
     <CanPatrol>true</CanPatrol>
     <PatrolWaitTime>1</PatrolWaitTime>
     <CheeringTime>2800</CheeringTime>
   </UnitAI>
   <UnitMotion>
     <FormationController>false</FormationController>
     <PassabilityClass>default</PassabilityClass>
     <WalkSpeed>9.0</WalkSpeed>
     <RunMultiplier>1.67</RunMultiplier>
   </UnitMotion>
   <Visibility>
     <RetainInFog>false</RetainInFog>
     <AlwaysVisible>false</AlwaysVisible>
     <Corpse>false</Corpse>
     <Preview>false</Preview>
   </Visibility>
   <Vision>
     <Range>12</Range>
   </Vision>
   <VisionSharing>
     <Bribable>false</Bribable>
   </VisionSharing>
   <VisualActor>
     <SilhouetteDisplay>true</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml	(revision 24689)
@@ -1,48 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
       <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>10.0</Pierce>
         <Crush>20.0</Crush>
       </Damage>
       <MaxRange>6.0</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Elephant</VisibleClasses>
   </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>
   <Position>
     <TurnRate>3</TurnRate>
   </Position>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>3</Hack>
-        <Pierce>4</Pierce>
-        <Crush>5</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.5</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml	(revision 24689)
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_aggressive_wolf">
+<Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
       <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
       </Damage>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Sound>
     <SoundGroups>
       <select>voice/global/civ_dog_bark.xml</select>
       <order_walk>voice/global/civ_dog_move.xml</order_walk>
       <order_attack>voice/global/civ_dog_move.xml</order_attack>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
       <death>actor/fauna/death/death_animal_gen.xml</death>
       <trained>interface/complete/building/complete_kennel.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.6</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Black Bear</GenericName>
     <SpecificName>Ursus americanus</SpecificName>
     <Icon>gaia/fauna_bear_black.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/bear_black.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Brown Bear</GenericName>
     <SpecificName>Ursus arctos</SpecificName>
     <Icon>gaia/fauna_bear_brown.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/bear_brown.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Polar Bear</GenericName>
     <SpecificName>Ursus maritimus</SpecificName>
     <Icon>gaia/fauna_bear_polar.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/bear_white.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml	(revision 24689)
@@ -1,33 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>12.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
       <MaxRange>1.0</MaxRange>
       <RepeatTime>1000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Wild Boar</GenericName>
     <SpecificName>Sus scrofa</SpecificName>
     <Icon>gaia/fauna_boar.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>150</Amount>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/boar.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml	(revision 24689)
@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>5.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Dromedary</GenericName>
     <SpecificName>Camelus dromedarius</SpecificName>
     <Icon>gaia/fauna_camel.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/camel_select.xml</select>
       <order_walk>actor/fauna/movement/camel_order.xml</order_walk>
       <death>actor/fauna/death/death_camel.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/camel.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_bull">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>150</Max>
+  </Health>
   <Identity>
     <GenericName>Bull</GenericName>
     <SpecificName>Bos taurus taurus</SpecificName>
     <Icon>gaia/fauna_bull.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/bull.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml	(revision 24689)
@@ -1,51 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
       <AttackName>Teeth</AttackName>
       <Damage>
-        <Hack>30.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>30</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>8.0</MaxRange>
+      <MaxRange>7</MaxRange>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="3.0" depth="12.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>100</Max>
+  </Health>
   <Identity>
     <GenericName>Nile Crocodile</GenericName>
     <SpecificName>Crocodylus niloticus</SpecificName>
     <Icon>gaia/fauna_crocodile.png</Icon>
   </Identity>
   <Position>
     <Anchor>pitch-roll</Anchor>
   </Position>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x512/ellipse.png</MainTexture>
         <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.3</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/crocodile.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>25</Max>
+  </Health>
   <Identity>
     <GenericName>Red Deer</GenericName>
     <SpecificName>Cervus elaphus</SpecificName>
     <Icon>gaia/fauna_deer.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/deer.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>40</Max>
+  </Health>
   <Identity>
     <GenericName>Mastiff</GenericName>
     <SpecificName>Canis lupus familiaris</SpecificName>
     <Icon>gaia/fauna_dog.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/mastiff.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
+  <Health>
+    <Max>40</Max>
+  </Health>
   <Identity>
     <GenericName>Wolfhound</GenericName>
     <SpecificName>Canis lupus familiaris</SpecificName>
     <Icon>units/brit_wolfhound.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>units/britons/wolfhound.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml	(revision 24689)
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Donkey</GenericName>
     <SpecificName>Equus africanus asinus</SpecificName>
     <Icon>gaia/fauna_donkey.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/horse_select.xml</select>
       <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
       <death>actor/fauna/animal/horse_death.xml</death>
       <trained>actor/fauna/animal/horse_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/donkey.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_infant.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>African Bush Elephant Calf</GenericName>
     <SpecificName>Loxodonta africana</SpecificName>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/elephant_african_baby.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian_infant.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish_elephant_infant">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Asian Elephant Calf</GenericName>
     <SpecificName>Elephas maximus</SpecificName>
     <Icon>gaia/fauna_elephant_african_infant.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/elephant_african_baby.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_defensive_fox">
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
   </Footprint>
+  <Health>
+    <Max>20</Max>
+  </Health>
   <Identity>
     <GenericName>Arctic Fox</GenericName>
     <SpecificName>Vulpes lagopus</SpecificName>
     <Icon>gaia/fauna_fox_arctic.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>2.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/fox_arctic.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_defensive_fox">
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
   </Footprint>
+  <Health>
+    <Max>20</Max>
+  </Health>
   <Identity>
     <GenericName>Red Fox</GenericName>
     <SpecificName>Vulpes vulpes</SpecificName>
     <Icon>gaia/fauna_fox_red.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>2.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/fox_red.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>25</Max>
+  </Health>
   <Identity>
     <GenericName>Thomson's Gazelle</GenericName>
     <SpecificName>Eudorcas thomsonii</SpecificName>
     <Icon>gaia/fauna_gazelle.png</Icon>
   </Identity>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/gazelle.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml	(revision 24689)
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <Height>13.0</Height>
   </Footprint>
   <Health>
-    <Max>150</Max>
+    <Max>80</Max>
   </Health>
   <Identity>
     <GenericName>Giraffe</GenericName>
     <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>350</Amount>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>14.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_adult.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml	(revision 24689)
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>7.5</Height>
   </Footprint>
+  <Health>
+    <Max>40</Max>
+  </Health>
   <Identity>
     <GenericName>Juvenile Giraffe</GenericName>
     <SpecificName>Giraffa camelopardalis</SpecificName>
     <Icon>gaia/fauna_giraffe.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>150</Amount>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>8.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.6</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/giraffe_baby.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml	(revision 24689)
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
-      <food>40</food>
+      <food>35</food>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
   </Footprint>
   <Health>
-    <Max>40</Max>
+    <Max>35</Max>
   </Health>
   <Identity>
     <GenericName>Goat</GenericName>
     <SpecificName>Capra aegagrus hircus</SpecificName>
     <Icon>gaia/fauna_goat.png</Icon>
   </Identity>
   <ResourceSupply>
-    <Amount>80</Amount>
+    <Amount>70</Amount>
     <MaxGatherers>2</MaxGatherers>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/goat_select.xml</select>
       <order_walk>actor/fauna/animal/goat_order.xml</order_walk>
       <death>actor/fauna/death/goat.xml</death>
       <trained>actor/fauna/animal/goat_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>3.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/goat.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml	(revision 24689)
@@ -1,53 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
       <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>12</Hack>
         <Pierce>12</Pierce>
       </Damage>
       <MaxRange>3</MaxRange>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="3.0" depth="6.0"/>
     <Height>3.5</Height>
   </Footprint>
   <Health>
     <Max>200</Max>
   </Health>
   <Identity>
     <GenericName>Hippopotamus</GenericName>
     <SpecificName>Hippopotamus amphibius</SpecificName>
     <Icon>gaia/fauna_hippopotamus.png</Icon>
   </Identity>
   <Loot>
     <xp>50</xp>
   </Loot>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>3</Hack>
-        <Pierce>4</Pierce>
-        <Crush>5</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <ResourceSupply>
     <Amount>400</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/hippopotamus.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml	(revision 24689)
@@ -1,32 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="3.0" depth="6.0"/>
     <Height>4.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Horse</GenericName>
     <SpecificName>Equus ferus caballus</SpecificName>
     <Icon>gaia/fauna_horse.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/horse_select.xml</select>
       <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
       <death>actor/fauna/animal/horse_death.xml</death>
       <trained>actor/fauna/animal/horse_trained.xml</trained>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/horse.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml	(revision 24689)
@@ -1,40 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
       <AttackName>Paws</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
-      <MaxRange>4.0</MaxRange>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Lion</GenericName>
     <SpecificName>Panthera leo</SpecificName>
     <Icon>gaia/fauna_lion.png</Icon>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.45</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/lion.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml	(revision 24689)
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Muskox</GenericName>
     <SpecificName>Ovibos moschatus</SpecificName>
     <Icon>gaia/fauna_muskox.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>200</Amount>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/muskox.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_piglet.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_piglet.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_piglet.xml	(revision 24689)
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="gaia/fauna_pig">
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>0.5</Height>
   </Footprint>
+  <Health>
+    <Max>15</Max>
+  </Health>
   <Identity>
     <GenericName>Piglet</GenericName>
   </Identity>
   <ResourceSupply>
     <Amount>10</Amount>
     <MaxGatherers>1</MaxGatherers>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>1.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.25</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/piglet.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rabbit.xml	(revision 24689)
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.0</Height>
   </Footprint>
   <Health>
-    <Max>10</Max>
+    <Max>5</Max>
   </Health>
   <Identity>
     <GenericName>Rabbit</GenericName>
     <SpecificName>Oryctolagus cuniculus</SpecificName>
     <Icon>gaia/fauna_rabbit.png</Icon>
   </Identity>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
   </Obstruction>
   <ResourceSupply>
     <Amount>50</Amount>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>2.0</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/rabbit1.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml	(revision 24689)
@@ -1,37 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
       <AttackName>Paws</AttackName>
       <Damage>
-        <Hack>30.0</Hack>
-        <Pierce>20.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>30</Hack>
+        <Pierce>0</Pierce>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>4.0</MaxRange>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Tiger</GenericName>
     <SpecificName>Panthera tigris</SpecificName>
     <Icon>gaia/fauna_tiger.png</Icon>
   </Identity>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/lion_select.xml</select>
       <attack_melee>actor/fauna/animal/lion_attack.xml</attack_melee>
       <death>actor/fauna/animal/lion_death.xml</death>
     </SoundGroups>
   </Sound>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
   <VisualActor>
     <Actor>fauna/tiger.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_whale_fin.xml	(revision 24689)
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_whale">
   <Footprint>
     <Square width="5.0" depth="20.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>200</Max>
+  </Health>
   <Identity>
     <GenericName>Fin Whale</GenericName>
     <SpecificName>Balaenoptera physalus</SpecificName>
     <Icon>gaia/fauna_fish.png</Icon>
   </Identity>
   <Position>
     <Altitude>-0.5</Altitude>
   </Position>
   <VisualActor>
     <Actor>fauna/whale_fin.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml	(revision 24689)
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Blue Wildebeest</GenericName>
     <SpecificName>Connochaetes taurinus</SpecificName>
     <Icon>gaia/fauna_wildebeest.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>150</Amount>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>4.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/wildebeest.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml	(revision 24689)
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
   </Footprint>
+  <Health>
+    <Max>50</Max>
+  </Health>
   <Identity>
     <GenericName>Common Zebra</GenericName>
     <SpecificName>Equus quagga</SpecificName>
     <Icon>gaia/fauna_zebra.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>150</Amount>
   </ResourceSupply>
   <StatusBars>
     <HeightOffset>3.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
     <WalkSpeed op="mul">0.9</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/zebra.xml</Actor>
   </VisualActor>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt.xml	(revision 24689)
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
-  <Health>
-    <Max>50</Max>
-  </Health>
   <Identity>
     <Tooltip>Kill to gather meat for food.</Tooltip>
   </Identity>
   <Loot>
     <xp>10</xp>
   </Loot>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>100</Amount>
     <Type>food.meat</Type>
     <MaxGatherers>8</MaxGatherers>
   </ResourceSupply>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml	(revision 24689)
@@ -1,55 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna">
   <Health>
-    <Max>200</Max>
     <Unhealable>true</Unhealable>
   </Health>
   <Identity>
     <Tooltip>Kill to butcher for food.</Tooltip>
   </Identity>
   <Loot>
     <xp>10</xp>
   </Loot>
   <Obstruction>
     <BlockMovement>false</BlockMovement>
     <BlockPathfinding>false</BlockPathfinding>
   </Obstruction>
   <Position>
     <Anchor>upright</Anchor>
     <Floating>true</Floating>
     <FloatDepth>0.0</FloatDepth>
   </Position>
   <ResourceSupply>
     <KillBeforeGather>true</KillBeforeGather>
     <Amount>2000</Amount>
     <Type>food.fish</Type>
     <MaxGatherers>5</MaxGatherers>
   </ResourceSupply>
   <Selectable>
     <Overlay>
       <Texture>
         <MainTexture>128x512/ellipse.png</MainTexture>
         <MainTextureMask>128x512/ellipse_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <StatusBars>
     <BarWidth>4.0</BarWidth>
     <BarHeight>0.666</BarHeight>
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitAI>
     <NaturalBehaviour>skittish</NaturalBehaviour>
     <RoamDistance>60.0</RoamDistance>
     <FleeDistance>60.0</FleeDistance>
     <RoamTimeMin>100000</RoamTimeMin>
     <RoamTimeMax>300000</RoamTimeMax>
     <FeedTimeMin>1</FeedTimeMin>
     <FeedTimeMax>2</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
     <WalkSpeed op="mul">1.8</WalkSpeed>
     <RunMultiplier>1</RunMultiplier>
   </UnitMotion>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 24688)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml	(revision 24689)
@@ -1,78 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Attack>
     <Capture>
       <AttackName>Capture</AttackName>
       <Capture>10</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
   </Attack>
   <Auras datatype="tokens">
     units/heroes/hero_garrison
   </Auras>
   <Cost>
     <Population>0</Population>
     <BuildTime>50</BuildTime>
     <Resources>
       <food>100</food>
       <metal>250</metal>
     </Resources>
   </Cost>
   <Identity>
     <Classes datatype="tokens">Human</Classes>
     <VisibleClasses datatype="tokens">Soldier Hero</VisibleClasses>
     <GenericName>Hero</GenericName>
     <Icon>technologies/laurel_wreath.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
     <xp>400</xp>
     <food>10</food>
     <wood>0</wood>
     <stone>0</stone>
     <metal>25</metal>
   </Loot>
   <Minimap>
     <Type>hero</Type>
   </Minimap>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>10</Hack>
-        <Pierce>20</Pierce>
-        <Crush>15</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>
       <Texture>
         <MainTexture>256x256/star.png</MainTexture>
         <MainTextureMask>256x256/star_mask.png</MainTextureMask>
       </Texture>
     </Overlay>
   </Selectable>
   <Sound>
     <SoundGroups>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <TrainingRestrictions>
     <Category>Hero</Category>
     <MatchLimit>1</MatchLimit>
   </TrainingRestrictions>
   <Vision>
     <Range>100</Range>
   </Vision>
 </Entity>