Update the templates to match the new unit names.

Rename ptol cavalry to camelry to better reflect what they are. Update the maps accordingly. This was SVN commit r21202.
2018-02-13 01:00:21 +00:00
parent 95b700d73c
commit 03f064f0a1
233 changed files with 256 additions and 237 deletions
@@ -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 }
 	],
@@ -5,6 +5,6 @@
    <Icon>units/brit_wolfhound.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/wolfhound.xml</Actor>
+    <Actor>units/britons/wolfhound.xml</Actor>
  </VisualActor>
 </Entity>
@@ -8,6 +8,6 @@
    <general>units/{civ}_cavalry_javelinist_b</general>
  </SkirmishReplacer>
  <VisualActor>
-    <Actor>units/athenians/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/athenians/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -20,6 +20,12 @@
  <Obstruction>
    <Static width="20.0" depth="20.0"/>
  </Obstruction>
+  <ProductionQueue>
+    <Entities datatype="tokens">
+      -units/{civ}_cavalry_archer_b
+      units/{civ}_camelry_archer_b
+    </Entities>
+  </ProductionQueue>
  <VisualActor>
    <Actor>structures/ptolemies/barracks.xml</Actor>
  </VisualActor>
@@ -15,7 +15,7 @@
    <Entities datatype="tokens">
      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
@@ -7,6 +7,6 @@
    <Entity>units/athen_cavalry_javelinist_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/athenians/cavalry_javelinist_a.xml</Actor>
+    <Actor>units/athenians/cavalry_javelinist_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Entity>units/athen_cavalry_javelinist_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/athenians/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/athenians/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/athenians/cavalry_javelinist_e.xml</Actor>
+    <Actor>units/athenians/cavalry_javelinist_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/athen_cavalry_swordsman_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/athenians/cavalry_swordsman_a.xml</Actor>
+    <Actor>units/athenians/cavalry_swordsman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -13,6 +13,6 @@
    <Entity>units/athen_cavalry_swordsman_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/athenians/cavalry_swordsman_b.xml</Actor>
+    <Actor>units/athenians/cavalry_swordsman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/athenians/cavalry_swordsman_e.xml</Actor>
+    <Actor>units/athenians/cavalry_swordsman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -8,6 +8,6 @@
    <Icon>units/athen_champion_infantry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/athenians/champion_unit_spear.xml</Actor>
+    <Actor>units/athenians/infantry_spearman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
  </Identity>
  <VisualActor>
-    <Actor>units/athenians/champion_unit_marine.xml</Actor>
+    <Actor>units/athenians/infantry_swordsman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -8,6 +8,6 @@
    <Icon>units/athen_champion_ranged.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/athenians/champion_unit_ranged.xml</Actor>
+    <Actor>units/athenians/infantry_archer_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -23,6 +23,6 @@
    <Icon>units/athen_champion_ranged.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/athenians/champion_unit_gastraphetes.xml</Actor>
+    <Actor>units/athenians/infantry_crossbowman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Icon>units/athen_hero_iphicrates.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/athenians/iphicrates.xml</Actor>
+    <Actor>units/athenians/hero_infantry_javelinist_iphicrates.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Icon>units/athen_hero_pericles.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/athenians/pericles.xml</Actor>
+    <Actor>units/athenians/hero_infantry_spearman_pericles.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Icon>units/athen_hero_themistocles.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/athenians/themistocles.xml</Actor>
+    <Actor>units/athenians/hero_infantry_swordsman_themistocles.xml</Actor>
  </VisualActor>
 </Entity>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_infantry_javelinist">
+  <Identity>
+    <Civ>athen</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Iphicrates</GenericName>
+    <SpecificName>Iphikratēs</SpecificName>
+    <Icon>units/athen_hero_iphicrates.png</Icon>
+  </Identity>
+  <VisualActor>
+    <Actor>units/athenians/hero_infantry_javelinist_xenophon.xml</Actor>
+  </VisualActor>
+</Entity>
@@ -7,6 +7,6 @@
    <Entity>units/brit_cavalry_javelinist_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_javelinist_a.xml</Actor>
+    <Actor>units/celts/cavalry_javelinist_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Entity>units/brit_cavalry_javelinist_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/celts/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/celts/cavalry_javelinist_e.xml</Actor>
+    <Actor>units/celts/cavalry_javelinist_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Icon>units/brit_hero_boudicca.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/boudicca_horse.xml</Actor>
+    <Actor>units/britons/hero_cavalry_javelinist_boudicca_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/brit_cavalry_swordsman_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_a.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Entity>units/brit_cavalry_swordsman_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_b.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_e.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -13,6 +13,6 @@
    <Icon>units/brit_champion_chariot.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/champion_unit_4.xml</Actor>
+    <Actor>units/britons/chariot_javelinist_c_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -8,6 +8,6 @@
    <Icon>units/brit_champion_infantry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/champion_unit_3.xml</Actor>
+    <Actor>units/britons/infantry_swordsman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -16,6 +16,6 @@
    <Icon>units/brit_hero_boudicca.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/boudicca_chariot.xml</Actor>
+    <Actor>units/britons/hero_chariot_javelinist_boudicca_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Icon>units/brit_hero_boudicca.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/boudicca.xml</Actor>
+    <Actor>units/britons/hero_infantry_swordsman_boudicca.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/brit_hero_caratacos.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/caradoc.xml</Actor>
+    <Actor>units/britons/hero_infantry_swordsman_caratacos.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/brit_hero_cunobelin.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/cunobelin_horse.xml</Actor>
+    <Actor>units/britons/hero_cavalry_swordsman_cunobelin_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/celt_hero_cunobelin.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/cunobelin.xml</Actor>
+    <Actor>units/britons/hero_infantry_swordsman_cunobelin.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/brit_war_dog_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_spearman_a.xml</Actor>
+    <Actor>units/britons/war_dog_mastiff_a.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Entity>units/brit_war_dog_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_spearman_b.xml</Actor>
+    <Actor>units/britons/war_dog_mastiff_b.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/celts/cavalry_spearman_e.xml</Actor>
+    <Actor>units/britons/war_dog_mastiff_e.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/cart_cavalry_javelinist_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_javelinist_a.xml</Actor>
+    <Actor>units/carthaginians/cavalry_javelinist_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Entity>units/cart_cavalry_javelinist_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/carthaginians/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_javelinist_e.xml</Actor>
+    <Actor>units/carthaginians/cavalry_javelinist_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/cart_cavalry_spearman_ital_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_spearman_a.xml</Actor>
+    <Actor>units/carthaginians/cavalry_spearman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -20,6 +20,6 @@
    <Entity>units/cart_cavalry_spearman_ital_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_spearman_b.xml</Actor>
+    <Actor>units/carthaginians/cavalry_spearman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_spearman_e.xml</Actor>
+    <Actor>units/carthaginians/cavalry_spearman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/cart_cavalry_swordsman_gaul_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_a.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -20,6 +20,6 @@
    <Entity>units/cart_cavalry_swordsman_gaul_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_b.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_e.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/cart_cavalry_swordsman_iber_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_swordsman_a.xml</Actor>
+    <Actor>units/carthaginians/cavalry_swordsman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -20,6 +20,6 @@
    <Entity>units/cart_cavalry_swordsman_iber_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_swordsman_b.xml</Actor>
+    <Actor>units/carthaginians/cavalry_swordsman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/carthaginians/cavalry_swordsman_e.xml</Actor>
+    <Actor>units/carthaginians/cavalry_swordsman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Icon>units/cart_champion_cavalry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/carthaginians/champion_unit_3.xml</Actor>
+    <Actor>units/carthaginians/cavalry_spearman_c_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Icon>units/cart_champion_elephant.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/carthaginians/champion_unit_2.xml</Actor>
+    <Actor>units/carthaginians/elephantry_c_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Icon>units/cart_champion_infantry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/carthaginians/champion_spearman.xml</Actor>
+    <Actor>units/carthaginians/infantry_spearman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Icon>units/cart_champion_infantry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/carthaginians/champion_unit_1.xml</Actor>
+    <Actor>units/carthaginians/infantry_pikeman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Icon>units/cart_hero_hamilcar.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/carthaginians/hero_hamilcar_horse.xml</Actor>
+    <Actor>units/carthaginians/hero_cavalry_swordsman_hamilcar_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Icon>units/cart_hero_hannibal.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/carthaginians/hero_hannibal_mount.xml</Actor>
+    <Actor>units/carthaginians/hero_elephantry_hannibal_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Icon>units/cart_hero_maharbal.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/carthaginians/hero_maharbal_horse.xml</Actor>
+    <Actor>units/carthaginians/hero_cavalry_spearman_maharbal_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/gaul_cavalry_javelinist_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_javelinist_a.xml</Actor>
+    <Actor>units/celts/cavalry_javelinist_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Entity>units/gaul_cavalry_javelinist_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/celts/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/celts/cavalry_javelinist_e.xml</Actor>
+    <Actor>units/celts/cavalry_javelinist_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/gaul_cavalry_swordsman_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_a.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Entity>units/gaul_cavalry_swordsman_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_b.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/celts/cavalry_swordsman_e.xml</Actor>
+    <Actor>units/celts/cavalry_swordsman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -8,6 +8,6 @@
    <Icon>units/gaul_champion_cavalry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/champion_unit_2.xml</Actor>
+    <Actor>units/gauls/cavalry_spearman_c_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -28,6 +28,6 @@
    </Run>
  </UnitMotion>
  <VisualActor>
-    <Actor>units/celts/fanatic.xml</Actor>
+    <Actor>units/gauls/infantry_spearman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -8,6 +8,6 @@
    <Icon>units/gaul_champion_infantry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/champion_unit_1.xml</Actor>
+    <Actor>units/gauls/infantry_swordsman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/gaul_hero_brennus.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/brennus.xml</Actor>
+    <Actor>units/gauls/hero_infantry_swordsman_brennus.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/gaul_hero_vercingetorix.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/vercingetorix_horse.xml</Actor>
+    <Actor>units/gauls/hero_cavalry_swordsman_vercingetorix_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/gaul_hero_viridomarus.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/viridomarus.xml</Actor>
+    <Actor>units/gauls/hero_infantry_spearman_viridomarus.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,7 +9,7 @@
    <Icon>units/gaul_hero_vercingetorix.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/celts/vercingetorix.xml</Actor>
+    <Actor>units/gauls/hero_infantry_swordsman_vercingetorix.xml</Actor>
  </VisualActor>
 </Entity>

@@ -7,6 +7,6 @@
    <Entity>units/iber_cavalry_javelinist_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/iberians/cavalry_javelinist_a.xml</Actor>
+    <Actor>units/iberians/cavalry_javelinist_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Entity>units/iber_cavalry_javelinist_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/iberians/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/iberians/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/iberians/cavalry_javelinist_e.xml</Actor>
+    <Actor>units/iberians/cavalry_javelinist_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/iber_cavalry_spearman_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/iberians/cavalry_spearman_a.xml</Actor>
+    <Actor>units/iberians/cavalry_spearman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Entity>units/iber_cavalry_spearman_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/iberians/cavalry_spearman_b.xml</Actor>
+    <Actor>units/iberians/cavalry_spearman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/iberians/cavalry_spearman_e.xml</Actor>
+    <Actor>units/iberians/cavalry_spearman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -14,6 +14,6 @@
    <Tooltip>Special: Flaming javelins. Good vs. Buildings.</Tooltip>
  </Identity>
  <VisualActor>
-    <Actor>units/iberians/champion_unit_2.xml</Actor>
+    <Actor>units/iberians/cavalry_javelinist_c_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <SelectionGroupName>units/iber_champion_infantry</SelectionGroupName>
  </Identity>
  <VisualActor>
-    <Actor>units/iberians/champion_unit_1.xml</Actor>
+    <Actor>units/iberians/infantry_swordsman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Icon>units/iber_hero_caros.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/iberians/hero_caros.xml</Actor>
+    <Actor>units/iberians/hero_infantry_swordsman_caros.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/iber_hero_indibil.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/iberians/hero_indibil_horse.xml</Actor>
+    <Actor>units/iberians/hero_cavalry_spearman_indibil_h.xml</Actor>
  </VisualActor>
 </Entity>
@@ -10,6 +10,6 @@
    <Icon>units/iber_hero_viriato.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/iberians/hero_viriato.xml</Actor>
+    <Actor>units/iberians/hero_infantry_swordsman_viriato.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/iber_hero_indibil.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/iberians/hero_indibil_infantry.xml</Actor>
+    <Actor>units/iberians/hero_infantry_spearman_indibil.xml</Actor>
  </VisualActor>
 </Entity>
@@ -26,6 +26,6 @@
    </SoundGroups>
  </Sound>
  <VisualActor>
-    <Actor>units/kushites/camelry_javelinist_b.xml</Actor>
+    <Actor>units/kushites/camelry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/kush_cavalry_javelinist_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/kushites/cavalry_javelinist_a.xml</Actor>
+    <Actor>units/kushites/cavalry_javelinist_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Entity>units/kush_cavalry_javelinist_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/kushites/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/kushites/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/kushites/cavalry_javelinist_e.xml</Actor>
+    <Actor>units/kushites/cavalry_javelinist_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/kush_cavalry_spearman_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/kushites/cavalry_spearman_a.xml</Actor>
+    <Actor>units/kushites/cavalry_spearman_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Entity>units/kush_cavalry_spearman_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/kushites/cavalry_spearman_b.xml</Actor>
+    <Actor>units/kushites/cavalry_spearman_b_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -5,6 +5,6 @@
  </Identity>
  <Promotion disable=""/>
  <VisualActor>
-    <Actor>units/kushites/cavalry_spearman_e.xml</Actor>
+    <Actor>units/kushites/cavalry_spearman_e_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Icon>units/kush_champion_cavalry.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/kushites/cavalry_spearman_champion.xml</Actor>
+    <Actor>units/kushites/cavalry_spearman_c_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Icon>units/kush_champion_elephant.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/kushites/elephant_champion.xml</Actor>
+    <Actor>units/kushites/elephantry_c_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Icon>units/kush_champion_archer.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/kushites/infantry_archer_champion.xml</Actor>
+    <Actor>units/kushites/infantry_archer_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -8,6 +8,6 @@
    <Icon>units/kush_champion_amun.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/kushites/infantry_swordsman_champion.xml</Actor>
+    <Actor>units/kushites/infantry_swordsman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -9,6 +9,6 @@
    <Icon>units/kush_champion_apedemak.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/kushites/infantry_axeman_champion.xml</Actor>
+    <Actor>units/kushites/infantry_axeman_c.xml</Actor>
  </VisualActor>
 </Entity>
@@ -11,6 +11,6 @@
    <Icon>units/ptol_hero_cleopatra.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/kushites/infantry_archer_hero_amanirenas.xml</Actor>
+    <Actor>units/kushites/hero_infantry_archer_amanirenas.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Icon>units/mace_hero_philip.png</Icon>
  </Identity>
  <VisualActor>
-    <Actor>units/ptolemies/hero_ptolemy_IV.xml</Actor>
+    <Actor>units/ptolemies/hero_cavalry_swordsman_ptolemy_IV_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -12,6 +12,6 @@
    <Tooltip>Hero Special: "Gift of Warships" - Allows the training of Ptolemaic trireme-class ships.</Tooltip>
  </Identity>
  <VisualActor>
-    <Actor>units/kushites/cavalry_spearman_hero_nastasen.xml</Actor>
+    <Actor>units/kushites/hero_cavalry_spearman_nastasen_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -7,6 +7,6 @@
    <Entity>units/mace_cavalry_javelinist_e</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/macedonians/cavalry_javelinist_a.xml</Actor>
+    <Actor>units/macedonians/cavalry_javelinist_a_m.xml</Actor>
  </VisualActor>
 </Entity>
@@ -20,6 +20,6 @@
    <Entity>units/mace_cavalry_javelinist_a</Entity>
  </Promotion>
  <VisualActor>
-    <Actor>units/macedonians/cavalry_javelinist_b.xml</Actor>
+    <Actor>units/macedonians/cavalry_javelinist_b_m.xml</Actor>
  </VisualActor>
 </Entity>
--- a/Show More
+++ b/Show More