Index: binaries/data/mods/public/globalscripts/Templates.js =================================================================== --- binaries/data/mods/public/globalscripts/Templates.js +++ binaries/data/mods/public/globalscripts/Templates.js @@ -388,7 +388,10 @@ }; ret.icon = template.Identity.Icon; ret.tooltip = template.Identity.Tooltip; - ret.requiredTechnology = template.Identity.RequiredTechnology; + ret.requiredTechnologies = []; + if (template.Identity.RequiredTechnologies && template.Identity.RequiredTechnologies._string) { + ret.requiredTechnologies = template.Identity.RequiredTechnologies._string.split(/\s+/); + } ret.visibleIdentityClasses = GetVisibleIdentityClasses(template.Identity); ret.nativeCiv = template.Identity.Civ; } Index: binaries/data/mods/public/gui/common/tooltips.js =================================================================== --- binaries/data/mods/public/gui/common/tooltips.js +++ binaries/data/mods/public/gui/common/tooltips.js @@ -624,12 +624,23 @@ { if (technologyEnabled) return ""; - return sprintf(translate("Requires %(technology)s"), { "technology": getEntityNames(GetTechnologyData(requiredTechnology, civ)) }); } +function getRequiredTechnologiesTooltip(technologyEnabled, requiredTechnologies, civ) +{ + if (technologyEnabled) + return ""; + + let mTechNames = requiredTechnologies.map(tech => getEntityNames(GetTechnologyData(tech, civ))); + // Translation: This comma is used for separating first to penultimate elements in an enumeration + return sprintf(translate("Requires %(technologies)s"), { + "technologies": mTechNames.join(translate(", ")) + }); +} + /** * Returns the population bonus information to display in the specified entity's construction button tooltip. */ Index: binaries/data/mods/public/gui/reference/common/helper.js =================================================================== --- binaries/data/mods/public/gui/reference/common/helper.js +++ binaries/data/mods/public/gui/reference/common/helper.js @@ -108,13 +108,14 @@ */ function getPhaseOfTemplate(template) { - if (!template.requiredTechnology) + if (!template.requiredTechnologies.length) return g_ParsedData.phaseList[0]; - - if (basename(template.requiredTechnology).startsWith("phase")) - return getActualPhase(template.requiredTechnology); - - return getPhaseOfTechnology(template.requiredTechnology); + + for (let tech of template.requiredTechnologies) { + if (basename(tech).startsWith("phase")) + return getActualPhase(tech); + } + return getPhaseOfTechnology(template.requiredTechnologies[0]); } /** Index: binaries/data/mods/public/gui/session/menu.js =================================================================== --- binaries/data/mods/public/gui/session/menu.js +++ binaries/data/mods/public/gui/session/menu.js @@ -575,17 +575,17 @@ modifier = "color:0 0 0 127:grayscale:"; else { - if (template.requiredTechnology) + if (template.requiredTechnologies.length) { - let technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", { - "tech": template.requiredTechnology, + let technologyEnabled = Engine.GuiInterfaceCall("AreTechnologiesResearched", { + "techs": template.requiredTechnologies, "player": g_ViewedPlayer }); if (!technologyEnabled) { modifier = "color:0 0 0 127:grayscale:"; button.enabled = false; - tooltips.push(getRequiredTechnologyTooltip(technologyEnabled, template.requiredTechnology, GetSimState().players[g_ViewedPlayer].civ)); + tooltips.push(getRequiredTechnologiesTooltip(technologyEnabled, template.requiredTechnologies, GetSimState().players[g_ViewedPlayer].civ)); } } Index: binaries/data/mods/public/gui/session/selection_panels.js =================================================================== --- binaries/data/mods/public/gui/session/selection_panels.js +++ binaries/data/mods/public/gui/session/selection_panels.js @@ -223,8 +223,8 @@ if (!template) return false; - let technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", { - "tech": template.requiredTechnology, + let technologyEnabled = Engine.GuiInterfaceCall("AreTechnologiesResearched", { + "techs": template.requiredTechnologies, "player": data.player }); @@ -252,7 +252,7 @@ let limits = getEntityLimitAndCount(data.playerState, data.item); tooltips.push( formatLimitString(limits.entLimit, limits.entCount, limits.entLimitChangers), - getRequiredTechnologyTooltip(technologyEnabled, template.requiredTechnology, GetSimState().players[data.player].civ), + getRequiredTechnologiesTooltip(technologyEnabled, template.requiredTechnologies, GetSimState().players[data.player].civ), getNeededResourcesTooltip(neededResources)); data.button.tooltip = tooltips.filter(tip => tip).join("\n"); @@ -936,8 +936,8 @@ if (!template) return false; - let technologyEnabled = Engine.GuiInterfaceCall("IsTechnologyResearched", { - "tech": template.requiredTechnology, + let technologyEnabled = Engine.GuiInterfaceCall("AreTechnologiesResearched", { + "techs": template.requiredTechnologies, "player": data.player }); @@ -992,7 +992,7 @@ tooltips.push(showTemplateViewerOnRightClickTooltip()); tooltips.push( formatBatchTrainingString(buildingsCountToTrainFullBatch, fullBatchSize, remainderBatch), - getRequiredTechnologyTooltip(technologyEnabled, template.requiredTechnology, GetSimState().players[data.player].civ), + getRequiredTechnologiesTooltip(technologyEnabled, template.requiredTechnologies, GetSimState().players[data.player].civ), getNeededResourcesTooltip(neededResources)); data.button.tooltip = tooltips.filter(tip => tip).join("\n"); Index: binaries/data/mods/public/simulation/ai/common-api/entity.js =================================================================== --- binaries/data/mods/public/simulation/ai/common-api/entity.js +++ binaries/data/mods/public/simulation/ai/common-api/entity.js @@ -80,29 +80,36 @@ return true; }, - "requiredTech": function() { return this.get("Identity/RequiredTechnology"); }, + "requiredTechs": function() { + let requiredTechnologies = this.get("Identity/RequiredTechnologies/_string"); + if (!requiredTechnologies) + return []; + + return requiredTechnologies.split(/\s+/); + }, "available": function(gameState) { - let techRequired = this.requiredTech(); - if (!techRequired) + let techsRequired = this.requiredTechs(); + if (!techsRequired) return true; - return gameState.isResearched(techRequired); + return gameState.areResearched(techsRequired); }, // specifically "phase": function() { - let techRequired = this.requiredTech(); - if (!techRequired) - return 0; - if (techRequired == "phase_village") - return 1; - if (techRequired == "phase_town") - return 2; - if (techRequired == "phase_city") - return 3; - if (techRequired.startsWith("phase_")) - return 4; - return 0; + let techsRequired = this.requiredTechs(); + let id = 0; + for (let techRequired of techsRequired) { + if (techRequired == "phase_village") + id = Math.max(id, 1); + else if (techRequired == "phase_town") + id = Math.max(id, 2); + else if (techRequired == "phase_city") + id = Math.max(id, 3); + else if (techRequired.startsWith("phase_")) + id = Math.max(id, 4); + } + return id; }, "cost": function(productionQueue) { Index: binaries/data/mods/public/simulation/ai/common-api/gamestate.js =================================================================== --- binaries/data/mods/public/simulation/ai/common-api/gamestate.js +++ binaries/data/mods/public/simulation/ai/common-api/gamestate.js @@ -212,6 +212,11 @@ return this.playerData.researchedTechs.has(template); }; +m.GameState.prototype.areResearched = function(techs) +{ + return techs.every((tech) => this.playerData.researchedTechs.has(tech)); +} + /** true if started or queued */ m.GameState.prototype.isResearching = function(template) { Index: binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js =================================================================== --- binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js +++ binaries/data/mods/public/simulation/ai/petra/queueplanBuilding.js @@ -28,7 +28,7 @@ if (!this.isGo(gameState)) return false; - if (this.template.requiredTech() && !gameState.isResearched(this.template.requiredTech())) + if (this.template.requiredTechs().length && !gameState.areResearched(this.template.requiredTechs())) return false; return gameState.ai.HQ.buildManager.hasBuilder(this.type); Index: binaries/data/mods/public/simulation/components/GuiInterface.js =================================================================== --- binaries/data/mods/public/simulation/components/GuiInterface.js +++ binaries/data/mods/public/simulation/components/GuiInterface.js @@ -565,6 +565,19 @@ return cmpTechnologyManager.IsTechnologyResearched(data.tech); }; +GuiInterface.prototype.AreTechnologiesResearched = function(player, data) +{ + if (!data.techs) + return true; + + let cmpTechnologyManager = QueryPlayerIDInterface(data.player || player, IID_TechnologyManager); + + if (!cmpTechnologyManager) + return false; + + return cmpTechnologyManager.AreTechnologiesResearched(data.techs); +}; + // Checks whether the requirements for this technology have been met GuiInterface.prototype.CheckTechnologyRequirements = function(player, data) { @@ -1915,6 +1928,7 @@ "GetAverageRangeForBuildings": 1, "GetTemplateData": 1, "IsTechnologyResearched": 1, + "AreTechnologiesResearched": 1, "CheckTechnologyRequirements": 1, "GetStartedResearch": 1, "GetBattleState": 1, Index: binaries/data/mods/public/simulation/components/Identity.js =================================================================== --- binaries/data/mods/public/simulation/components/Identity.js +++ binaries/data/mods/public/simulation/components/Identity.js @@ -83,7 +83,10 @@ "" + "" + "" + - "" + + "" + + "" + + "tokens" + + "" + "" + "" + "" + Index: binaries/data/mods/public/simulation/components/TechnologyManager.js =================================================================== --- binaries/data/mods/public/simulation/components/TechnologyManager.js +++ binaries/data/mods/public/simulation/components/TechnologyManager.js @@ -77,11 +77,11 @@ // Checks an entity template to see if its technology requirements have been met TechnologyManager.prototype.CanProduce = function (templateName) { - var cmpTempManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager); - var template = cmpTempManager.GetTemplate(templateName); + let cmpTempManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager); + let template = cmpTempManager.GetTemplate(templateName); - if (template.Identity && template.Identity.RequiredTechnology) - return this.IsTechnologyResearched(template.Identity.RequiredTechnology); + if (template.Identity && template.Identity.RequiredTechnologies && template.Identity.RequiredTechnologies._string) + return this.AreTechnologiesResearched(template.Identity.RequiredTechnologies._string.split(/\s+/)); // If there is no required technology then this entity can be produced return true; }; @@ -96,6 +96,11 @@ return this.researchedTechs.has(tech); }; +TechnologyManager.prototype.AreTechnologiesResearched = function(techs) +{ + return techs.every((tech) => this.researchedTechs.has(tech)); +} + TechnologyManager.prototype.IsTechnologyStarted = function(tech) { return this.researchStarted.has(tech); Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml =================================================================== --- binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml +++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_gate.xml @@ -18,7 +18,7 @@ Wooden Gate -StoneWall Palisade structures/wooden_gate.png - phase_village + phase_village -phase_town 10 Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml =================================================================== --- binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml +++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_long.xml @@ -27,7 +27,7 @@ Wooden Wall -StoneWall Palisade gaia/special_palisade.png - phase_village + phase_village -phase_town 10 Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml =================================================================== --- binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml +++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_medium.xml @@ -27,7 +27,7 @@ Wooden Wall -StoneWall Palisade gaia/special_palisade.png - phase_village + phase_village -phase_town 10 Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml =================================================================== --- binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml +++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_short.xml @@ -26,7 +26,7 @@ Wooden Wall -StoneWall Palisade gaia/special_palisade.png - phase_village + phase_village -phase_town Index: binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml =================================================================== --- binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml +++ binaries/data/mods/public/simulation/templates/other/palisades_rocks_tower.xml @@ -25,7 +25,7 @@ Wooden Wall -StoneWall Palisade Tower gaia/special_palisade.png - phase_village + phase_village -phase_town 10 Index: binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml =================================================================== --- binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml +++ binaries/data/mods/public/simulation/templates/other/wallset_palisade.xml @@ -5,7 +5,7 @@ Palisade -StoneWall Palisade structures/palisade_wall.png - phase_village + phase_village -phase_town Index: binaries/data/mods/public/simulation/templates/special/spy.xml =================================================================== --- binaries/data/mods/public/simulation/templates/special/spy.xml +++ binaries/data/mods/public/simulation/templates/special/spy.xml @@ -15,7 +15,7 @@ gaia Spy Spy - unlock_spies + unlock_spies true Index: binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml +++ binaries/data/mods/public/simulation/templates/structures/brit_crannog.xml @@ -15,7 +15,7 @@ structures/crannog.png Increase population limit and defend waterways. Crannóc - phase_town + phase_town Index: binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml +++ binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml @@ -46,7 +46,7 @@ -City Shipyard Town Construct and repair mighty warships. structures/uber_dock.png - phase_town + phase_town -phase_city 75 Index: binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml +++ binaries/data/mods/public/simulation/templates/structures/cart_wallset_short.xml @@ -3,7 +3,7 @@ cart Low Wall - phase_village + phase_village -phase_town structures/palisade_wall.png Index: binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml +++ binaries/data/mods/public/simulation/templates/structures/gaul_tavern.xml @@ -24,7 +24,7 @@ Taberna Recruit Naked Fanatics. structures/celtic_embassy.png - phase_town + phase_town -Village Town Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml +++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid.xml @@ -27,7 +27,7 @@ mr ‘3 Pyramid Pyramid -ConquestCritical - phase_city + phase_city structures/kush_pyramid_big.png Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml +++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml @@ -30,7 +30,7 @@ mr ‘3 Pyramid Pyramid -ConquestCritical PyramidLarge - phase_city + phase_city structures/kush_pyramid_big.png Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml +++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml @@ -28,7 +28,7 @@ mr -City Town Pyramid Pyramid -ConquestCritical PyramidSmall - phase_town + phase_town structures/kush_pyramid_small.png Index: binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml +++ binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml @@ -31,7 +31,7 @@ structures/temple_epic.png TempleOfAmun City -Town - phase_city + phase_city Index: binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml +++ binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml @@ -3,7 +3,7 @@ maur Vāraṇaśālā - phase_town + phase_town -City Town Index: binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml +++ binaries/data/mods/public/simulation/templates/structures/merc_camp_egyptian.xml @@ -31,7 +31,7 @@ MercenaryCamp Capture this structure to train mercenaries from Hellenistic Egypt. structures/military_settlement.png - phase_town + phase_town Index: binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml +++ binaries/data/mods/public/simulation/templates/structures/ptol_lighthouse.xml @@ -20,7 +20,7 @@ -City Town Build along the shore to reveal the shorelines over the entire map. Very large vision range: 180 meters. structures/lighthouse.png - phase_town + phase_town 0 Index: binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml +++ binaries/data/mods/public/simulation/templates/structures/ptol_mercenary_camp.xml @@ -31,7 +31,7 @@ MercenaryCamp Cheap Barracks-like structure that is buildable in neutral territory, but casts no territory influence. Train Mercenaries. structures/mercenary_camp.png - phase_town + phase_town Index: binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml +++ binaries/data/mods/public/simulation/templates/structures/rome_wallset_siege.xml @@ -6,7 +6,7 @@ Murus Latericius structures/siege_wall.png A wooden and turf palisade buildable in enemy and neutral territories. - phase_city + phase_city 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 +++ binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml @@ -32,7 +32,7 @@ Klēroukhía Colony structures/military_settlement.png - phase_town + phase_town Index: binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml +++ binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml @@ -34,7 +34,7 @@ Hellenic Royal Stoa Recruit special units. gaia/special_stoa.png - phase_town + phase_town Town Index: binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml +++ binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml @@ -34,7 +34,7 @@ Train healers. Garrison units to heal them at a quick rate (3 HP per second). Research healing and religious improvements. Town Temple structures/temple.png - phase_town + phase_town 50 Index: binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml +++ binaries/data/mods/public/simulation/templates/template_structure_defense_tower_stone.xml @@ -31,7 +31,7 @@ GarrisonTower Town DefenseTower StoneTower structures/defense_tower.png - phase_town + phase_town 0 Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml +++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml @@ -26,7 +26,7 @@ Stone Wall Wall off your town for a stout defense. structures/wall.png - phase_town + phase_town 0 Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml +++ binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml @@ -60,7 +60,7 @@ Shoots arrows. Garrison to defend a city wall against attackers. -ConquestCritical StoneWall Tower structures/tower.png - phase_town + phase_town 0 Index: binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml +++ binaries/data/mods/public/simulation/templates/template_structure_defense_wallset.xml @@ -10,7 +10,7 @@ StoneWall City Wall Wall off your town for a stout defense. - phase_town + phase_town true Index: binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml +++ binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml @@ -27,7 +27,7 @@ BarterMarket Market structures/market.png - phase_town + phase_town Create trade units to trade between other markets. Barter resources. Research trading and bartering improvements. Town Market Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml +++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml @@ -30,7 +30,7 @@ Train citizen-soldiers. Research training improvements. Village Barracks structures/barracks.png - phase_village + phase_village 30 Index: binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml +++ binaries/data/mods/public/simulation/templates/template_structure_military_blacksmith.xml @@ -29,7 +29,7 @@ -ConquestCritical Blacksmith structures/blacksmith.png - phase_town + phase_town Research weapons and armor improvements. Town Blacksmith Index: binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml +++ binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml @@ -30,7 +30,7 @@ Elephant Stables - phase_city + phase_city structures/elephant_stables.png Train elephant units. City ElephantStables Index: binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml +++ binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml @@ -40,7 +40,7 @@ Town Embassy Embassy - phase_town + phase_town 20 Index: binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml +++ binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml @@ -71,7 +71,7 @@ Defensive Fortress GarrisonFortress City structures/fortress.png - phase_city + phase_city 100 Index: binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml +++ binaries/data/mods/public/simulation/templates/template_structure_military_kennel.xml @@ -43,7 +43,7 @@ Town Train war dogs. structures/kennel.png - phase_town + phase_town 10 Index: binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml +++ binaries/data/mods/public/simulation/templates/template_structure_military_workshop.xml @@ -31,7 +31,7 @@ Siege Workshop structures/siege_workshop.png - phase_city + phase_city Build siege engines to destroy your opponents buildings. Research siege technologies to improve the effectiveness of these weapons. City Workshop Index: binaries/data/mods/public/simulation/templates/template_structure_special.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_special.xml +++ binaries/data/mods/public/simulation/templates/template_structure_special.xml @@ -43,7 +43,7 @@ This is a special building unique to a particular civilization. SpecialBuilding City - phase_city + phase_city Index: binaries/data/mods/public/simulation/templates/template_structure_wonder.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_wonder.xml +++ binaries/data/mods/public/simulation/templates/template_structure_wonder.xml @@ -51,7 +51,7 @@ Bring glory to your civilization and add large tracts of land to your empire. City Wonder structures/wonder.png - phase_city + phase_city 300 Index: binaries/data/mods/public/simulation/templates/template_unit_champion.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_champion.xml +++ binaries/data/mods/public/simulation/templates/template_unit_champion.xml @@ -12,7 +12,7 @@ Champion Unit Organic Human Champion Soldier - phase_city + phase_city 150 Index: binaries/data/mods/public/simulation/templates/template_unit_hero.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_hero.xml +++ binaries/data/mods/public/simulation/templates/template_unit_hero.xml @@ -31,7 +31,7 @@ Hero Organic Human Hero Soldier - phase_city + phase_city 400 Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml +++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml @@ -49,7 +49,7 @@ Light Warship Ranged Warship - phase_town + phase_town Garrison units for transport and to increase firepower. Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml +++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml @@ -41,7 +41,7 @@ Fire Ship Fireship Melee Warship Rapidly drain the health of enemy ships. Slowly loses health due to being on fire, so use the Fire Ship quickly. - phase_town + phase_town Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml +++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml @@ -27,7 +27,7 @@ -ConquestCritical Merchantman - phase_town + phase_town Trade between docks. Garrison a Trader aboard for additional profit (+20% for each garrisoned). Gather profitable aquatic treasures. Trader Bribable Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml +++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml @@ -59,7 +59,7 @@ Heavy Warship Garrison units for transport and to increase firepower. Ranged Warship - phase_city + phase_city 150 Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml +++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml @@ -49,7 +49,7 @@ Medium Warship Ranged Warship - phase_town + phase_town Garrison units for transport and to increase firepower. Index: binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege.xml +++ binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege.xml @@ -16,7 +16,7 @@ Siege Siege - phase_city + phase_city pitch-roll Index: binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml +++ binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml @@ -24,7 +24,7 @@ -ConquestCritical Healer Basic - phase_town + phase_town Heal units. Healer Index: binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml +++ binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml @@ -7,7 +7,7 @@ Greek Cavalry Hippeús units/hele_cavalry_swordsman.png - phase_town + phase_town units/athen_cavalry_swordsman_a Index: binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml +++ binaries/data/mods/public/simulation/templates/units/athen_champion_marine.xml @@ -6,7 +6,7 @@ Athenian Marine Epibátēs Athēnaîos units/athen_champion_marine.png - hellenes/special_iphicratean_reforms + hellenes/special_iphicratean_reforms units/athenians/infantry_swordsman_c.xml Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/athen_infantry_javelinist_b.xml @@ -22,7 +22,7 @@ Peltastḗs Thrâx Mercenary units/hele_infantry_javelinist.png - phase_town + phase_town units/athen_infantry_javelinist_a Index: binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/athen_infantry_marine_archer_b.xml @@ -22,7 +22,7 @@ Cretan Mercenary Archer Toxótēs Krētikós units/hele_infantry_archer.png - hellenes/special_iphicratean_reforms + hellenes/special_iphicratean_reforms units/athen_infantry_marine_archer_a Index: binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/athen_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml +++ binaries/data/mods/public/simulation/templates/units/brit_cavalry_swordsman_b.xml @@ -6,7 +6,7 @@ Epos Celtic Cavalry units/celt_cavalry_swordsman.png - phase_town + phase_town units/brit_cavalry_swordsman_a Index: binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/brit_infantry_javelinist_b.xml @@ -12,7 +12,7 @@ units/brit_infantry_javelinist_b Baguada units/celt_infantry_javelinist.png - phase_town + phase_town units/brit_infantry_javelinist_a Index: binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/brit_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml +++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_spearman_ital_b.xml @@ -11,7 +11,7 @@ Italian Italic Cavalry units/cart_cavalry_spearman.png - phase_town + phase_town units/cart_cavalry_spearman_ital_b Ḥayyāl Romaḥ Raḫūv Mercenary Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml +++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_gaul_b.xml @@ -11,7 +11,7 @@ Celt Gallic Mercenary Cavalry units/cart_cavalry_swordsman_2.png - phase_town + phase_town units/cart_cavalry_swordsman_gaul_b Ḥayyāl Ḥerev Raḫūv Mercenary Index: binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml +++ binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml @@ -11,7 +11,7 @@ Iberian Iberian Heavy Cavalry units/cart_cavalry_swordsman.png - phase_town + phase_town units/cart_cavalry_swordsman_iber_b Ḥayyāl Ḥerev Raḫūv Mercenary Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml +++ binaries/data/mods/public/simulation/templates/units/cart_infantry_javelinist_iber_b.xml @@ -19,7 +19,7 @@ Iberian Iberian Mercenary Skirmisher units/cart_infantry_javelinist.png - phase_town + phase_town units/cart_infantry_javelinist_iber_b Sǝḫīr Kidōn Mercenary Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml +++ binaries/data/mods/public/simulation/templates/units/cart_infantry_slinger_iber_b.xml @@ -19,7 +19,7 @@ Iberian Balearic Slinger units/cart_infantry_slinger.png - phase_town + phase_town units/cart_infantry_slinger_iber_b Qallāʿ Ibušimi Mercenary Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml +++ binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_gaul_b.xml @@ -19,7 +19,7 @@ Celt Gallic Mercenary Swordsman units/cart_infantry_swordsman.png - phase_town + phase_town units/cart_infantry_swordsman_gaul_b Seḫīr Ḥerev Mercenary Index: binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml +++ binaries/data/mods/public/simulation/templates/units/cart_infantry_swordsman_ital_b.xml @@ -19,7 +19,7 @@ Italian Samnite Swordsman units/cart_infantry_swordsman_2.png - phase_town + phase_town units/cart_infantry_swordsman_ital_b Seḫīr Romaḥ Mercenary Index: binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml +++ binaries/data/mods/public/simulation/templates/units/cart_ship_merchant.xml @@ -9,7 +9,7 @@ Seḥer 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_village 1.25 Index: binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/cart_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml +++ binaries/data/mods/public/simulation/templates/units/gaul_cavalry_swordsman_b.xml @@ -5,7 +5,7 @@ units/gaul_cavalry_swordsman_b Epos units/celt_cavalry_swordsman.png - phase_town + phase_town units/gaul_cavalry_swordsman_a Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml +++ binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml @@ -16,7 +16,7 @@ Naked Fanatic Gaesata units/celt_fanatic.png - phase_town + phase_town 1.4 Index: binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml +++ binaries/data/mods/public/simulation/templates/units/gaul_infantry_slinger_b.xml @@ -12,7 +12,7 @@ Celtic Slinger Iaosae units/celt_infantry_slinger.png - phase_town + phase_town units/gaul_infantry_slinger_a Index: binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/gaul_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml +++ binaries/data/mods/public/simulation/templates/units/iber_cavalry_spearman_b.xml @@ -5,7 +5,7 @@ units/iber_cavalry_spearman_b Lantzari units/iber_cavalry_spearman.png - phase_town + phase_town units/iber_cavalry_spearman_a Index: binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/iber_infantry_slinger_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/iber_infantry_slinger_b.xml +++ binaries/data/mods/public/simulation/templates/units/iber_infantry_slinger_b.xml @@ -10,7 +10,7 @@ units/iber_infantry_slinger_b Habailari units/iber_infantry_slinger.png - phase_town + phase_town units/iber_infantry_slinger_a Index: binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_b.xml +++ binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_b.xml @@ -10,7 +10,7 @@ units/iber_infantry_spearman_b Ezkutari units/iber_infantry_spearman.png - phase_town + phase_town units/iber_infantry_spearman_a Index: binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/iber_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_b.xml @@ -5,7 +5,7 @@ units/kush_cavalry_javelinist_b iry hr ssmwtt Napatan Light Cavalry - phase_village + phase_village units/kush_cavalry_javelinist.png Index: binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml @@ -12,7 +12,7 @@ Blemmye Desert Raider nhw Bulahau gml units/kush_merc_camelry.png - phase_town + phase_town Camel Mercenary Index: binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_cavalry_spearman_b.xml @@ -6,7 +6,7 @@ Meroitic Heavy Cavalry Htr units/kush_cavalry_spearman.png - phase_town + phase_town units/kush_cavalry_spearman_a Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml @@ -14,7 +14,7 @@ units/kush_infantry_archer_b Nubian Archer Pdty Nhsyw - phase_village + phase_village units/kush_infantry_archer.png Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml @@ -30,7 +30,7 @@ Nuba Clubman nhw Noba units/kush_infantry_clubman.png - phase_town + phase_town Mercenary Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml @@ -21,7 +21,7 @@ Nuba Skirmisher nhw ‘h3w Noba units/kush_infantry_merc_javelinist.png - phase_town + phase_town Mercenary Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml @@ -15,7 +15,7 @@ Meroitic Pikeman si3wrd units/kush_infantry_pikeman.png - phase_town + phase_town units/kush_infantry_pikeman_a Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml @@ -14,7 +14,7 @@ units/kush_infantry_spearman_b Nubian Spearman iry-rdwy Nhsyw - phase_village + phase_village units/kush_infantry_spearman.png Index: binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml +++ binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml @@ -15,7 +15,7 @@ Meroitic Swordsman knw hps units/kush_infantry_swordsman.png - phase_town + phase_town units/kush_infantry_swordsman_a Index: binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/mace_cavalry_javelinist_b.xml @@ -14,7 +14,7 @@ Hippakontistḕs Odrysós Mercenary units/mace_cavalry_javelinist.png - phase_town + phase_town units/mace_cavalry_javelinist_a Index: binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_a_barracks.xml @@ -1,7 +1,7 @@ - unlock_champion_units + unlock_champion_units units/mace_champion_infantry_e_barracks Index: binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/mace_infantry_archer_b.xml @@ -21,7 +21,7 @@ Toxótēs Krētikós Mercenary units/hele_infantry_archer.png - phase_town + phase_town units/mace_infantry_archer_a Index: binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml +++ binaries/data/mods/public/simulation/templates/units/mace_infantry_slinger_b.xml @@ -21,7 +21,7 @@ Sphendonḗtēs Rhódios Mercenary units/mace_infantry_slinger.png - phase_town + phase_town units/mace_infantry_slinger_a Index: binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/mace_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml +++ binaries/data/mods/public/simulation/templates/units/maur_cavalry_swordsman_b.xml @@ -6,7 +6,7 @@ Indian Raiding Cavalry Aśvārohagaṇaḥ units/maur_cavalry_swordsman.png - phase_town + phase_town units/maur_cavalry_swordsman_a Index: binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml @@ -31,7 +31,7 @@ maur Elephant Archer units/maur_cavalry_archer.png - phase_town + phase_town units/maur_elephant_archer_b Vachii Gaja Elephant -Cavalry Index: binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml +++ binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml @@ -12,7 +12,7 @@ Indian Swordsman Khadagdhari units/maur_infantry_swordsman.png - phase_town + phase_town units/maur_infantry_swordsman_a Index: binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml +++ binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml @@ -13,7 +13,7 @@ Rhomphaiaphoros Mercenary units/sele_infantry_swordsman.png - phase_town + phase_town units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml Index: binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml +++ binaries/data/mods/public/simulation/templates/units/merc_thorakites.xml @@ -20,7 +20,7 @@ Armored Swordsman Thōrakitēs units/mace_thorakites.png - phase_city + phase_city Mercenary Index: binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml +++ binaries/data/mods/public/simulation/templates/units/merc_thureophoros.xml @@ -11,7 +11,7 @@ Heavy Skirmisher Thyreophóros units/mace_thureophoros.png - phase_city + phase_city Mercenary Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_archer_b.xml @@ -12,7 +12,7 @@ Babylonian Scythed Chariot Babiruviya Ratha units/pers_chariot_archer.png - phase_town + phase_town units/pers_cavalry_archer_a Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_a_trireme.xml @@ -1,7 +1,7 @@ - persians/special_equine_transports + persians/special_equine_transports units/pers_cavalry_javelinist_e_trireme Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_b_trireme.xml @@ -1,7 +1,7 @@ - persians/special_equine_transports + persians/special_equine_transports units/pers_cavalry_javelinist_a_trireme Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_javelinist_e_trireme.xml @@ -1,6 +1,6 @@ - persians/special_equine_transports + persians/special_equine_transports Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_spearman_b.xml @@ -7,7 +7,7 @@ Cappadocian Cavalry Katpaduka Asabara units/pers_cavalry_spearman.png - phase_town + phase_town units/pers_cavalry_spearman_a Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_a_trireme.xml @@ -1,7 +1,7 @@ - persians/special_equine_transports + persians/special_equine_transports units/pers_cavalry_swordsman_e_trireme Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b.xml @@ -7,7 +7,7 @@ Hyrcanian Cavalry Varkaniya Asabara units/pers_cavalry_swordsman.png - phase_town + phase_town units/pers_cavalry_swordsman_a Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_b_trireme.xml @@ -1,7 +1,7 @@ - persians/special_equine_transports + persians/special_equine_transports units/pers_cavalry_swordsman_a_trireme Index: binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml +++ binaries/data/mods/public/simulation/templates/units/pers_cavalry_swordsman_e_trireme.xml @@ -1,6 +1,6 @@ - persians/special_equine_transports + persians/special_equine_transports Index: binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/pers_infantry_javelinist_b.xml @@ -15,7 +15,7 @@ Anatolian Auxiliary Spardiya Takabara units/pers_infantry_javelinist.png - phase_town + phase_town units/pers_infantry_javelinist_a Index: binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/pers_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_archer_b.xml @@ -7,7 +7,7 @@ Nabataean Camel Archer Mutsābiq Gamal Nabatu units/ptol_camelry_archer.png - phase_village + phase_village units/ptol_cavalry_archer_a Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_javelinist_merc_b.xml @@ -13,7 +13,7 @@ Hippeús Tarantînos Mercenary units/mace_cavalry_javelinist.png - phase_town + phase_town units/ptol_cavalry_javelinist_merc_a Index: binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_cavalry_spearman_merc_b.xml @@ -13,7 +13,7 @@ Hippeús Makedonikós Mercenary units/ptol_cavalry_spearman.png - phase_town + phase_town units/ptol_cavalry_spearman_merc_a Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml @@ -20,7 +20,7 @@ Cretan Mercenary Archer Toxótēs Krētikós units/hele_infantry_archer.png - phase_town + phase_town units/ptol_infantry_archer_a Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml @@ -6,7 +6,7 @@ Nubian Mercenary Archer Kousít Misthophóros Toxótēs units/ptol_infantry_archer.png - phase_village + phase_village Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml @@ -20,7 +20,7 @@ Thureophóros Akrobolistḗs Mercenary units/ptol_infantry_javelinist_merc.png - phase_village + phase_village units/ptol_infantry_javelinist_a Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_slinger_b.xml @@ -13,7 +13,7 @@ Judean Slinger Hebraikós Sphendonḗtēs units/athen_infantry_slinger.png - phase_town + phase_town units/ptol_infantry_slinger_a Index: binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_infantry_swordsman_merc_b.xml @@ -21,7 +21,7 @@ Celt Mercenary units/cart_infantry_swordsman.png - phase_town + phase_town units/ptol_infantry_swordsman_merc_a Index: binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/ptol_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/rome_cavalry_javelinist_b.xml @@ -7,7 +7,7 @@ Italian Allied Cavalry Eques Socius units/rome_cavalry_javelinist.png - phase_town + phase_town units/rome_cavalry_javelinist_a Index: binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml +++ binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml @@ -1,6 +1,6 @@ - unlock_champion_units + unlock_champion_units Index: binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml +++ binaries/data/mods/public/simulation/templates/units/rome_infantry_spearman_b.xml @@ -15,7 +15,7 @@ Veteran Spearman Triarius units/rome_infantry_spearman.png - phase_town + phase_town units/rome_infantry_spearman_a Index: binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/rome_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml +++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_archer_b.xml @@ -7,7 +7,7 @@ Dahae Horse Archer Hippotoxotès Dahae units/sele_cavalry_archer.png - phase_town + phase_town units/sele_cavalry_archer_a Index: binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/sele_cavalry_spearman_merc_b.xml @@ -13,7 +13,7 @@ Companion Cavalry Hippos Hetairike Mercenary - phase_town + phase_town units/mace_cavalry_spearman.png Index: binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml +++ binaries/data/mods/public/simulation/templates/units/sele_champion_cavalry.xml @@ -6,7 +6,7 @@ Seleucid Cataphract Seleukidón Kataphraktos units/sele_champion_cavalry.png - successors/unlock_reform_army + successors/unlock_reform_army units/seleucids/cavalry_spearman_c_m.xml Index: binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml +++ binaries/data/mods/public/simulation/templates/units/sele_champion_chariot.xml @@ -11,7 +11,7 @@ Scythed Chariot Drepanèphoros units/sele_champion_chariot.png - successors/unlock_traditional_army + successors/unlock_traditional_army units/seleucids/chariot_archer_c_m.xml Index: binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml +++ binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_pikeman.xml @@ -6,7 +6,7 @@ Silver Shield Pikeman Phalangitès Argyraspis units/sele_champion_pikeman.png - successors/unlock_traditional_army + successors/unlock_traditional_army units/seleucids/infantry_pikeman_c.xml Index: binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml +++ binaries/data/mods/public/simulation/templates/units/sele_champion_infantry_swordsman.xml @@ -6,7 +6,7 @@ Romanized Heavy Swordsman Thorakitès Rhomaïkós units/sele_champion_swordsman.png - successors/unlock_reform_army + successors/unlock_reform_army units/seleucids/infantry_swordsman_c.xml Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/sele_infantry_archer_merc_b.xml @@ -20,7 +20,7 @@ Toxótēs Syrías Mercenary units/hele_infantry_archer.png - phase_town + phase_town units/sele_infantry_archer_merc_a Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml +++ binaries/data/mods/public/simulation/templates/units/sele_infantry_javelinist_b.xml @@ -13,7 +13,7 @@ Arab Javelineer Pezakontistès Aravikós units/pers_infantry_javelinist.png - phase_village + phase_village units/sele_infantry_javelinist_a Index: binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml +++ binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml @@ -20,7 +20,7 @@ Rhomphaiaphoros Thrakikós units/sele_infantry_swordsman.png Mercenary - phase_town + phase_town units/sele_infantry_swordsman_merc_a Index: binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/sele_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house Index: binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml +++ binaries/data/mods/public/simulation/templates/units/spart_cavalry_spearman_b.xml @@ -7,7 +7,7 @@ Greek Allied Cavalry Hippeús Symmakhikós units/spart_cavalry_spearman.png - phase_town + phase_town units/spart_cavalry_spearman_a Index: binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml +++ binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml @@ -22,7 +22,7 @@ Ékdromos Skirítēs Elite units/spart_champion_infantry_sword.png - phase_town + phase_town Index: binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen_house.xml =================================================================== --- binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen_house.xml +++ binaries/data/mods/public/simulation/templates/units/spart_support_female_citizen_house.xml @@ -4,6 +4,6 @@ 30 - unlock_females_house + unlock_females_house