Ticket #3355: t3355_move_population_capacities_v1.patch

binaries/data/mods/public/gui/common/settings.js

@@ -29 +29 @@
  */
 function loadSettingsValues()
 {
     var settings = {
         "Ceasefire": loadCeasefire(),
+        "PopulationCapacities": loadPopulationCapacities(),
         "StartingResources": loadSettingValuesFile("starting_resources.json")
     };
 
     if (Object.keys(settings).some(key => settings[key] === undefined))
         return undefined;
@@ -85 +86 @@
             sprintf(translatePluralWithContext("ceasefire", "%(minutes)s minute", "%(minutes)s minutes", timeout), { "minutes": timeout })
     }));
 }
 
 /**
+ * Loads available population capacities.
+ *
+ * @returns {Array|undefined}
+ */
+function loadPopulationCapacities()
+{
+    var json = Engine.ReadJSONFile(g_SettingsDirectory + "population_capacities.json");
+
+    if (!json || json.Default === undefined || !json.PopulationCapacities || !Array.isArray(json.PopulationCapacities))
+    {
+        error("Could not load population_capacities.json");
+        return undefined;
+    }
+
+    return json.PopulationCapacities.map(population => ({
+        "Population": population,
+        "Default": population == json.Default,
+        "Title": population < 10000 ? population : translate("Unlimited")
+    }));
+}
+
+/**
  * Creates an object with all values of that property of the given setting and
  * finds the index of the default value.
  *
  * This allows easy copying of setting values to dropdown lists.
  *

binaries/data/mods/public/gui/gamesetup/gamesetup.js

@@ -3 +3 @@
 const DEFAULT_NETWORKED_MAP = "Acropolis 01";
 const DEFAULT_OFFLINE_MAP = "Acropolis 01";
 
 const VICTORY_DEFAULTIDX = 1;
 
-// TODO: Move these somewhere like simulation\data\game_types.json, Atlas needs them too
-// Translation: Type of victory condition.
-const POPULATION_CAP = ["50", "100", "150", "200", "250", "300", translate("Unlimited")];
-const POPULATION_CAP_DATA = [50, 100, 150, 200, 250, 300, 10000];
-const POPULATION_CAP_DEFAULTIDX = 5;
-
-const g_StartingResources = prepareForDropdown(g_Settings ? g_Settings.StartingResources : undefined);
 const g_Ceasefire = prepareForDropdown(g_Settings ? g_Settings.Ceasefire : undefined);
+const g_PopulationCapacities = prepareForDropdown(g_Settings ? g_Settings.PopulationCapacities : undefined);
+const g_StartingResources = prepareForDropdown(g_Settings ? g_Settings.StartingResources : undefined);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Is this is a networked game, or offline
 var g_IsNetworked;
@@ -197 +192 @@
             updateGameAttributes();
         }
         gameSpeed.selected = g_GameSpeeds["default"];
 
         var populationCaps = Engine.GetGUIObjectByName("populationCap");
-        populationCaps.list = POPULATION_CAP;
-        populationCaps.list_data = POPULATION_CAP_DATA;
-        populationCaps.selected = POPULATION_CAP_DEFAULTIDX;
+        populationCaps.list = g_PopulationCapacities.Title;
+        populationCaps.list_data = g_PopulationCapacities.Population;
+        populationCaps.selected = g_PopulationCapacities.Default;
         populationCaps.onSelectionChange = function() {
             if (this.selected != -1)
-                g_GameAttributes.settings.PopulationCap = POPULATION_CAP_DATA[this.selected];
+                g_GameAttributes.settings.PopulationCap = g_PopulationCapacities.Population[this.selected];
 
             updateGameAttributes();
         }
 
         var startingResourcesL = Engine.GetGUIObjectByName("startingResources");
@@ -1248 +1243 @@
     observerLateJoin.checked = g_GameAttributes.settings.ObserverLateJoin;
     observerLateJoinText.caption = observerLateJoin.checked ? translate("Yes") : translate("No");
 
     gameSpeedText.caption = g_GameSpeeds.names[speedIdx];
     gameSpeedBox.selected = speedIdx;
-    populationCap.selected = (mapSettings.PopulationCap !== undefined && POPULATION_CAP_DATA.indexOf(mapSettings.PopulationCap) != -1 ? POPULATION_CAP_DATA.indexOf(mapSettings.PopulationCap) : POPULATION_CAP_DEFAULTIDX);
-    populationCapText.caption = POPULATION_CAP[populationCap.selected];
+    populationCap.selected = mapSettings.PopulationCap !== undefined && g_PopulationCapacities.Population.indexOf(mapSettings.PopulationCap) != -1 ? g_PopulationCapacities.Population.indexOf(mapSettings.PopulationCap) : g_PopulationCapacities.Default;
+    populationCapText.caption = g_PopulationCapacities.Title[populationCap.selected];
     startingResources.selected = mapSettings.StartingResources !== undefined && g_StartingResources.Resources.indexOf(mapSettings.StartingResources) != -1 ? g_StartingResources.Resources.indexOf(mapSettings.StartingResources) : g_StartingResources.Default;
     startingResourcesText.caption = g_StartingResources.Title[startingResources.selected];
     ceasefire.selected = mapSettings.Ceasefire !== undefined && g_Ceasefire.Duration.indexOf(mapSettings.Ceasefire) != -1 ? g_Ceasefire.Duration.indexOf(mapSettings.Ceasefire) : g_Ceasefire.Default;
     ceasefireText.caption = g_Ceasefire.Title[ceasefire.selected];
 

binaries/data/mods/public/simulation/data/settings/population_capacities.json

@@ +1 @@
+{
+    "PopulationCapacities": [50, 100, 150, 200, 250, 300, 10000],
+    "Default": 300
+}