Index: binaries/data/mods/public/gui/gamesettings/GameSettings.js =================================================================== --- binaries/data/mods/public/gui/gamesettings/GameSettings.js +++ binaries/data/mods/public/gui/gamesettings/GameSettings.js @@ -3,7 +3,7 @@ * * This is intended as a helper to create the settings object for a game. * This object is referred to as: - * - g_GameAttributes in the GUI session context + * - g_InitAttributes in the GUI session context * - InitAttributes in the JS simulation context * - Either InitAttributes or MapSettings in the C++ simulation. * Settings can depend on each other, and the map provides many. @@ -89,10 +89,10 @@ /** * Send the game settings to the server. */ - setNetworkGameAttributes() + setNetworkInitAttributes() { if (this.isNetworked && this.isController) - Engine.SetNetworkGameAttributes(this.toInitAttributes()); + Engine.SendGameSetupMessage(this.toInitAttributes()); } /** @@ -128,7 +128,7 @@ this.pickRandomItems(); Engine.SetRankedGame(this.rating.enabled); - this.setNetworkGameAttributes(); + this.setNetworkInitAttributes(); // Replace player names with the real players. for (let guid in playerAssignments) Index: binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsControl.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsControl.js +++ binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsControl.js @@ -42,7 +42,7 @@ onLoad(initData, hotloadData) { if (hotloadData) - this.parseSettings(hotloadData.gameAttributes); + this.parseSettings(hotloadData.initAttributes); else if (g_IsController && this.gameSettingsFile.enabled) { let settings = this.gameSettingsFile.loadFile(); @@ -51,7 +51,7 @@ } this.updateLayout(); - this.setNetworkGameAttributes(); + this.setNetworkInitAttributes(); } onClose() @@ -61,7 +61,7 @@ onGetHotloadData(object) { - object.gameAttributes = this.getSettings(); + object.initAttributes = this.getSettings(); } onGamesetupMessage(message) @@ -122,23 +122,23 @@ * This is run on a timer to avoid flooding the network with messages, * e.g. when modifying a slider. */ - setNetworkGameAttributes() + setNetworkInitAttributes() { for (let handler of this.settingsChangeHandlers) handler(); if (g_IsNetworked && this.timer === undefined) - this.timer = setTimeout(this.setNetworkGameAttributesImmediately.bind(this), this.Timeout); + this.timer = setTimeout(this.setNetworkInitAttributesImmediately.bind(this), this.Timeout); } - setNetworkGameAttributesImmediately() + setNetworkInitAttributesImmediately() { if (this.timer) { clearTimeout(this.timer); delete this.timer; } - g_GameSettings.setNetworkGameAttributes(); + g_GameSettings.setNetworkInitAttributes(); } onLaunchGame() Index: binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsFile.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsFile.js +++ binaries/data/mods/public/gui/gamesetup/Controls/GameSettingsFile.js @@ -6,8 +6,8 @@ constructor(GameSettingsControl) { this.filename = g_IsNetworked ? - this.GameAttributesFileMultiplayer : - this.GameAttributesFileSingleplayer; + this.PersistedSettingsFileMultiplayer : + this.PersistedSettingsFileSingleplayer; this.gameSettingsControl = GameSettingsControl; @@ -25,16 +25,12 @@ Engine.FileExists(this.filename) && Engine.ReadJSONFile(this.filename); - let gameAttributes = - data && - data.attributes && - data.engine_info && - data.engine_info.engine_version == this.engineInfo.engine_version && - hasSameMods(data.engine_info.mods, this.engineInfo.mods) && + let persistedSettings = data?.engine_info?.engine_version == this.engineInfo.engine_version && + hasSameMods(data?.engine_info?.mods, this.engineInfo.mods) && data.attributes || {}; Engine.ProfileStop(); - return gameAttributes; + return persistedSettings; } /** @@ -57,8 +53,8 @@ GameSettingsFile.prototype.ConfigName = "persistmatchsettings"; -GameSettingsFile.prototype.GameAttributesFileSingleplayer = +GameSettingsFile.prototype.PersistedSettingsFileSingleplayer = "config/matchsettings.json"; -GameSettingsFile.prototype.GameAttributesFileMultiplayer = +GameSettingsFile.prototype.PersistedSettingsFileMultiplayer = "config/matchsettings.mp.json"; Index: binaries/data/mods/public/gui/gamesetup/Controls/StartGameControl.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Controls/StartGameControl.js +++ binaries/data/mods/public/gui/gamesetup/Controls/StartGameControl.js @@ -4,7 +4,7 @@ * 1. Ensure that the host cannot start the game unless all clients agreed on the game settings using the ready system. * * TODO: - * 2. Ensure that the host cannot start the game with GameAttributes different from the agreed ones. + * 2. Ensure that the host cannot start the game with InitAttributes different from the agreed ones. * This may be achieved by: * - Determining the seed collectively. * - passing the agreed game settings to the engine when starting the game instance Index: binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AIBehavior.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AIBehavior.js +++ binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AIBehavior.js @@ -21,7 +21,7 @@ onSelectionChange(itemIdx) { g_GameSettings.playerAI.setBehavior(this.playerIndex, this.dropdown.list_data[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AIDifficulty.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AIDifficulty.js +++ binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AIDifficulty.js @@ -21,7 +21,7 @@ onSelectionChange(itemIdx) { g_GameSettings.playerAI.setDifficulty(this.playerIndex, this.dropdown.list_data[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AISelection.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AISelection.js +++ binaries/data/mods/public/gui/gamesetup/Pages/AIConfigPage/Controls/AISelection.js @@ -31,7 +31,7 @@ onSelectionChange(itemIdx) { g_GameSettings.playerAI.setAI(this.playerIndex, this.dropdown.list_data[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerAssignment.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerAssignment.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerAssignment.js @@ -193,7 +193,7 @@ } playerAssignmentsControl.assignPlayer(guidToAssign, playerIndex); - gameSettingsControl.setNetworkGameAttributes(); + gameSettingsControl.setNetworkInitAttributes(); } isSelected(pData, guid, value) @@ -233,7 +233,7 @@ "behavior": Engine.ConfigDB_GetValue("user", "gui.gamesetup.aibehavior"), }); - gameSettingsControl.setNetworkGameAttributes(); + gameSettingsControl.setNetworkInitAttributes(); } isSelected(pData, guid, value) @@ -268,7 +268,7 @@ g_GameSettings.playerAI.setAI(playerIndex, undefined); - gameSettingsControl.setNetworkGameAttributes(); + gameSettingsControl.setNetworkInitAttributes(); } isSelected(pData, guid, value) Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerCiv.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerCiv.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerCiv.js @@ -63,7 +63,7 @@ onSelectionChange(itemIdx) { g_GameSettings.playerCiv.setValue(this.playerIndex, this.values.civ[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerColor.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerColor.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerColor.js @@ -36,7 +36,7 @@ onSelectionChange(itemIdx) { g_GameSettings.playerColor.setColor(this.playerIndex, this.values[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerTeam.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerTeam.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/PerPlayer/Dropdowns/PlayerTeam.js @@ -39,7 +39,7 @@ onSelectionChange(itemIdx) { g_GameSettings.playerTeam.setValue(this.playerIndex, itemIdx - 1); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Cheats.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Cheats.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Cheats.js @@ -26,7 +26,7 @@ onPress(checked) { g_GameSettings.cheats.setEnabled(!g_IsNetworked || checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/ExploredMap.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/ExploredMap.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/ExploredMap.js @@ -17,7 +17,7 @@ onPress(checked) { g_GameSettings.mapExploration.setExplored(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LastManStanding.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LastManStanding.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LastManStanding.js @@ -18,7 +18,7 @@ onPress(checked) { g_GameSettings.lastManStanding.setEnabled(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LockedTeams.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LockedTeams.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/LockedTeams.js @@ -22,7 +22,7 @@ onPress(checked) { g_GameSettings.lockedTeams.setEnabled(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Nomad.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Nomad.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Nomad.js @@ -17,7 +17,7 @@ onPress(checked) { g_GameSettings.nomad.setEnabled(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Rating.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Rating.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Rating.js @@ -19,7 +19,7 @@ onPress(checked) { g_GameSettings.rating.setEnabled(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RegicideGarrison.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RegicideGarrison.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RegicideGarrison.js @@ -19,7 +19,7 @@ onPress(checked) { g_GameSettings.regicideGarrison.setEnabled(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RevealedMap.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RevealedMap.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/RevealedMap.js @@ -17,7 +17,7 @@ onPress(checked) { g_GameSettings.mapExploration.setRevealed(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Spies.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Spies.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Spies.js @@ -18,7 +18,7 @@ onPress(checked) { g_GameSettings.disableSpies.setEnabled(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Treasures.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Treasures.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/Treasures.js @@ -17,7 +17,7 @@ onPress(checked) { g_GameSettings.disableTreasures.setEnabled(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/WorldPopulation.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/WorldPopulation.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Checkboxes/WorldPopulation.js @@ -17,7 +17,7 @@ onPress(checked) { g_GameSettings.population.setPopCap(checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Biome.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Biome.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Biome.js @@ -46,7 +46,7 @@ onSelectionChange(itemIdx) { g_GameSettings.biome.setBiome(this.dropdown.list_data[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Daytime.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Daytime.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Daytime.js @@ -49,7 +49,7 @@ onSelectionChange(itemIdx) { g_GameSettings.daytime.setValue(this.values.Id[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/GameSpeed.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/GameSpeed.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/GameSpeed.js @@ -41,7 +41,7 @@ onSelectionChange(itemIdx) { g_GameSettings.gameSpeed.setSpeed(this.dropdown.list_data[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Landscape.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Landscape.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/Landscape.js @@ -70,7 +70,7 @@ onSelectionChange(itemIdx) { g_GameSettings.landscape.setValue(this.values.Id[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapFilter.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapFilter.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapFilter.js @@ -35,7 +35,7 @@ if (this.values && this.values.Name.indexOf(this.gameSettingsControl.guiData.mapFilter.filter) === -1) { this.gameSettingsControl.guiData.mapFilter.filter = this.values.Name[this.values.Default]; - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } // Index may have changed, reset. this.setSelectedValue(this.gameSettingsControl.guiData.mapFilter.filter); Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSelection.js @@ -65,7 +65,7 @@ if (this.values.file.indexOf(g_GameSettings.map.map) === -1) { g_GameSettings.map.selectMap(this.values.file[this.values.Default]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } // The index may have changed: reset. this.setSelectedValue(g_GameSettings.map.map); @@ -87,7 +87,7 @@ return; this.reRenderTimeout = setTimeout(() => { g_GameSettings.map.selectMap(this.values.file[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); delete this.reRenderTimeout; }, 0); } Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSize.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSize.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapSize.js @@ -31,7 +31,7 @@ onSelectionChange(itemIdx) { g_GameSettings.mapSize.setSize(g_MapSizes.Tiles[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapType.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapType.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/MapType.js @@ -43,7 +43,7 @@ onSelectionChange(itemIdx) { g_GameSettings.map.setType(g_MapTypes.Name[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PlayerCount.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PlayerCount.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PlayerCount.js @@ -25,7 +25,7 @@ onSelectionChange(itemIdx) { g_GameSettings.playerCount.setNb(this.values[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PopulationCap.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PopulationCap.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/PopulationCap.js @@ -46,7 +46,7 @@ onSelectionChange(itemIdx) { g_GameSettings.population.setPopCap(false, g_PopulationCapacities.Population[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/StartingResources.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/StartingResources.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/StartingResources.js @@ -42,7 +42,7 @@ onSelectionChange(itemIdx) { g_GameSettings.startingResources.setResources(g_StartingResources.Resources[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/TeamPlacement.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/TeamPlacement.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/TeamPlacement.js @@ -45,7 +45,7 @@ onSelectionChange(itemIdx) { g_GameSettings.teamPlacement.setValue(this.values.Id[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/TriggerDifficulty.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/TriggerDifficulty.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/TriggerDifficulty.js @@ -33,7 +33,7 @@ onSelectionChange(itemIdx) { g_GameSettings.triggerDifficulty.setValue(this.values.Difficulty[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/WorldPopulationCap.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/WorldPopulationCap.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Dropdowns/WorldPopulationCap.js @@ -39,7 +39,7 @@ onSelectionChange(itemIdx) { g_GameSettings.population.setPopCap(true, g_WorldPopulationCapacities.Population[itemIdx]); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/Ceasefire.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/Ceasefire.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/Ceasefire.js @@ -27,7 +27,7 @@ onValueChange(value) { g_GameSettings.ceasefire.setValue(value); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicCount.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicCount.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicCount.js @@ -30,7 +30,7 @@ onValueChange(value) { g_GameSettings.relic.setCount(value); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicDuration.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicDuration.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/RelicDuration.js @@ -30,7 +30,7 @@ onValueChange(value) { g_GameSettings.relic.setDuration(value); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/SeaLevelRiseTime.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/SeaLevelRiseTime.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/SeaLevelRiseTime.js @@ -27,7 +27,7 @@ onValueChange(value) { g_GameSettings.seaLevelRise.setValue(value); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/WonderDuration.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/WonderDuration.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/Single/Sliders/WonderDuration.js @@ -30,7 +30,7 @@ onValueChange(value) { g_GameSettings.wonder.setDuration(value); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } }; Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/VictoryConditionCheckbox.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/VictoryConditionCheckbox.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/GameSettings/VictoryConditionCheckbox.js @@ -26,6 +26,6 @@ onPress(checked) { g_GameSettings.victoryConditions.setEnabled(this.victoryCondition, checked); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } } Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/ResetCivsButton.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/ResetCivsButton.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/ResetCivsButton.js @@ -21,7 +21,7 @@ for (let i = 0; i < g_GameSettings.playerCount.nbPlayers; ++i) g_GameSettings.playerCiv.setValue(i, "random"); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } } Index: binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/ResetTeamsButton.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/ResetTeamsButton.js +++ binaries/data/mods/public/gui/gamesetup/Pages/GameSetupPage/Panels/Buttons/ResetTeamsButton.js @@ -21,7 +21,7 @@ for (let i = 0; i < g_GameSettings.playerCount.nbPlayers; ++i) g_GameSettings.playerTeam.setValue(i, -1); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } } Index: binaries/data/mods/public/gui/gamesetup/Pages/MapBrowserPage/MapBrowserPage.js =================================================================== --- binaries/data/mods/public/gui/gamesetup/Pages/MapBrowserPage/MapBrowserPage.js +++ binaries/data/mods/public/gui/gamesetup/Pages/MapBrowserPage/MapBrowserPage.js @@ -22,7 +22,7 @@ if (map) g_GameSettings.map.selectMap(map); - this.gameSettingsControl.setNetworkGameAttributes(); + this.gameSettingsControl.setNetworkInitAttributes(); } openPage() Index: binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js =================================================================== --- binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js +++ binaries/data/mods/public/gui/gamesetup_mp/gamesetup_mp.js @@ -21,7 +21,7 @@ var g_ServerId; var g_IsRejoining = false; -var g_GameAttributes; // used when rejoining +var g_InitAttributes; // used when rejoining var g_PlayerAssignments; // used when rejoining var g_UserRating; @@ -227,7 +227,7 @@ break; case "gamesetup": - g_GameAttributes = message.data; + g_InitAttributes = message.data; break; case "players": @@ -240,11 +240,11 @@ { let player = g_PlayerAssignments[guid]; if (player.player > 0) // not observer or GAIA - g_GameAttributes.settings.PlayerData[player.player - 1].Name = player.name; + g_InitAttributes.settings.PlayerData[player.player - 1].Name = player.name; } Engine.SwitchGuiPage("page_loading.xml", { - "attribs": g_GameAttributes, + "attribs": g_InitAttributes, "isRejoining": g_IsRejoining, "playerAssignments": g_PlayerAssignments }); Index: binaries/data/mods/public/gui/replaymenu/replay_menu.js =================================================================== --- binaries/data/mods/public/gui/replaymenu/replay_menu.js +++ binaries/data/mods/public/gui/replaymenu/replay_menu.js @@ -103,7 +103,7 @@ // Check replay for compatibility replay.isCompatible = isReplayCompatible(replay); - sanitizeGameAttributes(replay.attribs); + sanitizeInitAttributes(replay.attribs); // Extract map names if (g_MapNames.indexOf(replay.attribs.settings.Name) == -1 && replay.attribs.settings.Name != "") @@ -158,7 +158,7 @@ /** * We may encounter malformed replays. */ -function sanitizeGameAttributes(attribs) +function sanitizeInitAttributes(attribs) { if (!attribs.settings) attribs.settings = {}; Index: binaries/data/mods/public/gui/session/MenuButtons.js =================================================================== --- binaries/data/mods/public/gui/session/MenuButtons.js +++ binaries/data/mods/public/gui/session/MenuButtons.js @@ -76,7 +76,7 @@ this.button = button; this.button.caption = translate("Summary"); this.button.hotkey = "summary"; - // TODO: Atlas should pass g_GameAttributes.settings + // TODO: Atlas should pass g_InitAttributes.settings this.button.enabled = !Engine.IsAtlasRunning(); this.pauseControl = pauseControl; @@ -106,7 +106,7 @@ "page_summary.xml", { "sim": { - "mapSettings": g_GameAttributes.settings, + "mapSettings": g_InitAttributes.settings, "playerStates": simState.players.filter((state, player) => g_IsObserver || g_ViewedPlayer == 0 || player == 0 || player == g_ViewedPlayer || simState.players[g_ViewedPlayer].hasSharedLos && g_Players[player].isMutualAlly[g_ViewedPlayer]), Index: binaries/data/mods/public/gui/session/chat/ChatMessageFormatSimulation.js =================================================================== --- binaries/data/mods/public/gui/session/chat/ChatMessageFormatSimulation.js +++ binaries/data/mods/public/gui/session/chat/ChatMessageFormatSimulation.js @@ -164,7 +164,7 @@ else if (msg.sourcePlayer == Engine.GetPlayerID()) message = translate("You have sent %(player2)s %(amounts)s."); else if (Engine.ConfigDB_GetValue("user", "gui.session.notifications.tribute") == "true" && - (g_IsObserver || g_GameAttributes.settings.LockTeams && + (g_IsObserver || g_InitAttributes.settings.LockTeams && g_Players[msg.sourcePlayer].isMutualAlly[Engine.GetPlayerID()] && g_Players[msg.targetPlayer].isMutualAlly[Engine.GetPlayerID()])) message = translate("%(player)s has sent %(player2)s %(amounts)s."); Index: binaries/data/mods/public/gui/session/developer_overlay/DeveloperOverlay.js =================================================================== --- binaries/data/mods/public/gui/session/developer_overlay/DeveloperOverlay.js +++ binaries/data/mods/public/gui/session/developer_overlay/DeveloperOverlay.js @@ -27,7 +27,7 @@ toggle() { - if (g_IsNetworked && !g_GameAttributes.settings.CheatsEnabled) + if (g_IsNetworked && !g_InitAttributes.settings.CheatsEnabled) return; this.devCommandsOverlay.hidden = !this.devCommandsOverlay.hidden; Index: binaries/data/mods/public/gui/session/developer_overlay/DeveloperOverlayCheckboxes.js =================================================================== --- binaries/data/mods/public/gui/session/developer_overlay/DeveloperOverlayCheckboxes.js +++ binaries/data/mods/public/gui/session/developer_overlay/DeveloperOverlayCheckboxes.js @@ -237,7 +237,7 @@ enabled() { - return !this.disabled && g_GameAttributes.mapType != "random"; + return !this.disabled && g_InitAttributes.mapType != "random"; } }; Index: binaries/data/mods/public/gui/session/diplomacy/playercontrols/DiplomacyPlayerText.js =================================================================== --- binaries/data/mods/public/gui/session/diplomacy/playercontrols/DiplomacyPlayerText.js +++ binaries/data/mods/public/gui/session/diplomacy/playercontrols/DiplomacyPlayerText.js @@ -26,7 +26,7 @@ return; this.diplomacyPlayerCiv.caption = g_CivData[g_Players[this.playerID].civ].Name; - this.diplomacyPlayerName.tooltip = translateAISettings(g_GameAttributes.settings.PlayerData[this.playerID]); + this.diplomacyPlayerName.tooltip = translateAISettings(g_InitAttributes.settings.PlayerData[this.playerID]); // Apply offset let rowSize = DiplomacyDialogPlayerControl.prototype.DiplomacyPlayerText.getRowHeight(); Index: binaries/data/mods/public/gui/session/lobby/LobbyGamelistReporter.js =================================================================== --- binaries/data/mods/public/gui/session/lobby/LobbyGamelistReporter.js +++ binaries/data/mods/public/gui/session/lobby/LobbyGamelistReporter.js @@ -2,7 +2,7 @@ * Send the current list of players, teams, AIs, observers and defeated/won and offline states to the lobby. * This report excludes the matchsettings, since they do not change during the match. * - * The playerData format from g_GameAttributes is kept to reuse the GUI function presenting the data, + * The playerData format from g_InitAttributes is kept to reuse the GUI function presenting the data, * but the payload size is minimized by only extracting properties relevant for display. */ class LobbyGamelistReporter @@ -30,16 +30,16 @@ let players = []; // Skip gaia - for (let playerID = 1; playerID < g_GameAttributes.settings.PlayerData.length; ++playerID) + for (let playerID = 1; playerID < g_InitAttributes.settings.PlayerData.length; ++playerID) { - let pData = g_GameAttributes.settings.PlayerData[playerID]; + let pData = g_InitAttributes.settings.PlayerData[playerID]; let player = { "Name": pData.Name, "Civ": pData.Civ }; - if (g_GameAttributes.settings.LockTeams) + if (g_InitAttributes.settings.LockTeams) player.Team = pData.Team; if (pData.AI) Index: binaries/data/mods/public/gui/session/lobby/LobbyRatingReporter.js =================================================================== --- binaries/data/mods/public/gui/session/lobby/LobbyRatingReporter.js +++ binaries/data/mods/public/gui/session/lobby/LobbyRatingReporter.js @@ -29,8 +29,8 @@ let report = { "playerID": Engine.GetPlayerID(), - "matchID": g_GameAttributes.matchID, - "mapName": g_GameAttributes.settings.Name, + "matchID": g_InitAttributes.matchID, + "mapName": g_InitAttributes.settings.Name, "timeElapsed": extendedSimState.timeElapsed, }; @@ -52,6 +52,6 @@ return Engine.HasXmppClient() && !g_IsReplay && Engine.GetPlayerID() != -1 && - g_GameAttributes.settings.RatingEnabled && - g_GameAttributes.settings.PlayerData.length == 3; + g_InitAttributes.settings.RatingEnabled && + g_InitAttributes.settings.PlayerData.length == 3; }; Index: binaries/data/mods/public/gui/session/message_box/OutOfSyncNetwork.js =================================================================== --- binaries/data/mods/public/gui/session/message_box/OutOfSyncNetwork.js +++ binaries/data/mods/public/gui/session/message_box/OutOfSyncNetwork.js @@ -27,7 +27,7 @@ "" ]; - if (msg.turn > 1 && g_GameAttributes.settings.PlayerData.some(pData => pData && pData.AI)) + if (msg.turn > 1 && g_InitAttributes.settings.PlayerData.some(pData => pData && pData.AI)) txt.push(translateWithContext("Out-Of-Sync", "Rejoining Multiplayer games with AIs is not supported yet!")); else txt.push( Index: binaries/data/mods/public/gui/session/message_box/QuitConfirmationDefeat.js =================================================================== --- binaries/data/mods/public/gui/session/message_box/QuitConfirmationDefeat.js +++ binaries/data/mods/public/gui/session/message_box/QuitConfirmationDefeat.js @@ -37,7 +37,7 @@ let askExit = !Engine.HasNetServer() || g_Players.every((player, i) => i == 0 || player.state != "active" || - g_GameAttributes.settings.PlayerData[i].AI != ""); + g_InitAttributes.settings.PlayerData[i].AI != ""); this.Title = won ? this.TitleVictory : this.TitleDefeated; Index: binaries/data/mods/public/gui/session/objectives/ObjectivesDialog.js =================================================================== --- binaries/data/mods/public/gui/session/objectives/ObjectivesDialog.js +++ binaries/data/mods/public/gui/session/objectives/ObjectivesDialog.js @@ -9,7 +9,7 @@ // TODO: atlas should support this if (!Engine.IsAtlasRunning()) - Engine.GetGUIObjectByName("gameDescriptionText").caption = getGameDescription(g_GameAttributes, mapCache); + Engine.GetGUIObjectByName("gameDescriptionText").caption = getGameDescription(g_InitAttributes, mapCache); Engine.GetGUIObjectByName("closeObjectives").onPress = this.close.bind(this); Index: binaries/data/mods/public/gui/session/session.js =================================================================== --- binaries/data/mods/public/gui/session/session.js +++ binaries/data/mods/public/gui/session/session.js @@ -38,7 +38,7 @@ /** * Map, player and match settings set in game setup. */ -const g_GameAttributes = deepfreeze(Engine.GuiInterfaceCall("GetInitAttributes")); +const g_InitAttributes = deepfreeze(Engine.GuiInterfaceCall("GetInitAttributes")); /** * True if this is a multiplayer game. @@ -266,8 +266,8 @@ restoreSavedGameData(initData.savedGUIData); } - if (g_GameAttributes.campaignData) - g_CampaignSession = new CampaignSession(g_GameAttributes.campaignData); + if (g_InitAttributes.campaignData) + g_CampaignSession = new CampaignSession(g_InitAttributes.campaignData); let mapCache = new MapCache(); g_Cheats = new Cheats(); @@ -539,15 +539,15 @@ } }; - if (g_GameAttributes.campaignData) + if (g_InitAttributes.campaignData) { let menu = g_CampaignSession.getMenu(); - if (g_GameAttributes.campaignData.skipSummary) + if (g_InitAttributes.campaignData.skipSummary) { Engine.SwitchGuiPage(menu); return; } - summaryData.campaignData = { "filename": g_GameAttributes.campaignData.run }; + summaryData.campaignData = { "filename": g_InitAttributes.campaignData.run }; summaryData.nextPage = menu; } Index: source/network/scripting/JSInterface_Network.cpp =================================================================== --- source/network/scripting/JSInterface_Network.cpp +++ source/network/scripting/JSInterface_Network.cpp @@ -221,15 +221,15 @@ return scriptInterface.CloneValueFromOtherCompartment(g_NetClient->GetScriptInterface(), pollNet); } -void SetNetworkGameAttributes(const ScriptInterface& scriptInterface, JS::HandleValue attribs1) +void SendGameSetupMessage(const ScriptInterface& scriptInterface, JS::HandleValue message1) { ENSURE(g_NetClient); // TODO: This is a workaround because we need to pass a MutableHandle to a JSAPI functions somewhere (with no obvious reason). ScriptRequest rq(scriptInterface); - JS::RootedValue attribs(rq.cx, attribs1); + JS::RootedValue message(rq.cx, message1); - g_NetClient->SendGameSetupMessage(&attribs, scriptInterface); + g_NetClient->SendGameSetupMessage(&message, scriptInterface); } void AssignNetworkPlayer(int playerID, const CStr& guid) @@ -293,7 +293,7 @@ ScriptFunction::Register<&DisconnectNetworkGame>(rq, "DisconnectNetworkGame"); ScriptFunction::Register<&GetPlayerGUID>(rq, "GetPlayerGUID"); ScriptFunction::Register<&PollNetworkClient>(rq, "PollNetworkClient"); - ScriptFunction::Register<&SetNetworkGameAttributes>(rq, "SetNetworkGameAttributes"); + ScriptFunction::Register<&SendGameSetupMessage>(rq, "SendGameSetupMessage"); ScriptFunction::Register<&AssignNetworkPlayer>(rq, "AssignNetworkPlayer"); ScriptFunction::Register<&KickPlayer>(rq, "KickPlayer"); ScriptFunction::Register<&SendNetworkChat>(rq, "SendNetworkChat");