Ticket #3806: 3806_player_gamesetup_v1.1.patch

File 3806_player_gamesetup_v1.1.patch, 31.8 KB (added by Imarok, 8 years ago)

Fixes the ticket. The additional loading state will be removed when elexis made his patch for gamesetup.js

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

     
    1616    let aiSelection = Engine.GetGUIObjectByName("aiSelection");
    1717    aiSelection.list = g_AIDescriptions.map(ai => ai.data.name);
    1818    aiSelection.selected = g_AIDescriptions.findIndex(ai => ai.id == settings.id);
    19     aiSelection.hidden = !settings.isController;
     19    aiSelection.hidden = !settings.canBeChanged;
    2020
    2121    let aiSelectionText = Engine.GetGUIObjectByName("aiSelectionText");
    2222    aiSelectionText.caption = aiSelection.list[aiSelection.selected];
    23     aiSelectionText.hidden = settings.isController;
     23    aiSelectionText.hidden = settings.canBeChanged;
    2424
    2525    let aiDiff = Engine.GetGUIObjectByName("aiDifficulty");
    2626    aiDiff.list = prepareForDropdown(g_Settings.AIDifficulties).Title;
    2727    aiDiff.selected = settings.difficulty;
    28     aiDiff.hidden = !settings.isController;
     28    aiDiff.hidden = !settings.canBeChanged;
    2929
    3030    let aiDiffText = Engine.GetGUIObjectByName("aiDifficultyText");
    3131    aiDiffText.caption = aiDiff.list[aiDiff.selected];
    32     aiDiffText.hidden = settings.isController;
     32    aiDiffText.hidden = settings.canBeChanged;
    3333}
    3434
    3535function selectAI(idx)

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

     
    3737        "MapTypes": loadMapTypes(),
    3838        "MapSizes": loadSettingValuesFile("map_sizes.json"),
    3939        "PlayerDefaults": loadPlayerDefaults(),
     40        "GuestSettings": loadSettingValuesFile("guest_settings.json"),
    4041        "PopulationCapacities": loadPopulationCapacities(),
    4142        "StartingResources": loadSettingValuesFile("starting_resources.json"),
    4243        "VictoryConditions": loadVictoryConditions()

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

     
    55const g_GameSpeeds = prepareForDropdown(g_Settings && g_Settings.GameSpeeds.filter(speed => !speed.ReplayOnly));
    66const g_MapSizes = prepareForDropdown(g_Settings && g_Settings.MapSizes);
    77const g_MapTypes = prepareForDropdown(g_Settings && g_Settings.MapTypes);
     8const g_GuestSettings = prepareForDropdown(g_Settings && g_Settings.GuestSettings);
    89const g_PopulationCapacities = prepareForDropdown(g_Settings && g_Settings.PopulationCapacities);
    910const g_StartingResources = prepareForDropdown(g_Settings && g_Settings.StartingResources);
    1011const g_VictoryConditions = prepareForDropdown(g_Settings && g_Settings.VictoryConditions);
    … …  
    146147 */
    147148const g_RandomCiv = '[color="' + g_ColorRandom + '"]' + translateWithContext("civilization", "Random") + '[/color]';
    148149
    149 // Is this is a networked game, or offline
     150// Is this a networked game, or offline
    150151var g_IsNetworked;
    151152
    152153// Is this user in control of game settings (i.e. is a network server, or offline player)
    … …  
    260261        g_GameAttributes.settings.CheatsEnabled = !g_IsNetworked;
    261262        g_GameAttributes.settings.RatingEnabled = Engine.IsRankedGame() || undefined;
    262263
    263         initMapNameList();
    264         initNumberOfPlayers();
    265         initGameSpeed();
    266         initPopulationCaps();
    267         initStartingResources();
    268         initCeasefire();
    269         initWonderDurations();
    270         initVictoryConditions();
    271         initMapSizes();
    272         initRadioButtons();
     264        initDropdowns();
    273265    }
    274     else
    275         hideControls();
    276266
    277267    initMultiplayerSettings();
    278268    initPlayerAssignments();
    … …  
    291281    }
    292282}
    293283
     284function initDropdowns()
     285{
     286    initMapNameList();
     287    initNumberOfPlayers();
     288    initGameSpeed();
     289    initGuestSettings();
     290    initPopulationCaps();
     291    initStartingResources();
     292    initCeasefire();
     293    initWonderDurations();
     294    initVictoryConditions();
     295    initMapSizes();
     296    initRadioButtons();
     297}
     298
    294299function initMapTypes()
    295300{
    296301    let mapTypes = Engine.GetGUIObjectByName("mapType");
    … …  
    331336        "optionPopulationCap",
    332337        "optionStartingResources",
    333338        "optionCeasefire",
     339        "optionGuestSettings",
    334340        "optionRevealMap",
    335341        "optionExploreMap",
    336342        "optionDisableTreasures",
    … …  
    380386function initGameSpeed()
    381387{
    382388    let gameSpeed = Engine.GetGUIObjectByName("gameSpeed");
    383     gameSpeed.hidden = false;
    384     Engine.GetGUIObjectByName("gameSpeedText").hidden = true;
     389    gameSpeed.hidden = !canPlayerChange("gameSpeed");
     390    Engine.GetGUIObjectByName("gameSpeedText").hidden = canPlayerChange("gameSpeed");
    385391    gameSpeed.list = g_GameSpeeds.Title;
    386392    gameSpeed.list_data = g_GameSpeeds.Speed;
    387393    gameSpeed.onSelectionChange = function() {
    … …  
    435441    };
    436442}
    437443
     444function initGuestSettings()
     445{
     446    let guestSettings = Engine.GetGUIObjectByName("guestSettings");
     447    guestSettings.list = g_GuestSettings.Title;
     448    guestSettings.list_data = g_GuestSettings.Data;
     449    if (guestSettings.selected == -1)
     450        guestSettings.selected = g_GuestSettings.Default;
     451    guestSettings.onSelectionChange = function() {
     452        if (this.selected != -1)
     453            g_GameAttributes.GuestSettings = g_GuestSettings.Data[this.selected];
     454
     455        updateGameAttributes();
     456    };
     457}
     458
    438459function initVictoryConditions()
    439460{
    440461    let victoryConditions = Engine.GetGUIObjectByName("victoryCondition");
    … …  
    515536function hideControls()
    516537{
    517538    for (let ctrl of ["mapType", "mapFilter", "mapSelection", "victoryCondition", "gameSpeed", "numPlayers"])
    518         hideControl(ctrl, ctrl + "Text");
     539        hideControl(ctrl, ctrl + "Text", canPlayerChange(ctrl));
    519540
    520541    // TODO: Shouldn't players be able to choose their own assignment?
    521542    for (let i = 0; i < g_MaxPlayers; ++i)
    … …  
    555576}
    556577
    557578/**
     579 * Returns if the player is allowed to change this setting
     580 */
     581function canPlayerChange(setting)
     582{
     583    if (g_GameAttributes.mapType == "scenario" &&
     584         ["victoryCondition", "wonderDuration", "populationCap",
     585         "startingResources", "ceasefire", "revealMap", "exploreMap",
     586         "disableTreasures", "lockTeams", "playerCiv", "playerTeam", "playerColor"].indexOf(setting) >= 0)
     587        return false;
     588
     589    if (g_GameAttributes.mapType != "random" && setting == "numPlayers")
     590        return false;
     591
     592    if (g_IsController)
     593        return true;
     594 
     595     if (setting == "guestSettings")
     596        return false;
     597
     598    if (g_GuestSettings.Data.indexOf(setting) == -1)
     599        return g_GameAttributes.GuestSettings == "all";
     600
     601    return g_GuestSettings.Data.indexOf(g_GameAttributes.GuestSettings) >= g_GuestSettings.Data.indexOf(setting);
     602}
     603
     604/**
    558605 * Hide and set some elements depending on whether we play single- or multiplayer.
    559606 */
    560607function initMultiplayerSettings()
    … …  
    561608{
    562609    Engine.GetGUIObjectByName("chatPanel").hidden = !g_IsNetworked;
    563610    Engine.GetGUIObjectByName("optionCheats").hidden = !g_IsNetworked;
     611    Engine.GetGUIObjectByName("optionGuestSettings").hidden = !g_IsNetworked;
    564612    Engine.GetGUIObjectByName("optionRating").hidden = !Engine.HasXmppClient();
    565613
    566614    Engine.GetGUIObjectByName("enableCheats").enabled = !Engine.IsRankedGame();
    … …  
    677725}
    678726
    679727/**
    680  * Called whenever the host changed any setting.
     728 * Called whenever someone changed any setting.
    681729 * @param {Object} message
    682730 */
    683731function handleGamesetupMessage(message)
    … …  
    694742    }
    695743
    696744    Engine.SetRankedGame(!!g_GameAttributes.settings.RatingEnabled);
    697 
    698745    updateGUIObjects();
    699746}
    700747
    … …  
    9951042        initGUIObjects();
    9961043        ++g_LoadingState;
    9971044    }
    998     else if (g_LoadingState == 2)
     1045    else if (g_LoadingState == 2 || g_LoadingState == 3)
    9991046    {
    10001047        while (true)
    10011048        {
    … …  
    10061053            log("Net message: " + uneval(message));
    10071054
    10081055            if (g_NetMessageTypes[message.type])
     1056            {
    10091057                g_NetMessageTypes[message.type](message);
     1058                if (g_LoadingState == 2 && message.type == "gamesetup")
     1059                {
     1060                    ++g_LoadingState;
     1061                    initDropdowns();
     1062                    hideControls();
     1063                }
     1064            }
    10101065            else
    10111066                error("Unrecognised net message type " + message.type);
    10121067        }
    … …  
    10221077function selectNumPlayers(num)
    10231078{
    10241079    // Avoid recursion
    1025     if (g_IsInGuiUpdate || !g_IsController || g_GameAttributes.mapType != "random")
     1080    if (g_IsInGuiUpdate || !canPlayerChange("numPlayers") || g_GameAttributes.mapType != "random")
    10261081        return;
    1027 
    10281082    // Unassign players from nonexistent slots
    10291083    if (g_IsNetworked)
    10301084    {
    … …  
    10861140function selectMapType(type)
    10871141{
    10881142    // Avoid recursion
    1089     if (g_IsInGuiUpdate || !g_IsController)
     1143    if (g_IsInGuiUpdate)
    10901144        return;
    10911145
    10921146    if (!g_MapPath[type])
    … …  
    11161170function selectMapFilter(id)
    11171171{
    11181172    // Avoid recursion
    1119     if (g_IsInGuiUpdate || !g_IsController)
     1173    if (g_IsInGuiUpdate)
    11201174        return;
    11211175
    11221176    g_GameAttributes.mapFilter = id;
    … …  
    11301184function selectMap(name)
    11311185{
    11321186    // Avoid recursion
    1133     if (g_IsInGuiUpdate || !g_IsController || !name)
     1187    if (g_IsInGuiUpdate || !name)
    11341188        return;
    11351189
    11361190    // Reset some map specific properties which are not necessarily redefined on each map
    … …  
    12621316
    12631317    if (g_IsNetworked)
    12641318    {
    1265         Engine.SetNetworkGameAttributes(g_GameAttributes);
     1319        Engine.NetworkChangeSettings(g_GameAttributes);
    12661320        Engine.StartNetworkGame();
    12671321    }
    12681322    else
    … …  
    13011355    let mapFilterIdx = g_MapFilters.findIndex(mapFilter => mapFilter.id == (g_GameAttributes.mapFilter || "default"));
    13021356    let mapTypeIdx = g_GameAttributes.mapType !== undefined ? g_MapTypes.Name.indexOf(g_GameAttributes.mapType) : g_MapTypes.Default;
    13031357    let gameSpeedIdx = g_GameAttributes.gameSpeed !== undefined ? g_GameSpeeds.Speed.indexOf(g_GameAttributes.gameSpeed) : g_GameSpeeds.Default;
     1358    let guestSettingsIdx = g_GameAttributes.GuestSettings !== undefined ? g_GuestSettings.Data.indexOf(g_GameAttributes.GuestSettings) : g_GuestSettings.Default;
    13041359
    13051360    // These dropdowns might set the default (as they ignore g_IsInGuiUpdate)
    13061361    let mapSizeIdx = mapSettings.Size !== undefined ? g_MapSizes.Tiles.indexOf(mapSettings.Size) : g_MapSizes.Default;
    … …  
    13111366    let ceasefireIdx = mapSettings.Ceasefire !== undefined ? g_Ceasefire.Duration.indexOf(mapSettings.Ceasefire) : g_Ceasefire.Default;
    13121367    let numPlayers = mapSettings.PlayerData ? mapSettings.PlayerData.length : g_MaxPlayers;
    13131368
    1314     if (g_IsController)
    1315     {
    1316         Engine.GetGUIObjectByName("mapType").selected = mapTypeIdx;
    1317         Engine.GetGUIObjectByName("mapFilter").selected = mapFilterIdx;
    1318         Engine.GetGUIObjectByName("mapSelection").selected = Engine.GetGUIObjectByName("mapSelection").list_data.indexOf(mapName);
    1319         Engine.GetGUIObjectByName("mapSize").selected = mapSizeIdx;
    1320         Engine.GetGUIObjectByName("numPlayers").selected = numPlayers - 1;
    1321         Engine.GetGUIObjectByName("victoryCondition").selected = victoryIdx;
    1322         Engine.GetGUIObjectByName("wonderDuration").selected = wonderDurationIdx;
    1323         Engine.GetGUIObjectByName("populationCap").selected = popIdx;
    1324         Engine.GetGUIObjectByName("gameSpeed").selected = gameSpeedIdx;
    1325         Engine.GetGUIObjectByName("ceasefire").selected = ceasefireIdx;
    1326         Engine.GetGUIObjectByName("startingResources").selected = startingResIdx;
    1327     }
    1328     else
    1329     {
    1330         Engine.GetGUIObjectByName("mapTypeText").caption = g_MapTypes.Title[mapTypeIdx];
    1331         Engine.GetGUIObjectByName("mapFilterText").caption = g_MapFilters[mapFilterIdx].name;
    1332         Engine.GetGUIObjectByName("mapSelectionText").caption = mapName == "random" ? g_RandomMap : translate(getMapDisplayName(mapName));
    1333         initMapNameList();
    1334     }
     1369    Engine.GetGUIObjectByName("mapType").selected = mapTypeIdx;
     1370    Engine.GetGUIObjectByName("mapFilter").selected = mapFilterIdx;
     1371    Engine.GetGUIObjectByName("mapSelection").selected = Engine.GetGUIObjectByName("mapSelection").list_data.indexOf(mapName);
     1372    Engine.GetGUIObjectByName("mapSize").selected = mapSizeIdx;
     1373    Engine.GetGUIObjectByName("numPlayers").selected = numPlayers - 1;
     1374    Engine.GetGUIObjectByName("victoryCondition").selected = victoryIdx;
     1375    Engine.GetGUIObjectByName("wonderDuration").selected = wonderDurationIdx;
     1376    Engine.GetGUIObjectByName("populationCap").selected = popIdx;
     1377    Engine.GetGUIObjectByName("gameSpeed").selected = gameSpeedIdx;
     1378    Engine.GetGUIObjectByName("ceasefire").selected = ceasefireIdx;
     1379    Engine.GetGUIObjectByName("startingResources").selected = startingResIdx;
     1380    Engine.GetGUIObjectByName("guestSettings").selected = guestSettingsIdx;
    13351381
     1382
     1383    initMapNameList();
     1384
    13361385    // Can be visible to both host and clients
    13371386    Engine.GetGUIObjectByName("mapSizeText").caption = g_GameAttributes.mapType == "random" ? g_MapSizes.LongName[mapSizeIdx] : translate("Default");
    13381387    Engine.GetGUIObjectByName("numPlayersText").caption = numPlayers;
    13391388    Engine.GetGUIObjectByName("victoryConditionText").caption = g_VictoryConditions.Title[victoryIdx];
    13401389    Engine.GetGUIObjectByName("wonderDurationText").caption = g_WonderDurations.Title[wonderDurationIdx];
     1390    Engine.GetGUIObjectByName("guestSettingsText").caption = g_GuestSettings.Title[guestSettingsIdx];
    13411391    Engine.GetGUIObjectByName("populationCapText").caption = g_PopulationCapacities.Title[popIdx];
    13421392    Engine.GetGUIObjectByName("startingResourcesText").caption = g_StartingResources.Title[startingResIdx];
    13431393    Engine.GetGUIObjectByName("ceasefireText").caption = g_Ceasefire.Title[ceasefireIdx];
    13441394    Engine.GetGUIObjectByName("gameSpeedText").caption = g_GameSpeeds.Title[gameSpeedIdx];
     1395    Engine.GetGUIObjectByName("mapTypeText").caption = g_MapTypes.Title[mapTypeIdx];
     1396    Engine.GetGUIObjectByName("mapFilterText").caption = g_MapFilters[mapFilterIdx].name;
     1397    Engine.GetGUIObjectByName("mapSelectionText").caption = mapName == "random" ? g_RandomMap : translate(getMapDisplayName(mapName));
    13451398
    13461399    setGUIBoolean("enableCheats", "enableCheatsText", !!mapSettings.CheatsEnabled);
    13471400    setGUIBoolean("disableTreasures", "disableTreasuresText", !!mapSettings.DisableTreasures);
    … …  
    13641417    Engine.GetGUIObjectByName("mapSizeDesc").hidden = !isRandom;
    13651418    Engine.GetGUIObjectByName("mapSize").hidden = !isRandom || !g_IsController;
    13661419    Engine.GetGUIObjectByName("mapSizeText").hidden = !isRandom || g_IsController;
    1367     hideControl("numPlayers", "numPlayersText", isRandom && g_IsController);
    13681420
    1369     let notScenario = g_GameAttributes.mapType != "scenario" && g_IsController ;
    1370 
    13711421    for (let ctrl of ["victoryCondition", "wonderDuration", "populationCap",
    13721422                      "startingResources", "ceasefire", "revealMap",
    1373                       "exploreMap", "disableTreasures", "lockTeams"])
    1374         hideControl(ctrl, ctrl + "Text", notScenario);
     1423                      "exploreMap", "disableTreasures", "lockTeams",
     1424                      "gameSpeed", "guestSettings", "enableCheats",
     1425                      "mapSelection", "numPlayers", "mapType", "mapFilter"])
     1426        hideControl(ctrl, ctrl + "Text", canPlayerChange(ctrl));
    13751427
     1428    let notScenario = g_GameAttributes.mapType != "scenario" && g_IsController ;
     1429
    13761430    setMapDescription();
    13771431
    13781432    for (let i = 0; i < g_MaxPlayers; ++i)
    … …  
    14081462        pCiv.selected = civ ? pCiv.list_data.indexOf(civ) : 0;
    14091463        pTeam.selected = team !== undefined && team >= 0 ? team+1 : 0;
    14101464
    1411         hideControl("playerAssignment["+i+"]", "playerAssignmentText["+i+"]", g_IsController);
    1412         hideControl("playerCiv["+i+"]", "playerCivText["+i+"]", notScenario);
    1413         hideControl("playerTeam["+i+"]", "playerTeamText["+i+"]", notScenario);
     1465        hideControl("playerAssignment["+i+"]", "playerAssignmentText["+i+"]", canPlayerChange("playerAssignment"));
     1466        hideControl("playerCiv["+i+"]", "playerCivText["+i+"]", canPlayerChange("playerCiv"));
     1467        hideControl("playerTeam["+i+"]", "playerTeamText["+i+"]", canPlayerChange("playerTeam"));
    14141468
    14151469        // Allow host to chose player colors on non-scenario maps
    14161470        let pColorPicker = Engine.GetGUIObjectByName("playerColorPicker["+i+"]");
    14171471        let pColorPickerHeading = Engine.GetGUIObjectByName("playerColorHeading");
    1418         let canChangeColors = g_IsController && g_GameAttributes.mapType != "scenario";
    1419         pColorPicker.hidden = !canChangeColors;
    1420         pColorPickerHeading.hidden = !canChangeColors;
    1421         if (canChangeColors)
     1472        //let canChangeColors = g_IsController && g_GameAttributes.mapType != "scenario";
     1473        pColorPicker.hidden = !canPlayerChange("playerColor");
     1474        pColorPickerHeading.hidden = !canPlayerChange("playerColor");
     1475        if (canPlayerChange("playerColor"))
    14221476            pColorPicker.selected = g_PlayerColors.findIndex(col => sameColor(col, color));
    14231477    }
    14241478
    … …  
    14851539 */
    14861540function updateGameAttributes()
    14871541{
    1488     if (g_IsInGuiUpdate || !g_IsController)
     1542    if (g_IsInGuiUpdate)
    14891543        return;
    14901544
    14911545    if (g_IsNetworked)
    14921546    {
    1493         Engine.SetNetworkGameAttributes(g_GameAttributes);
     1547        Engine.NetworkChangeSettings(g_GameAttributes);
    14941548        if (g_LoadingState >= 2)
    14951549            sendRegisterGameStanza();
    14961550    }
    … …  
    15041558
    15051559    Engine.PushGuiPage("page_aiconfig.xml", {
    15061560        "callback": "AIConfigCallback",
    1507         "isController": g_IsController,
     1561        "canBeChanged": canPlayerChange("playerConfig"),
    15081562        "playerSlot": playerSlot,
    15091563        "id": g_GameAttributes.settings.PlayerData[playerSlot].AI,
    15101564        "difficulty": g_GameAttributes.settings.PlayerData[playerSlot].AIDiff
    … …  
    15181572{
    15191573    g_LastViewedAIPlayer = -1;
    15201574
    1521     if (!ai.save || !g_IsController)
     1575    if (!ai.save)
    15221576        return;
    15231577
    15241578    g_GameAttributes.settings.PlayerData[ai.playerSlot].AI = ai.id;
    … …  
    15251579    g_GameAttributes.settings.PlayerData[ai.playerSlot].AIDiff = ai.difficulty;
    15261580
    15271581    if (g_IsNetworked)
    1528         Engine.SetNetworkGameAttributes(g_GameAttributes);
     1582        Engine.NetworkChangeSettings(g_GameAttributes);
    15291583    else
    15301584        updatePlayerList();
    15311585}
    … …  
    16211675        {
    16221676            g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
    16231677            if (g_IsNetworked)
    1624                 Engine.SetNetworkGameAttributes(g_GameAttributes);
     1678                Engine.NetworkChangeSettings(g_GameAttributes);
    16251679        }
    16261680
    16271681        let assignBox = Engine.GetGUIObjectByName("playerAssignment["+i+"]");
    … …  
    16321686            assignBox.selected = selection;
    16331687        assignBoxText.caption = hostNameList[selection];
    16341688
    1635         if (g_IsController)
    1636             assignBox.onselectionchange = function() {
    1637                 if (g_IsInGuiUpdate)
    1638                     return;
     1689        assignBox.onselectionchange = function() {
     1690            if (g_IsInGuiUpdate)
     1691                return;
    16391692
    1640                 let guid = hostGuidList[this.selected];
    1641                 if (!guid)
    1642                 {
    1643                     if (g_IsNetworked)
    1644                         // Unassign any host from this player slot
    1645                         Engine.AssignNetworkPlayer(playerID, "");
    1646                     // Remove AI from this player slot
    1647                     g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
    1648                 }
    1649                 else if (guid.substr(0, 3) == "ai:")
    1650                 {
    1651                     if (g_IsNetworked)
    1652                         // Unassign any host from this player slot
    1653                         Engine.AssignNetworkPlayer(playerID, "");
    1654                     // Set the AI for this player slot
    1655                     g_GameAttributes.settings.PlayerData[playerSlot].AI = guid.substr(3);
    1656                 }
    1657                 else
    1658                     swapPlayers(guid, playerSlot);
     1693            let guid = hostGuidList[this.selected];
     1694            if (!guid)
     1695            {
     1696                if (g_IsNetworked)
     1697                    // Unassign any host from this player slot
     1698                    Engine.AssignNetworkPlayer(playerID, "");
     1699                // Remove AI from this player slot
     1700                g_GameAttributes.settings.PlayerData[playerSlot].AI = "";
     1701            }
     1702            else if (guid.substr(0, 3) == "ai:")
     1703            {
     1704                if (g_IsNetworked)
     1705                    // Unassign any host from this player slot
     1706                    Engine.AssignNetworkPlayer(playerID, "");
     1707                // Set the AI for this player slot
     1708                g_GameAttributes.settings.PlayerData[playerSlot].AI = guid.substr(3);
     1709            }
     1710            else
     1711                swapPlayers(guid, playerSlot);
    16591712
    1660                 if (g_IsNetworked)
    1661                     Engine.SetNetworkGameAttributes(g_GameAttributes);
    1662                 else
    1663                     updatePlayerList();
    1664                 updateReadyUI();
    1665             };
     1713            if (g_IsNetworked)
     1714                Engine.NetworkChangeSettings(g_GameAttributes);
     1715            else
     1716                updatePlayerList();
     1717            updateReadyUI();
     1718        };
    16661719    }
    16671720
    16681721    g_IsInGuiUpdate = false;

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

     
    8080                            <object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="22%+37 2 50%+35 30" tooltip_style="onscreenToolTip">
    8181                                <translatableAttribute id="tooltip">Select player.</translatableAttribute>
    8282                            </object>
    83                             <object name="playerAssignmentText[n]" type="text" style="ModernLabelText" size="22%+5 0 50%+35 30"/>
     83                            <object name="playerAssignmentText[n]" type="text" style="ModernLabelText" size="22%+33 0 50%+35 30"/>
    8484                            <object name="playerConfig[n]" type="button" style="StoneButton" size="50%+40 4 50%+64 28"
    8585                                tooltip_style="onscreenToolTip"
    8686                                font="sans-bold-stroke-12"
    … …  
    250250                <translatableAttribute id="caption">Back</translatableAttribute>
    251251                <action on="Press">cancelSetup();</action>
    252252            </object>
    253 
     253 
    254254            <!-- Options -->
    255255            <object name="gameOptionsBox" size="100%-425 529 100%-25 525">
    256256                <!-- More Options Button -->
    … …  
    336336                    </object>
    337337                </object>
    338338
     339                <object name="optionGuestSettings" size="14 188 94% 206">
     340                    <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
     341                        <translatableAttribute id="caption">Guest Settings:</translatableAttribute>
     342                    </object>
     343                    <object name="guestSettingsText" size="40% 0 100% 100%" type="text" style="ModernLeftLabelText"/>
     344                    <object name="guestSettings" size="40%+10 0 100% 28" type="dropdown" style="ModernDropDown" hidden="true" tooltip_style="onscreenToolTip">
     345                        <translatableAttribute id="tooltip">Set which settings can be changed by every player.</translatableAttribute>
     346                    </object>
     347                </object>
     348
    339349                <object name="optionRevealMap" size="14 218 94% 246">
    340350                    <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
    341351                        <translatableAttribute id="caption" comment="Make sure to differentiate between the revealed map and explored map options!">Revealed Map:</translatableAttribute>

  • binaries/data/mods/public/simulation/data/settings/guest_settings.json

     
     1{
     2    "TranslatedKeys": ["Title"],
     3    "TranslationContext": "players can change",
     4    "Data":
     5    [
     6        {
     7            "Title": "None",
     8            "Data": "none"
     9        },
     10        {
     11            "Title": "Color",
     12            "Data": "playerColor",
     13            "Default": true
     14        },
     15        {
     16            "Title": "Color & Civilization",
     17            "Data": "playerCiv"
     18        },
     19        {
     20            "Title": "Color, Civilization & Team",
     21            "Data": "playerTeam"
     22        },
     23        {
     24            "Title": "All",
     25            "Data": "all"
     26        }
     27    ]
     28}

  • source/gui/scripting/ScriptFunctions.cpp

     
    344344    g_NetServer->UpdateGameAttributes(&attribs, *(pCxPrivate->pScriptInterface));
    345345}
    346346
     347void NetworkChangeSettings(ScriptInterface::CxPrivate* pCxPrivate, JS::HandleValue attribs1)
     348{
     349    ENSURE(g_NetClient);
     350    //TODO: This is a workaround because we need to pass a MutableHandle to a JSAPI functions somewhere
     351    // (with no obvious reason).
     352    JSContext* cx = pCxPrivate->pScriptInterface->GetContext();
     353    JSAutoRequest rq(cx);
     354    JS::RootedValue attribs(cx, attribs1);
     355
     356    g_NetClient->SendChangeSettingsMessage(&attribs, *(pCxPrivate->pScriptInterface));
     357}
     358
    347359void StartNetworkHost(ScriptInterface::CxPrivate* pCxPrivate, const std::wstring& playerName)
    348360{
    349361    ENSURE(!g_NetClient);
    … …  
    427439
    428440void AssignNetworkPlayer(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), int playerID, const std::string& guid)
    429441{
    430     ENSURE(g_NetServer);
     442    ENSURE(g_NetClient);
    431443
    432     g_NetServer->AssignPlayer(playerID, guid);
     444    g_NetClient->SendAssignPlayerMessage(playerID, guid);
    433445}
    434446
    435447void SetNetworkPlayerStatus(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::string& guid, int ready)
    … …  
    10491061    scriptInterface.RegisterFunction<bool, CStrW, bool, &KickPlayer>("KickPlayer");
    10501062    scriptInterface.RegisterFunction<JS::Value, &PollNetworkClient>("PollNetworkClient");
    10511063    scriptInterface.RegisterFunction<void, JS::HandleValue, &SetNetworkGameAttributes>("SetNetworkGameAttributes");
     1064    scriptInterface.RegisterFunction<void, JS::HandleValue, &NetworkChangeSettings>("NetworkChangeSettings");
    10521065    scriptInterface.RegisterFunction<void, int, std::string, &AssignNetworkPlayer>("AssignNetworkPlayer");
    10531066    scriptInterface.RegisterFunction<void, std::string, int, &SetNetworkPlayerStatus>("SetNetworkPlayerStatus");
    10541067    scriptInterface.RegisterFunction<void, &ClearAllPlayerReady>("ClearAllPlayerReady");

  • source/network/NetClient.cpp

     
    321321    SetCurrState(NCS_UNCONNECTED);
    322322}
    323323
     324void CNetClient::SendChangeSettingsMessage(JS::MutableHandleValue attrs, ScriptInterface& scriptInterface)
     325{
     326    // Pass the attributes as JSON, since that's the easiest safe
     327    // cross-thread way of passing script data
     328    std::string attrsJSON = scriptInterface.StringifyJSON(attrs, false);
     329    CChangeSettingsMessage changeSetting;
     330    changeSetting.m_Settings = attrsJSON;
     331    SendMessage(&changeSetting);
     332}
     333
     334void CNetClient::SendAssignPlayerMessage(const int playerID, const std::string guid)
     335{
     336    CAssignPlayerMessage assignPlayer;
     337    assignPlayer.m_PlayerID = playerID;
     338    assignPlayer.m_GUIDToAssign = guid;
     339    SendMessage(&assignPlayer);
     340}
     341
    324342void CNetClient::SendChatMessage(const std::wstring& text)
    325343{
    326344    CChatMessage chat;

  • source/network/NetClient.h

     
    187187     */
    188188    void LoadFinished();
    189189
     190    void SendChangeSettingsMessage(JS::MutableHandleValue attrs, ScriptInterface& scriptInterface);
     191
     192    void SendAssignPlayerMessage(const int playerID, const std::string guid);
     193
    190194    void SendChatMessage(const std::wstring& text);
    191195
    192196    void SendReadyMessage(const int status);

  • source/network/NetMessage.cpp

     
    199199        pNewMessage = new CSimulationMessage(scriptInterface);
    200200        break;
    201201
     202    case NMT_CHANGE_SETTINGS:
     203        pNewMessage = new CChangeSettingsMessage;
     204        break;
     205    case NMT_ASSIGN_PLAYER:
     206        pNewMessage = new CAssignPlayerMessage;
     207        break;
     208
    202209    default:
    203210        LOGERROR("CNetMessageFactory::CreateMessage(): Unknown message type '%d' received", header.GetType());
    204211        break;

  • source/network/NetMessages.h

     
    4545    NMT_SERVER_HANDSHAKE_RESPONSE,
    4646    NMT_AUTHENTICATE,       // Authentication stage
    4747    NMT_AUTHENTICATE_RESULT,
    48     NMT_CHAT,       // Common chat message
     48    NMT_CHAT,               // Common chat message
    4949    NMT_READY,
    5050    NMT_GAME_SETUP,
    5151    NMT_PLAYER_ASSIGNMENT,
    … …  
    6666    NMT_LOADED_GAME,
    6767    NMT_GAME_START,
    6868    NMT_END_COMMAND_BATCH,
    69     NMT_SYNC_CHECK, // OOS-detection hash checking
    70     NMT_SYNC_ERROR, // OOS-detection error
     69    NMT_SYNC_CHECK,         // OOS-detection hash checking
     70    NMT_SYNC_ERROR,         // OOS-detection error
    7171    NMT_SIMULATION_COMMAND,
     72    NMT_CHANGE_SETTINGS,    // User changes a setting in gamesetup
     73    NMT_ASSIGN_PLAYER,
    7274    NMT_LAST                // Last message in the list
    7375};
    7476
    … …  
    109111END_NMT_CLASS()
    110112
    111113START_NMT_CLASS_(Authenticate, NMT_AUTHENTICATE)
    112     NMT_FIELD(CStr8, m_GUID)
     114    NMT_FIELD(CStr, m_GUID)
    113115    NMT_FIELD(CStrW, m_Name)
    114116    NMT_FIELD(CStrW, m_Password)
    115117    NMT_FIELD_INT(m_IsLocalClient, u8, 1)
    … …  
    122124END_NMT_CLASS()
    123125
    124126START_NMT_CLASS_(Chat, NMT_CHAT)
    125     NMT_FIELD(CStr8, m_GUID) // ignored when client->server, valid when server->client
     127    NMT_FIELD(CStr, m_GUID) // ignored when client->server, valid when server->client
    126128    NMT_FIELD(CStrW, m_Message)
    127129END_NMT_CLASS()
    128130
    129131START_NMT_CLASS_(Ready, NMT_READY)
    130     NMT_FIELD(CStr8, m_GUID)
     132    NMT_FIELD(CStr, m_GUID)
    131133    NMT_FIELD_INT(m_Status, u8, 1)
    132134END_NMT_CLASS()
    133135
    134136START_NMT_CLASS_(PlayerAssignment, NMT_PLAYER_ASSIGNMENT)
    135137    NMT_START_ARRAY(m_Hosts)
    136         NMT_FIELD(CStr8, m_GUID)
     138        NMT_FIELD(CStr, m_GUID)
    137139        NMT_FIELD(CStrW, m_Name)
    138140        NMT_FIELD_INT(m_PlayerID, i8, 1)
    139141        NMT_FIELD_INT(m_Status, u8, 1)
    … …  
    151153
    152154START_NMT_CLASS_(FileTransferData, NMT_FILE_TRANSFER_DATA)
    153155    NMT_FIELD_INT(m_RequestID, u32, 4)
    154     NMT_FIELD(CStr8, m_Data)
     156    NMT_FIELD(CStr, m_Data)
    155157END_NMT_CLASS()
    156158
    157159START_NMT_CLASS_(FileTransferAck, NMT_FILE_TRANSFER_ACK)
    … …  
    163165END_NMT_CLASS()
    164166
    165167START_NMT_CLASS_(Rejoined, NMT_REJOINED)
    166     NMT_FIELD(CStr8, m_GUID)
     168    NMT_FIELD(CStr, m_GUID)
    167169END_NMT_CLASS()
    168170
    169171START_NMT_CLASS_(Kicked, NMT_KICKED)
    … …  
    172174END_NMT_CLASS()
    173175
    174176START_NMT_CLASS_(ClientTimeout, NMT_CLIENT_TIMEOUT)
    175     NMT_FIELD(CStr8, m_GUID)
     177    NMT_FIELD(CStr, m_GUID)
    176178    NMT_FIELD_INT(m_LastReceivedTime, u32, 4)
    177179END_NMT_CLASS()
    178180
    179181START_NMT_CLASS_(ClientPerformance, NMT_CLIENT_PERFORMANCE)
    180182    NMT_START_ARRAY(m_Clients)
    181         NMT_FIELD(CStr8, m_GUID)
     183        NMT_FIELD(CStr, m_GUID)
    182184        NMT_FIELD_INT(m_MeanRTT, u32, 4)
    183185    NMT_END_ARRAY()
    184186END_NMT_CLASS()
    … …  
    208210    NMT_END_ARRAY()
    209211END_NMT_CLASS()
    210212
     213START_NMT_CLASS_(ChangeSettings, NMT_CHANGE_SETTINGS)
     214    NMT_FIELD(CStr, m_GUID)
     215    NMT_FIELD(CStr, m_Settings)
     216END_NMT_CLASS()
     217
     218START_NMT_CLASS_(AssignPlayer, NMT_ASSIGN_PLAYER)
     219    NMT_FIELD_INT(m_PlayerID, i8, 1)
     220    NMT_FIELD(CStr, m_GUIDToAssign)
     221END_NMT_CLASS()
     222
    211223END_NMTS()
    212224
    213225#else

  • source/network/NetServer.cpp

     
    649649    session->AddTransition(NSS_PREGAME, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED, (void*)&OnDisconnect, context);
    650650    session->AddTransition(NSS_PREGAME, (uint)NMT_CHAT, NSS_PREGAME, (void*)&OnChat, context);
    651651    session->AddTransition(NSS_PREGAME, (uint)NMT_READY, NSS_PREGAME, (void*)&OnReady, context);
     652    session->AddTransition(NSS_PREGAME, (uint)NMT_CHANGE_SETTINGS, NSS_PREGAME, (void*)&OnChangeSettings, context);
     653    session->AddTransition(NSS_PREGAME, (uint)NMT_ASSIGN_PLAYER, NSS_PREGAME, (void*)&OnAssignPlayer, context);
    652654    session->AddTransition(NSS_PREGAME, (uint)NMT_LOADED_GAME, NSS_INGAME, (void*)&OnLoadedGame, context);
    653655
    654656    session->AddTransition(NSS_JOIN_SYNCING, (uint)NMT_CONNECTION_LOST, NSS_UNCONNECTED, (void*)&OnDisconnect, context);
    … …  
    11061108    return true;
    11071109}
    11081110
     1111bool CNetServerWorker::OnChangeSettings(void* context, CFsmEvent* event)
     1112{
     1113    ENSURE(event->GetType() == (uint)NMT_CHANGE_SETTINGS);
     1114    CNetServerSession* session = (CNetServerSession*)context;
     1115    CNetServerWorker& server = session->GetServer();
     1116
     1117    CChangeSettingsMessage* message = (CChangeSettingsMessage*)event->GetParamRef();
     1118    server.m_GameAttributesQueue.push_back(message->m_Settings);
     1119    return true;
     1120}
     1121
     1122bool CNetServerWorker::OnAssignPlayer(void* context, CFsmEvent* event)
     1123{
     1124    ENSURE(event->GetType() == (uint)NMT_ASSIGN_PLAYER);
     1125    CNetServerSession* session = (CNetServerSession*)context;
     1126    CNetServerWorker& server = session->GetServer();
     1127
     1128    CAssignPlayerMessage* message = (CAssignPlayerMessage*)event->GetParamRef();
     1129    server.m_AssignPlayerQueue.emplace_back(message->m_PlayerID, message->m_GUIDToAssign);
     1130    return true;
     1131}
     1132
    11091133bool CNetServerWorker::OnLoadedGame(void* context, CFsmEvent* event)
    11101134{
    11111135    ENSURE(event->GetType() == (uint)NMT_LOADED_GAME);

  • source/network/NetServer.h

     
    270270    static bool OnInGame(void* context, CFsmEvent* event);
    271271    static bool OnChat(void* context, CFsmEvent* event);
    272272    static bool OnReady(void* context, CFsmEvent* event);
     273    static bool OnChangeSettings(void* context, CFsmEvent* event);
     274    static bool OnAssignPlayer(void* context, CFsmEvent* event);
    273275    static bool OnLoadedGame(void* context, CFsmEvent* event);
    274276    static bool OnJoinSyncingLoadedGame(void* context, CFsmEvent* event);
    275277    static bool OnRejoined(void* context, CFsmEvent* event);