From 658a5a8dd135561d79d47e6309102edf9dc0ec35 Mon Sep 17 00:00:00 2001 From: bb Date: Fri, 31 May 2019 20:47:57 +0000 Subject: [PATCH] Rename Stables class to Stable since we use the singular forms. Fixes 964934cf4e Patch By: Angen Reviewed By: Nescio Differential Revision: https://code.wildfiregames.com/D1890 This was SVN commit r22328. --- .../public/maps/random/jebel_barkal_triggers.js | 14 +++++++------- .../public/simulation/ai/petra/headquarters.js | 4 ++-- .../mods/public/simulation/components/Identity.js | 2 +- .../persians/training_conscription_cavalry.json | 4 ++-- ...emplate_structure_military_elephant_stables.xml | 2 +- .../template_structure_military_stable.xml | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js index 6fad6b6aa2..1dff2f279b 100644 --- a/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js +++ b/binaries/data/mods/public/maps/random/jebel_barkal_triggers.js @@ -79,7 +79,7 @@ var scaleByMapSize = (min, max) => min + (max - min) * (TriggerHelper.GetMapSize var jebelBarkal_cityPatrolGroup_count = time => TriggerHelper.GetMapSizeTiles() > 192 ? scaleByTime(time, 3, scaleByMapSize(3, 10)) : 0; var jebelBarkal_cityPatrolGroup_interval = time => scaleByTime(time, 5, 3); var jebelBarkal_cityPatrolGroup_balancing = { - "buildingClasses": ["Wonder", "Temple", "CivCentre", "Fortress", "Barracks+!Stables", "Embassy"], + "buildingClasses": ["Wonder", "Temple", "CivCentre", "Fortress", "Barracks", "Embassy"], "unitCount": time => Math.min(20, scaleByTime(time, 10, 45)), "unitComposition": (time, heroes) => [ { @@ -163,7 +163,7 @@ var jebelBarkal_buildingGarrison = difficulty => [ "capacityRatio": 1 }, { - "buildingClasses": ["Barracks+!Stables", "Embassy"], + "buildingClasses": ["Barracks", "Embassy"], "unitTemplates": [...jebelBarkal_templates.citizenSoldiers, ...jebelBarkal_templates.champions], "capacityRatio": 1 }, @@ -173,13 +173,13 @@ var jebelBarkal_buildingGarrison = difficulty => [ "capacityRatio": 1 }, { - "buildingClasses": ["ElephantStables"], + "buildingClasses": ["ElephantStable"], "unitTemplates": jebelBarkal_templates.elephants, "capacityRatio": 1 }, { - "buildingClasses": ["Stables"], + "buildingClasses": ["Stable"], "unitTemplates": jebelBarkal_templates.champion_cavalry, "capacityRatio": 1 @@ -312,7 +312,7 @@ var jebelBarkal_attackerGroup_balancing = [ "targetClasses": () => "Unit+!Ship" }, { - "buildingClasses": ["Stables"], + "buildingClasses": ["Stable"], "unitCount": time => Math.min(30, scaleByTime(time, 0, 80)), "unitComposition": (time, heroes) => [ { @@ -328,7 +328,7 @@ var jebelBarkal_attackerGroup_balancing = [ "targetClasses": () => "Unit+!Ship" }, { - "buildingClasses": ["Barracks+!Stables", "Embassy"], + "buildingClasses": ["Barracks", "Embassy"], "unitCount": time => Math.min(35, scaleByTime(time, 0, 70)), "unitComposition": (time, heroes) => [ { @@ -340,7 +340,7 @@ var jebelBarkal_attackerGroup_balancing = [ "targetClasses": () => "Unit+!Ship" }, { - "buildingClasses": ["ElephantStables", "Wonder"], + "buildingClasses": ["ElephantStable", "Wonder"], "unitCount": time => scaleByTime(time, 1, 14), "unitComposition": (time, heroes) => [ { diff --git a/binaries/data/mods/public/simulation/ai/petra/headquarters.js b/binaries/data/mods/public/simulation/ai/petra/headquarters.js index 1014aceb61..f0e76a934b 100644 --- a/binaries/data/mods/public/simulation/ai/petra/headquarters.js +++ b/binaries/data/mods/public/simulation/ai/petra/headquarters.js @@ -1925,7 +1925,7 @@ m.HQ.prototype.constructTrainingBuildings = function(gameState, queues) let numRanges = gameState.getOwnEntitiesByClass("Range", true).length; let stableTemplate = this.canBuild(gameState, "structures/{civ}_stable") ? "structures/{civ}_stable" : undefined; - let numStables = gameState.getOwnEntitiesByClass("Stables", true).length; + let numStables = gameState.getOwnEntitiesByClass("Stable", true).length; if (this.getAccountedPopulation(gameState) > this.Config.Military.popForBarracks1 || this.phasing == 2 && gameState.getOwnStructures().filter(API3.Filters.byClass("Village")).length < 5) @@ -1983,7 +1983,7 @@ m.HQ.prototype.constructTrainingBuildings = function(gameState, queues) if (this.currentPhase < 3) return; - if (this.canBuild(gameState, "structures/{civ}_elephant_stables") && !gameState.getOwnEntitiesByClass("ElephantStables", true).hasEntities()) + if (this.canBuild(gameState, "structures/{civ}_elephant_stables") && !gameState.getOwnEntitiesByClass("ElephantStable", true).hasEntities()) { queues.militaryBuilding.addPlan(new m.ConstructionPlan(gameState, "structures/{civ}_elephant_stables", { "militaryBase": true })); return; diff --git a/binaries/data/mods/public/simulation/components/Identity.js b/binaries/data/mods/public/simulation/components/Identity.js index c810a38ae3..9bce4a5e20 100644 --- a/binaries/data/mods/public/simulation/components/Identity.js +++ b/binaries/data/mods/public/simulation/components/Identity.js @@ -62,7 +62,7 @@ Identity.prototype.Schema = "" + "" + "" + - "" + + "" + "" + "tokens" + "" + diff --git a/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json b/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json index 14a7dfaa09..7720ce88de 100644 --- a/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json +++ b/binaries/data/mods/public/simulation/data/technologies/persians/training_conscription_cavalry.json @@ -9,6 +9,6 @@ "researchTime": 40, "tooltip": "Faster batch training speed for the Stables.", "modifications": [{"value": "ProductionQueue/BatchTimeModifier", "add": -0.1}], - "affects": ["Stables"], + "affects": ["Stable"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" -} \ No newline at end of file +} diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml index 224ccebd6a..888b18ee04 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_elephant_stables.xml @@ -27,7 +27,7 @@ phase_city structures/stable_elephant.png Train elephant units. - City ElephantStables + City ElephantStable 0 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 dc1b120b9f..cc643be746 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 @@ -23,7 +23,7 @@ structures/pers_stable.png phase_village Train citizen-soldier cavalry. Research training improvements. - Village Stables + Village Stable 30