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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_black.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
+  <Attack>
+    <Melee>
+      <AttackName>Paws</AttackName>
+      <Damage>
+        <Hack>20</Hack>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_brown.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
+  <Attack>
+    <Melee>
+      <AttackName>Paws</AttackName>
+      <Damage>
+        <Hack>20</Hack>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_bear_polar.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive_bear">
+  <Attack>
+    <Melee>
+      <AttackName>Paws</AttackName>
+      <Damage>
+        <Hack>20</Hack>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>3.5</MaxRange>
+      <PrepareTime>1000</PrepareTime>
+      <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>3.0</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -4,12 +4,12 @@
     <Melee>
       <AttackName>Tusks</AttackName>
       <Damage>
-        <Hack>12.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>12</Hack>
       </Damage>
-      <MaxRange>1.0</MaxRange>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_bull">
+  <Attack>
+    <Melee>
+      <AttackName>Horns</AttackName>
+      <Damage>
+        <Hack>1</Hack>
+        <Pierce>5</Pierce>
+        <Crush>2</Crush>
+      </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.5</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
@@ -5,11 +5,11 @@
       <AttackName>Teeth</AttackName>
       <Damage>
         <Hack>30</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>7</MaxRange>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_mastiff.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
+  <Attack>
+    <Melee>
+      <AttackName>Fangs</AttackName>
+      <Damage>
+        <Hack>7</Hack>
+        <Pierce>2</Pierce>
+      </Damage>
+      <MaxRange>2.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_dog_wolfhound.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild_aggressive_dog">
+  <Attack>
+    <Melee>
+      <AttackName>Fangs</AttackName>
+      <Damage>
+        <Hack>7</Hack>
+        <Pierce>2</Pierce>
+      </Damage>
+      <MaxRange>2.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>2.0</Height>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_african_bush.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_elephant">
+  <Attack>
+    <Melee>
+      <AttackName>Trunk</AttackName>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>10</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>6</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="5.0" depth="10.0"/>
     <Height>9.0</Height>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_asian.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_elephant">
+  <Attack>
+    <Melee>
+      <AttackName>Trunk</AttackName>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>10</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="4.0" depth="8.0"/>
     <Height>7.0</Height>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_elephant_north_african.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive_elephant">
+  <Attack>
+    <Melee>
+      <AttackName>Trunk</AttackName>
+      <Damage>
+        <Hack>25</Hack>
+        <Pierce>10</Pierce>
+        <Crush>20</Crush>
+      </Damage>
+      <MaxRange>4.5</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="3.5" depth="7.0"/>
     <Height>6.5</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_arctic.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_defensive_fox">
+<Entity parent="template_unit_fauna_wild_defensive">
+  <Attack>
+    <Melee>
+      <AttackName>Fangs</AttackName>
+      <Damage>
+        <Hack>2.5</Hack>
+        <Pierce>5</Pierce>
+      </Damage>
+      <MaxRange>2</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_fox_red.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_wild_defensive_fox">
+<Entity parent="template_unit_fauna_wild_defensive">
+  <Attack>
+    <Melee>
+      <AttackName>Fangs</AttackName>
+      <Damage>
+        <Hack>2.5</Hack>
+        <Pierce>5</Pierce>
+      </Damage>
+      <MaxRange>2</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
+    </Melee>
+  </Attack>
   <Footprint>
     <Square width="1.0" depth="2.0"/>
     <Height>1.5</Height>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
@@ -7,7 +7,10 @@
         <Hack>12</Hack>
         <Pierce>12</Pierce>
       </Damage>
-      <MaxRange>3</MaxRange>
+      <MaxRange>4</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -4,13 +4,12 @@
     <Melee>
       <AttackName>Paws</AttackName>
       <Damage>
-        <Hack>20.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>20</Hack>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
@@ -5,11 +5,12 @@
       <AttackName>Horn</AttackName>
       <Damage>
         <Hack>20</Hack>
-        <Pierce>0</Pierce>
         <Crush>20</Crush>
       </Damage>
       <MaxRange>4</MaxRange>
+      <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -5,12 +5,11 @@
       <AttackName>Paws</AttackName>
       <Damage>
         <Hack>30</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>15</Hack>
         <Pierce>10</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>5</MaxRange>
       <PrepareTime>1000</PrepareTime>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_wolf.xml
@@ -6,11 +6,11 @@
       <Damage>
         <Hack>10</Hack>
         <Pierce>10</Pierce>
-        <Crush>0</Crush>
       </Damage>
-      <MaxRange>3</MaxRange>
+      <MaxRange>2.5</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
+      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
     </Melee>
   </Attack>
   <Footprint>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
-  <Attack>
-    <Melee>
-      <AttackName>Melee</AttackName>
-    </Melee>
-  </Attack>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
-  <Attack>
-    <Ranged>
-      <AttackName>Ranged</AttackName>
-    </Ranged>
-  </Attack>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>25</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>1.5</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -10,9 +10,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>12</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -20,9 +18,9 @@
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>1.5</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -3,20 +3,15 @@
   <Attack>
     <Ranged>
       <AttackName>Bow</AttackName>
-      <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
-      </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>10</MinRange>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>1.5</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -12,8 +12,8 @@
       <PrepareTime>4500</PrepareTime>
       <RepeatTime>5000</RepeatTime>
       <Projectile>
-        <Speed>40.0</Speed>
-        <Spread>6.0</Spread>
+        <Speed>40</Speed>
+        <Spread>6</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -12,8 +12,8 @@
       <PrepareTime>500</PrepareTime>
       <RepeatTime>4000</RepeatTime>
       <Projectile>
-        <Speed>150.0</Speed>
-        <Spread>1.0</Spread>
+        <Speed>150</Speed>
+        <Spread>1</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>8</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>12</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>1.5</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>16</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>1.5</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -5,7 +5,6 @@
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6.9</Hack>
-        <Pierce>0</Pierce>
         <Crush>2.3</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_maceman.xml
@@ -4,8 +4,6 @@
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>8</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>4</Hack>
         <Pierce>3</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <Bonuses>
         <BonusCavMelee>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -5,8 +5,6 @@
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>6.5</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
       <PrepareTime>375</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Hack>0</Hack>
-        <Pierce>9.0</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>16.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>1000</PrepareTime>
-      <RepeatTime>1500</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>3.0</Spread>
-        <Gravity>9.81</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-    </Ranged>
-  </Attack>
   <Health>
     <Max>100</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>7</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>2.0</Spread>
-        <Gravity>50.0</Gravity>
+        <Speed>100</Speed>
+        <Spread>2</Spread>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>18</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>70.0</Speed>
-        <Spread>4.0</Spread>
-        <Gravity>35.0</Gravity>
+        <Speed>70</Speed>
+        <Spread>4</Spread>
+        <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>14</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>0.8</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -5,7 +5,6 @@
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>13.8</Hack>
-        <Pierce>0</Pierce>
         <Crush>4.6</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>36</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>70.0</Speed>
+        <Speed>70</Speed>
         <Spread>1.6</Spread>
-        <Gravity>35.0</Gravity>
+        <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_maceman.xml
@@ -4,8 +4,6 @@
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>16</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>8</Hack>
         <Pierce>6</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
       <Bonuses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -4,9 +4,7 @@
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
-        <Hack>13.0</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>13</Hack>
       </Damage>
       <MaxRange>6</MaxRange>
       <PrepareTime>375</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
@@ -6,10 +6,9 @@
       <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>30</Hack>
-        <Pierce>0</Pierce>
         <Crush>120</Crush>
       </Damage>
-      <MaxRange>5.0</MaxRange>
+      <MaxRange>5</MaxRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
       <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>13.5</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>0.8</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -5,7 +5,6 @@
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>12</Hack>
-        <Pierce>0</Pierce>
         <Crush>4</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>26</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>70.0</Speed>
+        <Speed>70</Speed>
         <Spread>1.6</Spread>
-        <Gravity>35.0</Gravity>
+        <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -4,8 +4,6 @@
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>14</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>4</Hack>
         <Pierce>6</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>8</MaxRange>
       <PrepareTime>1000</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>6</Hack>
         <Pierce>5</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -5,8 +5,6 @@
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>11</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>375</PrepareTime>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_elephant_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_elephant_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_elephant_archer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>14</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>2.0</Spread>
-        <Gravity>50.0</Gravity>
+        <Speed>100</Speed>
+        <Spread>2</Spread>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="9"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
   <Loot>
     <xp>20</xp>
   </Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_aggressive">
-  <Attack>
-    <Melee>
-      <AttackName>Paws</AttackName>
-      <Damage>
-        <Hack>20</Hack>
-        <Pierce>0</Pierce>
-        <Crush>20</Crush>
-      </Damage>
-      <MaxRange>6</MaxRange>
-      <RepeatTime>2000</RepeatTime>
-    </Melee>
-  </Attack>
   <ResourceSupply>
     <Max>300</Max>
   </ResourceSupply>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_defensive">
-  <Attack>
-    <Melee>
-      <AttackName>Horns</AttackName>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>5</Pierce>
-        <Crush>2</Crush>
-      </Damage>
-      <MaxRange>1.5</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
   <Loot>
     <xp>50</xp>
   </Loot>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -1,19 +1,5 @@
 <?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>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_violent.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
   <UnitAI>
     <DefaultStance>violent</DefaultStance>
   </UnitAI>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
   <Loot>
     <xp>20</xp>
   </Loot>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
@@ -1,16 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
@@ -1,17 +0,0 @@
-<?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>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_violent.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_wild">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>1</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>4</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-      <RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
-    </Melee>
-  </Attack>
   <Loot>
     <xp>20</xp>
   </Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>28</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>0.4</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
@@ -5,7 +5,6 @@
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>27.6</Hack>
-        <Pierce>0</Pierce>
         <Crush>9.2</Crush>
       </Damage>
      <MaxRange>6</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>60</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>70.0</Speed>
+        <Speed>70</Speed>
         <Spread>0.8</Spread>
-        <Gravity>35.0</Gravity>
+        <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_maceman.xml
@@ -4,8 +4,6 @@
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>32</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>16</Hack>
         <Pierce>12</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>6</MaxRange>
       <Bonuses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -4,9 +4,7 @@
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
-        <Hack>26.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>26</Hack>
       </Damage>
      <MaxRange>6</MaxRange>
      <PrepareTime>375</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -6,10 +6,9 @@
       <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>60</Hack>
-        <Pierce>0</Pierce>
         <Crush>240</Crush>
       </Damage>
-      <MaxRange>5.0</MaxRange>
+      <MaxRange>5</MaxRange>
       <PrepareTime>750</PrepareTime>
       <RepeatTime>1500</RepeatTime>
      <PreferredClasses datatype="tokens">!Ship</PreferredClasses>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>27</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
+        <Speed>100</Speed>
         <Spread>0.4</Spread>
-        <Gravity>50.0</Gravity>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -5,7 +5,6 @@
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>24</Hack>
-        <Pierce>0</Pierce>
         <Crush>8</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>50</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
@@ -16,7 +14,7 @@
       <Projectile>
         <Speed>70</Speed>
         <Spread>0.8</Spread>
-        <Gravity>35.0</Gravity>
+        <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_maceman.xml
@@ -4,8 +4,6 @@
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>28</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>8</Hack>
         <Pierce>12</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>8</MaxRange>
       <PrepareTime>1000</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>12</Hack>
         <Pierce>10</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>450</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -5,8 +5,6 @@
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>22</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>375</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee.xml
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack>1</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0.0</Crush>
-      </Damage>
-      <MaxRange>3.5</MaxRange>
-      <PrepareTime>500</PrepareTime>
-      <RepeatTime>1000</RepeatTime>
-    </Melee>
-  </Attack>
   <Health>
     <Max>100</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -5,7 +5,6 @@
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6</Hack>
-        <Pierce>0</Pierce>
         <Crush>2</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_maceman.xml
@@ -4,8 +4,6 @@
     <Melee>
       <AttackName>Mace</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>7</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>2</Hack>
         <Pierce>3</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>8</MaxRange>
       <PrepareTime>1000</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -6,7 +6,6 @@
       <Damage>
         <Hack>3</Hack>
         <Pierce>2.5</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -5,8 +5,6 @@
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>5.5</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>375</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
-  <Attack>
-    <Ranged>
-      <Damage>
-        <Hack>0</Hack>
-        <Pierce>1.5</Pierce>
-        <Crush>0</Crush>
-      </Damage>
-      <MaxRange>10.0</MaxRange>
-      <MinRange>0.0</MinRange>
-      <PrepareTime>750</PrepareTime>
-      <RepeatTime>1250</RepeatTime>
-      <Delay>0</Delay>
-      <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>3.0</Spread>
-        <Gravity>9.81</Gravity>
-        <FriendlyFire>false</FriendlyFire>
-        <LaunchPoint y="3"/>
-      </Projectile>
-    </Ranged>
-  </Attack>
   <Health>
     <Max>50</Max>
   </Health>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>6.7</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>2.0</Spread>
-        <Gravity>50.0</Gravity>
+        <Speed>100</Speed>
+        <Spread>2</Spread>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Javelin</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>16</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>30</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>70.0</Speed>
-        <Spread>4.0</Spread>
-        <Gravity>35.0</Gravity>
+        <Speed>70</Speed>
+        <Spread>4</Spread>
+        <Gravity>35</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -4,7 +4,6 @@
     <Ranged>
       <AttackName>Sling</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>11.5</Pierce>
         <Crush>1.1</Crush>
       </Damage>
@@ -14,9 +13,9 @@
       <RepeatTime>1250</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>90.0</Speed>
-        <Spread>3.0</Spread>
-        <Gravity>45.0</Gravity>
+        <Speed>90</Speed>
+        <Spread>3</Spread>
+        <Gravity>45</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -4,19 +4,17 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>35.0</Pierce>
-        <Crush>0.0</Crush>
+        <Pierce>35</Pierce>
       </Damage>
-      <MaxRange>45.0</MaxRange>
-      <MinRange>0.0</MinRange>
+      <MaxRange>45</MaxRange>
+      <MinRange>0</MinRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>2.0</Spread>
-        <Gravity>50.0</Gravity>
+        <Speed>100</Speed>
+        <Spread>2</Spread>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -4,11 +4,9 @@
     <Melee>
       <AttackName>Harpoon</AttackName>
       <Damage>
-        <Hack>10.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>10</Hack>
       </Damage>
-      <MaxRange>5.0</MaxRange>
+      <MaxRange>5</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">!SeaCreature</RestrictedClasses>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -4,8 +4,6 @@
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>150</Crush>
       </Damage>
       <MaxRange>80</MaxRange>
@@ -14,9 +12,9 @@
       <RepeatTime>5000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>40.0</Speed>
-        <Spread>6.0</Spread>
-        <Gravity>20.0</Gravity>
+        <Speed>40</Speed>
+        <Spread>6</Spread>
+        <Gravity>20</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -4,19 +4,17 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>35.0</Pierce>
-        <Crush>0.0</Crush>
+        <Pierce>35</Pierce>
       </Damage>
-      <MaxRange>55.0</MaxRange>
-      <MinRange>0.0</MinRange>
+      <MaxRange>55</MaxRange>
+      <MinRange>0</MinRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>2.0</Spread>
-        <Gravity>50.0</Gravity>
+        <Speed>100</Speed>
+        <Spread>2</Spread>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Bolt</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>240</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>90</MaxRange>
       <MinRange>15</MinRange>
@@ -14,8 +12,8 @@
       <RepeatTime>6000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>150.0</Speed>
-        <Spread>1.0</Spread>
+        <Speed>150</Speed>
+        <Spread>1</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
@@ -4,9 +4,7 @@
     <Melee>
       <AttackName>Ram</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>0.0</Pierce>
-        <Crush>150.0</Crush>
+        <Crush>150</Crush>
       </Damage>
       <MaxRange>6.5</MaxRange>
       <PrepareTime>750</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -4,8 +4,6 @@
     <Ranged>
       <AttackName>Stone</AttackName>
       <Damage>
-        <Hack>0</Hack>
-        <Pierce>0</Pierce>
         <Crush>210</Crush>
       </Damage>
       <MaxRange>80</MaxRange>
@@ -14,9 +12,9 @@
       <RepeatTime>7000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>40.0</Speed>
-        <Spread>6.0</Spread>
-        <Gravity>20.0</Gravity>
+        <Speed>40</Speed>
+        <Spread>6</Spread>
+        <Gravity>20</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
         <ImpactActorName>props/units/weapons/rock_explosion.xml</ImpactActorName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -4,20 +4,19 @@
     <Ranged>
       <AttackName>Bow</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>12.0</Pierce>
+        <Pierce>12</Pierce>
         <Crush>2.5</Crush>
       </Damage>
-      <MaxRange>55.0</MaxRange>
-      <MinRange>10.0</MinRange>
+      <MaxRange>55</MaxRange>
+      <MinRange>10</MinRange>
       <ElevationBonus>10</ElevationBonus>
       <PrepareTime>1200</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>100.0</Speed>
-        <Spread>2.0</Spread>
-        <Gravity>50.0</Gravity>
+        <Speed>100</Speed>
+        <Spread>2</Spread>
+        <Gravity>50</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -4,9 +4,7 @@
     <Melee>
       <AttackName>Dagger</AttackName>
       <Damage>
-        <Hack>2.0</Hack>
-        <Pierce>0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>2</Hack>
       </Damage>
       <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_crossbowman.xml
@@ -4,9 +4,7 @@
     <Ranged>
       <AttackName>Crossbow</AttackName>
       <Damage>
-        <Hack>0</Hack>
         <Pierce>40</Pierce>
-        <Crush>0</Crush>
       </Damage>
       <MaxRange>60</MaxRange>
       <MinRange>0</MinRange>
@@ -14,9 +12,9 @@
       <RepeatTime>3000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>120.0</Speed>
+        <Speed>120</Speed>
         <Spread>0.8</Spread>
-        <Gravity>30.0</Gravity>
+        <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
       </Projectile>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_maiden_archer.xml
@@ -6,7 +6,7 @@
         <Poisoned>
           <Interval>2000</Interval>
           <Damage>
-            <Poison>1.0</Poison>
+            <Poison>1</Poison>
           </Damage>
           <Stackability>Extend</Stackability>
           <Duration>10000</Duration>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/plane.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/plane.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/plane.xml
@@ -4,9 +4,8 @@
     <Ranged>
       <AttackName context="Name of an attack of a World War II fighter plane.">Machine Guns</AttackName>
       <Damage>
-        <Hack>0.0</Hack>
-        <Pierce>100.0</Pierce>
-        <Crush>227.0</Crush>
+        <Pierce>100</Pierce>
+        <Crush>227</Crush>
       </Damage>
       <MaxRange>120</MaxRange>
       <MinRange>80</MinRange>
@@ -14,8 +13,8 @@
       <RepeatTime>10000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>75.0</Speed>
-        <Spread>1.0</Spread>
+        <Speed>75</Speed>
+        <Spread>1</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -12,8 +12,8 @@
       <RepeatTime>2000</RepeatTime>
       <Delay>0</Delay>
       <Projectile>
-        <Speed>10.0</Speed>
-        <Spread>2.0</Spread>
+        <Speed>10</Speed>
+        <Spread>2</Spread>
         <Gravity>9.81</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>