Index: binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/Identity.js
+++ binaries/data/mods/public/simulation/components/Identity.js
@@ -1,18 +1,18 @@
function Identity() {}
Identity.prototype.Schema =
- "Specifies various names and values associated with the unit type, typically for GUI display to users." +
+ "Specifies various names and values associated with the entity, typically for GUI display to users." +
"" +
"athen" +
"Athenian Hoplite" +
"Hoplī́tēs Athēnaïkós" +
"units/athen_infantry_spearman.png" +
"" +
- "" +
+ "" +
"" +
"" +
"" +
- "" +
+ "" +
"" +
"" +
"" +
@@ -21,11 +21,11 @@
"" +
"" +
"" +
- "" +
+ "" +
"" +
"" +
"" +
- "" +
+ "" +
"" +
"" +
"" +
@@ -54,7 +54,7 @@
"" +
"" +
"" +
- "" +
+ "" +
"" +
"tokens" +
"" +
@@ -62,7 +62,7 @@
"" +
"" +
"" +
- "" +
+ "" +
"" +
"tokens" +
"" +
Index: binaries/data/mods/public/simulation/components/TechnologyManager.js
===================================================================
--- binaries/data/mods/public/simulation/components/TechnologyManager.js
+++ binaries/data/mods/public/simulation/components/TechnologyManager.js
@@ -31,7 +31,7 @@
// This stores the modifications to unit stats from researched technologies
// Example data: {"ResourceGatherer/Rates/food.grain": [
- // {"multiply": 1.15, "affects": ["FemaleCitizen", "Infantry Sword"]},
+ // {"multiply": 1.15, "affects": ["FemaleCitizen", "Infantry Swordsman"]},
// {"add": 2}
// ]}
this.modifications = {};
Index: binaries/data/mods/public/simulation/components/tests/test_Identity.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Identity.js
+++ binaries/data/mods/public/simulation/components/tests/test_Identity.js
@@ -31,7 +31,7 @@
" good as a cheap siege weapon.",
"Rank": "Basic",
"Classes": { "_string": "CitizenSoldier Human Organic" },
- "VisibleClasses": { "_string": "Javelin" },
+ "VisibleClasses": { "_string": "Javelinist" },
"Formations": { "_string": "special/formations/skirmish" },
"Icon": "units/iber_infantry_javelinist.png",
"RequiredTechnology": "phase_town"
@@ -41,8 +41,8 @@
TS_ASSERT_EQUALS(cmpIdentity.GetLang(), "iberian");
TS_ASSERT_EQUALS(cmpIdentity.GetGender(), "female");
TS_ASSERT_EQUALS(cmpIdentity.GetRank(), "Basic");
-TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), ["CitizenSoldier", "Human", "Organic", "Javelin", "Basic"]);
-TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelin"]);
+TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetClassesList(), ["CitizenSoldier", "Human", "Organic", "Javelinist", "Basic"]);
+TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetVisibleClassesList(), ["Javelinist"]);
TS_ASSERT_EQUALS(cmpIdentity.HasClass("CitizenSoldier"), true);
TS_ASSERT_EQUALS(cmpIdentity.HasClass("Female"), false);
TS_ASSERT_UNEVAL_EQUALS(cmpIdentity.GetFormationsList(), ["special/formations/skirmish"]);
Index: binaries/data/mods/public/simulation/components/tests/test_Technologies.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Technologies.js
+++ binaries/data/mods/public/simulation/components/tests/test_Technologies.js
@@ -514,25 +514,25 @@
"modifications": [{
"value": "ResourceGatherer/Rates/food.grain",
"multiply": 15,
- "affects": "Spear Sword"
+ "affects": "Spearman Swordsman"
},
{
"value": "ResourceGatherer/Rates/food.meat",
"multiply": 10
}],
- "affects": ["Female", "CitizenSoldier Melee"]
+ "affects": ["FemaleCitizen", "CitizenSoldier Melee"]
};
let techMods = {
"ResourceGatherer/Rates/food.grain": [{
"affects": [
- ["Female", "Spear", "Sword"],
- ["CitizenSoldier", "Melee", "Spear", "Sword"]
+ ["FemaleCitizen", "Spearman", "Swordsman"],
+ ["CitizenSoldier", "Melee", "Spearman", "Swordsman"]
],
"multiply": 15
}],
"ResourceGatherer/Rates/food.meat": [{
"affects": [
- ["Female"],
+ ["FemaleCitizen"],
["CitizenSoldier", "Melee"]
],
"multiply": 10
@@ -544,37 +544,37 @@
"modifications": [{
"value": "ResourceGatherer/Rates/food.grain",
"multiply": 15,
- "affects": "Spear"
+ "affects": "Spearman"
},
{
"value": "ResourceGatherer/Rates/food.grain",
"multiply": 15,
- "affects": "Sword"
+ "affects": "Swordsman"
},
{
"value": "ResourceGatherer/Rates/food.meat",
"multiply": 10
}],
- "affects": ["Female", "CitizenSoldier Melee"]
+ "affects": ["FemaleCitizen", "CitizenSoldier Melee"]
};
techMods = {
"ResourceGatherer/Rates/food.grain": [{
"affects": [
- ["Female", "Spear"],
- ["CitizenSoldier", "Melee", "Spear"]
+ ["FemaleCitizen", "Spearman"],
+ ["CitizenSoldier", "Melee", "Spearman"]
],
"multiply": 15
},
{
"affects": [
- ["Female", "Sword"],
- ["CitizenSoldier", "Melee", "Sword"]
+ ["FemaleCitizen", "Swordsman"],
+ ["CitizenSoldier", "Melee", "Swordsman"]
],
"multiply": 15
}],
"ResourceGatherer/Rates/food.meat": [{
"affects": [
- ["Female"],
+ ["FemaleCitizen"],
["CitizenSoldier", "Melee"]
],
"multiply": 10
Index: binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
+++ binaries/data/mods/public/simulation/data/auras/teambonuses/iber_player_teambonus.json
@@ -1,6 +1,6 @@
{
"type": "global",
- "affects": ["CitizenSoldier Javelin"],
+ "affects": ["CitizenSoldier Javelinist"],
"affectedPlayers": ["ExclusiveMutualAlly"],
"modifications": [
{ "value": "Cost/Resources/food", "multiply": 0.8 },
Index: binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
+++ binaries/data/mods/public/simulation/data/auras/teambonuses/spart_player_teambonus.json
@@ -1,6 +1,6 @@
{
"type": "global",
- "affects": ["CitizenSoldier Spear Infantry"],
+ "affects": ["CitizenSoldier Infantry Spearman"],
"affectedPlayers": ["ExclusiveMutualAlly"],
"modifications": [
{ "value": "Health/Max", "multiply": 1.10 }
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/brit_catafalque_2.json
@@ -1,6 +1,6 @@
{
"type": "global",
- "affects": ["Javelin"],
+ "affects": ["Javelinist"],
"modifications": [
{ "value": "Attack/Ranged/MaxRange", "multiply": 1.2 }
],
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_1.json
@@ -1,6 +1,6 @@
{
"type": "global",
- "affects": ["CitizenSoldier Spear Infantry"],
+ "affects": ["CitizenSoldier Infantry Spearman"],
"modifications": [
{ "value": "Cost/Resources/food", "multiply": 0.9 },
{ "value": "Cost/Resources/wood", "multiply": 0.9 },
Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/catafalques/spart_catafalque_2.json
@@ -1,6 +1,6 @@
{
"type": "global",
- "affects": ["Champion Spear Infantry"],
+ "affects": ["Champion Infantry Spearman"],
"modifications": [
{ "value": "Cost/Resources/food", "multiply": 0.95 },
{ "value": "Cost/Resources/wood", "multiply": 0.95 },
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_2.json
@@ -1,6 +1,6 @@
{
"type": "global",
- "affects": ["Javelin Infantry"],
+ "affects": ["Infantry Javelinist"],
"modifications": [
{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 },
{ "value": "UnitMotion/Run/Speed", "multiply": 1.15 }
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_brasidas.json
@@ -1,7 +1,7 @@
{
"type": "range",
"radius": 60,
- "affects": ["Javelin Infantry Citizen"],
+ "affects": ["CitizenSoldier Infantry Javelinist"],
"modifications": [
{ "value": "Attack/Ranged/Pierce", "multiply": 1.25 },
{ "value": "Armour/Pierce", "add": 1 },
Index: binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
+++ binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
@@ -1,7 +1,7 @@
{
"type": "range",
"radius": 30,
- "affects": ["Spear"],
+ "affects": ["Spearman"],
"modifications": [
{ "value": "Attack/Melee/Hack", "multiply": 1.25 },
{ "value": "Attack/Melee/Pierce", "multiply": 1.25 },
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_01.json
@@ -16,6 +16,6 @@
"researchTime": 40,
"tooltip": "Infantry Spearmen +2 Pierce Armor Levels.",
"modifications": [{"value": "Armour/Pierce", "add": 2.0}],
- "affects": ["Infantry Spear"],
+ "affects": ["Infantry Spearman"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_02.json
@@ -16,6 +16,6 @@
"researchTime": 40,
"tooltip": "Infantry Spearmen +1 Pierce Armor Level.",
"modifications": [{"value": "Armour/Pierce", "add": 1.0}],
- "affects": ["Infantry Spear"],
+ "affects": ["Infantry Spearman"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
+++ binaries/data/mods/public/simulation/data/technologies/armor_infantryspearmen_pierce_03.json
@@ -17,6 +17,6 @@
"tooltip": "Infantry Spearmen +1 Pierce Armor Level.",
"modifications": [
{"value": "Armour/Pierce", "add": 1.0}],
- "affects": ["Infantry Spear"],
+ "affects": ["Infantry Spearman"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
+++ binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json
@@ -15,6 +15,6 @@
{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
{ "value": "Attack/Melee/Crush", "multiply": 1.2 }
],
- "affects": ["Sword", "Maceman"],
+ "affects": ["Swordsman", "Maceman"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
+++ binaries/data/mods/public/simulation/data/technologies/hellenes/attack_inf_spearfighting.json
@@ -13,6 +13,6 @@
"researchTime": 40,
"tooltip": "Spearmen +2 hack attack.",
"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
- "affects": ["Infantry Spear"],
+ "affects": ["Infantry Spearman"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
+++ binaries/data/mods/public/simulation/data/technologies/hellenes/spartans_agoge.json
@@ -11,6 +11,6 @@
{"value": "Health/Max", "multiply": 1.25},
{"value": "Cost/BuildTime", "multiply": 1.1}
],
- "affects": ["Spear Infantry"],
+ "affects": ["Infantry Spearman"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
\ No newline at end of file
+}
Index: binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
+++ binaries/data/mods/public/simulation/data/technologies/melee_inf_spearheads.json
@@ -15,6 +15,6 @@
"researchTime": 40,
"tooltip": "All Spear units +2 hack attack.",
"modifications": [{"value": "Attack/Melee/Hack", "add": 2.0}],
- "affects": ["Spear"],
+ "affects": ["Spearman"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
+++ binaries/data/mods/public/simulation/data/technologies/ranged_inf_skirmishers.json
@@ -19,6 +19,6 @@
{"value": "Attack/Ranged/Pierce", "add": 2.0},
{"value": "Attack/Ranged/MaxRange", "add": 4.0},
{"value": "Vision/Range", "add": 4.0}],
- "affects": ["Javelin"],
+ "affects": ["Javelinist"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
}
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -20,7 +20,7 @@
- Spear
+ Spearman
Cavalry Spearman
Counters: 1.5x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -19,7 +19,7 @@
- Sword
+ Swordsman
Cavalry Swordsman
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -19,7 +19,7 @@
- Javelin
+ Javelinist
Cavalry Skirmisher
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -22,7 +22,7 @@
- Ranged Javelin
+ Ranged Javelinist
Champion Cavalry Skirmisher
special/formations/skirmish
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -30,7 +30,7 @@
300
- Melee Spear
+ Melee Spearman
Champion Cavalry Spearman
Counters: 1.5x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -25,7 +25,7 @@
300
- Melee Sword
+ Melee Swordsman
Champion Cavalry Swordsman
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -25,7 +25,7 @@
120
- Ranged Javelin
+ Ranged Javelinist
Champion Skirmisher
special/formations/skirmish
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -31,7 +31,7 @@
200
- Melee Spear Pike
+ Melee Pikeman
Champion Pikeman
Counters: 3x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -31,7 +31,7 @@
Champion Spearman
- Melee Spear
+ Melee Spearman
Counters: 3x vs. Cavalry.
special/formations/testudo
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -25,7 +25,7 @@
200
- Melee Sword
+ Melee Swordsman
Champion Swordsman
special/formations/testudo
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -28,7 +28,7 @@
special/formations/skirmish
Hero Cavalry Skirmisher
- Javelin Ranged
+ Ranged Javelinist
1.05
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -22,7 +22,7 @@
- Melee Spear
+ Melee Spearman
Hero Cavalry Spearman
Counters: 1.5x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -22,7 +22,7 @@
- Melee Sword
+ Melee Swordsman
Hero Cavalry Swordsman
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelinist.xml
@@ -17,7 +17,7 @@
- Ranged Javelin
+ Ranged Javelinist
Hero Skirmisher
special/formations/skirmish
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -22,7 +22,7 @@
- Melee Spear Pike
+ Melee Pikeman
Hero Pikeman
Counters: 3x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -22,7 +22,7 @@
- Melee Spear
+ Melee Spearman
Hero Spearman
Counters: 3x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -22,7 +22,7 @@
- Melee Sword
+ Melee Swordsman
Hero Swordsman
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -24,7 +24,7 @@
- Spear Pike
+ Pikeman
Pikeman
Counters: 3x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -23,7 +23,7 @@
- Spear
+ Spearman
Spearman
Counters: 3x vs. Cavalry.
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -19,7 +19,7 @@
- Sword
+ Swordsman
Swordsman
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -23,7 +23,7 @@
- Javelin
+ Javelinist
Skirmisher
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -24,7 +24,7 @@
- Sling
+ Slinger
Slinger
Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
@@ -24,7 +24,7 @@
400
- -ConquestCritical
+ -ConquestCritical NavalTrader
Merchantman
phase_town
Index: binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -11,7 +11,7 @@
100
- -ConquestCritical
+ -ConquestCritical LandTrader
Trader Bribable
Trader
Trade resources between your own markets and those of your allies.
Index: binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
+++ binaries/data/mods/public/simulation/templates/units/athen_champion_ranged_gastraphetes.xml
@@ -20,6 +20,7 @@
Greek Gastraphetes
Toxótēs Skythikós
units/athen_champion_ranged.png
+ -Archer Crossbowman
units/athenians/infantry_crossbowman_c.xml
Index: binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -23,7 +23,7 @@
Meroitic Temple Guard
rs ‘Iprmk
Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes.
- Axe
+ -Swordsman Axeman
ApedemakGuard
units/kush_champion_apedemak.png
Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -31,7 +31,7 @@
nhw Noba
units/kush_infantry_clubman.png
phase_town
- Mercenary
+ -Swordsman Clubman Mercenary
units/kush_infantry_clubman_a