Ticket #1580: 1580.5.diff

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

@@ -32 +32 @@
     var settings = {
         "Ceasefire": loadCeasefire(),
         "GameSpeeds": loadSettingValuesFile("game_speeds.json"),
+        "PlayerColors": loadPlayerColors(),
         "PopulationCapacities": loadPopulationCapacities(),
         "StartingResources": loadSettingValuesFile("starting_resources.json")
     };
@@ -89 +90 @@
 }
 
 /**
+* Loads available colors settings.
+*
+* @returns {Array|undefined}
+*/
+function loadPlayerColors()
+{
+    var json = Engine.ReadJSONFile("simulation/data/player_defaults.json");
+
+    if (!json || !json.PlayerData || !Array.isArray(json.PlayerData))
+    {
+        error("Could not load player_defaults.json");
+        return undefined;
+    }
+
+    return json.PlayerData.map(player => player.Color);
+}
+
+/**
  * Loads available population capacities.
  *
  * @returns {Array|undefined}

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

@@ -7 +7 @@
 
 const g_Ceasefire = prepareForDropdown(g_Settings ? g_Settings.Ceasefire : undefined);
 const g_GameSpeeds = prepareForDropdown(g_Settings ? g_Settings.GameSpeeds.filter(speed => !speed.ReplayOnly) : undefined);
+const g_PlayerColors = prepareForDropdown(g_Settings ? g_Settings.PlayerColors : undefined);
 const g_PopulationCapacities = prepareForDropdown(g_Settings ? g_Settings.PopulationCapacities : undefined);
 const g_StartingResources = prepareForDropdown(g_Settings ? g_Settings.StartingResources : undefined);
 
@@ -50 +51 @@
 
 var g_AIs = [];
 
+var g_PlayerColorIds = [];
+var g_PlayerColorNames = [];
+var g_PlayerColorValues = [["r","g","b"]];
+
 var g_ChatMessages = [];
 
 // Data caches
@@ -380 +385 @@
             updateGameAttributes();
         };
 
+        // Populate color drop-down lists.
+        var colorPicker = Engine.GetGUIObjectByName("playerColorPicker["+i+"]");
+        colorPicker.list = getPlayerColorNames();
+        colorPicker.list_data = getPlayerColorIds();
+        colorPicker.selected = -1;
+        // Update color
+        colorPicker.onSelectionChange = function()
+        {
+            if (this.selected !== -1)
+            {
+                let numPlayers = g_GameAttributes.settings.PlayerData.length;
+                let inUse = false;
+                let playerColorValues = getPlayerColorValues();
+                for (let n = 0; n < numPlayers; ++n)
+                {
+                    if (rgbValuesMatch(playerColorValues[this.list_data[this.selected]], getSetting(g_GameAttributes.settings.PlayerData, g_DefaultPlayerData ? g_DefaultPlayerData[n] : {}, "Color")))
+                    {
+                        inUse = true;
+                        break;
+                    }
+                }
+                if(!inUse){
+                    copyRgbValuesFromColorIntoColor(playerColorValues[this.list_data[this.selected]], getSetting(g_GameAttributes.settings.PlayerData, g_DefaultPlayerData ? g_DefaultPlayerData[playerSlot] : {}, "Color"));
+                }
+            }
+            if (!g_IsInGuiUpdate)
+            {
+                    updateGameAttributes();
+            }
+        }
+
         // Set events
         var civ = Engine.GetGUIObjectByName("playerCiv["+i+"]");
         civ.onSelectionChange = function() {
@@ -413 +449 @@
     }
 }
 
+// Returns the index of the specified color.
+function getIndexOfColor(color)
+{
+    for (var i = 0; i < g_PlayerColors.r.length; ++i)
+    {
+        if (rgbValuesMatch(getPlayerColorValues()[i], color))
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+function getPlayerColorIds()
+{
+    for(let i = 0; i < g_PlayerColors.r.length;++i)
+        g_PlayerColorIds[i] = i;
+
+    return g_PlayerColorIds;
+}
+
+function copyRgbValuesFromColorIntoColor(color1, color2)
+{
+      color2.r = color1.r;
+    color2.g = color1.g;
+    color2.b = color1.b;
+}
+
+function getPlayerColorNames()
+{
+    for(let i = 0; i < g_PlayerColors.r.length;++i)
+        g_PlayerColorNames[i] = "[color=\"" + g_PlayerColors.r[i] + " " + g_PlayerColors.g[i] + " " + g_PlayerColors.b[i] + " 255\"]" + "■";
+
+        return g_PlayerColorNames;
+}
+
+function getPlayerColorValues()
+{
+    return g_Settings.PlayerColors;
+}
+
+function rgbValuesMatch(color1, color2)
+{
+    return color1.r === color2.r && color1.g === color2.g && color1.b === color2.b;
+}
+
 function handleNetMessage(message)
 {
     log("Net message: " + uneval(message));
@@ -1422 +1504 @@
         var pTeam = Engine.GetGUIObjectByName("playerTeam["+i+"]");
         var pTeamText = Engine.GetGUIObjectByName("playerTeamText["+i+"]");
         var pColor = Engine.GetGUIObjectByName("playerColor["+i+"]");
+        var pColorPicker = Engine.GetGUIObjectByName("playerColorPicker["+i+"]")
 
         // Player data / defaults
         var pData = mapSettings.PlayerData ? mapSettings.PlayerData[i] : {};
@@ -1428 +1511 @@
         var pDefs = g_DefaultPlayerData ? g_DefaultPlayerData[i] : {};
 
         // Common to all game types
-        var color = rgbToGuiColor(getSetting(pData, pDefs, "Color"));
-        pColor.sprite = "color:" + color + " 100";
+        var color = getSetting(pData, pDefs, "Color");
+        pColor.sprite = "color:" + rgbToGuiColor(color) + " 100";
         pName.caption = translate(getSetting(pData, pDefs, "Name"));
 
         var team = getSetting(pData, pDefs, "Team");
@@ -1449 +1532 @@
         {
             pCivText.hidden = false;
             pCiv.hidden = true;
+            pColorPicker.hidden = true;
             pTeamText.hidden = false;
             pTeam.hidden = true;
             // Set text values
@@ -1464 +1548 @@
             pCiv.hidden = false;
             pTeamText.hidden = true;
             pTeam.hidden = false;
+            pColorPicker.hidden = false;
             // Set dropdown values
             pCiv.selected = (civ ? pCiv.list_data.indexOf(civ) : 0);
             pTeam.selected = (team !== undefined && team >= 0) ? team+1 : 0;
+            pColorPicker.selected = getIndexOfColor(color);
         }
     }
 

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

@@ -42 +42 @@
             <!-- Player assignments -->
             <object size="24 49 100%-440 345" type="image" sprite="ModernDarkBoxGold" name="playerAssignmentsPanel">
                 <object size="0 6 100% 30">
-                    <object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 22% 100%">
+                    <object name="playerNameHeading" type="text" style="ModernLabelText" size="0 0 16% 100%">
                         <translatableAttribute id="caption">Player Name</translatableAttribute>
                     </object>
+                    <object name="playerColorHeading" type="text" style="ModernLabelText" size="-2% 0 40% 100%">
+                        <translatableAttribute id="caption">Color</translatableAttribute>
+                    </object>
                     <object name="playerPlacementHeading" type="text" style="ModernLabelText" size="22%+5 0 50%+35 100%">
                         <translatableAttribute id="caption">Player Placement</translatableAttribute>
                     </object>
@@ -71 +74 @@
                     <repeat count="8">
                         <object name="playerBox[n]" size="0 0 100% 32" hidden="true">
                             <object name="playerColor[n]" type="image" size="0 0 100% 100%"/>
-                            <object name="playerName[n]" type="text" style="ModernLabelText" size="0 2 22% 30"/>
+                            <object name="playerName[n]" type="text" style="ModernLabelText" size="0 0 16% 100%"/>
+                            <object name="playerColorPicker[n]" type="dropdown" style="ModernDropDown" size="16%+5 2 20%+5 30" tooltip_style="onscreenToolTip">
+                                <translatableAttribute id="tooltip">Pick Color.</translatableAttribute>
+                            </object>
                             <object name="playerAssignment[n]" type="dropdown" style="ModernDropDown" size="22%+5 2 50%+35 30" tooltip_style="onscreenToolTip">
                                 <translatableAttribute id="tooltip">Select player.</translatableAttribute>
                             </object>
@@ -152 +158 @@
                     tooltip_style="onscreenToolTip">
                     <translatableAttribute id="tooltip">Select a map to play on.</translatableAttribute>
                     <action on="SelectionChange">
-                        if (this.list_data[this.selected]) 
+                        if (this.list_data[this.selected])
                             selectMap(this.list_data[this.selected]);
                     </action>
                 </object>
@@ -179 +185 @@
 
             <!-- Map Description -->
             <object size="100%-425 529 100%-25 100%-60">
-                <object name="mapInfoName" type="text" style="ModernLeftLabelText" size="0 0 100%-120 30"/> 
+                <object name="mapInfoName" type="text" style="ModernLeftLabelText" size="0 0 100%-120 30"/>
                 <object type="image" sprite="ModernDarkBoxGold" size="0 30 100% 100%">
                     <object name="mapInfoDescription" type="text" style="MapDescription" size="0 0 100% 100%"/>
                 </object>