Ticket #3120: 3120.v3.patch

../../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"},

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

@@ -1034 +1034 @@
 }
 
 /**
+ * Called when the map changes or the number of players changes
+ */
+function resizePlayerData(newPData, len=newPData.length)
+{
+    let pData = g_GameAttributes.settings.PlayerData;
+    return len > pData.length ?
+        pData.concat(newPData.slice(pData.length)) :
+        pData.slice(0, len);
+    
+}
+
+/**
  * Called when the host choses the number of players on a random map.
  * @param {Number} num
  */
@@ -1052 +1064 @@
         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();
 }
@@ -1165 +1172 @@
         delete g_GameAttributes.settings.LastManStanding;
     }
 
+    // Persist player data settings on map change
+    if (g_GameAttributes.mapType == "skirmish")
+        mapSettings.PlayerData = resizePlayerData(mapSettings.PlayerData);
+
     if (mapSettings.PlayerData)
         sanitizePlayerData(mapSettings.PlayerData);