Ticket #1734: civinfo.patch

gui/civinfo/civinfo.js

@@ -15 +15 @@
     // Cache map data
     g_CivData = loadCivData();
 
-    var civList = [ { "name": civ.Name, "code": civ.Code } for each (civ in g_CivData) ];
+    var civList = [ { "name": civ.Name, "cult": civ.Culture, "code": civ.Code } for each (civ in g_CivData) ];
     
     // Alphabetically sort the list, ignoring case
     civList.sort(sortNameIgnoreCase);
 
     var civListNames = [ civ.name for each (civ in civList) ];
     var civListCodes = [ civ.code for each (civ in civList) ];
-
+    var civListCults = [ civ.cult for each (civ in civList) ];
+    
+    // Find Cultures, and add spaces in front of Faction names
+    var civCultKey = [];
+    for (c = 0; c < civListNames.length; ++c)
+    {
+        if (civListCults[c] == undefined)
+        {
+            civListCults[c] = civListCodes[c];
+        }
+        else if (civListCodes[c] != civListCults[c])
+        {
+            civListNames[c] = "    " + civListNames[c];
+        }
+        
+        if (civCultKey.indexOf(civListCults[c]) < 0)
+        {
+            civCultKey.push(civListCults[c]);
+        }
+    }
+    
+    // Sort Civs by Culture
+    civCultKey.sort();
+    var civArrNames = [];
+    var civArrCodes = [];
+    for (k = 0; k < civCultKey.length; ++k)
+    {
+        civArrNames[k] = [""];
+        civArrCodes[k] = [""];
+        for (c = 0; c < civListNames.length; ++c)
+        {
+            if (civListCodes[c] == civCultKey[k])
+            {
+                civArrNames[k][0] = civListNames[c];
+                civArrCodes[k][0] = civListCodes[c];
+            }
+            else if (civListCults[c] == civCultKey[k])
+            {
+                civArrNames[k].push(civListNames[c]);
+                civArrCodes[k].push(civListCodes[c]);
+            }
+        }
+    }
+    
+    // Join list back together
+    civListNames = [];
+    civListCodes = [];
+    for (k = 0; k < civCultKey.length; ++k)
+    {
+        civListNames = civListNames.concat(civArrNames[k]);
+        civListCodes = civListCodes.concat(civArrCodes[k]);
+    }
+    
     // Set civ control
     var civSelection = getGUIObjectByName("civSelection");
     civSelection.list = civListNames;
     civSelection.list_data = civListCodes;
     civSelection.selected = 0;
+    
 }
 
 // Function to make first char of string big