From 90c0957cefd190aac630fc613ec841cdbece7a55 Mon Sep 17 00:00:00 2001
From: scythetwirler <scythetwirler@wildfiregames.com>
Date: Sat, 4 Oct 2014 14:13:14 +0000
Subject: [PATCH] Fixes cavalry upgrade inconsistencies.

This was SVN commit r15837.
---
 .../templates/units/athen_cavalry_javelinist_a.xml        | 4 ++--
 .../templates/units/athen_cavalry_javelinist_e.xml        | 4 ++--
 .../templates/units/athen_cavalry_swordsman_a.xml         | 6 +++---
 .../templates/units/athen_cavalry_swordsman_e.xml         | 6 +++---
 .../templates/units/brit_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/brit_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/brit_cavalry_swordsman_a.xml          | 6 +++---
 .../templates/units/brit_cavalry_swordsman_e.xml          | 6 +++---
 .../templates/units/cart_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/cart_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/cart_cavalry_spearman_a.xml           | 6 +++---
 .../templates/units/cart_cavalry_spearman_e.xml           | 6 +++---
 .../templates/units/cart_cavalry_swordsman_2_a.xml        | 6 +++---
 .../templates/units/cart_cavalry_swordsman_2_e.xml        | 6 +++---
 .../templates/units/cart_cavalry_swordsman_a.xml          | 6 +++---
 .../templates/units/cart_cavalry_swordsman_e.xml          | 6 +++---
 .../templates/units/celt_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/celt_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/celt_cavalry_swordsman_a.xml          | 6 +++---
 .../templates/units/celt_cavalry_swordsman_e.xml          | 6 +++---
 .../templates/units/gaul_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/gaul_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/gaul_cavalry_swordsman_a.xml          | 6 +++---
 .../templates/units/gaul_cavalry_swordsman_e.xml          | 6 +++---
 .../templates/units/hele_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/hele_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/hele_cavalry_swordsman_a.xml          | 6 +++---
 .../templates/units/hele_cavalry_swordsman_e.xml          | 6 +++---
 .../templates/units/iber_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/iber_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/iber_cavalry_spearman_a.xml           | 6 +++---
 .../templates/units/iber_cavalry_spearman_e.xml           | 6 +++---
 .../templates/units/mace_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/mace_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/mace_cavalry_spearman_a.xml           | 6 +++---
 .../templates/units/mace_cavalry_spearman_e.xml           | 6 +++---
 .../templates/units/maur_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/maur_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/maur_cavalry_swordsman_a.xml          | 6 +++---
 .../templates/units/maur_cavalry_swordsman_e.xml          | 6 +++---
 .../templates/units/pers_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/pers_cavalry_javelinist_a_trireme.xml | 4 ++--
 .../templates/units/pers_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/pers_cavalry_javelinist_e_trireme.xml | 4 ++--
 .../templates/units/pers_cavalry_spearman_a.xml           | 6 +++---
 .../templates/units/pers_cavalry_spearman_e.xml           | 6 +++---
 .../templates/units/pers_cavalry_swordsman_a.xml          | 8 ++++----
 .../templates/units/pers_cavalry_swordsman_a_trireme.xml  | 8 ++++----
 .../templates/units/pers_cavalry_swordsman_e.xml          | 6 +++---
 .../templates/units/pers_cavalry_swordsman_e_trireme.xml  | 6 +++---
 .../templates/units/ptol_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/ptol_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/ptol_cavalry_spearman_a.xml           | 6 +++---
 .../templates/units/ptol_cavalry_spearman_e.xml           | 6 +++---
 .../templates/units/rome_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/rome_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/rome_cavalry_spearman_a.xml           | 6 +++---
 .../templates/units/rome_cavalry_spearman_e.xml           | 6 +++---
 .../templates/units/sele_cavalry_javelinist_a.xml         | 4 ++--
 .../templates/units/sele_cavalry_javelinist_e.xml         | 4 ++--
 .../templates/units/sele_cavalry_spearman_a.xml           | 6 +++---
 .../templates/units/sele_cavalry_spearman_e.xml           | 6 +++---
 .../templates/units/spart_cavalry_javelinist_a.xml        | 4 ++--
 .../templates/units/spart_cavalry_javelinist_e.xml        | 5 +++++
 .../templates/units/spart_cavalry_spearman_a.xml          | 6 +++---
 .../templates/units/spart_cavalry_spearman_e.xml          | 6 +++---
 66 files changed, 173 insertions(+), 168 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml
index ab4a7cc336..6e9fa72d16 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/athen_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml
index 93fce2bbdf..748ec7a43c 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/athen_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml
index f98c382de2..ebb4feb726 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/athen_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml
index 71c8783af6..b8ca35d36e 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/athen_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_a.xml
index 736cfa6da9..c59a213766 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/brit_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_e.xml
index 2e71528665..2a96755c9e 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/brit_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_a.xml
index 242c42df93..0a0c9ba3f9 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/brit_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_e.xml
index 99537ab364..ac73bc52d8 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/brit_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_a.xml
index 159e594cce..70e4d1dfa1 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_e.xml
index c6c681d96d..b708cab38d 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml
index bc9bb61e5f..3af99fc3a9 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_spearman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml
index 87b4e8ac6c..c8f0ae9d13 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_a.xml
index 306b4ae589..fd40c5ae7d 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_swordsman_2_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_e.xml
index dd811a724a..d202e104a3 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_2_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_swordsman_2_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_a.xml
index f105307afc..b558062c90 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_e.xml
index bcd727f1eb..f10a2038e5 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/cart_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
index c4fcbf0227..a195293166 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
index 090e3b735f..b11656fb0d 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
index 184941815b..bb5106e1aa 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
index 8448081f82..b0b7c166e1 100644
--- a/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/celt_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/celt_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_a.xml
index 66d7fcca75..58443db641 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/gaul_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_e.xml
index f9b2b57d2f..b69124040b 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/gaul_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_a.xml
index e8957c5ae5..7d62c55468 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/gaul_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_e.xml
index a862527dc3..36e3583416 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/gaul_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_a.xml
index 13cf5b7810..97a4dc63cc 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_e.xml
index 6c08716853..f586adf051 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
index 1589a4ee50..3618fd8e23 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
index 68fd56eb90..43f3980ab3 100644
--- a/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/hele_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/hele_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_a.xml
index f41b11d844..b25e95bda5 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Identity>
 	<Rank>Advanced</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_e.xml
index 9ac02e99f1..3e97a4f09b 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Identity>
 	<Rank>Elite</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml
index 700c70c535..47f4f2649c 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_cavalry_spearman_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml
index ab193aef1e..254e7bb62b 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/iber_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_a.xml
index c2915fd7bd..0182972488 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_e.xml
index 7591e74e11..f987817960 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml
index 85620762dc..6ca003c007 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_cavalry_spearman_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml
index f66b8142ba..8f1e40a19c 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_a.xml
index f7eaa95e39..c7da3ab25e 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/maur_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Identity>
 	<Rank>Advanced</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_e.xml
index b7a8914fe3..bdc38ab2fe 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/maur_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Identity>
 	<Rank>Elite</Rank>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_a.xml
index 927378532f..8b744d0770 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/maur_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_e.xml
index 342d0056bd..6645467393 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/maur_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a.xml
index 29d0f6e374..2755d5d590 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
index e1790dcdae..b2b24100bf 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_javelinist_b_trireme">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e.xml
index ecd3900500..a62a58e084 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
index b875e592f9..d4800f19a7 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_javelinist_a_trireme">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml
index 095932df6d..e1cb259a0e 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_spearman_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml
index c89aa6ce68..29154e70c9 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
index 3217faca81..5bc05738f0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_swordsman_b">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
-      <Hack>17</Hack>
+      <Hack>20.5</Hack>
     </Melee>
     <Charge>
       <Hack>25.0</Hack>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
index 4578401baa..ad2bbfda7a 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_swordsman_b_trireme">
   <Armour>
-    <Hack>4</Hack>
-    <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Hack>5</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Melee>
-      <Hack>17</Hack>
+      <Hack>20.5</Hack>
     </Melee>
     <Charge>
       <Hack>25.0</Hack>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
index c114658eae..4cf7d242a7 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_swordsman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
index f0c4fcd2be..890395d590 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/pers_cavalry_swordsman_a_trireme">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>5</Pierce>
+    <Crush>6</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_a.xml
index 3017b8fabf..0e9251b26b 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/ptol_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_e.xml
index bf13c9e28f..07ac2022f7 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/ptol_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_a.xml
index 073439d255..3474a5804a 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/ptol_cavalry_spearman_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_e.xml
index 2ce936788a..ee2b9b139e 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/ptol_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml
index 4daff209c4..a40925ffad 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml
index afc1c14217..f65a5ee538 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml
index 04d6cbeb5d..3665db6306 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome_cavalry_spearman_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml
index 4ed6b585fe..8a843332f5 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/rome_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_a.xml
index ba8c3c94de..2ccaa5d324 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/sele_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_e.xml
index f31dec781b..b0f4f3e16b 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/sele_cavalry_javelinist_a">
   <Armour>
-    <Hack>3</Hack>
+    <Hack>5</Hack>
     <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Crush>5</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_a.xml
index 26d8f99312..92755e82b5 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/sele_cavalry_spearman_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_e.xml
index 818c33c3d9..5efb63bf87 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/sele_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_a.xml
index 0d1f74d2fb..c22886d99e 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/spart_cavalry_javelinist_b">
   <Armour>
-    <Hack>2</Hack>
+    <Hack>4</Hack>
     <Pierce>2</Pierce>
-    <Crush>3</Crush>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Ranged>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_e.xml
index b9fbd19c2d..8d0c2691a9 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_e.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/spart_cavalry_javelinist_a">
+  <Armour>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>5</Crush>
+  </Armour>
   <Attack>
     <Ranged>
       <MaxRange>48</MaxRange>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_a.xml
index ecc62a0ca9..693a9c233e 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_a.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/spart_cavalry_spearman_b">
   <Armour>
-    <Hack>3</Hack>
-    <Pierce>1</Pierce>
-    <Crush>2</Crush>
+    <Hack>5</Hack>
+    <Pierce>3</Pierce>
+    <Crush>4</Crush>
   </Armour>
   <Attack>
     <Melee>
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_e.xml
index 6b358f7872..fd3014ee7e 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_e.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/spart_cavalry_spearman_a">
   <Armour>
-    <Hack>5</Hack>
-    <Pierce>3</Pierce>
-    <Crush>4</Crush>
+    <Hack>6</Hack>
+    <Pierce>4</Pierce>
+    <Crush>5</Crush>
   </Armour>
     <Attack>
     <Melee>