Ticket #1082: 0002-random-civ-color-default-first-nwpath.patch

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

@@ -3 +3 @@
 const DEFAULT_NETWORKED_MAP = "Median Oasis";
 const DEFAULT_OFFLINE_MAP = "Oasis";
 
+
+
+
+
+
+
 // TODO: Move these somewhere like simulation\data\game_types.json, Atlas needs them too
 const VICTORY_TEXT = ["Conquest", "None"];
 const VICTORY_DATA = ["conquest", "endless"];
@@ -387 +393 @@
     var civListNames = [ civ.name for each (civ in civList) ];
     var civListCodes = [ civ.code for each (civ in civList) ];
     
-    // Add random to the end of the list.
-    civListNames.push("[color=\"140 140 140 255\"]Random");
-    civListCodes.push("Random");
+    // Add random to the 
+    civListNames.);
+    civListCodes.);
 
     // Update the dropdowns
     for (var i = 0; i < MAX_PLAYERS; ++i)
@@ -709 +715 @@
     {
         return;
     }
-
+    
+    var numPlayers = g_GameAttributes.settings.PlayerData.length;
+    // We should assign a proper civilization if "random" was selected
+    for (var i = 0; i < numPlayers; ++i)
+    {
+        var civBox = getGUIObjectByName("playerCiv["+i+"]");
+        if (civBox.list_data[civBox.selected] == RANDOM_CIV.Code)
+        {
+            // "Random" is always the first element; if not this logic has to change
+            g_GameAttributes.settings.PlayerData[i].Civ = civBox.list_data[Math.floor(Math.random()*(civBox.list_data.length-1))+1];
+        }
+    }
+    
     if (g_IsNetworked)
     {
         Engine.SetNetworkGameAttributes(g_GameAttributes);
@@ -718 +736 @@
     else
     {
         // Find the player ID which the user has been assigned to
-        var numPlayers = g_GameAttributes.settings.PlayerData.length;
         var playerID = -1;
         for (var i = 0; i < numPlayers; ++i)
         {
@@ -727 +744 @@
             {
                 playerID = i+1;
             }
-            // while we are at it, we should assign a proper civilization if "Random" was selected
-            var civBox = getGUIObjectByName("playerCiv["+i+"]");
-            if (civBox.list_data[civBox.selected] == "Random")
-            {
-                // "Random" is always the last element; if not this logic has to change
-                g_GameAttributes.settings.PlayerData[i].Civ = civBox.list_data[Math.floor(Math.random()*(civBox.list_data.length-1))];
-            }
         }
         // Remove extra player data
         g_GameAttributes.settings.PlayerData = g_GameAttributes.settings.PlayerData.slice(0, numPlayers);
@@ -906 +916 @@
                 pTeamText.hidden = false;
                 pTeam.hidden = true;
 
-                // Set text values
-                pCivText.caption = g_CivData[civ].Name;
+                // Set text values.
+                // Since g_CivData only contains valid civilizations, take care of the case when "Random" is selected.
+                pCivText.caption = (g_CivData[civ] ? g_CivData[civ].Name : RANDOM_CIV.Name);
                 pTeamText.caption = (team !== undefined && team >= 0) ? team+1 : "-";
             }
             else if (g_GameAttributes.mapType == "random")

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

@@ -9 +9 @@
         },
         {
             "Name": "Player 1",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 80, "g": 80, "b": 200 },
             "AI": ""
         },
         {
             "Name": "Player 2",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 150, "g": 20, "b": 20 },
             "AI": "qbot"
         },
         {
             "Name": "Player 3",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 50, "g": 165, "b": 5 },
             "AI": "qbot"
         },
         {
             "Name": "Player 4",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 230, "g": 230, "b": 75 },
             "AI": "qbot"
         },
         {
             "Name": "Player 5",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 50, "g": 170, "b": 170 },
             "AI": "qbot"
         },
         {
             "Name": "Player 6",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 160, "g": 80, "b": 200 },
             "AI": "qbot"
         },
         {
             "Name": "Player 7",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 235, "g": 120, "b": 20 },
             "AI": "qbot"
         },
         {
             "Name": "Player 8",
-            "Civ": "hele",
+            "Civ": "",
             "Colour": { "r": 64, "g": 64, "b": 64 },
             "AI": "qbot"
         }