Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -8,7 +8,7 @@
         <Pierce>0</Pierce>
         <Crush>4</Crush>
       </Damage>
-      <MaxRange>3.5</MaxRange>
+      <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -8,7 +8,7 @@
         <Pierce>6</Pierce>
         <Crush>0</Crush>
       </Damage>
-      <MaxRange>7</MaxRange>
+      <MaxRange>8</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -4,18 +4,18 @@
     <Melee>
       <AttackName>Spear</AttackName>
       <Damage>
-        <Hack>6.0</Hack>
-        <Pierce>5.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>6</Hack>
+        <Pierce>5</Pierce>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>4.5</MaxRange>
+      <MaxRange>4</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>900</RepeatTime>
       <Bonuses>
-          <BonusCavMelee>
-            <Classes>Cavalry</Classes>
-            <Multiplier>3.0</Multiplier>
-          </BonusCavMelee>
+        <BonusCavMelee>
+          <Classes>Cavalry</Classes>
+          <Multiplier>3.0</Multiplier>
+        </BonusCavMelee>
       </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -4,11 +4,11 @@
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
-        <Hack>11.0</Hack>
+        <Hack>11</Hack>
         <Pierce>0</Pierce>
-        <Crush>0.0</Crush>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>3.5</MaxRange>
+      <MaxRange>3</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -8,7 +8,7 @@
         <Pierce>0</Pierce>
         <Crush>8</Crush>
       </Damage>
-      <MaxRange>3.5</MaxRange>
+      <MaxRange>3</MaxRange>
       <PrepareTime>500</PrepareTime>
       <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -8,7 +8,7 @@
         <Pierce>12</Pierce>
         <Crush>0</Crush>
       </Damage>
-      <MaxRange>7</MaxRange>
+      <MaxRange>8</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -4,11 +4,11 @@
     <Melee>
       <AttackName>Spear</AttackName>
       <Damage>
-        <Hack>12.0</Hack>
-        <Pierce>10.0</Pierce>
-        <Crush>0.0</Crush>
+        <Hack>12</Hack>
+        <Pierce>10</Pierce>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>4.5</MaxRange>
+      <MaxRange>4</MaxRange>
       <PrepareTime>450</PrepareTime>
       <RepeatTime>900</RepeatTime>
       <Bonuses>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -4,11 +4,11 @@
     <Melee>
       <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
-        <Hack>22.0</Hack>
+        <Hack>22</Hack>
         <Pierce>0</Pierce>
-        <Crush>0.0</Crush>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>3.5</MaxRange>
+      <MaxRange>3</MaxRange>
       <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -5,8 +5,12 @@
       <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6</Hack>
+        <Pierce>0</Pierce>
         <Crush>2</Crush>
       </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>
   </Attack>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -8,7 +8,7 @@
         <Pierce>3</Pierce>
         <Crush>0</Crush>
       </Damage>
-      <MaxRange>7</MaxRange>
+      <MaxRange>8</MaxRange>
       <PrepareTime>1000</PrepareTime>
       <RepeatTime>2000</RepeatTime>
       <Bonuses>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -4,10 +4,13 @@
     <Melee>
       <AttackName>Spear</AttackName>
       <Damage>
-        <Hack>3.0</Hack>
+        <Hack>3</Hack>
         <Pierce>2.5</Pierce>
+        <Crush>0</Crush>
       </Damage>
-      <MaxRange>4.5</MaxRange>
+      <MaxRange>4</MaxRange>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>1000</RepeatTime>
       <Bonuses>
         <BonusCavMelee>
           <Classes>Cavalry</Classes>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -6,7 +6,10 @@
       <Damage>
         <Hack>5.5</Hack>
         <Pierce>0</Pierce>
+        <Crush>0</Crush>
       </Damage>
+      <MaxRange>3</MaxRange>
+      <PrepareTime>375</PrepareTime>
       <RepeatTime>750</RepeatTime>
       <PreferredClasses datatype="tokens">Unit+!Ship</PreferredClasses>
     </Melee>