Ticket #1582: playernamespatch.patch

common/functions_utility.js

@@ -239 +239 @@
         }
     }
 }
+
+// ====================================================================
+// "Inside-out" implementation of Fisher-Yates shuffle
+function shuffleArray(source)
+{
+    if (!source.length)
+        return [];
+
+    var result = [source[0]];
+    for (var i = 1; i < source.length; ++i)
+    {
+        var j = Math.floor(Math.random() * i);
+        result[i] = result[j];
+        result[j] = source[i];
+    }
+    return result;
+}
+ No newline at end of file

gamesetup/gamesetup.js

@@ -767 +767 @@
     // Assign random civilizations to players with that choice 
     //  (this is synchronized because we're the host) 
     var civs = [ civ.Code for each (civ in g_CivData) if (civ.SelectableInGameSetup !== false) ]; 
+    
+    // Get civ specific player names
+    var civAINames = [ civ.AINames for each (civ in g_CivData) if (civ.SelectableInGameSetup !== false) ]; 
+    for (var j = 0; j < civs.length; ++j) 
+        if (civAINames[j] !== undefined)
+            shuffleArray(civAINames[j])
+        else
+            civAINames[j] = ["Player"];
+        
     for (var i = 0; i < numPlayers; ++i) 
     { 
         if (g_GameAttributes.settings.PlayerData[i].Civ == "random") 
             g_GameAttributes.settings.PlayerData[i].Civ = civs[Math.floor(Math.random()*civs.length)]; 
+        // Check if the player is AI and the match is not a scenario
+        if ((g_GameAttributes.mapType !== "scenario")&&(g_GameAttributes.settings.PlayerData[i].AI))
+        {
+            var civIndex;
+            for (var j = 0; j < civs.length; ++j) 
+            {
+                if (civs[j] == g_GameAttributes.settings.PlayerData[i].Civ) 
+                {
+                    civIndex = j;
+                    break;
+                }
+            }
+            
+            // Choose the name
+            var usedName = 0;
+            if (i < civAINames[civIndex].length)
+                var chosenName = civAINames[civIndex][i];
+            else 
+                var chosenName = civAINames[civIndex][Math.floor(Math.random() * civAINames[civIndex].length)];
+            for (var j = 0; j < numPlayers; ++j) 
+                if (g_GameAttributes.settings.PlayerData[j].Name.indexOf(chosenName) !== -1)
+                    usedName++;
+            
+            // Assign civ specific names to AI players
+            if (usedName)
+                g_GameAttributes.settings.PlayerData[i].Name = chosenName + " " + [undefined, "I", "II", "III", "IV", "V", "VI", "VII", "VIII"][usedName+1];
+            else
+                g_GameAttributes.settings.PlayerData[i].Name = chosenName;
+        }
     } 
     
     if (g_IsNetworked)
@@ -1356 +1394 @@
     }
     return false;
 }
-
-
-
-