Mixins: Remove the special mercenary technology, apply template changes directly.

Reviewed By: Freagarach Differential Revision: https://code.wildfiregames.com/D3832 This was SVN commit r25238.
2026-06-16 13:23:56 -07:00 · 2021-04-12 11:28:18 +00:00 · 2021-04-12 11:28:18 +00:00 · 37790e099c
commit 37790e099c
parent 318a5d7a2b
37 changed files with 87 additions and 86 deletions
--- a/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
+++ b/binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json
@ -1,22 +0,0 @@
-{
-	"autoResearch": true,
-	"icon": "coins.png",
-	"tooltip": "Non-Champion Mercenaries −60% food cost, no wood or stone costs, −30% training time, and unable to gather resources; Infantry costs 60 metal, Cavalry 80 metal, Elephants 120 metal.",
-	"modifications": [
-		{ "value": "Cost/BuildTime", "multiply": 0.7 },
-		{ "value": "Cost/Resources/food", "multiply": 0.4 },
-		{ "value": "Cost/Resources/wood", "replace": 0 },
-		{ "value": "Cost/Resources/stone", "replace": 0 },
-		{ "value": "Cost/Resources/metal", "replace": 60, "affects": "Infantry" },
-		{ "value": "Cost/Resources/metal", "replace": 80, "affects": "Cavalry" },
-		{ "value": "Cost/Resources/metal", "replace": 120, "affects": "Elephant" },
-		{ "value": "Loot/food", "multiply": 0.4 },
-		{ "value": "Loot/wood", "replace": 0 },
-		{ "value": "Loot/stone", "replace": 0 },
-		{ "value": "Loot/metal", "replace": 6, "affects": "Infantry" },
-		{ "value": "Loot/metal", "replace": 8, "affects": "Cavalry" },
-		{ "value": "Loot/metal", "replace": 12, "affects": "Elephant" },
-		{ "value": "ResourceGatherer/BaseSpeed", "replace": 0 }
-	],
-	"affects": ["Mercenary !Champion"]
-}
--- a/binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/merc_cav.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="mercenary">
+  <Cost>
+    <Resources>
+      <metal>80</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>8</metal>
+  </Loot>
+</Entity>
--- a/binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/merc_ele.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="mercenary">
+  <Cost>
+    <Resources>
+      <metal>120</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>12</metal>
+  </Loot>
+</Entity>
--- a/binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/merc_inf.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity parent="mercenary">
+  <Cost>
+    <Resources>
+      <metal>60</metal>
+    </Resources>
+  </Cost>
+  <Loot>
+    <metal>6</metal>
+  </Loot>
+</Entity>
--- a/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Cost>
+    <BuildTime op="mul">0.7</BuildTime>
+    <Resources>
+      <food op="mul">0.4</food>
+      <wood>0</wood>
+      <stone>0</stone>
+      <!-- Metal is specified on a per-class basis in derived templates. -->
+    </Resources>
+  </Cost>
+  <Identity>
+    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
+  </Identity>
+  <Loot>
+    <food op="mul">0.4</food>
+    <wood>0</wood>
+    <stone>0</stone>
+  </Loot>
+  <ResourceGatherer disable=""/>
+</Entity>
--- a/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
  <Builder>
    <Entities datatype="tokens">
      structures/athen/gymnasium
@ -12,7 +12,6 @@
    <SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
    <GenericName>Thracian Peltast</GenericName>
    <SpecificName>Peltastḗs Thrâx</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/athen_infantry_javelinist.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
  <Builder>
    <Entities datatype="tokens">
      structures/athen/gymnasium
@ -12,7 +12,6 @@
    <SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
    <GenericName>Cretan Mercenary Archer</GenericName>
    <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_infantry_archer.png</Icon>
    <RequiredTechnology>iphicratean_reforms</RequiredTechnology>
  </Identity>
--- 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
@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_spearman">
  <Identity>
    <Civ>cart</Civ>
    <GenericName>Italic Cavalry</GenericName>
    <SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
    <SelectionGroupName>units/cart/cavalry_spearman_ital_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_cavalry_spearman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- 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
@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_swordsman">
  <Identity>
    <Civ>cart</Civ>
    <GenericName>Gallic Mercenary Cavalry</GenericName>
    <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
    <SelectionGroupName>units/cart/cavalry_swordsman_gaul_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_cavalry_swordsman_2.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- 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
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_swordsman">
  <Attack>
    <Melee>
      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
@ -10,7 +10,6 @@
    <GenericName>Iberian Heavy Cavalry</GenericName>
    <SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
    <SelectionGroupName>units/cart/cavalry_swordsman_iber_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_cavalry_swordsman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
  <Builder>
    <Entities datatype="tokens">
      structures/{civ}/super_dock
@ -13,7 +13,6 @@
    <GenericName>Iberian Mercenary Skirmisher</GenericName>
    <SpecificName>Sǝḫīr Kidōn</SpecificName>
    <SelectionGroupName>units/cart/infantry_javelineer_iber_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_infantry_javelinist.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
+<Entity parent="merc_inf|template_unit_infantry_ranged_slinger">
  <Builder>
    <Entities datatype="tokens">
      structures/{civ}/super_dock
@ -13,7 +13,6 @@
    <GenericName>Balearic Slinger</GenericName>
    <SpecificName>Qallāʿ Ibušimi</SpecificName>
    <SelectionGroupName>units/cart/infantry_slinger_iber_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_infantry_slinger.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
  <Builder>
    <Entities datatype="tokens">
      structures/{civ}/super_dock
@ -13,7 +13,6 @@
    <GenericName>Gallic Mercenary Swordsman</GenericName>
    <SpecificName>Seḫīr Ḥerev</SpecificName>
    <SelectionGroupName>units/cart/infantry_swordsman_gaul_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_infantry_swordsman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
  <Builder>
    <Entities datatype="tokens">
      structures/{civ}/super_dock
@ -13,7 +13,6 @@
    <GenericName>Samnite Swordsman</GenericName>
    <SpecificName>Seḫīr Romaḥ</SpecificName>
    <SelectionGroupName>units/cart/infantry_swordsman_ital_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_infantry_swordsman_2.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="merc_cav|template_unit_cavalry_ranged_javelineer">
  <Attack>
    <Ranged>
      <Projectile>
@ -16,7 +16,7 @@
    <SelectionGroupName>units/kush/cavalry_javelineer_merc_b</SelectionGroupName>
    <GenericName>Blemmye Desert Raider</GenericName>
    <SpecificName>nhw Bulahau gml</SpecificName>
-    <VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
+    <VisibleClasses datatype="tokens">Camel</VisibleClasses>
    <Icon>units/kush_camel_javelinist.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
  <Builder>
    <Entities datatype="tokens">
      structures/kush/pyramid_small
@ -15,7 +15,6 @@
    <SelectionGroupName>units/kush/infantry_javelineer_merc_b</SelectionGroupName>
    <GenericName>Noba Skirmisher</GenericName>
    <SpecificName>nhw ʿhȝw Noba</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/kush_infantry_javelinist.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_maceman">
+<Entity parent="merc_inf|template_unit_infantry_melee_maceman">
  <Builder>
    <Entities datatype="tokens">
      structures/kush/pyramid_small
@ -15,7 +15,6 @@
    <SelectionGroupName>units/kush/infantry_maceman_b</SelectionGroupName>
    <GenericName>Noba Maceman</GenericName>
    <SpecificName>nhw Noba</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/kush_infantry_maceman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="merc_cav|template_unit_cavalry_ranged_javelineer">
  <Identity>
    <Civ>mace</Civ>
    <Lang>greek</Lang>
    <SelectionGroupName>units/mace/cavalry_javelineer_b</SelectionGroupName>
    <GenericName>Odrysian Skirmish Cavalry</GenericName>
    <SpecificName>Hippakontistḕs Odrysós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_cavalry_javelinist.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
  <Identity>
    <Civ>mace</Civ>
    <Lang>greek</Lang>
    <SelectionGroupName>units/mace/infantry_archer_b</SelectionGroupName>
    <GenericName>Cretan Mercenary Archer</GenericName>
    <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_infantry_archer.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
+<Entity parent="merc_inf|template_unit_infantry_ranged_slinger">
  <Identity>
    <Civ>mace</Civ>
    <Lang>greek</Lang>
    <SelectionGroupName>units/mace/infantry_slinger_b</SelectionGroupName>
    <GenericName>Rhodian Slinger</GenericName>
    <SpecificName>Sphendonḗtēs Rhódios</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_infantry_slinger.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="merc_inf|template_unit_champion_infantry_swordsman">
  <Attack>
    <Melee>
      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
@ -9,7 +9,6 @@
    <Lang>greek</Lang>
    <GenericName>Thracian Black Cloak</GenericName>
    <SpecificName>Rhomphaiophoros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/sele_infantry_swordsman.png</Icon>
  </Identity>
  <VisualActor>
--- a/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="merc_inf|template_unit_champion_infantry_swordsman">
  <Attack>
    <Melee>
      <Damage>
@ -11,7 +11,6 @@
    <Lang>greek</Lang>
    <GenericName>Armored Swordsman</GenericName>
    <SpecificName>Thōrakitēs</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_thorakites.png</Icon>
  </Identity>
  <Resistance>
--- a/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml
@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="merc_inf|template_unit_champion_infantry_javelineer">
  <Identity>
    <Lang>greek</Lang>
    <GenericName>Heavy Skirmisher</GenericName>
    <SpecificName>Thyreophoros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_thureophoros.png</Icon>
  </Identity>
  <VisualActor>
--- a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="merc_inf|hoplite|template_unit_champion_infantry_spearman">
  <Identity>
    <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Lang>persian</Lang>
    <GenericName>Cardaces Hoplite</GenericName>
    <SpecificName>Hoplites Kardakes</SpecificName>
--- a/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml
@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="merc_inf|template_unit_champion_infantry_javelineer">
  <Identity>
    <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Lang>persian</Lang>
    <GenericName>Cardaces Skirmisher</GenericName>
    <SpecificName>Peltastes Kardakes</SpecificName>
--- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="merc_cav|template_unit_cavalry_ranged_javelineer">
  <Identity>
    <Civ>ptol</Civ>
    <SelectionGroupName>units/ptol/cavalry_javelineer_merc_b</SelectionGroupName>
    <GenericName>Tarantine Settler Cavalry</GenericName>
    <SpecificName>Hippeús Tarantînos</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_cavalry_javelinist.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- 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
@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_spearman">
  <Identity>
    <Civ>ptol</Civ>
    <SelectionGroupName>units/ptol/cavalry_spearman_merc_b</SelectionGroupName>
    <GenericName>Macedonian Settler Cavalry</GenericName>
    <SpecificName>Hippeús Makedonikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/ptol_cavalry_spearman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
  <Builder>
    <Entities datatype="tokens">
      structures/ptol/lighthouse
@ -11,7 +11,6 @@
    <SelectionGroupName>units/ptol/infantry_archer_b</SelectionGroupName>
    <GenericName>Cretan Mercenary Archer</GenericName>
    <SpecificName>Toxótēs Krētikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_infantry_archer.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_javelineer">
  <Builder>
    <Entities datatype="tokens">
      structures/ptol/lighthouse
@ -11,7 +11,6 @@
    <SelectionGroupName>units/ptol/infantry_javelineer_b</SelectionGroupName>
    <GenericName>Mercenary Thureos Skirmisher</GenericName>
    <SpecificName>Thureophóros Akrobolistḗs</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/ptol_infantry_javelinist_merc.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- 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
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_infantry_melee_spearman">
+<Entity parent="merc_inf|hoplite|template_unit_infantry_melee_spearman">
  <Builder>
    <Entities datatype="tokens">
      structures/ptol/lighthouse
@ -11,7 +11,6 @@
    <SelectionGroupName>units/ptol/infantry_spearman_merc_b</SelectionGroupName>
    <GenericName>Mercenary Thureos Spearman</GenericName>
    <SpecificName>Thureophóros Misthophóros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/ptol_infantry_spearman_2.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
  <Builder>
    <Entities datatype="tokens">
      structures/ptol/lighthouse
@ -11,7 +11,6 @@
    <GenericName>Gallic Mercenary Swordsman</GenericName>
    <SpecificName>Gallikós Mistophorós</SpecificName>
    <SelectionGroupName>units/ptol/infantry_swordsman_merc_b</SelectionGroupName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/cart_infantry_swordsman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="merc_inf|template_unit_champion_infantry_javelineer">
  <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <GenericName>Samnite Skirmisher</GenericName>
    <SpecificName>Samnite Skirmisher</SpecificName>
    <Icon>units/samnite_skirmisher.png</Icon>
--- a/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="merc_inf|hoplite|template_unit_champion_infantry_spearman">
  <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <GenericName>Samnite Spearman</GenericName>
    <SpecificName>Samnite Spearman</SpecificName>
    <Icon>units/samnite_spearman.png</Icon>
--- a/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="merc_inf|template_unit_champion_infantry_swordsman">
  <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <GenericName>Samnite Swordsman</GenericName>
    <SpecificName>Samnite Swordsman</SpecificName>
    <Icon>units/samnite_swordsman.png</Icon>
--- 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
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="merc_cav|template_unit_cavalry_melee_spearman">
  <Identity>
    <Civ>sele</Civ>
    <Lang>greek</Lang>
    <SelectionGroupName>units/sele/cavalry_spearman_merc_b</SelectionGroupName>
    <GenericName>Companion Cavalry</GenericName>
    <SpecificName>Hippos Hetairike</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/mace_cavalry_spearman_merc.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="merc_inf|template_unit_infantry_ranged_archer">
  <Identity>
    <Civ>sele</Civ>
    <Lang>greek</Lang>
    <SelectionGroupName>units/sele/infantry_archer_merc_b</SelectionGroupName>
    <GenericName>Syrian Archer</GenericName>
    <SpecificName>Toxótēs Syrías</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/sele_infantry_archer.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>
--- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="merc_inf|template_unit_infantry_melee_swordsman">
  <Attack>
    <Melee>
      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
@ -11,7 +11,6 @@
    <SelectionGroupName>units/sele/infantry_swordsman_merc_b</SelectionGroupName>
    <GenericName>Thracian Mercenary Swordsman</GenericName>
    <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
    <Icon>units/sele_infantry_swordsman.png</Icon>
    <RequiredTechnology>phase_town</RequiredTechnology>
  </Identity>