diff --git a/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_1.xml b/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_1.xml
index 63f66257cb..b46fb58397 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_1.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_1.xml
@@ -1,23 +1,18 @@
-
+
-
-
- props/shield/round_r_f.pmd
+ props/shield/round_noboss_f.dae
-
+
-
props/shield/rome_parma_h.dds
-
player_trans.xml
-
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_2.xml b/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_2.xml
index f1e8abae80..ec647ec86f 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_2.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_2.xml
@@ -1,23 +1,18 @@
-
+
-
-
- props/shield/round_b_f.pmd
+ props/shield/round_s_f.pmd
-
props/shield/rome_parma_i.dds
-
player_trans.xml
-
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_3.xml b/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_3.xml
index c810de4207..a7f791cdd5 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_3.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/rome_parma_hero_3.xml
@@ -1,23 +1,18 @@
-
+
-
-
- props/shield/round_s_f.pmd
+ props/shield/round_noboss_f.dae
-
+
-
props/shield/rome_parma_k.dds
-
player_trans.xml
-
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_e.xml b/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_e.xml
index 12e5526a07..cecbd4b12b 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_e.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_e.xml
@@ -1,8 +1,6 @@
-
+
-
-
props/shield/scutum_r_f.pmd
@@ -11,7 +9,6 @@
-
props/shield/rome_tower_d.dds
@@ -26,7 +23,5 @@
props/shield/rome_tower_m.dds
-
player_trans.xml
-
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_marian.xml b/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_marian.xml
index 36e8cf0457..557431da64 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_marian.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/rome_scutum_marian.xml
@@ -2,12 +2,18 @@
-
+
props/shield/scutum_j_f.pmd
+
+ props/shield/scutum_r_f.pmd
+
+
+
+
diff --git a/binaries/data/mods/public/art/actors/props/units/shields/thracian_oval.xml b/binaries/data/mods/public/art/actors/props/units/shields/thracian_oval.xml
index 699736c755..13faa8e4ce 100644
--- a/binaries/data/mods/public/art/actors/props/units/shields/thracian_oval.xml
+++ b/binaries/data/mods/public/art/actors/props/units/shields/thracian_oval.xml
@@ -2,18 +2,18 @@
-
- props/shield/oval_a_f.pmd
+
+ props/shield/oval_s_f.pmd
+
+
+
+
props/shield/celt_oval2_a.dds
- props/shield/oval_a_f.pmd
-
-
-
props/shield/celt_oval2_c.dds
diff --git a/binaries/data/mods/public/art/actors/units/celts/caradoc.xml b/binaries/data/mods/public/art/actors/units/celts/caradoc.xml
index 970921adb8..b667bea63e 100644
--- a/binaries/data/mods/public/art/actors/units/celts/caradoc.xml
+++ b/binaries/data/mods/public/art/actors/units/celts/caradoc.xml
@@ -7,8 +7,8 @@
-
-
+
+
diff --git a/binaries/data/mods/public/art/actors/units/hellenes/thracian_blackcloak.xml b/binaries/data/mods/public/art/actors/units/hellenes/thracian_blackcloak.xml
index 93801519ec..c9b317b67b 100644
--- a/binaries/data/mods/public/art/actors/units/hellenes/thracian_blackcloak.xml
+++ b/binaries/data/mods/public/art/actors/units/hellenes/thracian_blackcloak.xml
@@ -24,7 +24,7 @@
-
+
skeletal/thrace_blackcloak_a.dds
diff --git a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp
index c2da683551..b713dd9e3f 100644
--- a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp
+++ b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.pmp
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:4570e42c9175c12b26e22e2b4a2cb903ad692f18f2f905d766ef16c290a87411
+oid sha256:8175ca69d0162fd0ab29af83400641a5d04e6cc803ac94e53e62a08025ca5c00
size 657147
diff --git a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml
index 20c1be1f76..2f720ef92c 100644
--- a/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml
+++ b/binaries/data/mods/public/maps/scenarios/Siwa Oasis.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:77d9e6030a48a068b175967fbceec8e65ffc091d2342047ee920cdeff1da2482
+oid sha256:1ae96a3cb75a3deb77a6cc6c27ed7272fc917a698d6c7e711389b2f15a41d3fc
size 474283
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index b53d4babf9..c3dd4e6867 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -19,11 +19,11 @@
- 200
+ 130
10
- 4
- 1
- 1
+ 0
+ 0
+ 0
2.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index 6a36020c05..3a01679ed7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -15,11 +15,11 @@
- 1000
+ 400
10
- 10
- 10
- 100
+ 0
+ 0
+ 25
400
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index b1a3029d63..cd64bf07ec 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -18,11 +18,11 @@
- 1000
- 0
- 10
- 10
- 100
+ 500
+ 10
+ 0
+ 0
+ 25
500
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
index 5f60f39638..406802ff01 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -18,11 +18,11 @@
- 1000
- 0
- 10
- 10
- 100
+ 450
+ 10
+ 20
+ 0
+ 0
450
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index b99f639d84..37171f76f4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -12,6 +12,13 @@
50
+
+ 500
+ 10
+ 20
+ 0
+ 5
+
10.0
14.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
index b8372041f5..bfe3a675d8 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -15,11 +15,11 @@
- 1000
- 10
- 10
- 10
- 100
+ 400
+ 5
+ 0
+ 0
+ 20
400
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
index 21c9df5af4..bdea2736d9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -14,11 +14,11 @@
- 1000
- 10
- 10
- 10
- 100
+ 350
+ 5
+ 20
+ 0
+ 0
350
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
index 523af758a2..3dc0ebaf23 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -10,6 +10,10 @@
100
+
+ 10
+ 10
+
1200
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
index a924221d3c..198715abb5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -13,6 +13,10 @@
100
+
+ 10
+ 10
+
5.2
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml
index c0f44bbd51..e2360478b1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_ranged.xml
@@ -15,11 +15,11 @@
- 1000
+ 200
10
- 10
- 10
- 100
+ 50
+ 0
+ 0
200
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 3afa8c4e41..367264f5fa 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -19,10 +19,10 @@
100
- 1
- 1
- 1
- 1
+ 5
+ 0
+ 0
+ 0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index e32c80e76b..ef698b42e9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -10,6 +10,9 @@
50
+
+ 5
+
4.0
5.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index f650d2f210..76f83c1375 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -10,6 +10,9 @@
50
+
+ 5
+
4.0
3.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index b82cff46ef..6bd372229a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -10,6 +10,9 @@
40
+
+ 4
+
3.0
2.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index be9861eea0..5ff3c1e950 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -10,6 +10,9 @@
45
+
+ 5
+
3.0
3.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index daab4744c0..02192b0048 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -10,6 +10,10 @@
30
+
+ 75
+ 4
+
2.0
2.0
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
index abea8f0df8..002b7a52ec 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
@@ -12,6 +12,13 @@
2
+
+ 200
+ 0
+ 10
+ 0
+ 10
+
200
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
index acdb148e6e..9e44be3929 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
@@ -11,6 +11,13 @@
100
+
+ 300
+ 0
+ 20
+ 10
+ 0
+
300