Changeset 25238

Timestamp:

Apr 12, 2021, 1:28:18 PM (3 years ago)

Author:

wraitii

Message:

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

Reviewed By: Freagarach

Differential Revision: ​https://code.wildfiregames.com/D3832

Location:

ps/trunk/binaries/data/mods/public/simulation

Files:

• data/technologies/unit_mercenary.json (deleted)
• templates/mixins/merc_cav.xml (added)
• templates/mixins/merc_ele.xml (added)
• templates/mixins/merc_inf.xml (added)
• templates/mixins/mercenary.xml (added)
• templates/units/athen/infantry_javelineer_b.xml (modified) (2 diffs)
• templates/units/athen/infantry_marine_archer_b.xml (modified) (2 diffs)
• templates/units/cart/cavalry_spearman_ital_b.xml (modified) (2 diffs)
• templates/units/cart/cavalry_swordsman_gaul_b.xml (modified) (2 diffs)
• templates/units/cart/cavalry_swordsman_iber_b.xml (modified) (2 diffs)
• templates/units/cart/infantry_javelineer_iber_b.xml (modified) (2 diffs)
• templates/units/cart/infantry_slinger_iber_b.xml (modified) (2 diffs)
• templates/units/cart/infantry_swordsman_gaul_b.xml (modified) (2 diffs)
• templates/units/cart/infantry_swordsman_ital_b.xml (modified) (2 diffs)
• templates/units/kush/cavalry_javelineer_merc_b.xml (modified) (2 diffs)
• templates/units/kush/infantry_javelineer_merc_b.xml (modified) (2 diffs)
• templates/units/kush/infantry_maceman_merc_b.xml (modified) (2 diffs)
• templates/units/mace/cavalry_javelineer_b.xml (modified) (2 diffs)
• templates/units/mace/infantry_archer_b.xml (modified) (2 diffs)
• templates/units/mace/infantry_slinger_b.xml (modified) (2 diffs)
• templates/units/merc_black_cloak.xml (modified) (2 diffs)
• templates/units/merc_thorakites.xml (modified) (2 diffs)
• templates/units/merc_thureophoros.xml (modified) (1 diff)
• templates/units/pers/kardakes_hoplite.xml (modified) (1 diff)
• templates/units/pers/kardakes_skirmisher.xml (modified) (1 diff)
• templates/units/ptol/cavalry_javelineer_merc_b.xml (modified) (2 diffs)
• templates/units/ptol/cavalry_spearman_merc_b.xml (modified) (2 diffs)
• templates/units/ptol/infantry_archer_b.xml (modified) (2 diffs)
• templates/units/ptol/infantry_javelineer_b.xml (modified) (2 diffs)
• templates/units/ptol/infantry_spearman_merc_b.xml (modified) (2 diffs)
• templates/units/ptol/infantry_swordsman_merc_b.xml (modified) (2 diffs)
• templates/units/samnite_skirmisher.xml (modified) (1 diff)
• templates/units/samnite_spearman.xml (modified) (1 diff)
• templates/units/samnite_swordsman.xml (modified) (1 diff)
• templates/units/sele/cavalry_spearman_merc_b.xml (modified) (2 diffs)
• templates/units/sele/infantry_archer_merc_b.xml (modified) (2 diffs)
• templates/units/sele/infantry_swordsman_merc_b.xml (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
@@ -13 +13 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
@@ -13 +13 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>cart</Civ>
@@ -6 +6 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_melee_swordsman">
   <Identity>
     <Civ>cart</Civ>
@@ -6 +6 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_swordsman">
+<Entity parent="template_unit_cavalry_melee_swordsman">
   <Attack>
     <Melee>
@@ -11 +11 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
@@ -14 +14 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
+<Entity parent="template_unit_infantry_ranged_slinger">
   <Builder>
     <Entities datatype="tokens">
@@ -14 +14 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
@@ -14 +14 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
@@ -14 +14 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_ranged_javelineer">
   <Attack>
     <Ranged>
@@ -17 +17 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
@@ -16 +16 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_maceman">
+<Entity parent="template_unit_infantry_melee_maceman">
   <Builder>
     <Entities datatype="tokens">
@@ -16 +16 @@
     <GenericName>Noba Maceman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/kush_infantry_maceman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>

ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_ranged_javelineer">
   <Identity>
     <Civ>mace</Civ>
@@ -7 +7 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="template_unit_infantry_ranged_archer">
   <Identity>
     <Civ>mace</Civ>
@@ -7 +7 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_slinger">
+<Entity parent="template_unit_infantry_ranged_slinger">
   <Identity>
     <Civ>mace</Civ>
@@ -7 +7 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
@@ -10 +10 @@
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiophoros</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
   </Identity>

ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="template_unit_champion_infantry_swordsman">
   <Attack>
     <Melee>
@@ -12 +12 @@
     <GenericName>Armored Swordsman</GenericName>
     <SpecificName>Thōrakitēs</SpecificName>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Icon>units/mace_thorakites.png</Icon>
   </Identity>

ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_hoplite.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="hoplite|template_unit_champion_infantry_spearman">
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Cardaces Hoplite</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/pers/kardakes_skirmisher.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="template_unit_champion_infantry_javelineer">
   <Identity>
     <Civ>pers</Civ>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>persian</Lang>
     <GenericName>Cardaces Skirmisher</GenericName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_ranged_javelineer">
+<Entity parent="template_unit_cavalry_ranged_javelineer">
   <Identity>
     <Civ>ptol</Civ>
@@ -6 +6 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>ptol</Civ>
@@ -6 +6 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="template_unit_infantry_ranged_archer">
   <Builder>
     <Entities datatype="tokens">
@@ -12 +12 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_javelineer">
+<Entity parent="template_unit_infantry_ranged_javelineer">
   <Builder>
     <Entities datatype="tokens">
@@ -12 +12 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_infantry_melee_spearman">
+<Entity parent="hoplite|template_unit_infantry_melee_spearman">
   <Builder>
     <Entities datatype="tokens">
@@ -12 +12 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="template_unit_infantry_melee_swordsman">
   <Builder>
     <Entities datatype="tokens">
@@ -12 +12 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_skirmisher.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_javelineer">
+<Entity parent="template_unit_champion_infantry_javelineer">
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Skirmisher</GenericName>
     <SpecificName>Samnite Skirmisher</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_spearman.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="hoplite|template_unit_champion_infantry_spearman">
+<Entity parent="hoplite|template_unit_champion_infantry_spearman">
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Spearman</GenericName>
     <SpecificName>Samnite Spearman</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/samnite_swordsman.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
+<Entity parent="template_unit_champion_infantry_swordsman">
   <Identity>
-    <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Samnite Swordsman</SpecificName>

ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_cavalry_melee_spearman">
+<Entity parent="template_unit_cavalry_melee_spearman">
   <Identity>
     <Civ>sele</Civ>
@@ -7 +7 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_ranged_archer">
+<Entity parent="template_unit_infantry_ranged_archer">
   <Identity>
     <Civ>sele</Civ>
@@ -7 +7 @@
     <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>

ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
+<Entity parent="template_unit_infantry_melee_swordsman">
   <Attack>
     <Melee>
@@ -12 +12 @@
     <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>