Index: binaries/data/mods/public/gui/session/session.js =================================================================== --- binaries/data/mods/public/gui/session/session.js +++ binaries/data/mods/public/gui/session/session.js @@ -182,7 +182,7 @@ /** * Unit classes to be checked for the idle-worker-hotkey. */ -var g_WorkerTypes = ["FemaleCitizen", "Trader", "FishingBoat", "CitizenSoldier"]; +var g_WorkerTypes = ["FemaleCitizen", "Trader", "FishingBoat", "Citizen"]; /** * Unit classes to be checked for the military-only-selection modifier and for the idle-warrior-hotkey. 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": ["Citizen Javelin"], "affectedPlayers": ["ExclusiveMutualAlly"], "modifications": [ { "value": "Cost/Resources/food", "multiply": 0.8 }, @@ -9,5 +9,5 @@ { "value": "Cost/Resources/stone", "multiply": 0.8 } ], "auraName": "Saripeko", - "auraDescription": "Allied Citizen-Soldier Javelinists −20% resource costs." + "auraDescription": "Allied Citizen Javelinists −20% resource costs." } Index: binaries/data/mods/public/simulation/data/auras/teambonuses/rome_player_teambonus.json =================================================================== --- binaries/data/mods/public/simulation/data/auras/teambonuses/rome_player_teambonus.json +++ binaries/data/mods/public/simulation/data/auras/teambonuses/rome_player_teambonus.json @@ -1,10 +1,10 @@ { "type": "global", - "affects": ["CitizenSoldier Infantry"], + "affects": ["Citizen Infantry"], "affectedPlayers": ["ExclusiveMutualAlly"], "modifications": [ { "value": "Cost/BuildTime", "multiply": 0.8 } ], "auraName": "Conscription", - "auraDescription": "Allied Citizen-Soldier Infantry −20% training time." + "auraDescription": "Allied Citizen Infantry −20% training time." } 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,10 +1,10 @@ { "type": "global", - "affects": ["CitizenSoldier Spear Infantry"], + "affects": ["Citizen Infantry Spear"], "affectedPlayers": ["ExclusiveMutualAlly"], "modifications": [ { "value": "Health/Max", "multiply": 1.10 } ], "auraName": "Peloponnesian League", - "auraDescription": "Allied Citizen-Soldier Infantry Spearmen +10% health." + "auraDescription": "Allied Citizen Infantry Spearmen +10% health." } Index: binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_1.json =================================================================== --- binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_1.json +++ binaries/data/mods/public/simulation/data/auras/units/catafalques/iber_catafalque_1.json @@ -1,10 +1,10 @@ { "type": "global", - "affects": ["Mercenary CitizenSoldier"], + "affects": ["Citizen Mercenary"], "affectedPlayers": ["Ally"], "modifications": [ { "value": "Cost/Resources/metal", "multiply": 0.75 } ], "auraName": "Mercenary Commander", - "auraDescription": "Along with his brother Indibil, Mandonius commanded the Iberian recruits and mercenaries that took part in the Punic Wars.\nAllied Citizen-Soldier Mercenaries −25% metal cost." + "auraDescription": "Along with his brother Indibil, Mandonius commanded the Iberian recruits and mercenaries that took part in the Punic Wars.\nAllied Citizen Mercenaries −25% metal cost." } 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": ["Citizen Infantry Spear"], "modifications": [ { "value": "Cost/Resources/food", "multiply": 0.9 }, { "value": "Cost/Resources/wood", "multiply": 0.9 }, @@ -8,5 +8,5 @@ { "value": "Cost/Resources/stone", "multiply": 0.9 } ], "auraName": "Lycurgan Military Reforms", - "auraDescription": "Lycurgus instituted several military reforms, thus the complete and undivided allegiance to Sparta from its citizens was implemented under his form of government.\nCitizen-Soldier Infantry Spearmen −10% resource costs." + "auraDescription": "Lycurgus instituted several military reforms, thus the complete and undivided allegiance to Sparta from its citizens was implemented under his form of government.\nCitizen Infantry Spearmen −10% resource costs." } Index: binaries/data/mods/public/simulation/data/civs/iber.json =================================================================== --- binaries/data/mods/public/simulation/data/civs/iber.json +++ binaries/data/mods/public/simulation/data/civs/iber.json @@ -71,7 +71,7 @@ { "Name": "Saripeko", "History": "The Iberians were long known to provide mercenaries to other nations to serve as auxiliaries to their armies in foreign wars. Carthage is the most well known example, and we have evidence of them serving in such a capacity in Aquitania.", - "Description": "Allied Citizen-Soldier Javelinists −20% resource costs." + "Description": "Allied Citizen Javelinists −20% resource costs." } ], "Structures": Index: binaries/data/mods/public/simulation/data/civs/rome.json =================================================================== --- binaries/data/mods/public/simulation/data/civs/rome.json +++ binaries/data/mods/public/simulation/data/civs/rome.json @@ -67,7 +67,7 @@ { "Name": "Conscription", "History": "Many Roman soldiers were conscripted into service. While volunteers were preferred, the Roman state did maintain an annual military draft. During an emergency the draft and the terms of service were enlarged. The importance of military service in Republican Rome was so great it was a prerequisite for a political career. Members of the Senate were called Conscript Fathers because of this, reflected in how the ordo equester was said to have been \"conscripted\" into the Senate.", - "Description": "Allied Citizen-Soldier Infantry −20% training time." + "Description": "Allied Citizen Infantry −20% training time." } ], "Structures": Index: binaries/data/mods/public/simulation/data/civs/spart.json =================================================================== --- binaries/data/mods/public/simulation/data/civs/spart.json +++ binaries/data/mods/public/simulation/data/civs/spart.json @@ -82,7 +82,7 @@ { "Name":"Peloponnesian League", "History":"Much of the Peloponnese was subject to Sparta in one way or another. This loose confederation, with Sparta as its leader, was later dubbed the Peloponnesian League by historians, but in ancient times was called 'The Lacedaemonians and their allies.'", - "Description":"Allied Citizen-Soldier Infantry Spearmen +10% health." + "Description":"Allied Citizen Infantry Spearmen +10% health." } ], "Structures": Index: binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json +++ binaries/data/mods/public/simulation/data/technologies/phase_city_athen.json @@ -11,11 +11,11 @@ "replaces": ["phase_city"], "icon": "city_phase.png", "researchTime": 60, - "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by another +50%. Silver Owls civ bonus grants an extra +10% metal gather rate to all workers. Citizen soldiers max health increased by +10%. All structures +9 garrisoned regeneration rate.", + "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by another +50%. Silver Owls civ bonus grants an extra +10% metal gather rate to all workers. Citizen Soldiers +10% health. All structures +9 garrisoned regeneration rate.", "modifications": [ { "value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.1, "affects": "Worker" }, { "value": "TerritoryInfluence/Radius", "multiply": 1.5, "affects": "CivCentre" }, - { "value": "Health/Max", "multiply": 1.1, "affects": "CitizenSoldier" }, + { "value": "Health/Max", "multiply": 1.1, "affects": "Citizen Soldier" }, { "value": "Capturable/GarrisonRegenRate", "add": 9, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml" Index: binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json +++ binaries/data/mods/public/simulation/data/technologies/phase_city_generic.json @@ -12,10 +12,10 @@ "replaces": ["phase_city"], "icon": "city_phase.png", "researchTime": 60, - "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by another +50%. Citizen soldiers max health increased by +10%. All structures +9 garrisoned regeneration rate.", + "tooltip": "Advance to City Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by another +50%. Citizen Soldiers +10% health. All structures +9 garrisoned regeneration rate.", "modifications": [ { "value": "TerritoryInfluence/Radius", "multiply": 1.5, "affects": "CivCentre" }, - { "value": "Health/Max", "multiply": 1.1, "affects": "CitizenSoldier" }, + { "value": "Health/Max", "multiply": 1.1, "affects": "Citizen Soldier" }, { "value": "Capturable/GarrisonRegenRate", "add": 9, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml" Index: binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json +++ binaries/data/mods/public/simulation/data/technologies/phase_town_athen.json @@ -11,11 +11,11 @@ "replaces": ["phase_town"], "icon": "town_phase.png", "researchTime": 30, - "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by +30%. 'Silver Owls' civ bonus grants an extra +10% metal gather rate to all workers. Citizen soldiers max health increased by +20%. All structures +7 garrisoned regeneration rate.", + "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by +30%. 'Silver Owls' civ bonus grants an extra +10% metal gather rate to all workers. Citizen Soldiers +20% health. All structures +7 garrisoned regeneration rate.", "modifications": [ { "value": "ResourceGatherer/Rates/metal.ore", "multiply": 1.1, "affects": "Worker" }, { "value": "TerritoryInfluence/Radius", "multiply": 1.3, "affects": "CivCentre" }, - { "value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier" }, + { "value": "Health/Max", "multiply": 1.2, "affects": "Citizen Soldier" }, { "value": "Capturable/GarrisonRegenRate", "add": 7, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml" Index: binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json +++ binaries/data/mods/public/simulation/data/technologies/phase_town_generic.json @@ -12,10 +12,10 @@ "replaces": ["phase_town"], "icon": "town_phase.png", "researchTime": 30, - "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by +30%. Citizen soldiers max health increased by +20%. All structures +7 garrisoned regeneration rate.", + "tooltip": "Advance to Town Phase, which unlocks more structures and units. Territory radius for Civic Centers increased by +30%. Citizen Soldiers +20% health. All structures +7 garrisoned regeneration rate.", "modifications": [ { "value": "TerritoryInfluence/Radius", "multiply": 1.3, "affects": "CivCentre" }, - { "value": "Health/Max", "multiply": 1.2, "affects": "CitizenSoldier" }, + { "value": "Health/Max", "multiply": 1.2, "affects": "Citizen Soldier" }, { "value": "Capturable/GarrisonRegenRate", "add": 7, "affects": "Structure" } ], "soundComplete": "interface/alarm/alarm_phase.xml"