Index: binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
@@ -4,6 +4,9 @@
     <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>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
@@ -4,6 +4,9 @@
     <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>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -3,7 +3,7 @@
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
-      <food>40</food>
+      <food>35</food>
     </Resources>
   </Cost>
   <Footprint>
@@ -11,7 +11,7 @@
     <Height>2.0</Height>
   </Footprint>
   <Health>
-    <Max>40</Max>
+    <Max>35</Max>
   </Health>
   <Identity>
     <GenericName>Goat</GenericName>
@@ -19,7 +19,7 @@
     <Icon>gaia/fauna_goat.png</Icon>
   </Identity>
   <ResourceSupply>
-    <Amount>80</Amount>
+    <Amount>70</Amount>
     <MaxGatherers>2</MaxGatherers>
   </ResourceSupply>
   <Sound>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -8,7 +8,8 @@
         <Pierce>0.0</Pierce>
         <Crush>0.0</Crush>
       </Damage>
-      <MaxRange>4.0</MaxRange>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
     </Melee>
   </Attack>
@@ -16,6 +17,9 @@
     <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>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -4,11 +4,12 @@
     <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>
@@ -16,6 +17,9 @@
     <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>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
@@ -1,9 +1,25 @@
 <?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>
Index: binaries/data/mods/public/simulation/templates/template_unit.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit.xml
+++ binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -79,7 +79,7 @@
       <Damage>
         <Hack>1</Hack>
         <Pierce>1</Pierce>
-        <Crush>15</Crush>
+        <Crush>1</Crush>
       </Damage>
     </Entity>
   </Resistance>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
@@ -1,5 +1,5 @@
 <?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>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
+++ /dev/null
@@ -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>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -37,15 +37,6 @@
   <Minimap>
     <Type>hero</Type>
   </Minimap>
-  <Resistance>
-    <Entity>
-      <Damage>
-        <Hack>10</Hack>
-        <Pierce>20</Pierce>
-        <Crush>15</Crush>
-      </Damage>
-    </Entity>
-  </Resistance>
   <Selectable>
     <Overlay>
       <AlwaysVisible/>