Ticket #1582: civ_names.patch

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

@@ -759 +759 @@
     var numPlayers = g_GameAttributes.settings.PlayerData.length; 
     // 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) ]; 
+    var civs = [ civ for each (civ in g_CivData) if (civ.SelectableInGameSetup !== false) ]; 
     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)]; 
+    {
+        if (g_GameAttributes.settings.PlayerData[i].Civ == "random")
+            g_GameAttributes.settings.PlayerData[i].Civ = civs[Math.floor(Math.random()*civs.length)].Code;
+        
+        // Assign a name to any player if it matches a default of "Player <number>"
+        if ((g_GameAttributes.mapType !== "scenario") && (/^Player \d+$/).test(g_GameAttributes.settings.PlayerData[i].Name))
+        {
+            // Find the full civ info (object) based on the assigned civ code
+            var playerCiv;
+            civs.forEach(function (testedCiv)
+            {
+                if (testedCiv.Code === g_GameAttributes.settings.PlayerData[i].Civ)
+                    playerCiv = testedCiv;
+            });
+
+            // Only set name it if civ info is found to avoid trouble
+            if (playerCiv !== undefined)
+            {
+                // When a list of AI names is available (set in civ JSON file) pick one
+                // (at least 8 names required to avoid the need for doubles)
+                if (playerCiv.AINames !== undefined && playerCiv.AINames.length >= 8)
+                {
+                    var nameIsNotUnique = true;
+                    while (nameIsNotUnique) // loop needed for checking potential doubles
+                    {
+                        // Pick a name at random
+                        g_GameAttributes.settings.PlayerData[i].Name = playerCiv.AINames[Math.floor(Math.random()*playerCiv.AINames.length)];
+
+                        // check for doubles, but skip the first time as it is always unique
+                        if (i===0) break;
+                        for (var k = 0; k < i; ++k)
+                        {
+                            if (g_GameAttributes.settings.PlayerData[k].Name === g_GameAttributes.settings.PlayerData[i].Name)
+                            {
+                                nameIsNotUnique = true;
+                                break; // hope the next loop with a different name goes better
+                            }
+                            else
+                                nameIsNotUnique = false; // unique name, move on
+                        }
+                    }
+                    // Add civ name for clarity (a ruler's name only is hard to infer civ from)
+                    g_GameAttributes.settings.PlayerData[i].Name += " ("+playerCiv.Name+")";
+                }
+                else // default to generic civ name
+                {
+                    g_GameAttributes.settings.PlayerData[i].Name = playerCiv.Name;
+                    
+                    // check for doubles, add number at end if necessary
+                    var sameCivNameCounter = 0;
+                    for (var k = 0; k < i; ++k)
+                    {
+                        if ( g_GameAttributes.settings.PlayerData[k].Name.indexOf(g_GameAttributes.settings.PlayerData[i].Name) !== -1)
+                            sameCivNameCounter++;
+                    }
+                    if (sameCivNameCounter > 0)
+                        g_GameAttributes.settings.PlayerData[i].Name += " " + getRomanNumber(sameCivNameCounter+1);
+                }
+            }
+        }
     } 
     
     if (g_IsNetworked)
@@ -1319 +1376 @@
     return false;
 }
 
-
-
-
+// A function to get roman numbers from 1 to 8 which is needed for AI name assignment
+function getRomanNumber(number)
+{
+    switch (number)
+    {
+    case 1:
+        return "I";
+    
+    case 2:
+        return "II";
+ 
+    case 3:
+        return "III";
+ 
+    case 4:
+        return "IV";
+        
+    case 5:
+        return "V";
+        
+    case 6:
+        return "VI";
+        
+    case 7:
+        return "VII";
+        
+    case 8:
+        return "VIII";
+        
+    default:
+        return number;
+    }
+}