Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -3,7 +3,6 @@
   <Armour>
     <Hack>3</Hack>
     <Pierce>1</Pierce>
-    <Crush>15</Crush>
   </Armour>
   <Attack>
     <Capture>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry">
-  <Armour>
-    <Hack>4</Hack>
-    <Pierce>3</Pierce>
-  </Armour>
   <Attack>
     <Melee>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>2</Pierce>
+    <Pierce op="add">1</Pierce>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
+  <Armour>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">2</Pierce>
+  </Armour>
   <Attack>
     <Melee>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
+    <Hack op="add">1</Hack>
+    <Pierce op="add">1</Pierce>
   </Armour>
   <Attack>
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
+  <Armour>
+    <Crush op="add">5</Crush>
+  </Armour>
   <Attack>
     <Capture>
       <Capture>5</Capture>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -3,7 +3,6 @@
   <Armour>
     <Hack>7</Hack>
     <Pierce>5</Pierce>
-    <Crush>20</Crush>
   </Armour>
   <Cost>
     <Population>1</Population>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -3,7 +3,7 @@
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
-    <Crush>25</Crush>
+    <Crush op="add">5</Crush>
   </Armour>
   <Cost>
     <Population>3</Population>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -3,7 +3,6 @@
   <Armour>
     <Hack>5</Hack>
     <Pierce>5</Pierce>
-    <Crush>20</Crush>
   </Armour>
   <Cost>
     <BuildTime>20</BuildTime>
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
@@ -3,7 +3,6 @@
   <Armour>
     <Hack op="add">8</Hack>
     <Pierce op="add">8</Pierce>
-    <Crush>20</Crush>
   </Armour>
   <Attack>
     <Melee>
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
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>10</Hack>
-    <Pierce>20</Pierce>
-    <Crush>15</Crush>
+    <Crush op="add">10</Crush>
   </Armour>
   <Attack>
     <Capture>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -3,7 +3,6 @@
   <Armour>
     <Hack>10</Hack>
     <Pierce>8</Pierce>
-    <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>50</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -3,7 +3,6 @@
   <Armour>
     <Hack>10</Hack>
     <Pierce>10</Pierce>
-    <Crush>25</Crush>
   </Armour>
   <Attack replace="">
     <Melee>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -3,7 +3,6 @@
   <Armour>
     <Hack>8</Hack>
     <Pierce>8</Pierce>
-    <Crush>25</Crush>
   </Armour>
   <Cost>
     <BuildTime>40</BuildTime>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
-  <Armour>
-    <Hack>2</Hack>
-    <Pierce>4</Pierce>
-    <Crush>15</Crush>
-  </Armour>
   <Attack>
     <Capture>
       <Capture>2</Capture>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-    <Crush>10</Crush>
+    <Crush op="add">-5</Crush>
   </Armour>
   <Attack>
     <Ranged>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
-  <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-  </Armour>
   <Attack>
     <Ranged>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
-  <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-  </Armour>
   <Attack>
     <Ranged>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
-  <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
-  </Armour>
   <Attack>
     <Ranged>
       <Damage>
Index: binaries/data/mods/public/simulation/templates/template_unit_support.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit">
   <Armour>
-    <Hack>1</Hack>
-    <Pierce>1</Pierce>
     <Crush>1</Crush>
   </Armour>
   <Cost>