Ticket #3120: 3120.v7.patch

0ad/binaries/data/mods/public/gui/credits/texts/programming.json

@@ -134 +134 @@
             {"nick": "njm"},
             {"nick": "NoMonkey", "name": "John Mena"},
             {"nick": "notpete", "name": "Rich Cross"},
+            {"nick": "Offensive ePeen", "name": "Jared Ryan Bills"},
             {"nick": "Ols", "name": "Oliver Whiteman"},
             {"nick": "olsner", "name": "Simon Brenner"},
             {"nick": "otero"},

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

@@ -1040 +1040 @@
 }
 
 /**
+ * Called when the map changes or the number of players changes
+ */
+function resizePlayerData(defPData, ply)
+{
+    if (g_IsNetworked)
+        // Unassign excess players
+        for (let guid in g_PlayerAssignments) 
+        { 
+            let player = g_PlayerAssignments[guid].player; 
+            if (player > ply)
+                Engine.AssignNetworkPlayer(player, ""); 
+        }
+    else
+        // Reassign player 1
+        g_PlayerAssignments = {
+            "local": {
+                "name": singleplayerName(),
+                "player": 1
+            }
+        };
+    let pData = g_GameAttributes.settings.PlayerData;
+    return ply > pData.length ?
+        pData.concat(defPData.slice(pData.length, ply)) :
+        pData.slice(0, ply);
+}
+
+/**
  * Called when the host choses the number of players on a random map.
  * @param {Number} num
  */
@@ -1048 +1075 @@
     if (g_IsInGuiUpdate || !g_IsController || g_GameAttributes.mapType != "random")
         return;
 
-    // Unassign players from nonexistent slots
-    if (g_IsNetworked)
-    {
-        for (let i = g_MaxPlayers; i > num; --i)
-            Engine.AssignNetworkPlayer(i, "");
-    }
-    else if (g_PlayerAssignments.local.player > num)
-        g_PlayerAssignments.local.player = 1;
-
     // Update player data
-    let pData = g_GameAttributes.settings.PlayerData;
-    if (num < pData.length)
-        g_GameAttributes.settings.PlayerData = pData.slice(0, num);
-    else
-        for (let i = pData.length; i < num; ++i)
-            g_GameAttributes.settings.PlayerData.push(g_DefaultPlayerData[i]);
+    g_GameAttributes.settings.PlayerData = resizePlayerData(g_DefaultPlayerData, num);
 
     updateGameAttributes();
 }
@@ -1171 +1184 @@
         delete g_GameAttributes.settings.LastManStanding;
     }
 
+    // Persist player data settings on map change
+    if (g_GameAttributes.mapType == "skirmish")
+    {
+        let bGaiaSet = (mapSettings.PlayerData[0] == null);
+        if (bGaiaSet)
+            mapSettings.PlayerData.shift();
+        mapSettings.PlayerData = resizePlayerData(mapSettings.PlayerData, mapSettings.PlayerData.length);
+        if (bGaiaSet)
+            mapSettings.PlayerData.unshift(null);
+    }
+
     if (mapSettings.PlayerData)
         sanitizePlayerData(mapSettings.PlayerData);
 
@@ -1190 +1214 @@
             g_GameAttributes.settings.PlayerData[i].AIDiff = g_DefaultPlayerData[i].AIDiff;
     }
 
-    if (g_IsNetworked)
-        // Unassign excess players
-        for (let guid in g_PlayerAssignments)
-        {
-            let player = g_PlayerAssignments[guid].player;
-            if (player > g_GameAttributes.settings.PlayerData.length)
-                Engine.AssignNetworkPlayer(player, "");
-        }
-    else
-        g_PlayerAssignments = {
-            "local": {
-                "name": singleplayerName(),
-                "player": 1
-            }
-        };
-
     updateGameAttributes();
 }