Ticket #4248: gamesetup_unassigned_player_fix_v2.patch

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

@@ -993 +993 @@
         playerData.shift();
 
     playerData.forEach((pData, index) => {
         pData.Color = pData.Color || g_PlayerColors[index];
         pData.Civ = pData.Civ || "random";
-        pData.AI = pData.AI || "";
+
+        // Use default AI if the map doesn't specify any explicitly
+        if (!("AI" in pData))
+            pData.AI = g_DefaultPlayerData[index].AI;
+
+        if (!("AIDiff" in pData))
+            pData.AIDiff = g_DefaultPlayerData[index].AIDiff;
     });
 
     // Replace colors with the best matching color of PlayerDefaults
     if (g_GameAttributes.mapType != "scenario")
     {
@@ -1073 +1079 @@
 }
 
 /**
  * Called when the map or the number of players changes.
  */
-function resizePlayerData(targetPlayerData, maxPlayers)
+function unassignInvalidPlayers(maxPlayers)
 {
     if (g_IsNetworked)
     {
         // Remove invalid playerIDs from the servers playerassignments copy
         for (let playerID = +maxPlayers + 1; playerID <= g_MaxPlayers; ++playerID)
@@ -1089 +1095 @@
             "local": {
                 "name": singleplayerName(),
                 "player": 1
             }
         };
-
-    let pData = g_GameAttributes.settings.PlayerData;
-    return maxPlayers > pData.length ?
-        pData.concat(targetPlayerData.slice(pData.length, maxPlayers)) :
-        pData.slice(0, maxPlayers);
 }
 
 /**
  * Called when the host choses the number of players on a random map.
  * @param {Number} num
@@ -1105 +1106 @@
 function selectNumPlayers(num)
 {
     if (g_IsInGuiUpdate || !g_IsController || g_GameAttributes.mapType != "random")
         return;
 
-    g_GameAttributes.settings.PlayerData = resizePlayerData(g_DefaultPlayerData, num);
+    let pData = g_GameAttributes.settings.PlayerData;
+    g_GameAttributes.settings.PlayerData =
+        num > pData.length ?
+            pData.concat(g_DefaultPlayerData.slice(pData.length, num)) :
+            pData.slice(0, num);
+
+    unassignInvalidPlayers(num);
 
     updateGameAttributes();
 }
 
 /**
@@ -1216 +1223 @@
     }
 
     if (mapSettings.PlayerData)
         sanitizePlayerData(mapSettings.PlayerData);
 
-    // Persist player data
-    if (g_GameAttributes.mapType == "skirmish")
-        mapSettings.PlayerData = resizePlayerData(mapSettings.PlayerData, mapSettings.PlayerData.length);
-
     // Copy any new settings
     g_GameAttributes.map = name;
     g_GameAttributes.script = mapSettings.Script;
     if (g_GameAttributes.map !== "random")
         for (let prop in mapSettings)
             g_GameAttributes.settings[prop] = mapSettings[prop];
 
-    // Use default AI if the map doesn't specify any explicitly
-    for (let i in g_GameAttributes.settings.PlayerData)
-    {
-        if (!('AI' in g_GameAttributes.settings.PlayerData[i]))
-            g_GameAttributes.settings.PlayerData[i].AI = g_DefaultPlayerData[i].AI;
-        if (!('AIDiff' in g_GameAttributes.settings.PlayerData[i]))
-            g_GameAttributes.settings.PlayerData[i].AIDiff = g_DefaultPlayerData[i].AIDiff;
-    }
+    unassignInvalidPlayers(g_GameAttributes.settings.PlayerData.length);
 
     updateGameAttributes();
 }
 
 function launchGame()