Ticket #3987: random_cultures_option.patch

gamesetup.js

@@ -353 +353 @@
         "optionExploreMap",
         "optionDisableTreasures",
         "optionLockTeams",
+        "optionRandomCivs",
         "optionCheats",
         "optionRating",
         "hideMoreOptions"
@@ -508 +509 @@
         "ExploreMap": "exploreMap",
         "DisableTreasures": "disableTreasures",
         "LockTeams": "lockTeams",
+        "RandomCivs" : "randomCivs",
         "CheatsEnabled": "enableCheats"
     };
 
@@ -1246 +1248 @@
     // Get a unique array of selectable cultures
     let cultures = Object.keys(g_CivData).filter(civ => g_CivData[civ].SelectableInGameSetup).map(civ => g_CivData[civ].Culture);
     cultures = cultures.filter((culture, index) => cultures.indexOf(culture) === index);
+    let civs = Object.keys(g_CivData).filter(civ => g_CivData[civ].SelectableInGameSetup)
 
     // Determine random civs and botnames
     for (let i in g_GameAttributes.settings.PlayerData)
@@ -1254 +1257 @@
         let chosenCiv = g_GameAttributes.settings.PlayerData[i].Civ || "random";
         if (chosenCiv == "random")
         {
-            let culture = cultures[Math.floor(Math.random() * cultures.length)];
-            let civs = Object.keys(g_CivData).filter(civ => g_CivData[civ].Culture == culture);
-            chosenCiv = civs[Math.floor(Math.random() * civs.length)];
+            if (g_GameAttributes.settings.RandomCivs)
+            {
+                let culture = cultures[Math.floor(Math.random() * cultures.length)];
+                let civs = Object.keys(g_CivData).filter(civ => g_CivData[civ].Culture == culture);
+                chosenCiv = civs[Math.floor(Math.random() * civs.length)];
+            }
+            else
+            {
+                chosenCiv = civs[Math.floor(Math.random() * civs.length)];
+            }
         }
         g_GameAttributes.settings.PlayerData[i].Civ = chosenCiv;
 
@@ -1371 +1381 @@
     setGUIBoolean("exploreMap", "exploreMapText", !!mapSettings.ExploreMap);
     setGUIBoolean("revealMap", "revealMapText", !!mapSettings.RevealMap);
     setGUIBoolean("lockTeams", "lockTeamsText", !!mapSettings.LockTeams);
+    setGUIBoolean("randomCivs", "randomCivsText", !!mapSettings.RandomCivs);
     setGUIBoolean("enableRating", "enableRatingText", !!mapSettings.RatingEnabled);
 
     Engine.GetGUIObjectByName("optionWonderDuration").hidden =
@@ -1393 +1404 @@
 
     for (let ctrl of ["victoryCondition", "wonderDuration", "populationCap",
                       "startingResources", "ceasefire", "revealMap",
-                      "exploreMap", "disableTreasures", "lockTeams"])
+                      "exploreMap", "disableTreasures", "lockTeams", "randomCivs"])
         hideControl(ctrl, ctrl + "Text", notScenario);
 
     for (let i = 0; i < g_MaxPlayers; ++i)

gamesetup.xml

@@ -376 +376 @@
                     </object>
                 </object>
 
-                <object name="optionCheats" size="14 338 94% 366" hidden="true">
+                <object name="optionRandomCivs" size="14 338 94% 366">
                     <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
+                        <translatableAttribute id="caption">Random Cultures:</translatableAttribute>
+                    </object>
+                    <object name="randomCivsText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
+                    <object name="randomCivs" size="40%+10 5 40%+30 100%-5" type="checkbox" style="ModernTickBox" hidden="true" tooltip_style="onscreenToolTip">
+                        <translatableAttribute id="tooltip">Toggle the selection of random civilizations by culture.</translatableAttribute>
+                    </object>
+                </object>
+                
+                <object name="optionCheats" size="14 368 94% 396" hidden="true">
+                    <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Cheats:</translatableAttribute>
                     </object>
                     <object name="enableCheatsText" size="40% 0 100% 28" type="text" style="ModernLeftLabelText"/>
@@ -386 +396 @@
                     </object>
                 </object>
 
-                <object name="optionRating" size="14 368 94% 396" hidden="true">
+                <object name="optionRating" size="14 398 94% 426" hidden="true">
                     <object size="0 0 40% 28" hidden="false" type="text" style="ModernRightLabelText">
                         <translatableAttribute id="caption">Rated Game:</translatableAttribute>
                     </object>