diff --git a/binaries/data/mods/public/maps/random/wild_lake.js b/binaries/data/mods/public/maps/random/wild_lake.js
index 9d4faee81d..e9b392f8f3 100644
--- a/binaries/data/mods/public/maps/random/wild_lake.js
+++ b/binaries/data/mods/public/maps/random/wild_lake.js
@@ -186,7 +186,7 @@ var mercenaryCampGuards = {
"generic/tropic": [
{ "Template" : "structures/merc_camp_egyptian" },
{ "Template" : "units/ptol_infantry_javelinist_b", "Count" : 4 },
- { "Template" : "units/ptol_cavalry_archer_e", "Count" : 3 },
+ { "Template" : "units/ptol_camelry_archer_e", "Count" : 3 },
{ "Template" : "units/ptol_infantry_slinger_a", "Count" : 4 },
{ "Template" : "units/ptol_champion_infantry_pikeman", "Count" : 3 }
],
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
index 06330fd37c..8d752d70ad 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies 2.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:5c1ec6fd800881d315675d76ec55f3daf97cc97587fa7b09f4da18e03b418af5
+oid sha256:3dc301501b2c8809ae3e4160eac7a39cf69b68b9e0edd7968e982267cd5484e9
size 478026
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
index 65978db398..2b026c7bf8 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Ptolemies.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0b69f515fb20139ff78e2598f3480515fdb233de67e2e1e213b05b18466b9884
+oid sha256:75ca31077d4b069d0519282ff3f689081ffd1c3cb928e67ed133928038dbdccb
size 358195
diff --git a/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml b/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
index 89717a0945..f204fac8d1 100644
--- a/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
+++ b/binaries/data/mods/public/maps/scenarios/Sandbox - Seleucids.xml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:efb284893be2b50c56eec85833c452ed79cb83ea7e0585443737e362274b030a
+oid sha256:80a94c803d7cb79bfbdb0d611661face0fa85097c994726bbbf43d6f2fd1c0a3
size 382417
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
index ef5a06fd51..1f927315bf 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_wolfhound.xml
@@ -5,6 +5,6 @@
units/brit_wolfhound.png
- units/celts/wolfhound.xml
+ units/britons/wolfhound.xml
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
index 05e3873c5c..a85e2d39e1 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_cavalry.xml
@@ -8,6 +8,6 @@
units/{civ}_cavalry_javelinist_b
- units/athenians/cavalry_javelinist_b.xml
+ units/athenians/cavalry_javelinist_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
index de38bbe5de..50c5041fc5 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_barracks.xml
@@ -20,6 +20,12 @@
+
+
+ -units/{civ}_cavalry_archer_b
+ units/{civ}_camelry_archer_b
+
+
structures/ptolemies/barracks.xml
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
index d0cc83328c..deeb7f281f 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
@@ -15,7 +15,7 @@
units/{civ}_infantry_pikeman_b
units/{civ}_infantry_javelinist_b
- units/{civ}_cavalry_archer_b
+ units/{civ}_camelry_archer_b
units/{civ}_hero_ptolemy_I
units/{civ}_hero_ptolemy_IV
units/{civ}_hero_cleopatra
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 bf56544f41..2c1ca84291 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
@@ -7,6 +7,6 @@
units/athen_cavalry_javelinist_e
- units/athenians/cavalry_javelinist_a.xml
+ units/athenians/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
index 98c1b9f6fd..ceb4f0e7af 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_javelinist_b.xml
@@ -11,6 +11,6 @@
units/athen_cavalry_javelinist_a
- units/athenians/cavalry_javelinist_b.xml
+ units/athenians/cavalry_javelinist_b_m.xml
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 6969f9571a..47b757813f 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
@@ -5,6 +5,6 @@
- units/athenians/cavalry_javelinist_e.xml
+ units/athenians/cavalry_javelinist_e_m.xml
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 9b2447179a..b1aab946ea 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
@@ -7,6 +7,6 @@
units/athen_cavalry_swordsman_e
- units/athenians/cavalry_swordsman_a.xml
+ units/athenians/cavalry_swordsman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
index a4a12cd4ec..fab597a96d 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
@@ -13,6 +13,6 @@
units/athen_cavalry_swordsman_a
- units/athenians/cavalry_swordsman_b.xml
+ units/athenians/cavalry_swordsman_b_m.xml
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 d80371fc79..09355f959c 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
@@ -5,6 +5,6 @@
- units/athenians/cavalry_swordsman_e.xml
+ units/athenians/cavalry_swordsman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml
index 719ba62f9d..2f626ee1f5 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_champion_infantry.xml
@@ -8,6 +8,6 @@
units/athen_champion_infantry.png
- units/athenians/champion_unit_spear.xml
+ units/athenians/infantry_spearman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml b/binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
index e28e0e7018..4094719ccd 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml
@@ -9,6 +9,6 @@
hellenes/special_iphicratean_reforms
- units/athenians/champion_unit_marine.xml
+ units/athenians/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
index 9686ad42d2..b6633ecddd 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged.xml
@@ -8,6 +8,6 @@
units/athen_champion_ranged.png
- units/athenians/champion_unit_ranged.xml
+ units/athenians/infantry_archer_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
index 9cf7549ede..dfe19fabd2 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
@@ -23,6 +23,6 @@
units/athen_champion_ranged.png
- units/athenians/champion_unit_gastraphetes.xml
+ units/athenians/infantry_crossbowman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml b/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
index ab92b2b943..c9ac00c5e3 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_hero_iphicrates.xml
@@ -12,6 +12,6 @@
units/athen_hero_iphicrates.png
- units/athenians/iphicrates.xml
+ units/athenians/hero_infantry_javelinist_iphicrates.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml b/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
index f3323584e0..0bcacd087b 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_hero_pericles.xml
@@ -12,6 +12,6 @@
units/athen_hero_pericles.png
- units/athenians/pericles.xml
+ units/athenians/hero_infantry_spearman_pericles.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml b/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
index 3bd4f899a9..80dbd14484 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_hero_themistocles.xml
@@ -12,6 +12,6 @@
units/athen_hero_themistocles.png
- units/athenians/themistocles.xml
+ units/athenians/hero_infantry_swordsman_themistocles.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml b/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
new file mode 100644
index 0000000000..5cdc4d2570
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/athen_hero_xenophon.xml
@@ -0,0 +1,13 @@
+
+
+
+ athen
+ greek
+ Iphicrates
+ Iphikratēs
+ units/athen_hero_iphicrates.png
+
+
+ units/athenians/hero_infantry_javelinist_xenophon.xml
+
+
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 c3a1a1c0ec..5d31822ac0 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
@@ -7,6 +7,6 @@
units/brit_cavalry_javelinist_e
- units/celts/cavalry_javelinist_a.xml
+ units/celts/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_b.xml
index f9eb6e1dfc..ef81d8adc9 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_b.xml
@@ -11,6 +11,6 @@
units/brit_cavalry_javelinist_a
- units/celts/cavalry_javelinist_b.xml
+ units/celts/cavalry_javelinist_b_m.xml
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 9bf1ab3142..c3edda1acb 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
@@ -5,6 +5,6 @@
- units/celts/cavalry_javelinist_e.xml
+ units/celts/cavalry_javelinist_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml
index 43dd421ffb..dc5928eb3f 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml
@@ -11,6 +11,6 @@
units/brit_hero_boudicca.png
- units/celts/boudicca_horse.xml
+ units/britons/hero_cavalry_javelinist_boudicca_m.xml
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 ac26c7025a..eb4ee391b3 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
@@ -7,6 +7,6 @@
units/brit_cavalry_swordsman_e
- units/celts/cavalry_swordsman_a.xml
+ units/celts/cavalry_swordsman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml
index 1d76240df8..768ebabb2b 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml
@@ -12,6 +12,6 @@
units/brit_cavalry_swordsman_a
- units/celts/cavalry_swordsman_b.xml
+ units/celts/cavalry_swordsman_b_m.xml
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 a65cc9c73c..b73459f055 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
@@ -5,6 +5,6 @@
- units/celts/cavalry_swordsman_e.xml
+ units/celts/cavalry_swordsman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
index 1f10f528cc..6b968f1ed9 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry.xml
@@ -13,6 +13,6 @@
units/brit_champion_chariot.png
- units/celts/champion_unit_4.xml
+ units/britons/chariot_javelinist_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
index cb61ea1bc7..9e409c48e3 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_champion_infantry.xml
@@ -8,6 +8,6 @@
units/brit_champion_infantry.png
- units/celts/champion_unit_3.xml
+ units/britons/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
index 14783152a4..5229c393e2 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca.xml
@@ -16,6 +16,6 @@
units/brit_hero_boudicca.png
- units/celts/boudicca_chariot.xml
+ units/britons/hero_chariot_javelinist_boudicca_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
index 159334ed40..89c4c80827 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_sword.xml
@@ -11,6 +11,6 @@
units/brit_hero_boudicca.png
- units/celts/boudicca.xml
+ units/britons/hero_infantry_swordsman_boudicca.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
index 22c2df8e77..05f85cfc35 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_caratacos.xml
@@ -9,6 +9,6 @@
units/brit_hero_caratacos.png
- units/celts/caradoc.xml
+ units/britons/hero_infantry_swordsman_caratacos.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
index 16cb31a6b1..ca89f845ef 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin.xml
@@ -9,6 +9,6 @@
units/brit_hero_cunobelin.png
- units/celts/cunobelin_horse.xml
+ units/britons/hero_cavalry_swordsman_cunobelin_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
index f1252ec05e..2a4111276a 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_hero_cunobelin_infantry.xml
@@ -9,6 +9,6 @@
units/celt_hero_cunobelin.png
- units/celts/cunobelin.xml
+ units/britons/hero_infantry_swordsman_cunobelin.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_war_dog_a.xml b/binaries/data/mods/public/simulation/templates/units/brit_war_dog_a.xml
index d2839ed21e..58b21ec7af 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_war_dog_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_war_dog_a.xml
@@ -7,6 +7,6 @@
units/brit_war_dog_e
- units/celts/cavalry_spearman_a.xml
+ units/britons/war_dog_mastiff_a.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_war_dog_b.xml b/binaries/data/mods/public/simulation/templates/units/brit_war_dog_b.xml
index a60d41e846..15bdad0171 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_war_dog_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_war_dog_b.xml
@@ -10,6 +10,6 @@
units/brit_war_dog_a
- units/celts/cavalry_spearman_b.xml
+ units/britons/war_dog_mastiff_b.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_war_dog_e.xml b/binaries/data/mods/public/simulation/templates/units/brit_war_dog_e.xml
index 5a56222220..6d4aadf0a3 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_war_dog_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_war_dog_e.xml
@@ -5,6 +5,6 @@
- units/celts/cavalry_spearman_e.xml
+ units/britons/war_dog_mastiff_e.xml
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 c5b44fc4ac..f7ff153ba2 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
@@ -7,6 +7,6 @@
units/cart_cavalry_javelinist_e
- units/carthaginians/cavalry_javelinist_a.xml
+ units/carthaginians/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_b.xml
index d0d679ea48..4f7d9861b3 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_javelinist_b.xml
@@ -11,6 +11,6 @@
units/cart_cavalry_javelinist_a
- units/carthaginians/cavalry_javelinist_b.xml
+ units/carthaginians/cavalry_javelinist_b_m.xml
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 7848a9235c..55794cb5e6 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
@@ -5,6 +5,6 @@
- units/carthaginians/cavalry_javelinist_e.xml
+ units/carthaginians/cavalry_javelinist_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_a.xml
index 91e73b4a4c..d76fbde82d 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_a.xml
@@ -7,6 +7,6 @@
units/cart_cavalry_spearman_ital_e
- units/carthaginians/cavalry_spearman_a.xml
+ units/carthaginians/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
index cef6f9c7e1..e6d95e28db 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml
@@ -20,6 +20,6 @@
units/cart_cavalry_spearman_ital_a
- units/carthaginians/cavalry_spearman_b.xml
+ units/carthaginians/cavalry_spearman_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_e.xml
index 971f0b744f..24ce7544b9 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_e.xml
@@ -5,6 +5,6 @@
- units/carthaginians/cavalry_spearman_e.xml
+ units/carthaginians/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_a.xml
index dbd44448b2..d7e01ba655 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_a.xml
@@ -7,6 +7,6 @@
units/cart_cavalry_swordsman_gaul_e
- units/celts/cavalry_swordsman_a.xml
+ units/celts/cavalry_swordsman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
index baa5d66575..69766d2f90 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml
@@ -20,6 +20,6 @@
units/cart_cavalry_swordsman_gaul_a
- units/celts/cavalry_swordsman_b.xml
+ units/celts/cavalry_swordsman_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_e.xml
index b71a649c91..f1934f371f 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_e.xml
@@ -5,6 +5,6 @@
- units/celts/cavalry_swordsman_e.xml
+ units/celts/cavalry_swordsman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_a.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_a.xml
index 66507e8fea..464e536d0a 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_a.xml
@@ -7,6 +7,6 @@
units/cart_cavalry_swordsman_iber_e
- units/carthaginians/cavalry_swordsman_a.xml
+ units/carthaginians/cavalry_swordsman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
index 6d9dc4a65c..875ca9cce0 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
@@ -20,6 +20,6 @@
units/cart_cavalry_swordsman_iber_a
- units/carthaginians/cavalry_swordsman_b.xml
+ units/carthaginians/cavalry_swordsman_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_e.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_e.xml
index a8fa67db09..b9015f6185 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_e.xml
@@ -5,6 +5,6 @@
- units/carthaginians/cavalry_swordsman_e.xml
+ units/carthaginians/cavalry_swordsman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
index 8d5d2f5485..38939cb446 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_champion_cavalry.xml
@@ -7,6 +7,6 @@
units/cart_champion_cavalry.png
- units/carthaginians/champion_unit_3.xml
+ units/carthaginians/cavalry_spearman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
index 85d1bde8ca..8d1187a284 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
@@ -7,6 +7,6 @@
units/cart_champion_elephant.png
- units/carthaginians/champion_unit_2.xml
+ units/carthaginians/elephantry_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
index 37913a88a1..b5bd15f1f0 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_champion_infantry.xml
@@ -7,6 +7,6 @@
units/cart_champion_infantry.png
- units/carthaginians/champion_spearman.xml
+ units/carthaginians/infantry_spearman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml
index 67347df1a5..dd86584377 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_champion_pikeman.xml
@@ -7,6 +7,6 @@
units/cart_champion_infantry.png
- units/carthaginians/champion_unit_1.xml
+ units/carthaginians/infantry_pikeman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
index b1b6e4bfc6..475e0d7d44 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
@@ -10,6 +10,6 @@
units/cart_hero_hamilcar.png
- units/carthaginians/hero_hamilcar_horse.xml
+ units/carthaginians/hero_cavalry_swordsman_hamilcar_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml
index 67c2acb252..aba9905305 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_hannibal.xml
@@ -10,6 +10,6 @@
units/cart_hero_hannibal.png
- units/carthaginians/hero_hannibal_mount.xml
+ units/carthaginians/hero_elephantry_hannibal_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
index 7dd4b65a4f..1b8722b58e 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_maharbal.xml
@@ -10,6 +10,6 @@
units/cart_hero_maharbal.png
- units/carthaginians/hero_maharbal_horse.xml
+ units/carthaginians/hero_cavalry_spearman_maharbal_m.xml
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 38d0e25d25..8091abf548 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
@@ -7,6 +7,6 @@
units/gaul_cavalry_javelinist_e
- units/celts/cavalry_javelinist_a.xml
+ units/celts/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_b.xml
index 8f01c62f47..e46b40140f 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_javelinist_b.xml
@@ -10,6 +10,6 @@
units/gaul_cavalry_javelinist_a
- units/celts/cavalry_javelinist_b.xml
+ units/celts/cavalry_javelinist_b_m.xml
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 14cea84bdd..82cbd3d94f 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
@@ -5,6 +5,6 @@
- units/celts/cavalry_javelinist_e.xml
+ units/celts/cavalry_javelinist_e_m.xml
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 c0b6f95bc8..ac13748067 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
@@ -7,6 +7,6 @@
units/gaul_cavalry_swordsman_e
- units/celts/cavalry_swordsman_a.xml
+ units/celts/cavalry_swordsman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml
index 9bf0fca054..afd91c9832 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml
@@ -11,6 +11,6 @@
units/gaul_cavalry_swordsman_a
- units/celts/cavalry_swordsman_b.xml
+ units/celts/cavalry_swordsman_b_m.xml
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 634f324eb6..e13f413622 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
@@ -5,6 +5,6 @@
- units/celts/cavalry_swordsman_e.xml
+ units/celts/cavalry_swordsman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
index 815f4c5c42..7d1369d50b 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry.xml
@@ -8,6 +8,6 @@
units/gaul_champion_cavalry.png
- units/celts/champion_unit_2.xml
+ units/gauls/cavalry_spearman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
index 150bbaa0e3..797028d51f 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
@@ -28,6 +28,6 @@
- units/celts/fanatic.xml
+ units/gauls/infantry_spearman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
index ef03da4098..9db2786924 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry.xml
@@ -8,6 +8,6 @@
units/gaul_champion_infantry.png
- units/celts/champion_unit_1.xml
+ units/gauls/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml b/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
index 7fa8e5bbf1..5b92ccc599 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_hero_brennus.xml
@@ -9,6 +9,6 @@
units/gaul_hero_brennus.png
- units/celts/brennus.xml
+ units/gauls/hero_infantry_swordsman_brennus.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
index 0a8f9f2d88..306fa0151a 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix.xml
@@ -9,6 +9,6 @@
units/gaul_hero_vercingetorix.png
- units/celts/vercingetorix_horse.xml
+ units/gauls/hero_cavalry_swordsman_vercingetorix_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml b/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml
index f29bfa6835..8220ea3a60 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_hero_viridomarus.xml
@@ -9,6 +9,6 @@
units/gaul_hero_viridomarus.png
- units/celts/viridomarus.xml
+ units/gauls/hero_infantry_spearman_viridomarus.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml
index 833a4fd460..4fb17d9d88 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml
@@ -9,7 +9,7 @@
units/gaul_hero_vercingetorix.png
- units/celts/vercingetorix.xml
+ units/gauls/hero_infantry_swordsman_vercingetorix.xml
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 cf34a146af..73ce1e0f18 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
@@ -7,6 +7,6 @@
units/iber_cavalry_javelinist_e
- units/iberians/cavalry_javelinist_a.xml
+ units/iberians/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml
index 78cc1fde0e..21151c16d7 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml
@@ -10,6 +10,6 @@
units/iber_cavalry_javelinist_a
- units/iberians/cavalry_javelinist_b.xml
+ units/iberians/cavalry_javelinist_b_m.xml
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 0b2baac80a..043e22ace3 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
@@ -5,6 +5,6 @@
- units/iberians/cavalry_javelinist_e.xml
+ units/iberians/cavalry_javelinist_e_m.xml
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 bec24840a7..55ab4834eb 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
@@ -7,6 +7,6 @@
units/iber_cavalry_spearman_e
- units/iberians/cavalry_spearman_a.xml
+ units/iberians/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml
index d33f65a419..499f491d4b 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml
@@ -11,6 +11,6 @@
units/iber_cavalry_spearman_a
- units/iberians/cavalry_spearman_b.xml
+ units/iberians/cavalry_spearman_b_m.xml
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 7775bc774e..1eca07342a 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
@@ -5,6 +5,6 @@
- units/iberians/cavalry_spearman_e.xml
+ units/iberians/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
index d2beb7a257..7b105d80f2 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry.xml
@@ -14,6 +14,6 @@
Special: Flaming javelins. Good vs. Buildings.
- units/iberians/champion_unit_2.xml
+ units/iberians/cavalry_javelinist_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
index 089fb828a4..332a407d63 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
@@ -7,6 +7,6 @@
units/iber_champion_infantry
- units/iberians/champion_unit_1.xml
+ units/iberians/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml b/binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml
index 85b814c75e..aa692caa61 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_hero_caros.xml
@@ -10,6 +10,6 @@
units/iber_hero_caros.png
- units/iberians/hero_caros.xml
+ units/iberians/hero_infantry_swordsman_caros.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml b/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml
index a50ee0fb5d..b3efe35a89 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil.xml
@@ -9,6 +9,6 @@
units/iber_hero_indibil.png
- units/iberians/hero_indibil_horse.xml
+ units/iberians/hero_cavalry_spearman_indibil_h.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml b/binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml
index 9b41fbf5bf..4363a49b08 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_hero_viriato.xml
@@ -10,6 +10,6 @@
units/iber_hero_viriato.png
- units/iberians/hero_viriato.xml
+ units/iberians/hero_infantry_swordsman_viriato.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml
index 2964419f07..a365a3a1f1 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml
@@ -9,6 +9,6 @@
units/iber_hero_indibil.png
- units/iberians/hero_indibil_infantry.xml
+ units/iberians/hero_infantry_spearman_indibil.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_camelry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_camelry_javelinist_b.xml
index f3aabee267..575e8cb441 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_camelry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_camelry_javelinist_b.xml
@@ -26,6 +26,6 @@
- units/kushites/camelry_javelinist_b.xml
+ units/kushites/camelry_javelinist_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_a.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_a.xml
index 5fd841a812..12558c6afa 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_a.xml
@@ -7,6 +7,6 @@
units/kush_cavalry_javelinist_e
- units/kushites/cavalry_javelinist_a.xml
+ units/kushites/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml
index 163774a8b0..ecd78d5b0a 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml
@@ -12,6 +12,6 @@
units/kush_cavalry_javelinist_a
- units/kushites/cavalry_javelinist_b.xml
+ units/kushites/cavalry_javelinist_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_e.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_e.xml
index 5607508cf0..b9f695da6c 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_e.xml
@@ -5,6 +5,6 @@
- units/kushites/cavalry_javelinist_e.xml
+ units/kushites/cavalry_javelinist_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_a.xml
index 4dfd46d809..c6065865ec 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_a.xml
@@ -7,6 +7,6 @@
units/kush_cavalry_spearman_e
- units/kushites/cavalry_spearman_a.xml
+ units/kushites/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml
index e2aac6a162..d719276a70 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml
@@ -12,6 +12,6 @@
units/kush_cavalry_spearman_a
- units/kushites/cavalry_spearman_b.xml
+ units/kushites/cavalry_spearman_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_e.xml
index 002883e67b..f1366c79f4 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_e.xml
@@ -5,6 +5,6 @@
- units/kushites/cavalry_spearman_e.xml
+ units/kushites/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml
index 553bfc6b2b..5e9b0f3d9a 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_cavalry.xml
@@ -7,6 +7,6 @@
units/kush_champion_cavalry.png
- units/kushites/cavalry_spearman_champion.xml
+ units/kushites/cavalry_spearman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
index 537a55bcb7..526190f736 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
@@ -7,6 +7,6 @@
units/kush_champion_elephant.png
- units/kushites/elephant_champion.xml
+ units/kushites/elephantry_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml
index a615bbf085..af740b7ea0 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry.xml
@@ -7,6 +7,6 @@
units/kush_champion_archer.png
- units/kushites/infantry_archer_champion.xml
+ units/kushites/infantry_archer_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
index 975bedc78f..f2201de1d7 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
@@ -8,6 +8,6 @@
units/kush_champion_amun.png
- units/kushites/infantry_swordsman_champion.xml
+ units/kushites/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
index ae7f8240f1..eeded1dc88 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -9,6 +9,6 @@
units/kush_champion_apedemak.png
- units/kushites/infantry_axeman_champion.xml
+ units/kushites/infantry_axeman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml b/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
index f6b94bd6fc..28b5929688 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_hero_amanirenas.xml
@@ -11,6 +11,6 @@
units/ptol_hero_cleopatra.png
- units/kushites/infantry_archer_hero_amanirenas.xml
+ units/kushites/hero_infantry_archer_amanirenas.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml b/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
index 8c8908a4c7..7c43f37c85 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
@@ -12,6 +12,6 @@
units/mace_hero_philip.png
- units/ptolemies/hero_ptolemy_IV.xml
+ units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml b/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
index 586fbd9d23..cf03a6f934 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
@@ -12,6 +12,6 @@
Hero Special: "Gift of Warships" - Allows the training of Ptolemaic trireme-class ships.
- units/kushites/cavalry_spearman_hero_nastasen.xml
+ units/kushites/hero_cavalry_spearman_nastasen_m.xml
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 bd781fbf2b..53843732e2 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
@@ -7,6 +7,6 @@
units/mace_cavalry_javelinist_e
- units/macedonians/cavalry_javelinist_a.xml
+ units/macedonians/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml
index d6b6b2813e..f219da4d09 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml
@@ -20,6 +20,6 @@
units/mace_cavalry_javelinist_a
- units/macedonians/cavalry_javelinist_b.xml
+ units/macedonians/cavalry_javelinist_b_m.xml
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 d591ee017a..ea4adaecc9 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
@@ -5,6 +5,6 @@
- units/macedonians/cavalry_javelinist_e.xml
+ units/macedonians/cavalry_javelinist_e_m.xml
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 d196236341..45fadaadea 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
@@ -7,6 +7,6 @@
units/mace_cavalry_spearman_e
- units/macedonians/cavalry_spearman_a.xml
+ units/macedonians/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml
index 070806a214..3b325f4e6c 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_cavalry_spearman_b.xml
@@ -12,6 +12,6 @@
units/mace_cavalry_spearman_a
- units/macedonians/cavalry_spearman_b.xml
+ units/macedonians/cavalry_spearman_b_m.xml
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 d7e2a0efa0..af06cac3b0 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
@@ -5,6 +5,6 @@
- units/macedonians/cavalry_spearman_e.xml
+ units/macedonians/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
index 88230bf9ff..3f2811c878 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry.xml
@@ -9,6 +9,6 @@
units/mace_champion_cavalry
- units/macedonians/champion_cavalry.xml
+ units/macedonians/cavalry_spearman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
index f67b6e0110..da9b489aac 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a.xml
@@ -13,6 +13,6 @@
2000
- units/macedonians/champion_infantry_a.xml
+ units/macedonians/infantry_spearman_c_a.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
index bb5b65e8d2..b11d5bdf71 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
@@ -13,6 +13,6 @@
- units/macedonians/champion_infantry_e.xml
+ units/macedonians/infantry_spearman_c_e.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
index e9735ced07..6f5bde6f0b 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
@@ -1,4 +1,4 @@
-
+
@@ -23,6 +23,6 @@
units/hele_hero_alexander.png
- units/macedonians/alexander.xml
+ units/macedonians/hero_cavalry_swordsman_alexander_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
index eab42ec583..36f6895d4e 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
@@ -11,6 +11,6 @@
units/mace_hero_craterus.png
- units/macedonians/craterus.xml
+ units/macedonians/hero_infantry_swordsman_craterus.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
index a320fe3fca..70442de2a2 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
@@ -11,6 +11,6 @@
units/hele_hero_demetrius.png
- units/macedonians/demetrius.xml
+ units/macedonians/hero_infantry_swordsman_demetrius.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
index 6e77a789f5..418a9325d0 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip.xml
@@ -11,6 +11,6 @@
units/hele_hero_philip.png
- units/macedonians/philip_horse.xml
+ units/macedonians/hero_cavalry_spearman_philip_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
index 337753cc09..c43cf17e24 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_philip_pike.xml
@@ -11,6 +11,6 @@
units/hele_hero_philip.png
- units/macedonians/philip.xml
+ units/macedonians/hero_infantry_pikeman_philip.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
index d26203a82b..5719add267 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_pyrrhus.xml
@@ -11,6 +11,6 @@
units/mace_hero_pyrrhus.png
- units/macedonians/pyrrhus_horse.xml
+ units/macedonians/hero_cavalry_spearman_pyrrhus_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_a.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_a.xml
index 08bb5a9535..c88167b243 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_a.xml
@@ -7,6 +7,6 @@
units/mace_infantry_pikeman_e
- units/macedonians/infantry_spearman_a.xml
+ units/macedonians/infantry_pikeman_a.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
index 02e0a46e39..eb635f2a5f 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_b.xml
@@ -19,6 +19,6 @@
units/mace_infantry_pikeman_a
- units/macedonians/infantry_spearman_b.xml
+ units/macedonians/infantry_pikeman_b.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_e.xml
index 23aaf2f39d..9b127277b1 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_infantry_pikeman_e.xml
@@ -5,6 +5,6 @@
- units/macedonians/infantry_spearman_e.xml
+ units/macedonians/infantry_pikeman_e.xml
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 b1ebcb6341..3801effbce 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
@@ -7,6 +7,6 @@
units/maur_cavalry_javelinist_e
- units/mauryans/cavalry_javelinist_a.xml
+ units/mauryans/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_b.xml
index c21dd341ab..42bfac96d6 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_javelinist_b.xml
@@ -11,6 +11,6 @@
units/maur_cavalry_javelinist_a
- units/mauryans/cavalry_javelinist_b.xml
+ units/mauryans/cavalry_javelinist_b_m.xml
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 317d620e1f..b27a5f20cf 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
@@ -5,6 +5,6 @@
- units/mauryans/cavalry_javelinist_e.xml
+ units/mauryans/cavalry_javelinist_e_m.xml
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 e18ec3b0c9..793d98ca05 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
@@ -7,6 +7,6 @@
units/maur_cavalry_swordsman_e
- units/mauryans/cavalry_swordsman_a.xml
+ units/mauryans/cavalry_swordsman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml
index 3e892bab02..0e0f821b08 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml
@@ -12,6 +12,6 @@
units/maur_cavalry_swordsman_a
- units/mauryans/cavalry_swordsman_b.xml
+ units/mauryans/cavalry_swordsman_b_m.xml
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 ef13fa5ba1..95c1310114 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
@@ -5,6 +5,6 @@
- units/mauryans/cavalry_swordsman_e.xml
+ units/mauryans/cavalry_swordsman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
index cf4b19b2e2..58028ad8fb 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_chariot.xml
@@ -20,6 +20,6 @@
- units/mauryans/chariot_a.xml
+ units/mauryans/chariot_archer_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
index 9505f4676b..3a6b38517e 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
@@ -7,6 +7,6 @@
units/maur_champion_elephant.png
- units/mauryans/elephant_siege.xml
+ units/mauryans/elephantry_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
index 088bea120e..bbc0edf0ed 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_infantry.xml
@@ -8,6 +8,6 @@
units/maur_champion_maceman.png
- units/mauryans/champion_maceman.xml
+ units/mauryans/infantry_maceman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
index e0c4b02bfe..ab2d6b63f0 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden.xml
@@ -9,6 +9,6 @@
units/maur_champion_maiden.png
- units/mauryans/champion_maiden_guard.xml
+ units/mauryans/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
index ddc47ac5cc..f77fe03222 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_archer.xml
@@ -8,6 +8,6 @@
units/maur_champion_maiden_archer.png
- units/mauryans/champion_maiden_guard_archer.xml
+ units/mauryans/infantry_archer_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_a.xml
index 32f9917c40..11890c4706 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_a.xml
@@ -7,6 +7,6 @@
units/maur_elephant_archer_e
- units/mauryans/elephant_archer_a.xml
+ units/mauryans/elephantry_archer_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
index 3a5319b13d..470c4782ae 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -72,6 +72,6 @@
- units/mauryans/elephant_archer_b.xml
+ units/mauryans/elephantry_archer_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_e.xml
index 9704ef9a00..939b82a2c3 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_e.xml
@@ -5,6 +5,6 @@
- units/mauryans/elephant_archer_e.xml
+ units/mauryans/elephantry_archer_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
index fa36754f15..7765fd8edb 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
@@ -17,6 +17,6 @@
Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.
- units/mauryans/hero_chariot.xml
+ units/mauryans/hero_chariot_archer_ashoka_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
index db4e8a72ba..bee067dd69 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml
@@ -11,6 +11,6 @@
units/maur_hero_chanakya.png
- units/mauryans/hero_chanakya.xml
+ units/mauryans/hero_healer_chanakya.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_infantry_archer_ashoka.xml
similarity index 88%
rename from binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml
rename to binaries/data/mods/public/simulation/templates/units/maur_hero_infantry_archer_ashoka.xml
index ac19f4ee64..9e55ed4f6a 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_infantry_archer_hero_ashoka.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_infantry_archer_ashoka.xml
@@ -11,6 +11,6 @@
Hero Special: "Edicts of Ashoka" - Edict Pillars of Ashoka can be built during Ashoka's lifetime.
- units/mauryans/hero_ashoka.xml
+ units/mauryans/hero_infantry_archer_ashoka.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml b/binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
index 7c088e631e..07f79d8765 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
@@ -20,6 +20,6 @@
- units/mauryans/elephant_hero.xml
+ units/mauryans/hero_elephantry_maurya_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
index 1ea6769212..b675f82af1 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -17,6 +17,6 @@
phase_town
- units/hellenes/thracian_blackcloak.xml
+ units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
index d801f73e31..94ab546ba7 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@@ -25,6 +25,6 @@
Mercenary
- units/macedonians/thorakites.xml
+ units/hellenes/infantry_swordsman_c_thorakites.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
index 1b04178fce..f6646ef709 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@@ -16,6 +16,6 @@
Mercenary
- units/macedonians/thureophoros.xml
+ units/hellenes/infantry_javelinist_c_thureophoros.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_arstibara.xml b/binaries/data/mods/public/simulation/templates/units/pers_arstibara.xml
index 3ce814342f..ca8f03af84 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_arstibara.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_arstibara.xml
@@ -14,6 +14,6 @@
units/pers_arstibara.png
- units/persians/apple_bearer.xml
+ units/persians/infantry_spearman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml
index 8f77194d47..f2db8e625a 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_a.xml
@@ -7,6 +7,6 @@
units/pers_cavalry_archer_e
- units/persians/cavalry_archer_a.xml
+ units/persians/chariot_archer_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
index d3b6dda5c5..2ac457d0db 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml
@@ -24,6 +24,6 @@
- units/persians/cavalry_archer_b.xml
+ units/persians/chariot_archer_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml
index befc8ce18f..0fa890fc98 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_e.xml
@@ -5,6 +5,6 @@
- units/persians/cavalry_archer_e.xml
+ units/persians/chariot_archer_e_m.xml
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 b79db604c9..740d93cd36 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
@@ -7,6 +7,6 @@
units/pers_cavalry_javelinist_e
- units/persians/cavalry_javelinist_a.xml
+ units/persians/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b.xml
index 57e92ba013..a7f7fc6872 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b.xml
@@ -11,6 +11,6 @@
units/pers_cavalry_javelinist_a
- units/persians/cavalry_javelinist_b.xml
+ units/persians/cavalry_javelinist_b_m.xml
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 a8c51c5fc0..23043eb4f5 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
@@ -5,6 +5,6 @@
- units/persians/cavalry_javelinist_e.xml
+ units/persians/cavalry_javelinist_e_m.xml
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 4db4e9b03e..fef0e3d2e5 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
@@ -7,6 +7,6 @@
units/pers_cavalry_spearman_e
- units/persians/cavalry_spearman_a.xml
+ units/persians/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml
index 8c61b491ba..15a0b51f54 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml
@@ -12,6 +12,6 @@
units/pers_cavalry_spearman_a
- units/persians/cavalry_spearman_b.xml
+ units/persians/cavalry_spearman_b_m.xml
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 ea69e7e810..3d3daa8f70 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
@@ -5,6 +5,6 @@
- units/persians/cavalry_spearman_e.xml
+ units/persians/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
index 1d46dc145a..8c63b6ed63 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml
@@ -12,6 +12,6 @@
units/pers_cavalry_swordsman_a
- units/persians/cavalry_swordsman_b.xml
+ units/persians/cavalry_swordsman_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
index 5866a4932f..1b2243842f 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry.xml
@@ -7,6 +7,6 @@
units/pers_champion_cavalry.png
- units/persians/champion_unit_2.xml
+ units/persians/cavalry_spearman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml
index ac78e918a7..3f8aba4430 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_cavalry_archer.xml
@@ -7,6 +7,6 @@
units/pers_champion_cavalry.png
- units/persians/champion_unit_2_archer.xml
+ units/persians/cavalry_archer_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
index 34832ecb28..6b19dc068c 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
@@ -7,6 +7,6 @@
units/pers_champion_elephant.png
- units/persians/war_elephant.xml
+ units/persians/elephantry_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
index a784bdef9c..e4074570b0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_champion_infantry.xml
@@ -8,6 +8,6 @@
units/pers_champion_infantry.png
- units/persians/champion_unit_1.xml
+ units/persians/infantry_spearman_c2.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
index 7e6ad147b5..ca269e6580 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
@@ -23,6 +23,6 @@
- units/persians/hero_cyrus.xml
+ units/persians/hero_cavalry_spearman_cyrus_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
index 455c430e6e..7bd440212d 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_darius.xml
@@ -15,6 +15,6 @@
units/pers_hero_darius.png
- units/persians/hero_darius_chariot.xml
+ units/persians/hero_chariot_archer_darius_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
index 92b3b35bae..fd93fbb5bd 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes.xml
@@ -10,6 +10,6 @@
units/pers_hero_xerxes.png
- units/persians/hero_xerxes.xml
+ units/persians/hero_infantry_archer_xerxes.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
index d08b4d7375..de7f676de4 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_hero_xerxes_chariot.xml
@@ -15,6 +15,6 @@
units/pers_hero_xerxes.png
- units/persians/hero_xerxes_chariot.xml
+ units/persians/hero_chariot_archer_xerxes_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
index 0d6a8a6f9b..65afc80bd0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_hoplite.xml
@@ -14,6 +14,6 @@
Mercenary
- units/persians/kardakes_hoplite.xml
+ units/persians/infantry_spearman_c3.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
index 27fc859711..8dcc4216a0 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers_kardakes_skirmisher.xml
@@ -14,6 +14,6 @@
Mercenary
- units/persians/kardakes_skirmisher.xml
+ units/persians/infantry_javelinist_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_a.xml
similarity index 51%
rename from binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml
rename to binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_a.xml
index bf2693556a..4e8197f995 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_a.xml
@@ -1,12 +1,12 @@
-
+
Advanced
- units/ptol_cavalry_archer_e
+ units/ptol_camelry_archer_e
- units/ptolemies/cavalry_archer_a.xml
+ units/ptolemies/camelry_archer_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_b.xml
similarity index 80%
rename from binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
rename to binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_b.xml
index 255cd85a72..8fd9f2df82 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_b.xml
@@ -3,14 +3,14 @@
ptol
Camel
- units/ptol_camel_archer
+ units/ptol_camelry_archer
Nabataean Camel Archer
Mutsābiq Gamal Nabatu
units/ptol_camelry_archer.png
phase_village
- units/ptol_cavalry_archer_a
+ units/ptol_camelry_archer_a
@@ -20,6 +20,6 @@
- units/ptolemies/cavalry_archer_b.xml
+ units/ptolemies/camelry_archer_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_e.xml
similarity index 60%
rename from binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml
rename to binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_e.xml
index f1b163fdc4..3ad8bbffa3 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_camelry_archer_e.xml
@@ -1,10 +1,10 @@
-
+
Elite
- units/ptolemies/cavalry_archer_e.xml
+ units/ptolemies/camelry_archer_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml
index e306ee02bf..fe9cdf63de 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_a.xml
@@ -7,6 +7,6 @@
units/ptol_cavalry_javelinist_merc_e
- units/macedonians/cavalry_javelinist_a.xml
+ units/macedonians/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
index 32d38e71cb..a353c65c9b 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml
@@ -19,6 +19,6 @@
units/ptol_cavalry_javelinist_merc_a
- units/macedonians/cavalry_javelinist_b.xml
+ units/macedonians/cavalry_javelinist_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml
index 85278c6eed..573756f064 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_e.xml
@@ -5,6 +5,6 @@
- units/macedonians/cavalry_javelinist_e.xml
+ units/macedonians/cavalry_javelinist_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml
index 8765e4eb5b..796a71feb5 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_a.xml
@@ -7,6 +7,6 @@
units/ptol_cavalry_spearman_merc_e
- units/ptolemies/cavalry_spearman_a.xml
+ units/ptolemies/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
index 0f22c7733e..f0bb17fb21 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml
@@ -19,6 +19,6 @@
units/ptol_cavalry_spearman_merc_a
- units/ptolemies/cavalry_spearman_b.xml
+ units/ptolemies/cavalry_spearman_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml
index 24b192fd9a..0a81574b6a 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_e.xml
@@ -5,6 +5,6 @@
- units/ptolemies/cavalry_spearman_e.xml
+ units/ptolemies/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml
index 339f3f3df3..79de00d7d4 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_champion_cavalry.xml
@@ -7,6 +7,6 @@
units/ptol_champion_cavalry.png
- units/ptolemies/champion_cavalry.xml
+ units/ptolemies/cavalry_spearman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
index dc6c102e57..50a2ecd27e 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
@@ -7,6 +7,6 @@
units/ptol_champion_elephant.png
- units/ptolemies/champion_elephant.xml
+ units/ptolemies/elephantry_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml
index d2e59b3cd3..265aa0ee41 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_champion_infantry_pikeman.xml
@@ -8,6 +8,6 @@
units/ptol_champion_infantry.png
- units/ptolemies/champion_infantry.xml
+ units/ptolemies/infantry_pikeman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml b/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
index 628185d927..725458c0c8 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_hero_cleopatra.xml
@@ -13,6 +13,6 @@
units/ptol_hero_cleopatra.png
- units/ptolemies/hero_cleopatra.xml
+ units/ptolemies/hero_infantry_archer_cleopatra.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
index a9a08121cc..3231072a1d 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_I.xml
@@ -11,6 +11,6 @@
units/hele_hero_alexander.png
- units/ptolemies/hero_ptolemy_I_mount.xml
+ units/ptolemies/hero_elephantry_ptolemy_I_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
index 879cc4134b..df9fa463d7 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_hero_ptolemy_IV.xml
@@ -11,6 +11,6 @@
units/mace_hero_philip.png
- units/ptolemies/hero_ptolemy_IV.xml
+ units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_a.xml
index 1fcff57a3f..0b61e438fe 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_a.xml
@@ -7,6 +7,6 @@
units/ptol_infantry_pikeman_e
- units/ptolemies/infantry_spearman_a.xml
+ units/ptolemies/infantry_pikeman_a.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
index 14e82a0353..a71564683c 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_b.xml
@@ -18,6 +18,6 @@
units/ptol_infantry_pikeman_a
- units/ptolemies/infantry_spearman_b.xml
+ units/ptolemies/infantry_pikeman_b.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_e.xml
index 22583eeb93..1f3da59a17 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_pikeman_e.xml
@@ -5,6 +5,6 @@
- units/ptolemies/infantry_spearman_e.xml
+ units/ptolemies/infantry_pikeman_e.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml
index 58708d9c7c..ab4ab2951f 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_a.xml
@@ -7,6 +7,6 @@
units/ptol_infantry_spearman_merc_e
- units/ptolemies/infantry_spearman_2_a.xml
+ units/ptolemies/infantry_spearman_a.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
index b26bfc7d1b..46052eb7bb 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_b.xml
@@ -25,6 +25,6 @@
units/ptol_infantry_spearman_merc_a
- units/ptolemies/infantry_spearman_2_b.xml
+ units/ptolemies/infantry_spearman_b.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml
index 972111ab20..40e60c7e11 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_spearman_merc_e.xml
@@ -5,6 +5,6 @@
- units/ptolemies/infantry_spearman_2_e.xml
+ units/ptolemies/infantry_spearman_e.xml
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 75f1a14aa7..b6ae089adc 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
@@ -7,6 +7,6 @@
units/rome_cavalry_javelinist_e
- units/romans/cavalry_javelinist_a.xml
+ units/romans/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml
index cb1131b39f..3e3c95c7ef 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml
@@ -13,6 +13,6 @@
units/rome_cavalry_javelinist_a
- units/romans/cavalry_javelinist_b.xml
+ units/romans/cavalry_javelinist_b_m.xml
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 fc76a2ca37..03e11703ec 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
@@ -5,6 +5,6 @@
- units/romans/cavalry_javelinist_e.xml
+ units/romans/cavalry_javelinist_e_m.xml
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 1377ee2cb9..2de99cdfbf 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
@@ -7,6 +7,6 @@
units/rome_cavalry_spearman_e
- units/romans/cavalry_spearman_a.xml
+ units/romans/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml
index 4744faea89..f2fcb93d05 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_cavalry_spearman_b.xml
@@ -12,6 +12,6 @@
units/rome_cavalry_spearman_a
- units/romans/cavalry_spearman_b.xml
+ units/romans/cavalry_spearman_b_m.xml
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 9570f809f3..f8076ac8e2 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
@@ -5,6 +5,6 @@
- units/romans/cavalry_spearman_e.xml
+ units/romans/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml b/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
index d61e406503..47a87e2af6 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_centurio_imperial.xml
@@ -17,6 +17,6 @@
- units/romans/imp_rome_champion_1.xml
+ units/romans/infantry_swordsman_c4.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
index e5d3cc0670..8950bbfda3 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry.xml
@@ -9,6 +9,6 @@
units/rome_champion_cavalry
- units/romans/champion_unit_2.xml
+ units/romans/cavalry_swordsman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml
index dc8bda96ab..7c38bce76d 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_champion_infantry.xml
@@ -9,6 +9,6 @@
units/rome_champion_infantry.png
- units/romans/champion_unit_1.xml
+ units/romans/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml
similarity index 86%
rename from binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml
rename to binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml
index 94bb3ab5c9..be1e55cb44 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_marcellus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml
@@ -11,7 +11,7 @@
units/rome_hero_marcellus.png
- units/romans/hero_marcellus.xml
+ units/romans/hero_infantry_swordsman_marcellus.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml
similarity index 84%
rename from binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml
rename to binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml
index 0078646ebd..9f72d6508d 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_hero_maximus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml
@@ -10,6 +10,6 @@
units/rome_hero_maximus.png
- units/romans/hero_maximus.xml
+ units/romans/hero_infantry_swordsman_maximus.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
index 8ad8f030b6..abe6276faf 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus.xml
@@ -11,6 +11,6 @@
units/rome_hero_marcellus.png
- units/romans/hero_marcellus_horse.xml
+ units/romans/hero_cavalry_swordsman_marcellus_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
index 02f3f215ea..ecb9134a30 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus.xml
@@ -10,6 +10,6 @@
units/rome_hero_maximus.png
- units/romans/hero_maximus_horse.xml
+ units/romans/hero_cavalry_swordsman_maximus_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml
index 50fbe0fbf5..db1cd45e57 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_hero_scipio.xml
@@ -10,6 +10,6 @@
units/rome_hero_scipio.png
- units/romans/hero_scipio_horse.xml
+ units/romans/hero_cavalry_swordsman_scipio_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
index 1f2fda1d1a..8e913c7aa5 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_imperial.xml
@@ -17,6 +17,6 @@
300
- units/romans/champion_unit_4_imp_legion.xml
+ units/romans/infantry_swordsman_c3.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml
index e062b97449..3417495238 100644
--- a/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml
+++ b/binaries/data/mods/public/simulation/templates/units/rome_legionnaire_marian.xml
@@ -13,6 +13,6 @@
150
- units/romans/champion_unit_3.xml
+ units/romans/infantry_swordsman_c2.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
index 63164453ec..b9704bc402 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
@@ -8,6 +8,6 @@
units/samnite_skirmisher.png
- units/carthaginians/samnite_skirmisher.xml
+ units/carthaginians/infantry_javelinist_c_samnite.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
index 95bab1a58e..784f6181ac 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
@@ -8,6 +8,6 @@
units/samnite_spearman.png
- units/carthaginians/samnite_spearman.xml
+ units/carthaginians/infantry_spearman_c_samnite.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
index 839cb8b6f2..6f36e6cd65 100644
--- a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
@@ -8,6 +8,6 @@
units/samnite_swordsman.png
- units/carthaginians/samnite_swordsman.xml
+ units/carthaginians/infantry_swordsman_2_b.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml
index 93f935db4c..b439af37fa 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_a.xml
@@ -7,6 +7,6 @@
units/sele_cavalry_archer_e
- units/seleucids/cavalry_archer_a.xml
+ units/seleucids/cavalry_archer_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
index 2c007c9f7d..3361738265 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml
@@ -13,6 +13,6 @@
units/sele_cavalry_archer_a
- units/seleucids/cavalry_archer_b.xml
+ units/seleucids/cavalry_archer_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml
index 899b73cebe..02b1cb31d1 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_e.xml
@@ -5,6 +5,6 @@
- units/seleucids/cavalry_archer_e.xml
+ units/seleucids/cavalry_archer_e_m.xml
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 ad9e5f3ab3..27cdb388e3 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
@@ -7,6 +7,6 @@
units/sele_cavalry_javelinist_e
- units/athenians/cavalry_javelinist_a.xml
+ units/athenians/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_b.xml
index 830abfaaa4..040316a249 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_javelinist_b.xml
@@ -12,6 +12,6 @@
units/sele_cavalry_javelinist_a
- units/athenians/cavalry_javelinist_b.xml
+ units/athenians/cavalry_javelinist_b_m.xml
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 d7d458abaf..42aa36a345 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
@@ -5,6 +5,6 @@
- units/athenians/cavalry_javelinist_e.xml
+ units/athenians/cavalry_javelinist_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml
index 970a3cc4ed..443f43ada9 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_a.xml
@@ -7,6 +7,6 @@
units/sele_cavalry_spearman_merc_e
- units/macedonians/cavalry_spearman_a.xml
+ units/macedonians/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
index cc80693e8b..daf7020522 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml
@@ -20,6 +20,6 @@
units/sele_cavalry_spearman_merc_a
- units/macedonians/cavalry_spearman_b.xml
+ units/macedonians/cavalry_spearman_b_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml
index 982c11df0c..5d0b895ea0 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_e.xml
@@ -5,6 +5,6 @@
- units/macedonians/cavalry_spearman_e.xml
+ units/macedonians/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
index 72ccd0cc34..9f47fcf131 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml
@@ -9,6 +9,6 @@
successors/unlock_reform_army
- units/seleucids/champion_cataphract.xml
+ units/seleucids/cavalry_spearman_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
index df889a48f7..3eb18722ea 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml
@@ -20,6 +20,6 @@
- units/seleucids/champion_chariot.xml
+ units/seleucids/chariot_archer_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
index cb334e0f1c..1f4740f324 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
@@ -8,6 +8,6 @@
units/maur_champion_elephant.png
- units/seleucids/champion_elephant.xml
+ units/seleucids/elephantry_c_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
index dff56dad44..cbac0f8bf0 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml
@@ -9,6 +9,6 @@
successors/unlock_traditional_army
- units/seleucids/champion_infantry_pikeman.xml
+ units/seleucids/infantry_pikeman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml
index 6072e9d1ab..9c35e59248 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml
@@ -9,6 +9,6 @@
successors/unlock_reform_army
- units/seleucids/champion_infantry_swordsman.xml
+ units/seleucids/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
index fdfe58ba1c..5410fb4c8e 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_great.xml
@@ -11,6 +11,6 @@
units/sele_hero_antiochus_the_great.png
- units/seleucids/hero_antiochus_the_great_cav.xml
+ units/seleucids/hero_cavalry_spearman_antiochus_the_great_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
index 7640e2141e..5b2c64c1f9 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_hero_antiochus_righteous.xml
@@ -11,6 +11,6 @@
units/sele_hero_antiochus_the_righteous.png
- units/ptolemies/hero_ptolemy_IV.xml
+ units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml b/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
index 2cb9b70645..ad7207c1cf 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_hero_seleucus_victor.xml
@@ -11,6 +11,6 @@
units/sele_hero_seleucus.png
- units/seleucids/hero_seleucus_victor_mount.xml
+ units/seleucids/hero_elephantry_seleucus_victor_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_a.xml b/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_a.xml
index 6dce0c40ce..f81661b1dd 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_a.xml
@@ -7,6 +7,6 @@
units/sele_infantry_spearman_e
- units/seleucids/thureophoros_a.xml
+ units/seleucids/infantry_spearman_a.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
index a39e64d5ee..d864d3cc03 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_b.xml
@@ -18,6 +18,6 @@
units/sele_infantry_spearman_a
- units/seleucids/thureophoros_b.xml
+ units/seleucids/infantry_spearman_b.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_e.xml b/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_e.xml
index 761bba90d8..afe87d210c 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_infantry_spearman_e.xml
@@ -5,6 +5,6 @@
- units/seleucids/thureophoros_e.xml
+ units/seleucids/infantry_spearman_e.xml
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 d008186efd..75a2b62bbc 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
@@ -7,6 +7,6 @@
units/spart_cavalry_javelinist_e
- units/spartans/cavalry_javelinist_a.xml
+ units/spartans/cavalry_javelinist_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_b.xml
index cb936ea37f..41d8b45ade 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_javelinist_b.xml
@@ -12,6 +12,6 @@
units/spart_cavalry_javelinist_a
- units/spartans/cavalry_javelinist_b.xml
+ units/spartans/cavalry_javelinist_b_m.xml
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 7675cac651..2e0d59f4b3 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
@@ -5,6 +5,6 @@
- units/spartans/cavalry_javelinist_e.xml
+ units/spartans/cavalry_javelinist_e_m.xml
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 0b49af3630..5c08791c50 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
@@ -7,6 +7,6 @@
units/spart_cavalry_spearman_e
- units/spartans/cavalry_spearman_a.xml
+ units/spartans/cavalry_spearman_a_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml
index d70fa16a96..94cae522ae 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml
@@ -13,6 +13,6 @@
units/spart_cavalry_spearman_a
- units/spartans/cavalry_spearman_b.xml
+ units/spartans/cavalry_spearman_b_m.xml
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 dcc050da58..ea3c1d6593 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
@@ -5,6 +5,6 @@
- units/spartans/cavalry_spearman_e.xml
+ units/spartans/cavalry_spearman_e_m.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml
index b280092eec..00735a78d8 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_pike.xml
@@ -8,6 +8,6 @@
units/spart_champion_infantry_pike.png
- units/spartans/champion_pikeman.xml
+ units/spartans/infantry_pikeman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml
index 623b5317a1..6b60e681b2 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_spear.xml
@@ -8,6 +8,6 @@
units/spart_champion_infantry_spear.png
- units/spartans/champion_infantry.xml
+ units/spartans/infantry_spearman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
index a860a3fdfd..e158d95175 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
@@ -30,6 +30,6 @@
- units/spartans/champion_infantry_sword.xml
+ units/spartans/infantry_swordsman_c.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml b/binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml
index f9d309d058..b173535eb8 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_hero_agis.xml
@@ -11,6 +11,6 @@
units/spart_hero_agis.png
- units/spartans/agis.xml
+ units/spartans/hero_infantry_spearman_agis.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml b/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
index d82f5db31e..a4a18749ba 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_hero_brasidas.xml
@@ -11,6 +11,6 @@
units/spart_hero_brasidas.png
- units/spartans/brasidas.xml
+ units/spartans/hero_infantry_swordsman_brasidas.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml b/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
index fd1203533a..364bf563a2 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas.xml
@@ -11,6 +11,6 @@
units/spart_hero_leonidas.png
- units/spartans/leonidas.xml
+ units/spartans/hero_infantry_spearman_leonidas.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml
index e2540792c7..b279cef086 100644
--- a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml
+++ b/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml
@@ -4,6 +4,6 @@
units/spart_hero_leonidas_300.png
- units/spartans/leonidas_300.xml
+ units/spartans/hero_infantry_spearman_leonidas_300.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml b/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml
index 3c032589e0..fbb828b53a 100644
--- a/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml
+++ b/binaries/data/mods/public/simulation/templates/units/thebes_sacred_band_hoplitai.xml
@@ -9,6 +9,6 @@
units/thebes_sacred_band_hoplitai.png
- units/hellenes/champion_sacred_band.xml
+ units/hellenes/infantry_spearman_c_sacred_band.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml b/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml
index 148ce21c04..89884cc120 100644
--- a/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml
+++ b/binaries/data/mods/public/simulation/templates/units/thespian_melanochitones.xml
@@ -8,6 +8,6 @@
units/thespian_melanochitones.png
- units/hellenes/thespian.xml
+ units/hellenes/infantry_swordsman_c_thespian.xml