From 7946def8638a5e13b871a0f93c7dce407312c9fc Mon Sep 17 00:00:00 2001 From: Freagarach Date: Mon, 30 May 2022 15:13:17 +0000 Subject: [PATCH] Fix maps with conquest CC victory conditions. Rename the file to be consistent with its title. Also `centre` -> `center` as per the style guide. Reported by @nwtour at https://code.wildfiregames.com/D3530#171291. Reported by: @Langbart Essentially a patch by: @Langbart Fixes #6548 This was SVN commit r26913. --- .../data/mods/public/maps/skirmishes/acropolis_bay_2p.xml | 2 +- .../simulation/data/settings/victory_conditions/conquest.json | 2 +- ...conquest_civiccentres.json => conquest_civic_centers.json} | 4 ++-- .../data/settings/victory_conditions/conquest_structures.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename binaries/data/mods/public/simulation/data/settings/victory_conditions/{conquest_civiccentres.json => conquest_civic_centers.json} (84%) diff --git a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml index 0738ee9b23..b8f03b515a 100644 --- a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9689b42aca92daa77043b7b47fdbb7636f0d8ca97696ee47a1a08bebc55d4680 +oid sha256:08a2ad126bb1a5217a1772582ca961eb646b95d807d0e6a5b1f53cdec41121bb size 847910 diff --git a/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest.json b/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest.json index 1868d5bd37..7c41806285 100644 --- a/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest.json +++ b/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest.json @@ -11,7 +11,7 @@ "scripts/Conquest.js" ], "Default": true, - "DisabledWhenChecked": ["conquest_units", "conquest_structures", "conquest_civiccentres"], + "DisabledWhenChecked": ["conquest_units", "conquest_structures", "conquest_civic_centers"], "GUIOrder": 0 } } diff --git a/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_civiccentres.json b/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_civic_centers.json similarity index 84% rename from binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_civiccentres.json rename to binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_civic_centers.json index 6328fbb6c4..fb527e3468 100644 --- a/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_civiccentres.json +++ b/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_civic_centers.json @@ -2,8 +2,8 @@ "TranslatedKeys": ["Title", "Description"], "Data": { - "Title": "Conquest Civic Centres", - "Description": "Defeat opponents by destroying all their fully build civic centres.", + "Title": "Conquest Civic Centers", + "Description": "Defeat opponents by destroying all their fully build civic centers.", "Scripts": [ "scripts/TriggerHelper.js", diff --git a/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_structures.json b/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_structures.json index 60a8488536..26c087fea9 100644 --- a/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_structures.json +++ b/binaries/data/mods/public/simulation/data/settings/victory_conditions/conquest_structures.json @@ -10,7 +10,7 @@ "scripts/ConquestCommon.js", "scripts/ConquestStructures.js" ], - "DisabledWhenChecked": ["conquest", "conquest_civiccentres"], + "DisabledWhenChecked": ["conquest", "conquest_civic_centers"], "GUIOrder": 1 } }