diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js index 870949223e..41f392b4be 100644 --- a/binaries/data/mods/public/gui/common/tooltips.js +++ b/binaries/data/mods/public/gui/common/tooltips.js @@ -968,9 +968,9 @@ function getRequirementsTooltip(enabled, requirements, civ) return ""; // Simple requirements (one tech) can be translated on the fly. - if ("Techs" in requirements && !requirements.Techs.includes(" ")) + if ("Techs" in requirements && !requirements.Techs._string.includes(" ")) return objectionFont(sprintf(translate("Requires %(technology)s"), { - "technology": getEntityNames(GetTechnologyData(requirements.Techs, civ)) + "technology": getEntityNames(GetTechnologyData(requirements.Techs._string, civ)) })); return objectionFont(translate(requirements.Tooltip)); } diff --git a/binaries/data/mods/public/gui/reference/common/TemplateParser.js b/binaries/data/mods/public/gui/reference/common/TemplateParser.js index bda9bd5e24..20af37f320 100644 --- a/binaries/data/mods/public/gui/reference/common/TemplateParser.js +++ b/binaries/data/mods/public/gui/reference/common/TemplateParser.js @@ -77,7 +77,7 @@ class TemplateParser else { let highestPhaseIndex = 0; - for (const tech of parsed.requirements.Techs.split(" ")) + for (const tech of parsed.requirements.Techs._string.split(" ")) { if (tech[0] === "!") continue; @@ -271,12 +271,24 @@ class TemplateParser data.tooltip = upgrade.tooltip || data.tooltip; data.requirements = upgrade.requirements || data.requirements; - if (!data.requirements) + if (!data.requirements?.Techs) data.phase = this.phaseList[0]; - else if (this.TemplateLoader.isPhaseTech(data.requirements.Techs)) - data.phase = this.getActualPhase(data.requirements.Techs); else - data.phase = this.getPhaseOfTechnology(data.requirements.Techs, civCode); + { + let highestPhaseIndex = 0; + for (const tech of data.requirements.Techs._string.split(" ")) + { + if (tech[0] === "!") + continue; + + const phaseIndex = this.phaseList.indexOf( + this.TemplateLoader.isPhaseTech(tech) ? this.getActualPhase(tech) : + this.getPhaseOfTechnology(tech, civCode)); + if (phaseIndex > highestPhaseIndex) + highestPhaseIndex = phaseIndex; + } + data.phase = this.phaseList[highestPhaseIndex]; + } newUpgrades.push(data); } diff --git a/binaries/data/mods/public/simulation/helpers/Requirements.js b/binaries/data/mods/public/simulation/helpers/Requirements.js index 228eaf711e..576fd24067 100644 --- a/binaries/data/mods/public/simulation/helpers/Requirements.js +++ b/binaries/data/mods/public/simulation/helpers/Requirements.js @@ -23,6 +23,9 @@ RequirementsHelper.prototype.EntityRequirementsSchema = RequirementsHelper.prototype.TechnologyRequirementsSchema = "" + + "" + + "tokens" + + "" + "" + ""; @@ -118,8 +121,8 @@ RequirementsHelper.prototype.AllRequirementsMet = function(template, cmpTechMana return false; } } - if (requirementType === "Techs") - for (const tech of requirement.split(" ")) + if (requirementType === "Techs" && requirement._string) + for (const tech of requirement._string.split(" ")) if (tech[0] === "!" ? cmpTechManager.IsTechnologyResearched(tech.substring(1)) : !cmpTechManager.IsTechnologyResearched(tech)) return false; @@ -152,8 +155,8 @@ RequirementsHelper.prototype.AnyRequirementsMet = function(template, cmpTechMana return true; } } - if (requirementType === "Techs") - for (const tech of requirement.split(" ")) + if (requirementType === "Techs" && requirement._string) + for (const tech of requirement._string.split(" ")) if (tech[0] === "!" ? !cmpTechManager.IsTechnologyResearched(tech.substring(1)) : cmpTechManager.IsTechnologyResearched(tech)) return true; diff --git a/binaries/data/mods/public/simulation/helpers/tests/test_Requirements.js b/binaries/data/mods/public/simulation/helpers/tests/test_Requirements.js index 64ddd2e116..56bf9cbc54 100644 --- a/binaries/data/mods/public/simulation/helpers/tests/test_Requirements.js +++ b/binaries/data/mods/public/simulation/helpers/tests/test_Requirements.js @@ -21,7 +21,7 @@ met(); // Simple requirements are assumed to be additive. template = { - "Techs": "phase_city" + "Techs": { "_string": "phase_city" } }; AddMock(playerEnt, IID_TechnologyManager, { @@ -40,7 +40,7 @@ AddMock(playerEnt, IID_TechnologyManager, { met(); template = { - "Techs": "cartography phase_city" + "Techs": { "_string": "cartography phase_city" } }; AddMock(playerEnt, IID_TechnologyManager, { @@ -248,7 +248,7 @@ met(); // Technology requirements. template = { "All": { - "Techs": "phase_town" + "Techs": { "_string": "phase_town" } } }; @@ -264,14 +264,14 @@ met(); template = { "All": { - "Techs": "phase_city" + "Techs": { "_string": "phase_city" } } }; notMet(); template = { "All": { - "Techs": "phase_town phase_city" + "Techs": { "_string": "phase_town phase_city" } } }; notMet(); @@ -283,14 +283,14 @@ met(); template = { "All": { - "Techs": "!phase_city" + "Techs": { "_string": "!phase_city" } } }; notMet(); template = { "All": { - "Techs": "!phase_town phase_city" + "Techs": { "_string": "!phase_town phase_city"} } }; notMet(); @@ -310,7 +310,7 @@ template = { "Variants": 2 } }, - "Techs": "phase_town" + "Techs": { "_string": "phase_town" } } }; @@ -423,7 +423,7 @@ met(); // Technology requirements. template = { "Any": { - "Techs": "phase_town" + "Techs": { "_string": "phase_town" } } }; @@ -439,7 +439,7 @@ met(); template = { "Any": { - "Techs": "phase_town phase_city" + "Techs": { "_string": "phase_town phase_city" } } }; @@ -450,7 +450,7 @@ met(); template = { "Any": { - "Techs": "!phase_town" + "Techs": { "_string": "!phase_town" } } }; @@ -466,7 +466,7 @@ met(); template = { "Any": { - "Techs": "!phase_town phase_city" + "Techs": { "_string": "!phase_town phase_city" } } }; @@ -485,7 +485,7 @@ template = { "Variants": 2 } }, - "Techs": "!phase_town" + "Techs": { "_string": "!phase_town" } } }; @@ -507,7 +507,7 @@ met(); template = { "All": { "All": { - "Techs": "!phase_town" + "Techs": { "_string": "!phase_town" } }, "Any": { "Entities": { @@ -516,7 +516,7 @@ template = { "Variants": 2 } }, - "Techs": "phase_city" + "Techs": { "_string": "phase_city" } } } }; @@ -578,7 +578,7 @@ met(); template = { "Any": { "All": { - "Techs": "!phase_town" + "Techs": { "_string": "!phase_town" } }, "Any": { "Entities": { @@ -587,7 +587,7 @@ template = { "Variants": 2 } }, - "Techs": "phase_city" + "Techs": { "_string": "phase_city" } } } }; @@ -651,7 +651,7 @@ template = { "All": { "Any": { "All": { - "Techs": "cartography phase_imperial", + "Techs": { "_string": "cartography phase_imperial" } }, "Entities": { "class_1": { @@ -659,9 +659,9 @@ template = { "Variants": 2 } }, - "Techs": "phase_city" + "Techs": { "_string": "phase_city" } }, - "Techs": "!phase_town" + "Techs": { "_string": "!phase_town" } } }; diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml index 173b26818d..089fadec30 100644 --- a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml +++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_trainable.xml @@ -2,7 +2,7 @@ - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/special/spy.xml b/binaries/data/mods/public/simulation/templates/special/spy.xml index 6177432d4d..7ac49d1983 100644 --- a/binaries/data/mods/public/simulation/templates/special/spy.xml +++ b/binaries/data/mods/public/simulation/templates/special/spy.xml @@ -17,7 +17,7 @@ technologies/spy_trader.png true - unlock_spies + unlock_spies diff --git a/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml b/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml index f97b48e0b8..c18df18848 100644 --- a/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml +++ b/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml @@ -17,7 +17,7 @@ Naval structures/crannog.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml b/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml index 400bd3b936..89b15e7e3d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart/wallset_short.xml @@ -5,7 +5,7 @@ Low Wall structures/palisade_wall.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml b/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml index 146f875a68..116fb208f1 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml @@ -31,7 +31,7 @@ City Council structures/tholos.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml b/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml index b1c4fcea65..85ad174d66 100644 --- a/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml +++ b/binaries/data/mods/public/simulation/templates/structures/gaul/tavern.xml @@ -22,7 +22,7 @@ -Village Town structures/embassy_celtic.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml index bc17505677..e5418b4edb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/civil_centre.xml @@ -38,7 +38,7 @@ upgrading - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/han/civil_centre_court.xml b/binaries/data/mods/public/simulation/templates/structures/han/civil_centre_court.xml index 85c3df31b2..823faa37c0 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/civil_centre_court.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/civil_centre_court.xml @@ -20,7 +20,7 @@ CivCentre CivSpecific structures/military_settlement.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/han/defense_tower.xml b/binaries/data/mods/public/simulation/templates/structures/han/defense_tower.xml index 7bac572e5e..4f5fd6191d 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/defense_tower.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/defense_tower.xml @@ -27,7 +27,7 @@ upgrading - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/han/laozigate.xml b/binaries/data/mods/public/simulation/templates/structures/han/laozigate.xml index 38b8d6142a..5a89077a65 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/laozigate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/laozigate.xml @@ -24,7 +24,7 @@ LaoziGate Town structures/paifang.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/han/ministry.xml b/binaries/data/mods/public/simulation/templates/structures/han/ministry.xml index 92f18bfe88..8da86a6097 100644 --- a/binaries/data/mods/public/simulation/templates/structures/han/ministry.xml +++ b/binaries/data/mods/public/simulation/templates/structures/han/ministry.xml @@ -40,7 +40,7 @@ Train the Nine Ministers. Territory root. Research a powerful suite of Administrative technologies. structures/imperial_ministry.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/iber/monument.xml b/binaries/data/mods/public/simulation/templates/structures/iber/monument.xml index e6b42f209d..db44b1282e 100644 --- a/binaries/data/mods/public/simulation/templates/structures/iber/monument.xml +++ b/binaries/data/mods/public/simulation/templates/structures/iber/monument.xml @@ -34,7 +34,7 @@ Monument Town structures/iberian_bull.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml b/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml index d8b0c0ded0..030c8c734b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml +++ b/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_large.xml @@ -29,7 +29,7 @@ City Pyramid structures/kush_pyramid_big.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_small.xml b/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_small.xml index 2e4d3812a4..a4edb53d7e 100644 --- a/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_small.xml +++ b/binaries/data/mods/public/simulation/templates/structures/kush/pyramid_small.xml @@ -26,7 +26,7 @@ Village Pyramid structures/kush_pyramid_small.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml b/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml index 19c117ed43..8366a0e6fa 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome/army_camp.xml @@ -75,7 +75,7 @@ Town ArmyCamp structures/roman_camp.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml index 8a5d5d6bc0..4e04f69900 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml @@ -29,7 +29,7 @@ Colony structures/military_settlement.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml index d9b4af4d65..eda75c3ff1 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_house.xml @@ -28,7 +28,7 @@ Village House structures/house.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml index b1b44342ff..0582d16572 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_stoa.xml @@ -30,7 +30,7 @@ Town Stoa structures/stoa.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml index c61cef6b6e..3fe81afbb1 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml @@ -32,7 +32,7 @@ Town Temple structures/temple.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml index 8b82979f57..7127525dbc 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml @@ -56,7 +56,7 @@ ArtilleryTower structures/tower_artillery.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml index e4bb79e355..69a3b80875 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml @@ -53,7 +53,7 @@ BoltTower structures/tower_bolt.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml index 861f6d920f..606790af56 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml @@ -35,7 +35,7 @@ SentryTower structures/sentry_tower.png - phase_village + phase_village @@ -66,7 +66,7 @@ upgrading - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml index d5e651134b..2b26e1d372 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_stone.xml @@ -33,7 +33,7 @@ StoneTower structures/defense_tower.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml index c7ed5d0baa..a09e8ce703 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall.xml @@ -15,7 +15,7 @@ Wall structures/wall.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml index 7fd10b9f4d..dbfc06d892 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml @@ -30,7 +30,7 @@ Village Farmstead structures/farmstead.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml index 097318ff6d..3b41a7c70d 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml @@ -28,7 +28,7 @@ Trade Town Market structures/market.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml index fb5cc42743..e952e0386d 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_storehouse.xml @@ -28,7 +28,7 @@ Village Storehouse structures/storehouse.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml index cb7ffff498..d509228404 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_arsenal.xml @@ -28,7 +28,7 @@ City Arsenal structures/siege_workshop.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml index 24eb4a5980..403150948e 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml @@ -29,7 +29,7 @@ Village Barracks structures/barracks.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml index 425def9bc1..8175939cdd 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stable.xml @@ -29,7 +29,7 @@ City ElephantStable structures/stable_elephant.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml index 20ef6faa1a..c48bbef80c 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml @@ -23,7 +23,7 @@ template_structure_military_embassy Town Embassy - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml index 384082faf8..625ea04aa6 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_forge.xml @@ -26,7 +26,7 @@ Town Forge structures/blacksmith.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml index 723f651979..981c2b9fae 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml @@ -69,7 +69,7 @@ Defensive Fortress structures/fortress.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml index 13d66d8064..f00526c85d 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_range.xml @@ -25,7 +25,7 @@ Village Range structures/range.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml index 904bc92e97..0e5ee264f4 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml @@ -29,7 +29,7 @@ Village Stable structures/stable_01.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml index ea5fb4e40e..34c936c7fe 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml @@ -29,7 +29,7 @@ Economic Village Corral structures/corral.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special.xml b/binaries/data/mods/public/simulation/templates/template_structure_special.xml index 3755767a82..a28d339319 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_special.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_special.xml @@ -19,7 +19,7 @@ Special Structure City - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml index 1d524a4b53..6fc7263932 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml @@ -41,7 +41,7 @@ City Wonder structures/wonder.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml index d8627d71e3..7fb1a50da6 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml @@ -14,7 +14,7 @@ Soldier Champion Champion Unit - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml index 9057c2ce18..295ea12935 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml @@ -20,7 +20,7 @@ Cavalry Champion Cavalry - unlock_champion_cavalry + -phase_city unlock_champion_cavalry diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml index 58ed9cad38..78a73d0289 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml @@ -2,7 +2,7 @@ - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml index 7cfcd1f10a..2a9108d415 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml @@ -26,7 +26,7 @@ Hero technologies/laurel_wreath.png - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml index 32938cc1aa..575113c847 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml @@ -41,7 +41,7 @@ Unrepairable. Gradually loses health. Can only attack Ships. Melee Warship Fireship - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml index 434fa84bdb..a70d249607 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_merchant.xml @@ -20,7 +20,7 @@ -ConquestCritical Trader Bribable - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_heavy.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_heavy.xml index 074ac76d41..3f533f7168 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_heavy.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_heavy.xml @@ -55,7 +55,7 @@ Heavy Quinquereme - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_light.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_light.xml index 3c4b4a44b0..e1b5346899 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_light.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_light.xml @@ -23,7 +23,7 @@ Light Bireme - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_medium.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_medium.xml index 39f3e500e0..074f23e67e 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_medium.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_warship_medium.xml @@ -25,7 +25,7 @@ Medium Trireme - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege.xml index 21fc97922e..7acae8ebea 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_siege.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_siege.xml @@ -16,7 +16,7 @@ Siege Siege - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml index 2012064fae..11ecf090b0 100644 --- a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml +++ b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml @@ -30,7 +30,7 @@ Basic Heal units. - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_wallset.xml b/binaries/data/mods/public/simulation/templates/template_wallset.xml index 994b249ec7..5038def172 100644 --- a/binaries/data/mods/public/simulation/templates/template_wallset.xml +++ b/binaries/data/mods/public/simulation/templates/template_wallset.xml @@ -12,7 +12,7 @@ structures/wall.png true - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml index b1f61381d0..d3b4848951 100644 --- a/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/athen/cavalry_swordsman_b.xml @@ -11,7 +11,7 @@ Hippeús units/athen/cavalry_swordsman.png - phase_town + phase_town diff --git 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 index 9df46ee91a..c5d9b0b9b8 100644 --- 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 @@ -6,7 +6,7 @@ Peltastḗs Thrâx units/athen/infantry_javelinist.png - phase_town + phase_town diff --git 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 index d59a7e4de3..b422b1c1d4 100644 --- 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 @@ -6,7 +6,7 @@ Toxótēs Krētikós units/mace/infantry_archer.png - iphicratean_reforms + iphicratean_reforms diff --git a/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen_house.xml index 0c181b71a7..14a9ee1169 100644 --- a/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml index da5efc7192..2815afc720 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit/cavalry_swordsman_b.xml @@ -7,7 +7,7 @@ Celtic Cavalry units/brit/cavalry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml index ead6d94c7a..de333a3866 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit/infantry_javelineer_b.xml @@ -13,7 +13,7 @@ Adretos units/brit/infantry_javelinist.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_house.xml index 23c4b30b43..8530ac8223 100644 --- a/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/brit/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git 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 index f9bed4d4d0..da7d77271e 100644 --- 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 @@ -7,7 +7,7 @@ units/cart/cavalry_spearman_ital_b units/cart/cavalry_spearman.png - phase_town + phase_town diff --git 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 index 4b3a2845e8..0e4ca50c8e 100644 --- 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 @@ -7,7 +7,7 @@ units/cart/cavalry_swordsman_gaul_b units/cart/cavalry_swordsman_2.png - phase_town + phase_town diff --git 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 index 095daab30a..a852f595de 100644 --- 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 @@ -12,7 +12,7 @@ units/cart/cavalry_swordsman_iber_b units/cart/cavalry_swordsman.png - phase_town + phase_town diff --git 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 index c6b2ef20c4..be95326ab9 100644 --- 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 @@ -15,7 +15,7 @@ units/cart/infantry_javelineer_iber_b units/cart/infantry_javelinist.png - phase_town + phase_town diff --git 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 index 8fef77c406..177c1bae18 100644 --- 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 @@ -15,7 +15,7 @@ units/cart/infantry_slinger_iber_b units/cart/infantry_slinger.png - phase_town + phase_town diff --git 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 index a37e164424..2b4166870e 100644 --- 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 @@ -15,7 +15,7 @@ units/cart/infantry_swordsman_gaul_b units/cart/infantry_swordsman.png - phase_town + phase_town diff --git 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 index d2566fc3cc..95d0fb90a4 100644 --- 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 @@ -15,7 +15,7 @@ units/cart/infantry_swordsman_ital_b units/cart/infantry_swordsman_2.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml index dda40861f6..16b8e4f391 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart/ship_merchant.xml @@ -10,7 +10,7 @@ Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures. Carthaginians have +25% sea trading bonus. units/cart/ship_merchant.png - phase_village + -phase_town phase_village diff --git a/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen_house.xml index e895502bcb..4e8963bf39 100644 --- a/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/cart/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml index 7f80d3d9e1..1bbcad47f2 100644 --- a/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/gaul/cavalry_swordsman_b.xml @@ -6,7 +6,7 @@ Eporedos units/gaul/cavalry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml b/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml index d1997af531..172f2b3a65 100644 --- a/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml +++ b/binaries/data/mods/public/simulation/templates/units/gaul/champion_fanatic.xml @@ -13,7 +13,7 @@ Bariogaisatos units/gaul/champion_fanatic.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml index 395d1a5d5f..333b350d30 100644 --- a/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml @@ -11,7 +11,7 @@ Talmoris units/gaul/infantry_slinger.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_house.xml index 8eb16886d0..552f98e174 100644 --- a/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/han/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/han/cavalry_archer_b.xml index 4979750266..955f10a552 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/cavalry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/cavalry_archer_b.xml @@ -6,7 +6,7 @@ Gōng Qíbīng units/han/cavalry_archer.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/han/cavalry_crossbowman_b.xml b/binaries/data/mods/public/simulation/templates/units/han/cavalry_crossbowman_b.xml index c5c8fb5a1b..636c8cee0c 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/cavalry_crossbowman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/cavalry_crossbowman_b.xml @@ -6,7 +6,7 @@ Han Cavalry Crossbowman units/han/cavalry_crossbowman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/han/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/han/cavalry_spearman_b.xml index 9fecdcb5be..0e4fe10076 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/cavalry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/cavalry_spearman_b.xml @@ -6,7 +6,7 @@ Máo Qíbīng units/han/cavalry_spearman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml index a728096c5e..fddae030e7 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_cavalry_spearman_academy.xml @@ -6,7 +6,7 @@ units/han/champion_cavalry units/han/champion_cavalry_spearman.png - phase_city + -unlock_champion_cavalry phase_city diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml index 46ed31db2d..6625906bcb 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_chariot_academy.xml @@ -11,7 +11,7 @@ Chariot units/han/chariot.png - phase_city + -unlock_champion_cavalry phase_city diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml index 8d21691c25..111bcefecf 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_archer_academy.xml @@ -6,9 +6,6 @@ Yǔ Lín units/han/champion_infantry_archer units/han/champion_infantry_archer.png - - phase_city - units/han/infantry_archer_c.xml diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml index 4f434b4524..083b592350 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_crossbowman_academy.xml @@ -4,9 +4,6 @@ han Juezhang units/han/champion_infantry_crossbowman.png - - phase_city - units/han/infantry_crossbowman_c.xml diff --git a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml index f9dd5ebcd5..858c981bb1 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/champion_infantry_spearman_academy.xml @@ -6,9 +6,6 @@ Hǔ Bēn units/han/champion_infantry_spearman units/han/champion_infantry_swordsman.png - - phase_city - units/han/infantry_spearman_c.xml diff --git a/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml index 459ba74d76..b67ca825d1 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml @@ -11,7 +11,7 @@ Shè Shǒu units/han/infantry_archer.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml index 0764040c0c..f8488b8e27 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml @@ -21,7 +21,7 @@ Jǐ Bīng units/han/infantry_halberdman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_special_b.xml b/binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_special_b.xml index 2eec23fdcd..f6311d59dd 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_special_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_special_b.xml @@ -11,7 +11,7 @@ Dāo Bīng units/han/infantry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/han/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/han/support_female_citizen_house.xml index 0a7ea36b05..0a6cab712c 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml b/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml index a93bb226e2..d670be5943 100644 --- a/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml +++ b/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml @@ -45,7 +45,7 @@ Minister units/han/minister.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml index 9be6f9d47f..30c16c1d78 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber/cavalry_spearman_b.xml @@ -6,7 +6,7 @@ Lantzari units/iber/cavalry_spearman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml index e31c860528..efb40614f7 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml @@ -10,7 +10,7 @@ Leial Ezpatari units/iber/champion_infantry.png - unlock_champion_infantry + unlock_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml index 5f84659619..5238db0146 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber/infantry_slinger_b.xml @@ -11,7 +11,7 @@ Habailari units/iber/infantry_slinger.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml index 458dbf91af..bd15ea11ff 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber/infantry_spearman_b.xml @@ -11,7 +11,7 @@ Ezkutari units/iber/infantry_spearman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen_house.xml index cf576adff3..89cd97448d 100644 --- a/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/iber/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml index 6de66c9862..6e30e18d92 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_b.xml @@ -8,7 +8,7 @@ Napatan Light Cavalry units/kush/cavalry_javelinist.png - phase_village + phase_village diff --git 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 index de1b558716..5926df687b 100644 --- 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 @@ -19,7 +19,7 @@ Camel units/kush/camel_javelinist.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml index 3e9c41bf5c..cfed25381b 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/cavalry_spearman_b.xml @@ -8,7 +8,7 @@ Htr units/kush/cavalry_spearman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml index 0b56bbb4e1..2a09068d61 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_archer_b.xml @@ -16,7 +16,7 @@ Pdty Nhsyw units/kush/infantry_archer.png - phase_village + phase_village diff --git 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 index 887e9a66a7..793aa489a5 100644 --- 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 @@ -16,7 +16,7 @@ nhw ʿhȝw Noba units/kush/infantry_javelinist.png - phase_town + phase_town diff --git 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 index a86e807e83..fd2b88f899 100644 --- 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 @@ -16,7 +16,7 @@ nhw Noba units/kush/infantry_maceman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml index 568c03238d..38e3300eda 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_pikeman_b.xml @@ -16,7 +16,7 @@ siȝwrd units/kush/infantry_pikeman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml index 7eeccbac78..b130e732b5 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_spearman_b.xml @@ -16,7 +16,7 @@ iry-rdwy Nhsyw units/kush/infantry_spearman.png - phase_village + phase_village diff --git a/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml index ead7034765..00c39ec5db 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/infantry_swordsman_b.xml @@ -16,7 +16,7 @@ knw hps units/kush/infantry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen_house.xml index 2ccf281d2e..de8993781f 100644 --- a/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/kush/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git 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 index 2f441259ab..7a2aaf2335 100644 --- 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 @@ -8,7 +8,7 @@ Hippakontistḕs Odrysós units/mace/cavalry_javelinist.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml index 3d31d510bc..92ce09a503 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml @@ -8,7 +8,7 @@ units/mace/champion_infantry_spearman units/mace/hypaspist.png - unlock_champion_infantry + unlock_champion_infantry diff --git 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 index 6084e89291..27f39dc9bd 100644 --- 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 @@ -8,7 +8,7 @@ Toxótēs Krētikós units/mace/infantry_archer.png - phase_town + phase_town diff --git 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 index 68f7cf3f7f..a360e4a65f 100644 --- 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 @@ -8,7 +8,7 @@ Sphendonḗtēs Rhódios units/mace/infantry_slinger.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen_house.xml index 438d1daf66..c2f2bf363a 100644 --- a/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml index 9263ae037f..aae8ede05d 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur/cavalry_swordsman_b.xml @@ -7,7 +7,7 @@ Aśvārohagaṇaḥ units/maur/cavalry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml index ffca6f5f7d..01ed1c4877 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur/elephant_archer_b.xml @@ -7,7 +7,7 @@ units/maur/elephant_archer_b units/maur/elephant_archer.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml b/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml index 87a3ea9cdd..cb930f738c 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur/hero_chandragupta_infantry.xml @@ -16,7 +16,7 @@ - phase_city + phase_city diff --git a/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml index f3d198f48e..7d0eed77bb 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur/infantry_swordsman_b.xml @@ -18,7 +18,7 @@ Khadagdhari units/maur/infantry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen_house.xml index ed7cfca5b5..de1e770136 100644 --- a/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/maur/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml index f4ab00bfc3..191aa85afe 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_archer_b.xml @@ -8,7 +8,7 @@ Asabāra Parθava units/pers/cavalry_archer.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a_trireme.xml index d8e441f47c..66c913a3f8 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a_trireme.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_a_trireme.xml @@ -2,7 +2,7 @@ - equine_transports + -phase_town equine_transports diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml index aac80a2109..e5f2f5a511 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b.xml @@ -8,7 +8,7 @@ Asabāra Varkaniya units/pers/cavalry_axeman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b_trireme.xml index 8705cf5086..b4962c674c 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b_trireme.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_b_trireme.xml @@ -2,7 +2,7 @@ - equine_transports + -phase_town equine_transports diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e_trireme.xml index f092de1ec4..e898cf6a39 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e_trireme.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_axeman_e_trireme.xml @@ -2,7 +2,7 @@ - equine_transports + -phase_town equine_transports diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a_trireme.xml index 936c63a596..65afc86953 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a_trireme.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_a_trireme.xml @@ -2,7 +2,7 @@ - equine_transports + equine_transports diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b_trireme.xml index 66d8421f26..f216f68a3b 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b_trireme.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_b_trireme.xml @@ -2,7 +2,7 @@ - equine_transports + equine_transports diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e_trireme.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e_trireme.xml index 9d71699cde..d23b2b198e 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e_trireme.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_javelineer_e_trireme.xml @@ -2,7 +2,7 @@ - equine_transports + equine_transports diff --git a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml index 1139c69ee1..8ba8beeac5 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/cavalry_spearman_b.xml @@ -8,7 +8,7 @@ Asabāra Katpatuka units/pers/cavalry_spearman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml index c35c84bb58..1f2b6b17db 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/infantry_javelineer_b.xml @@ -8,7 +8,7 @@ Pastiš Spardiya units/pers/infantry_javelinist.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen_house.xml index 6136e28895..61283a8907 100644 --- a/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/pers/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml index 133b040561..b8d2aed56c 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/cavalry_archer_b.xml @@ -18,7 +18,7 @@ Mutsābiq Gamal Nabatu units/ptol/camel_archer.png - phase_village + phase_village diff --git 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 index 44cd8f8b77..5ae62a9c18 100644 --- 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 @@ -7,7 +7,7 @@ Hippeús Tarantînos units/hele/tarentine_cavalry_e.png - phase_town + phase_town diff --git 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 index 62a67d0700..7a7bbb05c6 100644 --- 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 @@ -7,7 +7,7 @@ Hippeús Makedonikós units/ptol/cavalry_spearman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml index 9abb9735e3..75fc7ddd26 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml @@ -7,7 +7,7 @@ Phalangitès Agema units/ptol/champion_infantry.png - unlock_champion_infantry + unlock_champion_infantry diff --git 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 index b8b75be73b..1e8843fa9a 100644 --- 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 @@ -13,7 +13,7 @@ Toxótēs Krētikós units/mace/infantry_archer.png - phase_town + phase_town diff --git 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 index c9734a9253..9696c6dc75 100644 --- 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 @@ -13,7 +13,7 @@ Thureophóros Akrobolistḗs units/ptol/infantry_javelinist_merc.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml index 85c9943be3..25229ed667 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/infantry_slinger_b.xml @@ -13,7 +13,7 @@ Hebraikós Sphendonḗtēs units/ptol/infantry_slinger.png - phase_village + phase_village diff --git 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 index a69fd77355..9800cb244d 100644 --- 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 @@ -13,7 +13,7 @@ Thureophóros Misthophóros units/ptol/infantry_spearman_2.png - phase_town + phase_town diff --git 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 index 3490dd4288..fa19c049ae 100644 --- 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 @@ -13,7 +13,7 @@ units/ptol/infantry_swordsman_merc_b units/cart/infantry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen_house.xml index 99f88adaf8..bb875f12b7 100644 --- a/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/ptol/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml index 75ffbab9c1..712d444f15 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome/cavalry_javelineer_b.xml @@ -8,7 +8,7 @@ units/rome/cavalry_javelineer_b units/rome/cavalry_javelinist.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml index 636bea84a3..9b3a6a7298 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_spear_gladiator.xml @@ -22,7 +22,7 @@ Elite units/rome/champion_infantry_gladiator_spear.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml index 146429454c..c9dcfeb7a9 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_sword_gladiator.xml @@ -22,7 +22,7 @@ Elite units/rome/champion_infantry_gladiator_sword.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml index 1e00f519d2..1492e02431 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome/infantry_spearman_b.xml @@ -20,7 +20,7 @@ Triārius units/rome/infantry_spearman.png - phase_town + phase_town Elite rank Spearmen can be promoted to champion Centurions. diff --git a/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen_house.xml index 0afbac0754..62a71770b0 100644 --- a/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/rome/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml index cac4483e1d..afe89b92d8 100644 --- a/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/sele/cavalry_archer_b.xml @@ -8,7 +8,7 @@ Hippotoxotès Dahae units/pers/cavalry_archer.png - phase_town + phase_town diff --git 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 index 228c7cc38f..b38e250632 100644 --- 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 @@ -8,7 +8,7 @@ Hippos Hetairike units/sele/cavalry_spearman_merc.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml index 8c23a1bd28..f0404464ed 100644 --- a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml +++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_pikeman.xml @@ -7,7 +7,7 @@ Argyraspis units/sele/champion_pikeman.png - traditional_army_sele + -phase_city traditional_army_sele diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml index 304d62c15e..8ec78f69c1 100644 --- a/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_infantry_swordsman.xml @@ -7,7 +7,7 @@ Thorakitès Rhomaïkós units/sele/champion_swordsman.png - reformed_army_sele + -phase_city reformed_army_sele diff --git 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 index 9e0f813671..ce4dd14518 100644 --- 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 @@ -8,7 +8,7 @@ Toxótēs Syrías units/sele/infantry_archer.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml index 2e2fb13378..91bf6eea24 100644 --- a/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml @@ -8,7 +8,7 @@ Pezakontistès Aravikós units/sele/infantry_javelinist.png - phase_village + phase_village diff --git 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 index 8bd8509f18..99e05ae18d 100644 --- 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 @@ -13,7 +13,7 @@ Rhomphaiaphoros Thrakikós units/sele/infantry_swordsman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen_house.xml index 7c1b6c531d..59af63ab5c 100644 --- a/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml index 990c0c73fc..8abfee4696 100644 --- a/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml +++ b/binaries/data/mods/public/simulation/templates/units/spart/cavalry_spearman_b.xml @@ -8,7 +8,7 @@ Hippeús Symmakhikós units/spart/cavalry_spearman.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml index 038efa8863..581a358d60 100644 --- a/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml +++ b/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml @@ -19,7 +19,7 @@ Elite units/spart/champion_infantry_sword.png - phase_town + phase_town diff --git a/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen_house.xml b/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen_house.xml index c5eabf05c7..d24485f481 100644 --- a/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen_house.xml +++ b/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen_house.xml @@ -5,7 +5,7 @@ - unlock_females_house + unlock_females_house diff --git a/source/tools/entity/checkrefs.py b/source/tools/entity/checkrefs.py index 744b20cf62..3eedffb2a9 100644 --- a/source/tools/entity/checkrefs.py +++ b/source/tools/entity/checkrefs.py @@ -306,9 +306,10 @@ class CheckRefs: reqTag = cmp_identity.find('Requirements') if reqTag is not None: def parse_requirements(req, recursionDepth = 1): - techTag = req.find('Techs') - if techTag is not None: - self.deps.append((str(fp), f'simulation/data/technologies/{techTag.text}.json')) + techsTag = req.find('Techs') + if techsTag is not None: + for techTag in techsTag.text.split(): + self.deps.append((str(fp), f'simulation/data/technologies/{techTag}.json')) if recursionDepth > 0: recursionDepth -= 1