Index: binaries/data/mods/public/simulation/data/technologies/training_advanced_mercenary.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/training_advanced_mercenary.json (nonexistent)
+++ binaries/data/mods/public/simulation/data/technologies/training_advanced_mercenary.json (working copy)
@@ -0,0 +1,8 @@
+{
+ "autoResearch": true,
+ "icon": "upgrade_advanced.png",
+ "tooltip": "Advanced mercenaries train slower.",
+ "requirements": { "tech": "upgrade_rank_advanced_mercenary" },
+ "modifications": [{ "value": "Cost/BuildTime", "multiply": 1.20 }],
+ "affects": ["Mercenary Advanced"]
+}
\ No newline at end of file
Index: binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json (nonexistent)
+++ binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json (working copy)
@@ -0,0 +1,13 @@
+{
+ "genericName": "Expertise In War",
+ "description": "Hire professional mercenaries to fight in your army.",
+ "cost": {"food": 200, "wood": 0, "stone": 0, "metal": 300},
+ "requirements": { "all": [{ "tech": "phase_town" }, { "any": [{ "civ": "athen"}, { "civ": "cart"}, { "civ": "mace"}, { "civ": "ptol"}, { "civ": "sele"}] }] },
+ "requirementsTooltip": "Unlocked in Town Phase.",
+ "icon": "upgrade_mercenary_advanced.png",
+ "researchTime": 40,
+ "tooltip": "Mercenary units train at advanced rank but +20% training time.",
+ "modifications": [{ "value": "Promotion/RequiredXp", "replace": 0 }],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml",
+ "affects": ["Mercenary Basic"]
+}
\ No newline at end of file
Index: binaries/data/mods/public/simulation/data/technologies/upgrade_rank_elite_mercenary.json
===================================================================
--- binaries/data/mods/public/simulation/data/technologies/upgrade_rank_elite_mercenary.json (nonexistent)
+++ binaries/data/mods/public/simulation/data/technologies/upgrade_rank_elite_mercenary.json (working copy)
@@ -0,0 +1,20 @@
+{
+ "genericName": "Elite Mercenaries",
+ "description": "Hire battle-hardened elite mercenaries to fight the enemy.",
+ "cost": {"food": 0, "wood": 500, "stone": 0, "metal": 500},
+ "requirements": { "all": [{ "tech": "phase_city"}, { "any": [{ "civ": "athen"}, { "civ": "cart"}, { "civ": "mace"}, { "civ": "sele"}] }] },
+ "requirementsTooltip": "Unlocked in City Phase.",
+ "supersedes": "upgrade_rank_advanced_mercenary",
+ "icon": "upgrade_mercenary_elite.png",
+ "researchTime": 60,
+ "tooltip": "All Mercenary units are trained as elite but +50% cost and +25% training time.",
+ "modifications": [
+ { "value": "Cost/Resources/food", "multiply": 1.5 },
+ { "value": "Cost/Resources/wood", "multiply": 1.5 },
+ { "value": "Cost/Resources/metal", "multiply": 1.5 },
+ { "value": "Cost/Resources/stone", "multiply": 1.5 },
+ { "value": "Promotion/RequiredXp", "replace": 0 },
+ { "value": "Cost/BuildTime", "multiply": 1.50 }],
+ "soundComplete": "interface/alarm/alarm_upgradearmory.xml",
+ "affects": ["Mercenary CitizenSoldier"]
+}
Index: binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml (revision 19553)
+++ binaries/data/mods/public/simulation/templates/structures/athen_barracks.xml (working copy)
@@ -21,6 +21,12 @@
+
+
+ upgrade_rank_advanced_mercenary
+ upgrade_rank_elite_mercenary
+
+
structures/athenians/barracks.xml
structures/fndn_5x5.xml
Index: binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml (revision 19553)
+++ binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml (working copy)
@@ -28,6 +28,8 @@
unlock_champion_units
+ upgrade_rank_advanced_mercenary
+ upgrade_rank_elite_mercenary
Index: binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml (revision 19553)
+++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml (working copy)
@@ -43,6 +43,8 @@
-phase_town
-phase_city
+ upgrade_rank_advanced_mercenary
+ upgrade_rank_elite_mercenary
Index: binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml (revision 19553)
+++ binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml (working copy)
@@ -35,6 +35,10 @@
0.8
+
+ upgrade_rank_advanced_mercenary
+ upgrade_rank_elite_mercenary
+