Ticket #1580: 1580.8.diff

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

@@ -148 +148 @@
 
 // ====================================================================
 
+function sameColor(color1, color2)
+{
+    return color1.r === color2.r && color1.g === color2.g && color1.b === color2.b;
+}
+
+// ====================================================================
+
 /**
  * Convert time in milliseconds to [hh:]mm:ss string representation.
  * @param time Time period in milliseconds (integer)

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

@@ -10 +10 @@
 const g_PopulationCapacities = prepareForDropdown(g_Settings ? g_Settings.PopulationCapacities : undefined);
 const g_StartingResources = prepareForDropdown(g_Settings ? g_Settings.StartingResources : undefined);
 
+const g_PlayerColors = initPlayerDefaults().slice(1).map(playerData => playerData.Color);
+
 ////////////////////////////////////////////////////////////////////////////////////////////////
 
 // Is this is a networked game, or offline
@@ -380 +382 @@
             updateGameAttributes();
         };
 
+        // Populate color drop-down lists.
+        var colorPicker = Engine.GetGUIObjectByName("playerColorPicker["+i+"]");
+        colorPicker.list = g_PlayerColors.map(color => '[color="' + color.r + ' ' + color.g + ' ' + color.b + '"]■[/color]' );
+        colorPicker.list_data = g_PlayerColors.map((color, index) => index);
+        colorPicker.selected = -1;
+
+        // Update color
+        colorPicker.onSelectionChange = function()
+        {
+            if (this.selected == -1)
+                return;
+
+            // Add missing properties
+            g_GameAttributes.settings.PlayerData.forEach((pData, index) => {
+                if (!pData.Color)
+                    pData.Color = g_PlayerColors[index];
+            });
+
+            // If someone else has that color, give him/her the old one
+            let playerID = g_GameAttributes.settings.PlayerData.findIndex(pData => sameColor(g_PlayerColors[this.selected], pData.Color));
+            if (playerID != -1)
+                g_GameAttributes.settings.PlayerData[playerID].Color = g_GameAttributes.settings.PlayerData[playerSlot].Color;
+
+            g_GameAttributes.settings.PlayerData[playerSlot].Color = g_PlayerColors[this.selected];
+
+            if (!g_IsInGuiUpdate)
+                updateGameAttributes();
+        }
+
         // Set events
         var civ = Engine.GetGUIObjectByName("playerCiv["+i+"]");
         civ.onSelectionChange = function() {
@@ -1422 +1453 @@
         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 +1460 @@
         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 +1481 @@
         {
             pCivText.hidden = false;
             pCiv.hidden = true;
+            pColorPicker.hidden = true;
             pTeamText.hidden = false;
             pTeam.hidden = true;
             // Set text values
@@ -1464 +1497 @@
             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 = g_PlayerColors.findIndex(col => sameColor(col, 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="-3% 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="15%+5 2 20%+5 30" tooltip_style="onscreenToolTip">
+                                <translatableAttribute id="tooltip">Pick a 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>