Ticket #3355: t3355_move_gamesetup_strings_v1.patch

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

@@ -3 +3 @@
 
 function init(settings)
 {
     g_PlayerSlot = settings.playerSlot;
 
-    translateObjectKeys(settings.ais, ["name", "description"]);
     g_AIs = [
         {id: "", data: {name: translateWithContext("ai", "None"), description: translate("AI will be disabled for this player.")}}
-    ].concat(settings.ais);
+    ].concat(settings.AIs);
 
     var aiSelection = Engine.GetGUIObjectByName("aiSelection");
-    aiSelection.list = [ translate(ai.data.name) for each (ai in g_AIs) ];
+    aiSelection.list = g_AIs.map(ai => translate(ai.data.name));
 
     var selected = 0;
     for (var i = 0; i < g_AIs.length; ++i)
     {
         if (g_AIs[i].id == settings.id)
@@ -23 +22 @@
         }
     }
     aiSelection.selected = selected;
 
     var aiDiff = Engine.GetGUIObjectByName("aiDifficulty");
-    // Translation: AI difficulty level.
-    aiDiff.list = [translateWithContext("aiDiff", "Sandbox"), translateWithContext("aiDiff", "Very Easy"), translateWithContext("aiDiff", "Easy"), translateWithContext("aiDiff", "Medium"), translateWithContext("aiDiff", "Hard"), translateWithContext("aiDiff", "Very Hard")];
+    aiDiff.list = settings.difficulties.Title;
     aiDiff.selected = settings.difficulty;
 }
 
 function selectAI(idx)
 {

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

@@ -83 +83 @@
     return text.substr(0, 255).replace(/\\/g, "\\\\").replace(/\[/g, "\\[");
 }
 
 // ====================================================================
 
-// Load default player data, for when it's not otherwise specified
-function initPlayerDefaults()
-{
-    var data = Engine.ReadJSONFile("simulation/data/player_defaults.json");
-    if (!data || !data.PlayerData)
-    {
-        error("Failed to parse player defaults in player_defaults.json (check for valid JSON data)");
-        return [];
-    }
-
-    return data.PlayerData;
-}
-
-// ====================================================================
-
-// Load map size data
-function initMapSizes()
-{
-    var sizes = {
-        "shortNames":[],
-        "names":[],
-        "tiles": [],
-        "default": 0
-    };
 
-    var data = Engine.ReadJSONFile("simulation/data/map_sizes.json");
-    if (!data || !data.Sizes)
-    {
-        error("Failed to parse map sizes in map_sizes.json (check for valid JSON data)");
-        return sizes;
-    }
-
-    translateObjectKeys(data, ["Name", "LongName"]);
-    for (var i = 0; i < data.Sizes.length; ++i)
-    {
-        sizes.shortNames.push(data.Sizes[i].Name);
-        sizes.names.push(data.Sizes[i].LongName);
-        sizes.tiles.push(data.Sizes[i].Tiles);
-
-        if (data.Sizes[i].Default)
-            sizes["default"] = i;
-    }
-
-    return sizes;
-}
-
-// ====================================================================
-
-// Load game speed data
-function initGameSpeeds()
+// Loads the translated description and filename of the preview image of the map (or a placeholder for random map).
+function getMapDescriptionAndPreview(mapType, mapName)
 {
-    var gameSpeeds = {
-        "names": [],
-        "speeds": [],
-        "default": 0
+    let mapData;
+    if (mapType == "random" && mapName == "random")
+        mapData = {"settings": {"Description": translate("A randomly selected map.")}};
+    else if (mapType == "random" && Engine.FileExists(mapName + ".json"))
+        mapData = Engine.ReadJSONFile(mapName + ".json");
+    else if (Engine.FileExists(mapName + ".xml"))
+        mapData = Engine.LoadMapSettings(mapName + ".xml");
+    else
+        // Warn the player if we can't find the map.
+        warn(sprintf("Map '%(mapName)s' not found locally.", { mapName: mapName }));
+
+    return {
+        "description": translate(mapData && mapData.settings.Description ? mapData.settings.Description : "Sorry, no description available."),
+        "preview": mapData && mapData.settings.Preview ? mapData.settings.Preview : "nopreview.png"
     };
-
-    var data = Engine.ReadJSONFile("simulation/data/game_speeds.json");
-    if (!data || !data.Speeds)
-    {
-        error("Failed to parse game speeds in game_speeds.json (check for valid JSON data)");
-        return gameSpeeds;
-    }
-
-    translateObjectKeys(data, ["Name"]);
-    for (var i = 0; i < data.Speeds.length; ++i)
-    {
-        gameSpeeds.names.push(data.Speeds[i].Name);
-        gameSpeeds.speeds.push(data.Speeds[i].Speed);
-
-        if (data.Speeds[i].Default)
-            gameSpeeds["default"] = i;
-    }
-
-    return gameSpeeds;
 }
 
-
 // ====================================================================
 
 // Convert integer color values to string (for use in GUI objects)
 function rgbToGuiColor(color, alpha)
 {

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

@@ +1 @@
+// Used by lobby, gamesetup, session, and replay GUI
+const g_Settings = loadAvailableSettings();
+
+function loadAvailableSettings()
+{
+    let settings = Engine.ReadJSONFile("simulation/data/settings/PlayerLimit.json");
+    if (!settings)
+        return false;
+
+    const settingNames = ["AI_Difficulties", "Ceasefire", "GameSpeeds", "GameTypes", "MapTypes",
+                          "MapSizes", "PlayerDefaults", "PopulationCapacity", "StartingResources"];
+
+    for (let settingName of settingNames)
+    {
+        // Read json file
+        let file = "simulation/data/settings/" + settingName + ".json";
+        let json = Engine.ReadJSONFile(file);
+        if (!json || !json[settingName])
+        {
+            error("Couldn't load " + settingName + " settings!");
+            return false;
+        }
+
+        // Translate setting values
+        let settingValues = json[settingName];
+        if (json.TranslatedKeys)
+            translateObjectKeys(settingValues, json.TranslatedKeys);
+
+        settings[settingName] = settingValues;
+    }
+    return settings;
+}
+
+function initAIDescription()
+{
+    let AIs = Engine.GetAIs();
+    translateObjectKeys(AIs, ["name", "description"]);
+    // Sort AIs by displayed name
+    AIs.sort((a, b) => a.data.name < b.data.name ? -1 : b.data.name < a.data.name ? +1 : 0);
+    return AIs;
+}
+
+// Shows a message box and calls a function if the setting files couldn't be parsed
+function validSettings(callback)
+{
+    if (!g_Settings)
+        messageBox(400, 200, translate("Can't load game settings!"), translate("ERROR!"), 0, [translate("OK")], [callback]);
+    return g_Settings;
+}
+
+// Transforms array to easily copy values to the dropdownlist.
+function prepareForDropdown(settingsName)
+{
+    let settings = {};
+    let settingValues = g_Settings[settingsName];
+    for (let index in settingValues)
+    {
+        for (let property in settingValues[index])
+        {
+            if (property == "Default")
+                continue;
+
+            if (index == 0)
+                settings[property] = [];
+
+            // Switch property and index
+            settings[property][index] = settingValues[index][property];
+        }
+
+        if (settingValues[index].Default)
+            settings.default = +index;
+    }
+    return settings;
+}
+
+//Returns the translation of the given AI difficulty. Requires g_Settings.
+function translateAIDifficulty(index)
+{
+    let difficuly = g_Settings.AI_Difficulties[index];
+    return difficuly ? difficuly[0].Title : translateWithContext("AI difficulty", "Unknown");
+}
+
+//Returns the translation of the given AI name (like "petra"). Requires g_AIs to be present.
+function translateAIName(aiName)
+{
+    let AI_description = g_AIs.filter(ai => ai.id == aiName);
+    return AI_description.length > 0 ? translate(AI_description[0].data.name) : translateWithContext("AI name", "Unknown");
+}
+
+//Returns the translation of the given map type. Requires g_Settings.
+function translateCeasefire(duration)
+{
+    let ceasefire = g_Settings.Ceasefire.filter(c => c.Duration == duration);
+    return ceasefire.length > 0 ? ceasefire[0].Title : translateWithContext("ceasefire duration", "Unknown");
+}
+// translateGameSpeeds not needed for now
+
+//Returns the translation of the given map type. Requires g_Settings.
+function translateGameType(gameType)
+{
+    let type = g_Settings.GameTypes.filter(t => t.Name == gameType);
+    return type.length > 0 ? type[0].Title : translateWithContext("game type", "Unknown");
+}
+
+//Returns the translation of the given map type. Requires g_Settings.
+function translateMapType(mapType)
+{
+    let type = g_Settings.MapTypes.filter(t => t.Name == mapType);
+    return type.length > 0 ? type[0].Title : translateWithContext("map type", "Unknown");
+}
+
+// Returns translated map size for a given a numeric size. Requires g_Settings.
+function translateMapSize(tiles)
+{
+    let size = g_Settings.MapSizes.filter(s => s.Tiles == tiles);
+    return size.length > 0 ? size[0].Name : translateWithContext("map size", "Default");
+}
+
+// Returns the translation for a given numeric value. Requires g_Settings.
+function translatePopulationCapacity(population)
+{
+    let popCap = g_Settings.PopulationCapacity.filter(p => p.Population == population);
+    return popCap.length > 0 ? popCap[0].Title : translateWithContext("population capacity", "Unknown");
+}

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

@@ -1 @@
-////////////////////////////////////////////////////////////////////////////////////////////////
 // Constants
 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;
-// Translation: Amount of starting resources.
-const STARTING_RESOURCES = [translateWithContext("startingResources", "Very Low"), translateWithContext("startingResources", "Low"), translateWithContext("startingResources", "Medium"), translateWithContext("startingResources", "High"), translateWithContext("startingResources", "Very High"), translateWithContext("startingResources", "Deathmatch")];
-const STARTING_RESOURCES_DATA = [100, 300, 500, 1000, 3000, 50000];
-const STARTING_RESOURCES_DEFAULTIDX = 1;
-// Translation: Ceasefire.
-const CEASEFIRE = [translateWithContext("ceasefire", "No ceasefire"), translateWithContext("ceasefire", "5 minutes"), translateWithContext("ceasefire", "10 minutes"), translateWithContext("ceasefire", "15 minutes"), translateWithContext("ceasefire", "20 minutes"), translateWithContext("ceasefire", "30 minutes"), translateWithContext("ceasefire", "45 minutes"), translateWithContext("ceasefire", "60 minutes")];
-const CEASEFIRE_DATA = [0, 5, 10, 15, 20, 30, 45, 60];
-const CEASEFIRE_DEFAULTIDX = 0;
-// Max number of players for any map
-const MAX_PLAYERS = 8;
-
-////////////////////////////////////////////////////////////////////////////////////////////////
+// Contains settings transformed for the dropdown lists
+var g_PlayerDefaults = [], g_AIDiffs = {}, g_Ceasefire = {}, g_GameSpeeds = {};
+var g_GameTypes = {}, g_MapTypes = {}, g_MapSizes = {};
+var g_PopulationCapacity = {}, g_StartingResources = {};
 
 // Is this is a networked game, or offline
 var g_IsNetworked;
 
 // Is this user in control of game settings (i.e. is a network server, or offline player)
@@ -50 +34 @@
 var g_GameStarted = false;
 
 var g_PlayerAssignments = {};
 
 // Default game setup attributes
-var g_DefaultPlayerData = [];
 var g_GameAttributes = {
     settings: {}
 };
 
-var g_GameSpeeds = {};
-var g_MapSizes = {};
-
-var g_AIs = [];
-
 var g_ChatMessages = [];
 
 // Data caches
 var g_MapData = {};
 var g_CivData = {};
@@ -76 +54 @@
 // To prevent the display locking up while we load the map metadata,
 // we'll start with a 'loading' message and switch to the main screen in the
 // tick handler
 var g_LoadingState = 0; // 0 = not started, 1 = loading, 2 = loaded
 
-// Filled by scripts in victory_conditions/
-var g_VictoryConditions = {};
-
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 function init(attribs)
 {
     switch (attribs.type)
@@ -115 +90 @@
 }
 
 // Called after the map data is loaded and cached
 function initMain()
 {
-    // Load AI list
-    g_AIs = Engine.GetAIs();
-
-    // Sort AIs by displayed name
-    g_AIs.sort(function (a, b) {
-        return a.data.name < b.data.name ? -1 : b.data.name < a.data.name ? +1 : 0;
-    });
-
-    // Get default player data - remove gaia
-    g_DefaultPlayerData = initPlayerDefaults();
-    g_DefaultPlayerData.shift();
-    for (var i = 0; i < g_DefaultPlayerData.length; ++i)
-        g_DefaultPlayerData[i].Civ = "random";
+    if (!validSettings(cancelAndReturn))
+        return;
 
-    g_GameSpeeds = initGameSpeeds();
-    g_MapSizes = initMapSizes();
+    // Transform setting arrays for usage in dropdown lists
+    g_AIDiffs = prepareForDropdown("AI_Difficulties");
+    g_Ceasefire = prepareForDropdown("Ceasefire");
+    g_GameSpeeds = prepareForDropdown("GameSpeeds");
+    g_GameTypes = prepareForDropdown("GameTypes");
+    g_MapSizes = prepareForDropdown("MapSizes");
+    g_MapTypes = prepareForDropdown("MapTypes");
+    g_PopulationCapacity = prepareForDropdown("PopulationCapacity");
+    g_StartingResources = prepareForDropdown("StartingResources");
+
+    // Modify player defaults for later usage
+    g_PlayerDefaults = g_Settings.PlayerDefaults.map(player => { player.Civ = "random"; return player; });
+    g_PlayerDefaults.shift()
 
     // Init civs
     initCivNameList();
 
     // Init map types
     var mapTypes = Engine.GetGUIObjectByName("mapTypeSelection");
-    mapTypes.list = [translateWithContext("map", "Skirmish"), translateWithContext("map", "Random"), translate("Scenario")];
-    mapTypes.list_data = ["skirmish","random","scenario"];
+    mapTypes.list = g_MapTypes.Title;
+    mapTypes.list_data = g_MapTypes.Name;
 
     // Setup map filters - will appear in order they are added
     addFilter("default", translate("Default"), function(settings) { return settings && (settings.Keywords === undefined || !keywordTestOR(settings.Keywords, ["naval", "demo", "hidden"])); });
     addFilter("naval", translate("Naval Maps"), function(settings) { return settings && settings.Keywords !== undefined && keywordTestAND(settings.Keywords, ["naval"]); });
     addFilter("demo", translate("Demo Maps"), function(settings) { return settings && settings.Keywords !== undefined && keywordTestAND(settings.Keywords, ["demo"]); });
@@ -165 +140 @@
         g_GameAttributes.matchID = Engine.GetMatchID();
 
         initMapNameList();
 
         var numPlayersSelection = Engine.GetGUIObjectByName("numPlayersSelection");
-        var players = [];
-        for (var i = 1; i <= MAX_PLAYERS; ++i)
-            players.push(i);
-        numPlayersSelection.list = players;
-        numPlayersSelection.list_data = players;
-        numPlayersSelection.selected = MAX_PLAYERS - 1;
+        let playersArray = Array(g_Settings.MaxPlayers).fill(0).map((value, index) => index + 1);
+        numPlayersSelection.list = playersArray;
+        numPlayersSelection.list_data = playersArray;
+        numPlayersSelection.selected = g_Settings.MaxPlayers - 1;
 
         var gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
         gameSpeed.hidden = false;
         Engine.GetGUIObjectByName("gameSpeedText").hidden = true;
-        gameSpeed.list = g_GameSpeeds.names;
-        gameSpeed.list_data = g_GameSpeeds.speeds;
+        gameSpeed.list = g_GameSpeeds.Title;
+        gameSpeed.list_data = g_GameSpeeds.Speed;
         gameSpeed.onSelectionChange = function() {
             if (this.selected != -1)
-                g_GameAttributes.gameSpeed = g_GameSpeeds.speeds[this.selected];
+                g_GameAttributes.gameSpeed = g_GameSpeeds.Speed[this.selected];
 
             updateGameAttributes();
         }
-        gameSpeed.selected = g_GameSpeeds["default"];
+        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_PopulationCapacity.Title;
+        populationCaps.list_data = g_PopulationCapacity.Population;
+        populationCaps.selected = g_PopulationCapacity.default;
         populationCaps.onSelectionChange = function() {
             if (this.selected != -1)
-                g_GameAttributes.settings.PopulationCap = POPULATION_CAP_DATA[this.selected];
+                g_GameAttributes.settings.PopulationCap = g_PopulationCapacity.Population[this.selected];
 
             updateGameAttributes();
         }
 
         var startingResourcesL = Engine.GetGUIObjectByName("startingResources");
-        startingResourcesL.list = STARTING_RESOURCES;
-        startingResourcesL.list_data = STARTING_RESOURCES_DATA;
-        startingResourcesL.selected = STARTING_RESOURCES_DEFAULTIDX;
+        startingResourcesL.list = g_StartingResources.Title;
+        startingResourcesL.list_data = g_StartingResources.Resources;
+        startingResourcesL.selected = g_StartingResources.default;
         startingResourcesL.onSelectionChange = function() {
             if (this.selected != -1)
-                g_GameAttributes.settings.StartingResources = STARTING_RESOURCES_DATA[this.selected];
+                g_GameAttributes.settings.StartingResources = g_StartingResources.Resources[this.selected];
 
             updateGameAttributes();
         }
 
         var ceasefireL = Engine.GetGUIObjectByName("ceasefire");
-        ceasefireL.list = CEASEFIRE;
-        ceasefireL.list_data = CEASEFIRE_DATA;
-        ceasefireL.selected = CEASEFIRE_DEFAULTIDX;
+        ceasefireL.list = g_Ceasefire.Title;
+        ceasefireL.list_data = g_Ceasefire.Duration;
+        ceasefireL.selected = g_Ceasefire.default;
         ceasefireL.onSelectionChange = function() {
             if (this.selected != -1)
-                g_GameAttributes.settings.Ceasefire = CEASEFIRE_DATA[this.selected];
+                g_GameAttributes.settings.Ceasefire = g_Ceasefire.Duration[this.selected];
 
             updateGameAttributes();
         }
 
         var victoryConditions = Engine.GetGUIObjectByName("victoryCondition");
-        var victories = getVictoryConditions();
-        victoryConditions.list = victories.text;
-        victoryConditions.list_data = victories.data;
+        victoryConditions.list = g_GameTypes.Title;
+        victoryConditions.list_data = g_GameTypes.Name;
         victoryConditions.onSelectionChange = function() {
             if (this.selected != -1)
             {
-                g_GameAttributes.settings.GameType = victories.data[this.selected];
-                g_GameAttributes.settings.VictoryScripts = victories.scripts[this.selected];
+                g_GameAttributes.settings.GameType = g_GameTypes.Name[this.selected];
+                g_GameAttributes.settings.VictoryScripts = g_GameTypes.Scripts[this.selected];
             }
 
             updateGameAttributes();
         };
-        victoryConditions.selected = VICTORY_DEFAULTIDX;
+        victoryConditions.selected = g_GameTypes.default;
 
         var mapSize = Engine.GetGUIObjectByName("mapSize");
-        mapSize.list = g_MapSizes.names;
-        mapSize.list_data = g_MapSizes.tiles;
+        mapSize.list = g_MapSizes.LongName;
+        mapSize.list_data = g_MapSizes.Tiles;
         mapSize.onSelectionChange = function() {
             if (this.selected != -1)
-                g_GameAttributes.settings.Size = g_MapSizes.tiles[this.selected];
+                g_GameAttributes.settings.Size = g_MapSizes.Tiles[this.selected];
             updateGameAttributes();
         };
         mapSize.selected = 0;
 
         Engine.GetGUIObjectByName("revealMap").onPress = function() {
@@ -292 +264 @@
         Engine.GetGUIObjectByName("gameSpeedText").hidden = false;
         Engine.GetGUIObjectByName("gameSpeed").hidden = true;
 
         // Disable player and game options controls
         // TODO: Shouldn't players be able to choose their own assignment?
-        for (var i = 0; i < MAX_PLAYERS; ++i)
+        for (let i = 0; i < g_Settings.MaxPlayers; ++i)
         {
             Engine.GetGUIObjectByName("playerAssignment["+i+"]").hidden = true;
             Engine.GetGUIObjectByName("playerCiv["+i+"]").hidden = true;
             Engine.GetGUIObjectByName("playerTeam["+i+"]").hidden = true;
         }
@@ -339 +311 @@
         }
     }
 
     // Settings for all possible player slots
     var boxSpacing = 32;
-    for (var i = 0; i < MAX_PLAYERS; ++i)
+    for (let i = 0; i < g_Settings.MaxPlayers; ++i)
     {
         // Space player boxes
         var box = Engine.GetGUIObjectByName("playerBox["+i+"]");
         var boxSize = box.size;
         var h = boxSize.bottom - boxSize.top;
         boxSize.top = i * boxSpacing;
         boxSize.bottom = i * boxSpacing + h;
         box.size = boxSize;
 
         // Populate team dropdowns
-        var team = Engine.GetGUIObjectByName("playerTeam["+i+"]");
-        team.list = [translateWithContext("team", "None"), "1", "2", "3", "4"];
-        team.list_data = [-1, 0, 1, 2, 3];
+        let team = Engine.GetGUIObjectByName("playerTeam["+i+"]");
+        let teamsArray = Array(g_Settings.MaxTeams).fill(0).map((v, i) => i + 1); // 1, 2, ... MaxTeams
+        team.list = [translateWithContext("team", "None")].concat(teamsArray); // "None", 1, 2, ..., maxTeams
+        team.list_data = [-1].concat(teamsArray.map(player => player - 1)); // -1, 0, ..., (maxTeams-1)
         team.selected = 0;
 
         let playerSlot = i; // declare for inner function use
         team.onSelectionChange = function() {
             if (this.selected != -1)
@@ -398 +371 @@
     }
 }
 
 function handleNetMessage(message)
 {
+    if (!g_Settings)
+        return;
+
     log("Net message: "+uneval(message));
 
     switch (message.type)
     {
     case "netstatus":
@@ -571 +547 @@
     //  Add random civ to beginning of list 
     civListNames.unshift('[color="orange"]' + translateWithContext("civilization", "Random") + '[/color]');
     civListCodes.unshift("random"); 
 
     // Update the dropdowns
-    for (var i = 0; i < MAX_PLAYERS; ++i)
+    for (let i = 0; i < g_Settings.MaxPlayers; ++i)
     {
         var civ = Engine.GetGUIObjectByName("playerCiv["+i+"]");
         civ.list = civListNames;
         civ.list_data = civListCodes;
         civ.selected = 0;
@@ -703 +679 @@
 
     // Ensure that cheats are enabled in singleplayer
     if (!g_IsNetworked) 
         mapSettings.CheatsEnabled = true; 
 
-    var aiCodes = [ ai.id for each (ai in g_AIs) ];
     var civListCodes = [ civ.Code for each (civ in g_CivData) if (civ.SelectableInGameSetup !== false) ];
     civListCodes.push("random");
 
     var playerData = mapSettings.PlayerData;
 
@@ -762 +737 @@
     }
 
     if (attrs.gameSpeed)
     {
         var gameSpeedBox = Engine.GetGUIObjectByName("gameSpeed");
-        gameSpeedBox.selected = g_GameSpeeds.speeds.indexOf(attrs.gameSpeed);
+        gameSpeedBox.selected = g_GameSpeeds.Speed.indexOf(attrs.gameSpeed);
     }
 
     if (!Engine.HasXmppClient())
     {
         g_GameAttributes.settings.RatingEnabled = false;
@@ -787 +762 @@
     Engine.WriteJSONFile(g_IsNetworked ? FILEPATH_MATCHSETTINGS_MP : FILEPATH_MATCHSETTINGS_SP, attributes);
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////
 // GUI event handlers
 
+function cancelAndReturn()
+{
+    cancelSetup();
+    if(Engine.HasXmppClient())
+        Engine.SwitchGuiPage("page_lobby.xml");
+    else
+        Engine.SwitchGuiPage("page_pregame.xml");
+}
+
 function cancelSetup()
 {
     if (g_IsController)
         saveGameAttributes();
 
@@ -858 +842 @@
     }
     else
     {
         // Add player data from defaults
         for (var i = pData.length; i < num; ++i)
-            g_GameAttributes.settings.PlayerData.push(g_DefaultPlayerData[i]);
+            g_GameAttributes.settings.PlayerData.push(g_PlayerDefaults[i]);
     }
 
     // Some players may have lost their assigned slot
     for (var guid in g_PlayerAssignments)
     {
@@ -908 +892 @@
         break;
 
     case "skirmish":
         g_GameAttributes.mapPath = "maps/skirmishes/";
         g_GameAttributes.settings = {
-            PlayerData: g_DefaultPlayerData.slice(0, 4),
+            PlayerData: g_PlayerDefaults.slice(0, 4),
             Seed: Math.floor(Math.random() * 65536),
             AISeed: Math.floor(Math.random() * 65536),
             CheatsEnabled: g_GameAttributes.settings.CheatsEnabled
         };
         break;
 
     case "random":
         g_GameAttributes.mapPath = "maps/random/";
         g_GameAttributes.settings = {
-            PlayerData: g_DefaultPlayerData.slice(0, 4),
+            PlayerData: g_PlayerDefaults.slice(0, 4),
             Seed: Math.floor(Math.random() * 65536),
             AISeed: Math.floor(Math.random() * 65536),
             CheatsEnabled: g_GameAttributes.settings.CheatsEnabled
         };
         break;
@@ -975 +959 @@
             g_GameAttributes.settings[prop] = undefined;
 
     var mapData = loadMapData(name);
     var mapSettings = (mapData && mapData.settings ? deepcopy(mapData.settings) : {});
 
+    // Reset victory conditions
+    if (g_GameAttributes.mapType != "random")
+    {
+        let victoryIdx = mapSettings.GameType && g_GameTypes.Name.indexOf(mapSettings.GameType) != -1 ? g_GameTypes.Name.indexOf(mapSettings.GameType) : g_GameTypes.default;
+        g_GameAttributes.settings.GameType = g_GameTypes.Name[victoryIdx];
+        g_GameAttributes.settings.VictoryScripts = g_GameTypes.Scripts[victoryIdx];
+    }
+
     // Copy any new settings
     g_GameAttributes.map = name;
     g_GameAttributes.script = mapSettings.Script;
     if (g_GameAttributes.map !== "random")
         for (var prop in mapSettings)
@@ -990 +982 @@
 
     // Use default AI if the map doesn't specify any explicitly
     for (var i = 0; i < g_GameAttributes.settings.PlayerData.length; ++i)
     {
         if (!('AI' in g_GameAttributes.settings.PlayerData[i]))
-            g_GameAttributes.settings.PlayerData[i].AI = g_DefaultPlayerData[i].AI;
+            g_GameAttributes.settings.PlayerData[i].AI = g_PlayerDefaults[i].AI;
         if (!('AIDiff' in g_GameAttributes.settings.PlayerData[i]))
-            g_GameAttributes.settings.PlayerData[i].AIDiff = g_DefaultPlayerData[i].AIDiff;
+            g_GameAttributes.settings.PlayerData[i].AIDiff = g_PlayerDefaults[i].AIDiff;
     }
 
     // Reset player assignments on map change
     if (!g_IsNetworked)
     {   // Slot 1
@@ -1008 +1000 @@
 
         for (var guid in g_PlayerAssignments)
         {   // Unassign extra players
             var player = g_PlayerAssignments[guid].player;
 
-            if (player <= MAX_PLAYERS && player > numPlayers)
+            if (player <= g_Settings.MaxPlayers && player > numPlayers)
                 Engine.AssignNetworkPlayer(player, "");
         }
     }
 
     updateGameAttributes();
@@ -1133 +1125 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 function onGameAttributesChange()
 {
+    if (!g_Settings)
+        return;
+
     g_IsInGuiUpdate = true;
 
     // Don't set any attributes here, just show the changes in GUI
 
     var mapName = g_GameAttributes.map || "";
     var mapSettings = g_GameAttributes.settings;
-    var numPlayers = (mapSettings.PlayerData ? mapSettings.PlayerData.length : MAX_PLAYERS);
+    var numPlayers = mapSettings.PlayerData ? mapSettings.PlayerData.length : g_Settings.MaxPlayers;
 
     // Update some controls for clients
     if (!g_IsController)
     {
         var mapFilterSelection = Engine.GetGUIObjectByName("mapFilterSelection");
@@ -1157 +1152 @@
         Engine.GetGUIObjectByName("mapSelectionText").caption = translate(getMapDisplayName(mapName));
         if (mapSettings.PopulationCap)
         {
             var populationCapBox = Engine.GetGUIObjectByName("populationCap");
             populationCapBox.selected = populationCapBox.list_data.indexOf(mapSettings.PopulationCap);
-        }       
+        }
         if (mapSettings.StartingResources)
         {
             var startingResourcesBox = Engine.GetGUIObjectByName("startingResources");
             startingResourcesBox.selected = startingResourcesBox.list_data.indexOf(mapSettings.StartingResources);
         }
@@ -1204 +1199 @@
     var ceasefireText = Engine.GetGUIObjectByName("ceasefireText");
     var gameSpeedText = Engine.GetGUIObjectByName("gameSpeedText");
     var gameSpeedBox = Engine.GetGUIObjectByName("gameSpeed");
 
     // We have to check for undefined on these properties as not all maps define them.
-    var sizeIdx = (mapSettings.Size !== undefined && g_MapSizes.tiles.indexOf(mapSettings.Size) != -1 ? g_MapSizes.tiles.indexOf(mapSettings.Size) : g_MapSizes["default"]);
-    var speedIdx = (g_GameAttributes.gameSpeed !== undefined && g_GameSpeeds.speeds.indexOf(g_GameAttributes.gameSpeed) != -1) ? g_GameSpeeds.speeds.indexOf(g_GameAttributes.gameSpeed) : g_GameSpeeds["default"];
-    var victories = getVictoryConditions();
-    var victoryIdx = (mapSettings.GameType !== undefined && victories.data.indexOf(mapSettings.GameType) != -1 ? victories.data.indexOf(mapSettings.GameType) : VICTORY_DEFAULTIDX);
-    enableCheats.checked = (mapSettings.CheatsEnabled === undefined || !mapSettings.CheatsEnabled ? false : true)
+    var sizeIdx = mapSettings.Size && g_MapSizes.Tiles.indexOf(mapSettings.Size) != -1 ? g_MapSizes.Tiles.indexOf(mapSettings.Size) : g_MapSizes.default;
+    var speedIdx = g_GameAttributes.gameSpeed && g_GameSpeeds.Speed.indexOf(g_GameAttributes.gameSpeed) != -1 ? g_GameSpeeds.Speed.indexOf(g_GameAttributes.gameSpeed) : g_GameSpeeds.default;
+    var victoryIdx = mapSettings.GameType && g_GameTypes.Name.indexOf(mapSettings.GameType) != -1 ? g_GameTypes.Name.indexOf(mapSettings.GameType) : g_GameTypes.default;
+    enableCheats.checked = mapSettings.CheatsEnabled == true;
     enableCheatsText.caption = (enableCheats.checked ? translate("Yes") : translate("No"));
-    if (mapSettings.RatingEnabled !== undefined)
+    if (mapSettings.RatingEnabled)
     {
         enableRating.checked = mapSettings.RatingEnabled;
         Engine.SetRankedGame(enableRating.checked);
         enableRatingText.caption = (enableRating.checked ? translate("Yes") : translate("No"));
         enableCheats.enabled = !enableRating.checked;
         lockTeams.enabled = !enableRating.checked;
     }
     else
         enableRatingText.caption = "Unknown";
-    gameSpeedText.caption = g_GameSpeeds.names[speedIdx];
+    gameSpeedText.caption = g_GameSpeeds.Title[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];
-    startingResources.selected = (mapSettings.StartingResources !== undefined && STARTING_RESOURCES_DATA.indexOf(mapSettings.StartingResources) != -1 ? STARTING_RESOURCES_DATA.indexOf(mapSettings.StartingResources) : STARTING_RESOURCES_DEFAULTIDX);
-    startingResourcesText.caption = STARTING_RESOURCES[startingResources.selected];
-    ceasefire.selected = (mapSettings.Ceasefire !== undefined && CEASEFIRE_DATA.indexOf(mapSettings.Ceasefire) != -1 ? CEASEFIRE_DATA.indexOf(mapSettings.Ceasefire) : CEASEFIRE_DEFAULTIDX);
-    ceasefireText.caption = CEASEFIRE[ceasefire.selected];
+    populationCap.selected = mapSettings.PopulationCap && g_PopulationCapacity.Population.indexOf(mapSettings.PopulationCap) != -1 ? g_PopulationCapacity.Population.indexOf(mapSettings.PopulationCap) : g_PopulationCapacity.default;
+    populationCapText.caption = g_PopulationCapacity.Title[populationCap.selected];
+    startingResources.selected = mapSettings.StartingResources && 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.hasOwnProperty("Ceasefire") && g_Ceasefire.Duration.indexOf(mapSettings.Ceasefire) != -1 ? g_Ceasefire.Duration.indexOf(mapSettings.Ceasefire) : g_Ceasefire.default;
+    ceasefireText.caption = g_Ceasefire.Title[ceasefire.selected];
 
     // Update map preview
     Engine.GetGUIObjectByName("mapPreview").sprite = "cropped:(0.78125,0.5859375)session/icons/mappreview/" + getMapPreview(mapName);
 
     // Hide/show settings depending on whether we can change them or not
@@ -1270 +1264 @@
         }
         else
         {
             // Client
             numPlayersText.caption = numPlayers;
-            mapSizeText.caption = g_MapSizes.names[sizeIdx];
+            mapSizeText.caption = g_MapSizes.LongName[sizeIdx];
             revealMapText.caption = (mapSettings.RevealMap ? translate("Yes") : translate("No"));
             exploreMapText.caption = (mapSettings.ExporeMap ? translate("Yes") : translate("No"));
             disableTreasuresText.caption = (mapSettings.DisableTreasures ? translate("Yes") : translate("No"));
-            victoryConditionText.caption = victories.text[victoryIdx];
+            victoryConditionText.caption = g_GameTypes.Title[victoryIdx];
             lockTeamsText.caption = (mapSettings.LockTeams ? translate("Yes") : translate("No"));
         }
 
         break;
 
@@ -1313 +1307 @@
         {
             // Client
             revealMapText.caption = (mapSettings.RevealMap ? translate("Yes") : translate("No"));
             exploreMapText.caption = (mapSettings.ExploreMap ? translate("Yes") : translate("No"));
             disableTreasuresText.caption = (mapSettings.DisableTreasures ? translate("Yes") : translate("No"));
-            victoryConditionText.caption = victories.text[victoryIdx];
+            victoryConditionText.caption = g_GameTypes.Title[victoryIdx];
             lockTeamsText.caption = (mapSettings.LockTeams ? translate("Yes") : translate("No"));
         }
 
         break;
 
@@ -1343 +1337 @@
         startingResourcesText.hidden = false;
         populationCap.hidden = true;
         populationCapText.hidden = false;
         ceasefire.hidden = true;
         ceasefireText.hidden = false;
-        
+
         numPlayersText.caption = numPlayers;
         mapSizeText.caption = translate("Default");
         revealMapText.caption = (mapSettings.RevealMap ? translate("Yes") : translate("No"));
         exploreMapText.caption = (mapSettings.ExploreMap ? translate("Yes") : translate("No"));
         disableTreasuresText.caption = translate("No");
-        victoryConditionText.caption = victories.text[victoryIdx];
+        victoryConditionText.caption = g_GameTypes.Title[victoryIdx];
         lockTeamsText.caption = (mapSettings.LockTeams ? translate("Yes") : translate("No"));
 
         startingResourcesText.caption = translate("Determined by scenario");
         populationCapText.caption = translate("Determined by scenario");
         ceasefireText.caption = translate("Determined by scenario");
@@ -1377 +1371 @@
     // Load the description from the map file, if there is one
     var description = mapSettings.Description ? translate(mapSettings.Description) : translate("Sorry, no description available.");
 
     // Describe the number of players and the victory conditions
     var playerString = sprintf(translatePlural("%(number)s player. ", "%(number)s players. ", numPlayers), { number: numPlayers });
-    let victory = translate(victories.text[victoryIdx]);
-    if (victoryIdx != VICTORY_DEFAULTIDX)
+    let victory = translate(g_GameTypes.Title[victoryIdx]);
+    if (victoryIdx != g_GameTypes.default)
         victory = "[color=\"orange\"]" + victory + "[/color]";
     playerString += translate("Victory Condition:") + " " + victory + ".\n\n" + description;
 
-    for (var i = 0; i < MAX_PLAYERS; ++i)
+    for (let i = 0; i < g_Settings.MaxPlayers; ++i)
     {
         // Show only needed player slots
         Engine.GetGUIObjectByName("playerBox["+i+"]").hidden = (i >= numPlayers);
 
         // Show player data or defaults as necessary
@@ -1402 +1396 @@
         var pTeamText = Engine.GetGUIObjectByName("playerTeamText["+i+"]");
         var pColor = Engine.GetGUIObjectByName("playerColor["+i+"]");
 
         // Player data / defaults
         var pData = mapSettings.PlayerData ? mapSettings.PlayerData[i] : {};
-        var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[i] : {};
+        var pDefs = g_PlayerDefaults[i];;
 
         // Common to all game types
         var color = rgbToGuiColor(getSetting(pData, pDefs, "Color"));
         pColor.sprite = "color:" + color + " 100";
         pName.caption = translate(getSetting(pData, pDefs, "Name"));
@@ -1513 +1507 @@
 
     // Only enable start button if we have enough assigned players
     if (g_IsController)
         Engine.GetGUIObjectByName("startGame").enabled = (g_AssignedCount > 0);
 
-    for each (var ai in g_AIs)
+    var AIs = initAIDescription();
+    for (let ai of AIs)
     {
         if (ai.data.hidden)
         {
             // If the map uses a hidden AI then don't hide it
             var usedByMap = false;
-            for (var i = 0; i < MAX_PLAYERS; ++i)
+            for (let i = 0; i < g_Settings.MaxPlayers; ++i)
                 if (i < g_GameAttributes.settings.PlayerData.length &&
                     g_GameAttributes.settings.PlayerData[i].AI == ai.id)
                 {
                     usedByMap = true;
                     break;
@@ -1540 +1535 @@
 
     noAssignment = hostNameList.length;
     hostNameList.push("[color=\"140 140 140 255\"]" + translate("Unassigned"));
     hostGuidList.push("");
 
-    for (var i = 0; i < MAX_PLAYERS; ++i)
+    for (let i = 0; i < g_Settings.MaxPlayers; ++i)
     {
         let playerSlot = i;
         let playerID = i+1; // we don't show Gaia, so first slot is ID 1
 
         var selection = assignments[playerID];
@@ -1579 +1574 @@
             if (g_IsController)
             {
                 configButton.hidden = false;
                 configButton.onpress = function() {
                     Engine.PushGuiPage("page_aiconfig.xml", {
-                        ais: g_AIs,
-                        id: g_GameAttributes.settings.PlayerData[playerSlot].AI,
-                        difficulty: g_GameAttributes.settings.PlayerData[playerSlot].AIDiff,
-                        callback: "AIConfigCallback",
-                        playerSlot: playerSlot // required by the callback function
+                        "AIs": AIs,
+                        "id": g_GameAttributes.settings.PlayerData[playerSlot].AI,
+                        "difficulty": g_GameAttributes.settings.PlayerData[playerSlot].AIDiff,
+                        "difficulties" : g_AIDiffs,
+                        "callback": "AIConfigCallback",
+                        "playerSlot": playerSlot // required by the callback function
                     });
                 };
             }
         }
         // There was a human, so make sure we don't have any AI left
@@ -1711 +1707 @@
         var player = g_PlayerAssignments[msg.guid].player - 1;
         var mapName = g_GameAttributes.map;
         var mapData = loadMapData(mapName);
         var mapSettings = (mapData && mapData.settings ? mapData.settings : {});
         var pData = mapSettings.PlayerData ? mapSettings.PlayerData[player] : {};
-        var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[player] : {};
+        var pDefs = g_PlayerDefaults[player];
 
         color = rgbToGuiColor(getSetting(pData, pDefs, "Color"));
     }
 
     var formatted;
@@ -1784 +1780 @@
 
 function updateReadyUI()
 {
     if (!g_IsNetworked)
         return; // Disabled for single-player games.
-    var isAI = new Array(MAX_PLAYERS + 1);
+    var isAI = new Array(g_Settings.MaxPlayers + 1);
     for (var i = 0; i < isAI.length; ++i)
         isAI[i] = true;
     var allReady = true;
     for (var guid in g_PlayerAssignments)
     {
         // We don't really care whether observers are ready.
         if (g_PlayerAssignments[guid].player == -1 || !g_GameAttributes.settings.PlayerData[g_PlayerAssignments[guid].player - 1])
             continue;
         var pData = g_GameAttributes.settings.PlayerData ? g_GameAttributes.settings.PlayerData[g_PlayerAssignments[guid].player - 1] : {};
-        var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[g_PlayerAssignments[guid].player - 1] : {};
+        var pDefs = g_PlayerDefaults[g_PlayerAssignments[guid].player - 1];
         isAI[g_PlayerAssignments[guid].player] = false;
         if (g_PlayerAssignments[guid].status || !g_IsNetworked)
             Engine.GetGUIObjectByName("playerName[" + (g_PlayerAssignments[guid].player - 1) + "]").caption = '[color="0 255 0"]' + translate(getSetting(pData, pDefs, "Name")) + '[/color]';
         else
         {
             Engine.GetGUIObjectByName("playerName[" + (g_PlayerAssignments[guid].player - 1) + "]").caption = translate(getSetting(pData, pDefs, "Name"));
             allReady = false;
         }
     }
     // AIs are always ready.
-    for (var playerid = 0; playerid < MAX_PLAYERS; ++playerid)
-    {       
+    for (let playerid = 0; playerid < g_Settings.MaxPlayers; ++playerid)
+    {
         if (!g_GameAttributes.settings.PlayerData[playerid])
             continue;
         var pData = g_GameAttributes.settings.PlayerData ? g_GameAttributes.settings.PlayerData[playerid] : {};
-        var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[playerid] : {};
+        var pDefs = g_PlayerDefaults[playerid];
         if (isAI[playerid + 1])
             Engine.GetGUIObjectByName("playerName[" + playerid + "]").caption = '[color="0 255 0"]' + translate(getSetting(pData, pDefs, "Name")) + '[/color]';
     }
 
     // The host is not allowed to start until everyone is ready.
@@ -1967 +1963 @@
         "nbp":nbp,
         "tnbp":tnbp,
         "players":players
     };
     Engine.SendRegisterGame(gameData);
-}
-
-function getVictoryConditions()
-{
-    var r = {};
-    r.text = [translate("None")];
-    r.data = ["endless"];
-    r.scripts = [[]];
-    for (var vc in g_VictoryConditions)
-    {
-        r.data.push(vc);
-        r.text.push(g_VictoryConditions[vc].name);
-        r.scripts.push(g_VictoryConditions[vc].scripts);
-    }
-    return r;
-}
+}
+ No newline at end of file

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
-    <script file="gui/common/network.js"/>
     <script file="gui/common/functions_civinfo.js"/>
     <script file="gui/common/functions_global_object.js"/>
     <script file="gui/common/functions_utility.js"/>
+    <script file="gui/common/network.js"/>
+    <script file="gui/common/settings.js"/>
     <script file="gui/gamesetup/gamesetup.js"/>
-    <!-- After gamesetup.js which defines g_VictoryConditions -->
-    <script directory="gui/gamesetup/victory_conditions/"/>
 
     <!-- Add a translucent black background to fade out the menu page -->
     <object type="image" style="ModernWindow" size="0 0 100% 100%">
 
         <object style="TitleText" type="text" size="50%-128 4 50%+128 36">
@@ -237 +236 @@
                 style="StoneButton"
                 size="100%-308 100%-52 100%-168 100%-24"
                 tooltip_style="onscreenToolTip"
             >
                 <translatableAttribute id="caption">Back</translatableAttribute>
-                <action on="Press">
-                    <![CDATA[
-                        cancelSetup();
-                        if(!Engine.HasXmppClient())
-                            Engine.SwitchGuiPage("page_pregame.xml");
-                        else
-                            Engine.SwitchGuiPage("page_lobby.xml");
-                    ]]>
-                </action>
+                <action on="Press">cancelAndReturn();</action>
             </object>
 
             <!-- Options -->
             <object name="gameOptionsBox" size="100%-425 529 100%-25 525">
                 <!-- More Options Button -->

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

@@ -1 @@
-g_VictoryConditions.conquest = {
-    "name" : translate("Conquest"),
-    "description" : translate("Defeat all opponents"),
-    "scripts" : ["scripts/ConquestCommon.js", "scripts/TriggerHelper.js", "scripts/Conquest.js"]
-};

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

@@ -1 @@
-g_VictoryConditions.conquestStructure = {
-    "name" : translate("Conquest Structures"),
-    "description" : translate("Destroy all structures of enemies"),
-    "scripts" : ["scripts/ConquestCommon.js", "scripts/TriggerHelper.js", "scripts/ConquestStructures.js"]
-};

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

@@ -1 @@
-g_VictoryConditions.conquestUnits = {
-    "name" : translate("Conquest Units"),
-    "description" : translate("Destroy all units of enemies"),
-    "scripts" : ["scripts/ConquestCommon.js", "scripts/TriggerHelper.js", "scripts/ConquestUnits.js"]
-};

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

@@ -1 @@
-g_VictoryConditions.wonder = {
-    "name" : translate("Wonder"),
-    "description" : translate("Build a wonder to win"),
-    "scripts" : ["scripts/ConquestCommon.js", "scripts/TriggerHelper.js", "scripts/Conquest.js", "scripts/WonderVictory.js"]
-};

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

@@ +1 @@
+const g_specialKey = Math.random();
+const g_timestamp = Engine.ConfigDB_GetValue("user", "lobby.chattimestamp") == "true";
+const g_modPrefix = "@";
+const SPAM_BLOCK_LENGTH = 30;
+
 var g_ChatMessages = [];
 var g_Name = "unknown";
 var g_GameList = {}
 var g_GameListSortBy = "name";
 var g_PlayerListSortBy = "name";
 var g_GameListOrder = 1; // 1 for ascending sort, and -1 for descending
 var g_PlayerListOrder = 1;
-var g_specialKey = Math.random();
 // This object looks like {"name":[numMessagesSinceReset, lastReset, timeBlocked]} when in use.
 var g_spamMonitor = {};
-var g_timestamp = Engine.ConfigDB_GetValue("user", "lobby.chattimestamp") == "true";
-var g_mapSizes = {};
-const g_mapTypesText = [translateWithContext("map", "Skirmish"), translateWithContext("map", "Random"), translate("Scenario")];
-const g_mapTypes = ["skirmish", "random", "scenario"];
 var g_userRating = ""; // Rating of user, defaults to Unrated
-var g_modPrefix = "@";
 var g_joined = false;
-// Block spammers for 30 seconds.
-var SPAM_BLOCK_LENGTH = 30;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 function init(attribs)
 {
+    if (!validSettings(returnToMainMenu))
+        return;
+
     // Play menu music
     initMusic();
     global.music.setState(global.music.states.MENU);
 
-    g_Name = Engine.LobbyGetNick();
-
-    g_mapSizes = initMapSizes();
-    g_mapSizes.shortNames.splice(0, 0, translateWithContext("map size", "Any"));
-    g_mapSizes.tiles.splice(0, 0, "");
-
+    // Setup mapsize filter
     var mapSizeFilter = Engine.GetGUIObjectByName("mapSizeFilter");
-    mapSizeFilter.list = g_mapSizes.shortNames;
-    mapSizeFilter.list_data = g_mapSizes.tiles;
+    var mapSizes = prepareForDropdown("MapSizes");
+    mapSizeFilter.list = [translateWithContext("map size", "Any")].concat(mapSizes.Name);
+    mapSizeFilter.list_data = [""].concat(mapSizes.Tiles);
 
+    // Setup playercount filter
+    var playersArray = Array(g_Settings.MaxPlayers - 1).fill(0).map((value, index) => index + 2); // 2, 3, ... MaxPlayers
     var playersNumberFilter = Engine.GetGUIObjectByName("playersNumberFilter");
-    playersNumberFilter.list = [translateWithContext("player number", "Any"),2,3,4,5,6,7,8];
-    playersNumberFilter.list_data = ["",2,3,4,5,6,7,8];
+    playersNumberFilter.list = [translateWithContext("player number", "Any")].concat(playersArray);
+    playersNumberFilter.list_data = [""].concat(playersArray);
 
+    // Setup maptype filter
     var mapTypeFilter = Engine.GetGUIObjectByName("mapTypeFilter");
-    mapTypeFilter.list = [translateWithContext("map", "Any")].concat(g_mapTypesText);
-    mapTypeFilter.list_data = [""].concat(g_mapTypes);
+    var mapTypes = prepareForDropdown("MapTypes");
+    mapTypeFilter.list = [translateWithContext("map type", "Any")].concat(mapTypes.Title);
+    mapTypeFilter.list_data = [""].concat(mapTypes.Name);
 
+    // Init GUI elements
+    g_Name = Engine.LobbyGetNick();
     Engine.LobbySetPlayerPresence("available");
     Engine.SendGetGameList();
     Engine.SendGetBoardList();
     Engine.SendGetRatingList();
     updatePlayerList();
@@ -468 +470 @@
             else
                 name = '[color="255 0 0"]' + name + '[/color]';
             list_name.push(name);
             list_ip.push(g.ip);
             list_mapName.push(translate(g.niceMapName));
-            list_mapSize.push(translatedMapSize(g.mapSize));
-            let idx = g_mapTypes.indexOf(g.mapType);
-            list_mapType.push(idx != -1 ? g_mapTypesText[idx] : "");
+            list_mapSize.push(translateMapSize(g.mapSize));
+            list_mapType.push(translateMapType(g.mapType));
             list_nPlayers.push(g.nbp + "/" +g.tnbp);
             list.push(name);
             list_data.push(c);
         }
         c++;
@@ -546 +547 @@
     // Push this player's name and status onto the list
     return [formattedName, formattedStatus, formattedRating];
 }
 
 /**
- * Given a map size, returns that map size translated into the current
- * language.
- */
-function translatedMapSize(mapSize)
-{
-    if (+mapSize !== +mapSize) // NaN
-        return translate(mapSize);
-    else
-        return g_mapSizes.shortNames[g_mapSizes.tiles.indexOf(+mapSize)];
-}
-
-/**
  * Populate the game info area with information on the current game selection.
  */
 function updateGameSelection()
 {
     var selected = Engine.GetGUIObjectByName("gamesBox").selected;
@@ -572 +561 @@
         Engine.GetGUIObjectByName("joinGameButton").hidden = true;
         Engine.GetGUIObjectByName("gameInfoEmpty").hidden = false;
         return;
     }
 
-    var mapData;
     var g = Engine.GetGUIObjectByName("gamesBox").list_data[selected];
 
-    // Load map data
-    if (g_GameList[g].mapType == "random" && g_GameList[g].mapName == "random")
-        mapData = {"settings": {"Description": translate("A randomly selected map.")}};
-    else if (g_GameList[g].mapType == "random" && Engine.FileExists(g_GameList[g].mapName + ".json"))
-        mapData = Engine.ReadJSONFile(g_GameList[g].mapName + ".json");
-    else if (Engine.FileExists(g_GameList[g].mapName + ".xml"))
-        mapData = Engine.LoadMapSettings(g_GameList[g].mapName + ".xml");
-    else
-        // Warn the player if we can't find the map. 
-        warn(sprintf("Map '%(mapName)s' not found locally.", { mapName: g_GameList[g].mapName }));
-
     // Show the game info panel and join button.
     Engine.GetGUIObjectByName("gameInfo").hidden = false;
     Engine.GetGUIObjectByName("joinGameButton").hidden = false;
     Engine.GetGUIObjectByName("gameInfoEmpty").hidden = true;
 
     // Display the map name, number of players, the names of the players, the map size and the map type.
     Engine.GetGUIObjectByName("sgMapName").caption = translate(g_GameList[g].niceMapName);
     Engine.GetGUIObjectByName("sgNbPlayers").caption = g_GameList[g].nbp + "/" + g_GameList[g].tnbp;
     Engine.GetGUIObjectByName("sgPlayersNames").caption = g_GameList[g].players;
-    Engine.GetGUIObjectByName("sgMapSize").caption = translatedMapSize(g_GameList[g].mapSize);
-    let idx = g_mapTypes.indexOf(g_GameList[g].mapType);
-    Engine.GetGUIObjectByName("sgMapType").caption = idx != -1 ? g_mapTypesText[idx] : "";
-
-    // Display map description if it exists, otherwise display a placeholder.
-    if (mapData && mapData.settings.Description)
-        var mapDescription = translate(mapData.settings.Description);
-    else
-        var mapDescription = translate("Sorry, no description available.");
+    Engine.GetGUIObjectByName("sgMapSize").caption = translateMapSize(g_GameList[g].mapSize);
+    Engine.GetGUIObjectByName("sgMapType").caption = translateMapType(g_GameList[g].mapType);
 
-    // Display map preview if it exists, otherwise display a placeholder.
-    if (mapData && mapData.settings.Preview)
-        var mapPreview = mapData.settings.Preview;
-    else
-        var mapPreview = "nopreview.png";
-
-    Engine.GetGUIObjectByName("sgMapDescription").caption = mapDescription;
-    Engine.GetGUIObjectByName("sgMapPreview").sprite = "cropped:(0.7812,0.5859)session/icons/mappreview/" + mapPreview;
+    // Display map description & preview (or placeholder)
+    let mapData = getMapDescriptionAndPreview(g_GameList[g].mapType, g_GameList[g].mapName);
+    Engine.GetGUIObjectByName("sgMapDescription").caption = mapData.description;
+    Engine.GetGUIObjectByName("sgMapPreview").sprite = "cropped:(0.7812,0.5859)session/icons/mappreview/" + mapData.preview;
 }
 
 /**
  * Start the joining process on the currectly selected game.
  */
@@ -859 +825 @@
         break;
     case "ban": // TODO: Split reason from nick and pass it too, for now just support "/ban nick"
         Engine.LobbyBan(nick, "");
         break;
     case "quit":
-        lobbyStop();
-        Engine.SwitchGuiPage("page_pregame.xml");
+        returnToMainMenu();
         break;
     case "say":
     case "me":
         return false;
     default:
@@ -1088 +1053 @@
         }
     }
 
 }
 
+function returnToMainMenu()
+{
+    lobbyStop();
+    Engine.SwitchGuiPage("page_pregame.xml");
+}
+
 /* Utilities */
 // Generate a (mostly) unique color for this player based on their name.
 // See http://stackoverflow.com/questions/3426404/create-a-hexadecimal-colour-based-on-a-string-with-jquery-javascript
 function getPlayerColor(playername)
 {

binaries/data/mods/public/gui/lobby/lobby.xml

@@ -3 +3 @@
 <objects>
     <script file="gui/common/functions_global_object.js"/>
     <script file="gui/common/functions_utility.js"/>
     <script file="gui/common/timer.js"/>
     <script file="gui/common/music.js"/>
+    <script file="gui/common/settings.js"/>
 
     <script file="gui/lobby/lobby.js"/>
 
     <object type="image" style="ModernWindow" size="0 0 100% 100%" name="lobbyWindow">
 
@@ -161 +162 @@
                 </action>
             </object>
 
             <object type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
                 <translatableAttribute id="caption">Main Menu</translatableAttribute>
-                <action on="Press">
-                    lobbyStop();
-                    Engine.SwitchGuiPage("page_pregame.xml");
-                </action>
+                <action on="Press">returnToMainMenu();</action>
             </object>
         </object>
 
         <!-- Middle panel: Filters, game list, chat box. -->
         <object name="middlePanel" size="20%+5 5% 100%-255 97.2%">

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

@@ -11 +11 @@
 // Cache the basic player data (name, civ, color)
 var g_Players = [];
 // Cache the useful civ data
 var g_CivData = {};
 
-var g_GameSpeeds = {};
-var g_CurrentSpeed;
-
 var g_PlayerAssignments = { "local": { "name": translate("You"), "player": 1 } };
 
 // Cache dev-mode settings that are frequently or widely used
 var g_DevSettings = {
     controlAll: false
@@ -145 +142 @@
 }
 
 // Init
 function init(initData, hotloadData)
 {
+    initMusic();
+
+    if (!validSettings(function() { leaveGame(true); }))
+        return;
+
     if (initData)
     {
         g_IsNetworked = initData.isNetworked; // Set network mode
         g_IsController = initData.isController; // Set controller mode
         g_PlayerAssignments = initData.playerAssignments;
@@ -175 +177 @@
     if (Engine.GetPlayerID() <= 0)
         g_IsObserver = true;
 
     updateTopPanel();
 
-    g_GameSpeeds = initGameSpeeds();
-    g_CurrentSpeed = Engine.GetSimRate();
     var gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
-    gameSpeed.list = g_GameSpeeds.names;
-    gameSpeed.list_data = g_GameSpeeds.speeds;
-    var idx = g_GameSpeeds.speeds.indexOf(g_CurrentSpeed);
-    gameSpeed.selected = idx != -1 ? idx : g_GameSpeeds["default"];
+    var gameSpeeds = prepareForDropdown("GameSpeeds");
+    gameSpeed.list = gameSpeeds.Title;
+    gameSpeed.list_data = gameSpeeds.Speed;
+    var idx = gameSpeed.list_data.indexOf(Engine.GetSimRate());
+    gameSpeed.selected = idx != -1 ? idx : gameSpeeds.default;
     gameSpeed.onSelectionChange = function() { changeGameSpeed(+this.list_data[this.selected]); }
     initMenuPosition(); // set initial position
 
     // Populate player selection dropdown
     var playerNames = [];
@@ -207 +208 @@
 
     if (hotloadData)
         g_Selection.selected = hotloadData.selection;
 
     // Starting for the first time:
-    initMusic();
     if (!g_IsObserver)
     {
         var civMusic = g_CivData[g_Players[Engine.GetPlayerID()].civ].Music;
         global.music.storeTracks(civMusic);
     }
@@ -356 +356 @@
                             "players": g_Players,
                             "mapSettings": mapSettings
                          });
 }
 
+
 // Return some data that we'll use when hotloading this file after changes
 function getHotloadData()
 {
     return { selection: g_Selection.selected };
 }
@@ -398 +399 @@
 /**
  * Called every frame.
  */
 function onTick()
 {
+    if (!g_Settings)
+        return;
+
     var now = new Date;
     var tickLength = new Date - lastTickTime;
     lastTickTime = now;
 
     checkPlayerState();
@@ -507 +511 @@
 
 function changeGameSpeed(speed)
 {
     // For non-networked games only
     if (!g_IsNetworked)
-    {
         Engine.SetSimRate(speed);
-        g_CurrentSpeed = speed;
-    }
 }
 
 /**
  * Recomputes GUI state that depends on simulation state or selection state. Called directly every simulation
  * update (see session.xml), or from onTick when the selection has changed.

binaries/data/mods/public/gui/session/session.xml

@@ -6 +6 @@
 <script file="gui/common/functions_civinfo.js"/>
 <script file="gui/common/functions_global_object.js"/>
 <script file="gui/common/functions_utility.js"/>
 <script file="gui/common/l10n.js"/>
 <script file="gui/common/music.js"/>
+<script file="gui/common/settings.js"/>
 <script file="gui/common/timer.js"/>
 <script file="gui/common/tooltips.js"/>
 <!-- load all scripts in this directory -->
 <script directory="gui/session/"/>
 

binaries/data/mods/public/gui/summary/layout.js

@@ -137 +137 @@
 {
     for (var h = 0; h < MAX_HEADINGTITLE; ++h) 
     {
         Engine.GetGUIObjectByName("titleHeading["+ h +"]").hidden = true;
         Engine.GetGUIObjectByName("Heading[" + h + "]").hidden = true;
-        for (var p = 0; p < MAX_SLOTS; ++p)
+        for (let p = 0; p < g_Settings.MaxPlayers; ++p)
         {
             Engine.GetGUIObjectByName("valueData[" + p + "][" + h + "]").hidden = true;
-            for (var t = 0; t < MAX_TEAMS; ++t) 
+            for (let t = 0; t < g_Settings.MaxTeams; ++t)
             {
                 Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + h + "]").hidden = true;
                 Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + h + "]").hidden = true;
             }
         }
@@ -187 +187 @@
 
 function updateGeneralPanelCounter(counters)
 {
     var rowPlayerObjectWidth = 0;
     var left = 0;
-    for (var p = 0; p < MAX_SLOTS; ++p)
+    for (let p = 0; p < g_Settings.MaxPlayers; ++p)
     {
         left = 240;
         var counterObject;
         for (var w in counters)
         {
@@ -202 +202 @@
         }
         if (rowPlayerObjectWidth == 0)
             rowPlayerObjectWidth = left;
 
         var counterTotalObject;
-        for (var t = 0; t < MAX_TEAMS; ++t)
+        for (var t = 0; t < g_Settings.MaxTeams; ++t)
         {
             left = 240;
             for (var w in counters)
             {
                 counterObject = Engine.GetGUIObjectByName("valueDataTeam[" + t + "][" + p + "][" + w + "]");
@@ -262 +262 @@
         Engine.GetGUIObjectByName("playerNameHeading").caption = "";
 }
 
 function updateObjectPlayerPosition()
 {
-    for (var h = 0; h < MAX_SLOTS; ++h) 
+    for (let h = 0; h < g_Settings.MaxPlayers; ++h)
     {
         var playerBox = Engine.GetGUIObjectByName("playerBox[" + h + "]");
         var boxSize = playerBox.size;
         boxSize.top += h * (PLAYER_BOX_Y_SIZE + PLAYER_BOX_GAP);
         boxSize.bottom = boxSize.top + PLAYER_BOX_Y_SIZE;
         playerBox.size = boxSize;
 
-        for (var i = 0; i < MAX_TEAMS; ++i)
+        for (let i = 0; i < g_Settings.MaxTeams; ++i)
         {
             var playerBoxt = Engine.GetGUIObjectByName("playerBoxt[" + i + "][" + h + "]");
             boxSize = playerBoxt.size;
             boxSize.top += h * (PLAYER_BOX_Y_SIZE + PLAYER_BOX_GAP);
             boxSize.bottom = boxSize.top + PLAYER_BOX_Y_SIZE;

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

@@ -1 @@
-// Max player slots for any map (TODO: should read from config)
-const MAX_SLOTS = 8;
-const MAX_TEAMS = 4;
 const MAX_HEADINGTITLE = 8;
 
 // const for filtering long collective headings
 const LONG_HEADING_WIDTH = 250;
 // Vertical size of player box
@@ -43 +40 @@
  * Select active panel
  * @param panelNumber Number of panel, which should get active state (integer)
  */
 function selectPanel(panelNumber)
 {
+    if (!g_Settings)
+        return;
+
     var panelNames = [ 'scorePanel', 'buildingsPanel', 'unitsPanel', 'resourcesPanel', 'marketPanel', 'miscPanel'];
 
     function adjustTabDividers(tabSize)
     {
         var leftSpacer = Engine.GetGUIObjectByName("tabDividerLeft");
@@ -130 +130 @@
         teamCounterFn(panelInfo.counters);
 }
 
 function init(data)
 {
+    if (!g_Settings)
+        return;
+
     updateObjectPlayerPosition();
     g_GameData = data;
 
-    // Map
-    var mapDisplayType = translate("Scenario");
-
     Engine.GetGUIObjectByName("timeElapsed").caption = sprintf(translate("Game time elapsed: %(time)s"), { time: timeToString(data.timeElapsed) });
 
     Engine.GetGUIObjectByName("summaryText").caption = data.gameResult;
 
-    // This is only defined for random maps
-    if (data.mapSettings.Size)
-    {
-        // load the map sizes from the JSON file
-        var mapSizes = initMapSizes();
-
-        // retrieve the index of the map size
-        for (var mapSizeIndex in mapSizes.tiles)
-        {
-            if (mapSizes.tiles[mapSizeIndex] == data.mapSettings.Size)
-            {
-                mapDisplayType = mapSizes.names[mapSizeIndex];
-                break;
-            }
-        }
-    }
-
-    Engine.GetGUIObjectByName("mapName").caption = sprintf(translate("%(mapName)s - %(mapType)s"), { mapName: translate(data.mapSettings.Name), mapType: mapDisplayType});
+    var mapDisplayType = data.mapSettings.mapType == "random" ? translateMapSize(data.mapSettings.Size) : translateMapType(data.mapSettings.mapType);
+    Engine.GetGUIObjectByName("mapName").caption = sprintf(translate("%(mapName)s - %(mapType)s"),
+            { mapName: translate(data.mapSettings.Name), mapType: mapDisplayType});
 
     // Panels
     g_MaxPlayers = data.playerStates.length - 1;
 
     if (data.mapSettings.LockTeams) // teams ARE locked

binaries/data/mods/public/gui/summary/summary.xml

@@ -8 +8 @@
 
 <objects>
     <script file="gui/common/functions_global_object.js"/>
     <script file="gui/common/functions_civinfo.js"/>
     <script file="gui/common/functions_utility.js"/>
+    <script file="gui/common/settings.js"/>
     <script file="gui/summary/counters.js"/>
     <script file="gui/summary/layout.js"/>
     <script file="gui/summary/summary.js"/>
 
     <object type="image"

binaries/data/mods/public/l10n/messages.json

@@ -451 +451 @@
                 }
             },
             {
                 "extractor": "json",
                 "filemasks": [
-                    "simulation/data/game_speeds.json",
-                    "simulation/data/player_defaults.json"
+                    "simulation/data/settings/PlayerDefaults.json"
                 ],
                 "options": {
                     "keywords": [
                         "Name"
                     ]
                 }
             },
             {
                 "extractor": "json",
                 "filemasks": [
-                    "simulation/data/map_sizes.json"
+                    "simulation/data/settings/MapSizes.json"
                 ],
                 "options": {
                     "keywords": [
                         "Name",
                         "LongName"
                     ]
                 }
             },
             {
                 "extractor": "json",
+                "filemasks": [
+                    "simulation/data/settings/GameTypes.json"
+                ],
+                "options": {
+                    "keywords": [
+                        "Title",
+                        "Description"
+                    ]
+                }
+            },
+            {
+                "extractor": "json",
+                "filemasks": [
+                    "simulation/data/settings/AI_Difficulties.json",
+                    "simulation/data/settings/Ceasefire.json",
+                    "simulation/data/settings/GameSpeeds.json",
+                    "simulation/data/settings/MapTypes.json",
+                    "simulation/data/settings/PopulationCapacity.json",
+                    "simulation/data/settings/StartingResources.json"
+                ],
+                "options": {
+                    "keywords": [
+                        "Title"
+                    ]
+                }
+            },
+            {
+                "extractor": "json",
                 "filemasks": [
                     "simulation/ai/**.json"
                 ],
                 "options": {
                     "keywords": [

binaries/data/mods/public/simulation/data/game_speeds.json

@@ -1 @@
-{
-    "Speeds":
-    [
-        {
-            "Name": "Turtle (0.1x)",
-            "Speed": 0.10
-        },
-        {
-            "Name": "Slow (0.25x)",
-            "Speed": 0.25
-        },
-        {
-            "Name": "Leisurely (0.5x)",
-            "Speed": 0.50
-        },
-        {
-            "Name": "Relaxed (0.75x)",
-            "Speed": 0.75
-        },
-        {
-            "Name": "Normal (1x)",
-            "Speed": 1.0,
-            "Default": true
-        },
-        {
-            "Name": "Fast (1.25x)",
-            "Speed": 1.25
-        },
-        {
-            "Name": "Very Fast (1.5x)",
-            "Speed": 1.5
-        },
-        {
-            "Name": "Insane (2x)",
-            "Speed": 2.0
-        }
-    ]
-}

binaries/data/mods/public/simulation/data/map_sizes.json

@@ -1 @@
-{
-    "Sizes":
-    [
-        {
-            "Name": "Tiny",
-            "LongName": "Tiny",
-            "Tiles": 128
-        },
-        {
-            "Name": "Small",
-            "LongName": "Small (2 players)",
-            "Tiles": 192
-        },
-        {
-            "Name": "Medium",
-            "LongName": "Medium (3 players)",
-            "Tiles": 256,
-            "Default": true
-        },
-        {
-            "Name": "Normal",
-            "LongName": "Normal (4 players)",
-            "Tiles": 320
-        },
-        {
-            "Name": "Large",
-            "LongName": "Large (6 players)",
-            "Tiles": 384
-        },
-        {
-            "Name": "Very Large",
-            "LongName": "Very Large (8 players)",
-            "Tiles": 448
-        },
-        {
-            "Name": "Giant",
-            "LongName": "Giant",
-            "Tiles": 512
-        }
-    ]
-}

binaries/data/mods/public/simulation/data/player_defaults.json

@@ -1 @@
-{
-    "PlayerData":
-    [
-        {
-            "Name": "Gaia",
-            "Civ": "gaia",
-            "Color": { "r": 255, "g": 255, "b": 255 },
-            "AI": "",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 1",
-            "Civ": "athen",
-            "Color": { "r": 46, "g": 46, "b": 200 },
-            "AI": "",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 2",
-            "Civ": "cart",
-            "Color": { "r": 150, "g": 20, "b": 20 },
-            "AI": "petra",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 3",
-            "Civ": "gaul",
-            "Color": { "r": 50, "g": 165, "b": 5 },
-            "AI": "petra",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 4",
-            "Civ": "iber",
-            "Color": { "r": 230, "g": 230, "b": 75 },
-            "AI": "petra",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 5",
-            "Civ": "mace",
-            "Color": { "r": 50, "g": 170, "b": 170 },
-            "AI": "petra",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 6",
-            "Civ": "maur",
-            "Color": { "r": 160, "g": 80, "b": 200 },
-            "AI": "petra",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 7",
-            "Civ": "pers",
-            "Color": { "r": 235, "g": 120, "b": 20 },
-            "AI": "petra",
-            "AIDiff": 3
-        },
-        {
-            "Name": "Player 8",
-            "Civ": "rome",
-            "Color": { "r": 64, "g": 64, "b": 64 },
-            "AI": "petra",
-            "AIDiff": 3
-        }
-    ]
-}

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Title"],
+    "AI_Difficulties":
+    [
+        {
+            "Name": "sandbox",
+            "Title": "Sandbox"
+        },
+        {
+            "Name": "very easy",
+            "Title": "Very Easy"
+        },
+        {
+            "Name": "easy",
+            "Title": "Easy"
+        },
+        {
+            "Name": "medium",
+            "Title": "Medium",
+            "Default": true
+        },
+        {
+            "Name": "hard",
+            "Title": "Hard"
+        },
+        {
+            "Name": "very hard",
+            "Title": "Very Hard"
+        }
+    ]
+}
+ No newline at end of file

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Title"],
+    "Ceasefire":
+    [
+        {
+            "Duration": 0,
+            "Title": "No ceasefire",
+            "Default": true
+        },
+        {
+            "Duration": 1,
+            "Title": "1 minute"
+        },
+        {
+            "Duration": 2,
+            "Title": "2 minutes"
+        },
+        {
+            "Duration": 3,
+            "Title": "3 minutes"
+        },
+        {
+            "Duration": 5,
+            "Title": "5 minutes"
+        },
+        {
+            "Duration": 10,
+            "Title": "10 minutes"
+        },
+        {
+            "Duration": 15,
+            "Title": "15 minutes"
+        },
+        {
+            "Duration": 20,
+            "Title": "20 minutes"
+        },
+        {
+            "Duration": 30,
+            "Title": "30 minutes"
+        },
+        {
+            "Duration": 45,
+            "Title": "45 minutes"
+        },
+        {
+            "Duration": 60,
+            "Title": "60 minutes"
+        }
+    ]
+}

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Title"],
+    "GameSpeeds":
+    [
+        {
+            "Speed": 0.10,
+            "Title": "Turtle (0.1x)"
+        },
+        {
+            "Speed": 0.25,
+            "Title": "Slow (0.25x)"
+        },
+        {
+            "Speed": 0.50,
+            "Title": "Leisurely (0.5x)"
+        },
+        {
+            "Speed": 0.75,
+            "Title": "Relaxed (0.75x)"
+        },
+        {
+            "Speed": 1.0,
+            "Title": "Normal (1x)",
+            "Default": true
+        },
+        {
+            "Speed": 1.25,
+            "Title": "Fast (1.25x)"
+        },
+        {
+            "Speed": 1.5,
+            "Title": "Very Fast (1.5x)"
+        },
+        {
+            "Speed": 2.0,
+            "Title": "Insane (2x)"
+        }
+    ]
+}

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Title"],
+    "GameTypes":
+    [
+        {
+            "Name": "endless",
+            "Title": "None",
+            "Description": "Endless Game",
+            "Scripts": []
+        },
+        {
+            "Name": "conquest",
+            "Title": "Conquest",
+            "Description": "Defeat all opponents",
+            "Scripts":
+            [
+                "scripts/TriggerHelper.js",
+                "scripts/ConquestCommon.js",
+                "scripts/Conquest.js"
+            ],
+            "Default": true
+        },
+        {
+            "Name": "conquestStructures",
+            "Title": "Conquest Structures",
+            "Description": "Destroy all structures of enemies",
+            "Scripts":
+            [
+                "scripts/TriggerHelper.js",
+                "scripts/ConquestCommon.js",
+                "scripts/ConquestStructures.js"
+            ]
+        },
+        {
+            "Name": "conquestUnits",
+            "Title": "Conquest Units",
+            "Description": "Kill all enemy units",
+            "Scripts":
+            [
+                "scripts/TriggerHelper.js",
+                "scripts/ConquestCommon.js",
+                "scripts/ConquestUnits.js"
+            ]
+        },
+        {
+            "Name": "wonder",
+            "Title": "Wonder",
+            "Description": "Build and protect a wonder to win",
+            "Scripts":
+            [
+                "scripts/TriggerHelper.js",
+                "scripts/ConquestCommon.js",
+                "scripts/Conquest.js",
+                "scripts/WonderVictory.js"
+            ]
+        }
+    ]
+}

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Name", "LongName"],
+    "MapSizes":
+    [
+        {
+            "Tiles": 128,
+            "Name": "Tiny",
+            "LongName": "Tiny"
+        },
+        {
+            "Tiles": 192,
+            "Name": "Small",
+            "LongName": "Small (2 players)"
+        },
+        {
+            "Tiles": 256,
+            "Name": "Medium",
+            "LongName": "Medium (3 players)",
+            "Default": true
+        },
+        {
+            "Tiles": 320,
+            "Name": "Normal",
+            "LongName": "Normal (4 players)"
+        },
+        {
+            "Tiles": 384,
+            "Name": "Large",
+            "LongName": "Large (6 players)"
+        },
+        {
+            "Tiles": 448,
+            "Name": "Very Large",
+            "LongName": "Very Large (8 players)"
+        },
+        {
+            "Tiles": 512,
+            "Name": "Giant",
+            "LongName": "Giant"
+        }
+    ]
+}

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Title"],
+    "MapTypes":
+    [
+        {
+            "Name": "skirmish",
+            "Title": "Skirmish",
+            "Default": true
+        },
+        {
+            "Name": "random",
+            "Title": "Random"
+        },
+        {
+            "Name": "scenario",
+            "Title": "Scenario"
+        }
+    ]
+}
+ No newline at end of file

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Name"],
+    "PlayerDefaults":
+    [
+        {
+            "Name": "Gaia",
+            "Civ": "gaia",
+            "Color": { "r": 255, "g": 255, "b": 255 },
+            "AI": "",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 1",
+            "Civ": "athen",
+            "Color": { "r": 46, "g": 46, "b": 200 },
+            "AI": "",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 2",
+            "Civ": "cart",
+            "Color": { "r": 150, "g": 20, "b": 20 },
+            "AI": "petra",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 3",
+            "Civ": "gaul",
+            "Color": { "r": 50, "g": 165, "b": 5 },
+            "AI": "petra",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 4",
+            "Civ": "iber",
+            "Color": { "r": 230, "g": 230, "b": 75 },
+            "AI": "petra",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 5",
+            "Civ": "mace",
+            "Color": { "r": 50, "g": 170, "b": 170 },
+            "AI": "petra",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 6",
+            "Civ": "maur",
+            "Color": { "r": 160, "g": 80, "b": 200 },
+            "AI": "petra",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 7",
+            "Civ": "pers",
+            "Color": { "r": 235, "g": 120, "b": 20 },
+            "AI": "petra",
+            "AIDiff": 3
+        },
+        {
+            "Name": "Player 8",
+            "Civ": "rome",
+            "Color": { "r": 64, "g": 64, "b": 64 },
+            "AI": "petra",
+            "AIDiff": 3
+        }
+    ]
+}

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

@@ +1 @@
+{
+    "MaxPlayers": 8,
+    "MaxTeams": 4
+}

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Title"],
+    "PopulationCapacity":
+    [
+        {
+            "Population": 50,
+            "Title": "50"
+        },
+        {
+            "Population": 100,
+            "Title": "100"
+        },
+        {
+            "Population": 150,
+            "Title": "150"
+        },
+        {
+            "Population": 200,
+            "Title": "200"
+        },
+        {
+            "Population": 250,
+            "Title": "250"
+        },
+        {
+            "Population": 300,
+            "Title": "300",
+            "Default": true
+        },
+        {
+            "Population": 10000,
+            "Title": "Unlimited"
+        }
+    ]
+}

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

@@ +1 @@
+{
+    "TranslatedKeys": ["Title"],
+    "StartingResources":
+    [
+        {
+            "Resources": 100,
+            "Title": "Very Low"
+        },
+        {
+            "Resources": 300,
+            "Title": "Low",
+            "Default": true
+        },
+        {
+            "Resources": 500,
+            "Title": "Medium"
+        },
+        {
+            "Resources": 1000,
+            "Title": "High"
+        },
+        {
+            "Resources": 3000,
+            "Title": "Very High"
+        },
+        {
+            "Resources": 50000,
+            "Title": "Deathmatch"
+        }
+    ]
+}

binaries/data/mods/public/simulation/helpers/Player.js

@@ -13 +13 @@
     // Default settings
     if (!settings)
         settings = {};
 
     // Get default player data
-    var rawData = Engine.ReadJSONFile("player_defaults.json");
-    if (!(rawData && rawData.PlayerData))
-        throw("Player.js: Error reading player_defaults.json");
+    var rawData = Engine.ReadJSONFile("settings/PlayerDefaults.json");
+    if (!rawData || !rawData.PlayerDefaults)
+        throw("Player.js: Error reading PlayerDefaults.json");
 
     // Add gaia to simplify iteration
     if (settings.PlayerData && settings.PlayerData[0])
         settings.PlayerData.unshift(null);
 
-    var playerDefaults = rawData.PlayerData;
+    var playerDefaults = rawData.PlayerDefaults;
     var playerData = settings.PlayerData;
 
     // Get player manager
     var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
     var numPlayers = cmpPlayerManager.GetNumPlayers();
@@ -168 +168 @@
             var cmpPlayer = Engine.QueryInterface(cmpPlayerManager.GetPlayerByID(i), IID_Player);
             cmpPlayer.SetLockTeams(true);
         }
 
     // Disable the AIIinterface when no AI players are present
-    if (playerData && !playerData.some(function(v) { return v && v.AI ? true : false; }))
+    if (playerData && playerData.every(player => !player || !player.AI))
         Engine.QueryInterface(SYSTEM_ENTITY, IID_AIInterface).Disable();
 }
 
 // Get a setting if it exists or return default
 function getSetting(settings, defaults, idx, property)

source/simulation2/Simulation2.cpp

@@ -878 +878 @@
     return file.DecodeUTF8(); // assume it's UTF-8
 }
 
 std::string CSimulation2::GetPlayerDefaults()
 {
-    return ReadJSON(L"simulation/data/player_defaults.json");
+    return ReadJSON(L"simulation/data/settings/PlayerDefaults.json");
 }
 
 std::string CSimulation2::GetMapSizes()
 {
-    return ReadJSON(L"simulation/data/map_sizes.json");
+    return ReadJSON(L"simulation/data/settings/MapSizes.json");
 }
 
 std::string CSimulation2::GetAIData()
 {
     ScriptInterface& scriptInterface = GetScriptInterface();

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp

@@ -139 +139 @@
     sizer->Add(Tooltipped(new wxTextCtrl(this, ID_MapDescription, wxEmptyString, wxDefaultPosition, wxSize(-1, 100), wxTE_MULTILINE),
             _("Short description used on the map selection screen")), wxSizerFlags().Expand());
 
     sizer->AddSpacer(5);
 
+    // TODO: load from GameTypes.json
     wxArrayString gameTypes;
     gameTypes.Add(_T("conquest"));
+    gameTypes.Add(_T("conquestStructures"));
+    gameTypes.Add(_T("conquestUnits"));
     gameTypes.Add(_T("wonder"));
     gameTypes.Add(_T("endless"));
 
     wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
     gridSizer->AddGrowableCol(1);

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp

@@ -535 +535 @@
     // Get player names
     wxArrayString players;
     AtlasMessage::qGetPlayerDefaults qryPlayers;
     qryPlayers.Post();
     AtObj playerData = AtlasObject::LoadFromJSON(*qryPlayers.defaults);
-    AtObj playerDefs = *playerData["PlayerData"];
+    AtObj playerDefs = *playerData["PlayerDefaults"];
     for (AtIter p = playerDefs["item"]; p.defined(); ++p)
     {
         players.Add(wxString(p["Name"]));
     }
     wxDynamicCast(FindWindow(ID_PlayerSelect), PlayerComboBox)->SetPlayers(players);

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

@@ -517 +517 @@
             POST_MESSAGE(LoadPlayerSettings, (true));
             m_MapSettings.NotifyObservers();
         }
     }
 
-    // TODO: we shouldn't hardcode this, but instead dynamically create
-    //  new player notebook pages on demand; of course the default data
-    //  will be limited by the entries in player_defaults.json
+    // TODO: Load value from PlayerLimit.json
     static const size_t MAX_NUM_PLAYERS = 8;
 
     bool m_InGUIUpdate;
     AtObj m_PlayerDefaults;
     PlayerNotebook* m_Players;
@@ -640 +638 @@
 void PlayerSettingsControl::LoadDefaults()
 {
     AtlasMessage::qGetPlayerDefaults qryPlayers;
     qryPlayers.Post();
     AtObj playerData = AtlasObject::LoadFromJSON(*qryPlayers.defaults);
-    m_PlayerDefaults = *playerData["PlayerData"];
+    m_PlayerDefaults = *playerData["PlayerDefaults"];
 }
 
 void PlayerSettingsControl::ReadFromEngine()
 {
     AtlasMessage::qGetMapSettings qry;