Ticket #3987: civselection_randomcivoption_v3.1.patch

binaries/data/config/default.cfg

@@ -85 +85 @@
 noautomipmap = true
 novbo = false
 noframebufferobject = false
+randomcultures = true
 
 ; Disable hardware cursors
 nohwcursor = false
@@ -234 +235 @@
 toggle = "Ctrl+F11"          ; Enable/disable HTTP/GPU modes for new profiler
 
 [hotkey.selection]
-add = Shift                  ; Add units to selection
+add = Shift                  ; Add units/civilizations to selection
 milonly = Alt                ; Add only military units to selection
 idleonly = "I"               ; Select only idle units
 remove = Ctrl                ; Remove units from selection

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

@@ +1 @@
+let g_CivData = {};
+let g_GroupingData = {};
+let g_GroupingChoice = "none";
+let g_SelectedGroupingChoice = "none";
+let g_Player = 0;
+let g_Selected = {
+    "isGroup": false,
+    "code": "athen"
+};
+let g_EmblemMargin = 8;
+let g_HeaderEmblemSize = 80;
+let g_DoubleClick = false;
+let g_CustomGrouping = false;
+let g_PreviousSelection = {};
+
+/**
+ * Run when UI Page loaded.
+ */
+function init(settings)
+{
+    // Cache civ data
+    g_CivData = loadCivData(true);
+    g_Player = settings.player;
+
+    // If no civ passed, choose one at random
+    if (!settings.civ)
+    {
+        let num = Math.floor(Math.random() * Object.keys(g_CivData).length);
+        settings.civ = {
+            "codes": [Object.keys(g_CivData)[num]],
+            "grouped": false
+        };
+    }
+    g_DoubleClick = false;
+    // Cache grouping data and create list
+    let grpList = ["Ungrouped"];
+    let grpList_data = ["nogroup"];
+    for (let grp of Engine.BuildDirEntList("simulation/data/civs/grouping/", "*.json", false))
+    {
+        let data = Engine.ReadJSONFile(grp);
+        if (!data)
+            continue;
+        translateObjectKeys(data, ["ListEntry"]);
+        g_GroupingData[data.Code] = loadGroupingSchema(data.Folder, data.CivAttribute);
+
+        grpList.push(data.ListEntry);
+        grpList_data.push(data.Code);
+    }
+
+    g_GroupingData["custom"] = {"custom": {"Name": "Custom", "History": "", "code": "cust", "Singular": "Custom", "civlist": settings.civ.codes, "embs": []}};
+
+    let grpSel = Engine.GetGUIObjectByName("groupSelection");
+    grpSel.list = grpList;
+    grpSel.list_data = grpList_data;
+
+    // Read civ choice from passed data
+    if (!settings.civ.grouped)
+    {
+        g_Selected.code = settings.civ.codes[0];
+        grpSel.selected = 0;
+        selectCiv(g_Selected.code, true, false);
+    }
+    else
+    {
+        g_GroupingChoice = settings.civ.group.type;
+        g_SelectedGroupingChoice = settings.civ.group.type;
+
+        g_Selected.isGroup = true;
+        if (settings.civ.group.code !== "all")
+        {
+            g_Selected.code = settings.civ.group.code;
+            if (settings.civ.group.type != "custom")
+                grpSel.selected = grpSel.list_data.indexOf(g_GroupingChoice);
+            else
+                grpSel.selected = 0;
+            if (settings.civ.group.type == "custom")
+            {
+                g_CustomGrouping = true;
+                g_GroupingData["custom"]["custom"].civlist = settings.civ.codes;
+            }
+            selectCiv(g_Selected.code, true, true);
+        }
+        else
+        {
+            grpSel.selected = 0;
+            selectAllCivs();
+        }
+    }
+    Engine.GetGUIObjectByName("randomCultures").checked = Engine.ConfigDB_GetValue("user", "randomcultures") === "true";
+    Engine.GetGUIObjectByName("selectAll").checked = g_Selected.code == "all";
+}
+
+function chooseGrouping(choice)
+{
+    if (g_CustomGrouping)
+    {
+        g_CustomGrouping = false;
+        selectCiv(Object.keys(g_CivData)[Math.floor(Math.random() * Object.keys(g_CivData).length)], false, false);
+    }
+    if (choice === "nogroup")
+        draw_ungrouped();
+    else
+        draw_grouped(choice);
+}
+
+function draw_grouped(group)
+{
+    Engine.GetGUIObjectByName("optionRandomCultures").hidden = !Engine.GetGUIObjectByName("selectAll").checked;
+
+    let grp = 0;
+    let emb = 0;
+    let vOffset = 0;
+    let hOffset = 0;
+    g_GroupingChoice = group;
+
+    let grouping = g_GroupingData[group];
+    let selectedCivs = [];
+
+    for (let civ in g_CivData)
+        g_CivData[civ].embs = [];
+    for (let code in grouping)
+    {
+        // Pre-emptive check to make sure we have at least one emblem left
+        if (!Engine.GetGUIObjectByName("emblem["+emb+"]"))
+            break;
+
+        let grpObj = Engine.GetGUIObjectByName("civGroup["+grp+"]");
+
+        let grpSize = grpObj.size;
+        grpSize.top = vOffset;
+        grpSize.right = hOffset;
+
+        grpSize.left = (grp % 2 == 0 || grouping[code].civlist.length > 3) ? g_HeaderEmblemSize-g_EmblemMargin : 400;
+        grpObj.size = grpSize;
+        grpObj.hidden = false;
+
+        g_GroupingData[g_GroupingChoice][code].embs = [];
+
+        let grpHeading = Engine.GetGUIObjectByName("civGroup["+grp+"]_heading");
+        grpHeading.caption = grouping[code].Name;
+
+        let embHeading = Engine.GetGUIObjectByName("emblem["+emb+"]_heading");
+        embHeading.caption = '';
+
+        if (code !== "groupless")
+        {
+            let grpBtn = Engine.GetGUIObjectByName("emblem["+emb+"]_btn");
+            grpBtn.tooltip = grouping[code].Name;
+            setBtnFunc(grpBtn, selectCiv, [code, false, true]);
+
+            setEmbPos("emblem["+emb+"]", hOffset, vOffset+g_EmblemMargin);
+            setEmbSize("emblem["+emb+"]", g_HeaderEmblemSize);
+
+            let sprite = (code !== g_Selected.code) ? "grayscale:" : "";
+            if (grouping[code].Emblem)
+                sprite += grouping[code].Emblem;
+            else
+                sprite += g_CivData[grouping[code].civlist[0]].Emblem;
+            Engine.GetGUIObjectByName("emblem["+emb+"]_img").sprite = "stretched:"+sprite;
+            Engine.GetGUIObjectByName("emblem["+emb+"]").hidden = grouping[code].civlist.length == 1;
+            g_GroupingData[g_GroupingChoice][code].embs.push(emb);
+            ++emb;
+        }
+
+        let range = [emb];
+
+        for (let civ of grouping[code].civlist)
+        {
+            if (g_GroupingData["custom"]["custom"].civlist.indexOf(civ) > -1)
+                selectedCivs.push(emb);
+
+            if (!g_Selected.isGroup && civ == g_Selected.code)
+                selectedCivs.push(emb);
+            let embImg = Engine.GetGUIObjectByName("emblem["+emb+"]_img");
+            if (!embImg)
+            {
+                error("There are not enough images in the current GUI layout to support that many civs");
+                break;
+            }
+
+            let embHeading = Engine.GetGUIObjectByName("emblem["+emb+"]_heading");
+            embHeading.caption = '';
+
+            g_CivData[civ].embs.push(emb);
+            g_GroupingData[g_GroupingChoice][code].embs.push(emb);
+
+            embImg.sprite = "stretched:";
+            if (civ !== g_Selected.code && code !== g_Selected.code)
+                embImg.sprite += "grayscale:";
+            embImg.sprite += g_CivData[civ].Emblem;
+
+            let embBtn = Engine.GetGUIObjectByName("emblem["+emb+"]_btn");
+            embBtn.tooltip = g_CivData[civ].Name;
+            setBtnFunc(embBtn, selectCiv, [civ, false, false]);
+            Engine.GetGUIObjectByName("emblem["+emb+"]").hidden = false;
+
+            emb++;
+        }
+        range[1] = emb - 1;
+
+        if (grp % 2 == 1 && grouping[code].civlist.length < 4) 
+        {
+            setEmbSize("emblem["+range[0]+"]", 80);
+            vOffset += grpHeading.size.bottom + 2;
+            vOffset += gridArrayRepeatedObjects("emblem[emb]", "emb", 4, 0, range, vOffset, (g_HeaderEmblemSize+325));
+            vOffset += g_EmblemMargin * 2;
+        }
+        else
+        {
+            setEmbSize("emblem["+range[0]+"]", 80);
+            if (grouping[code].civlist.length > 4)
+            {
+                vOffset += gridArrayRepeatedObjects("emblem[emb]", "emb", 4, 0, range, vOffset+25, g_HeaderEmblemSize);
+                vOffset += 50;
+            }
+            else
+                gridArrayRepeatedObjects("emblem[emb]", "emb", 4, 0, range, vOffset+25, g_HeaderEmblemSize);
+        }
+        hOffset = (hOffset >= 325) || (grouping[code].civlist.length > 3) ? 0 : 325;
+
+        grp++;
+    }
+    hideRemaining("emblem[", emb, "]");
+    hideRemaining("civGroup[", grp, "]");
+    highlightEmblems(selectedCivs); 
+
+    if (g_Selected.code === "all")
+        selectAllCivs();
+}
+
+function draw_ungrouped()
+{
+    setEmbSize("emblem[0]");
+    gridArrayRepeatedObjects("emblem[emb]", "emb", 30, 25, [], 0, 0, 4);
+    gridArrayRepeatedObjects("emblem[emb]_heading", "emb", 0, 0, [], 5, 10);
+
+    let emb = 0;
+    let selectedCivs = [];
+    for (let civ in g_CivData)
+    {
+        if (g_GroupingData["custom"]["custom"].civlist.indexOf(civ) != -1)
+        {
+            selectedCivs.push(emb);
+            g_GroupingData["custom"]["custom"].embs.push(emb);
+        }
+
+        if (!g_Selected.isGroup && civ == g_Selected.code)
+            selectedCivs.push(emb);
+
+        g_CivData[civ].embs = [emb];
+
+        let embImg = Engine.GetGUIObjectByName("emblem["+emb+"]_img");
+
+        let embHeading = Engine.GetGUIObjectByName("emblem["+emb+"]_heading");
+        embHeading.caption = g_CivData[civ].Name;
+
+        let range = [emb];
+        if (!embImg)
+        {
+            error("There are not enough images in the current GUI layout to support that many civs");
+            break;
+        }
+
+        range[1] = emb - 1;
+
+        embImg.sprite = "stretched:";
+        if (civ !== g_Selected.code)
+            embImg.sprite += ":";
+        embImg.sprite += g_CivData[civ].Emblem;
+
+        let embBtn = Engine.GetGUIObjectByName("emblem["+emb+"]_btn");
+        embBtn.tooltip = '';
+        setBtnFunc(embBtn, selectCiv, [civ, false, false]);
+
+        Engine.GetGUIObjectByName("emblem["+emb+"]").hidden = false;
+        emb++;
+    }
+    hideRemaining("emblem[", emb, "]");
+    hideRemaining("civGroup[", 0, "]");
+
+    highlightEmblems(selectedCivs);
+
+    if (g_Selected.code === "all")
+        selectAllCivs();
+}
+
+function selectCiv(code, onInit, isGroup)
+{
+    let customCivs = g_GroupingData["custom"]["custom"].civlist;
+    let customCivsEmbs = g_GroupingData["custom"]["custom"].embs;
+    
+    if (g_Selected.code == code && customCivs.length == 1 && !onInit)
+    {
+        selectAllCivs();
+        return;
+    }
+
+    let selection = [];
+    if (isGroup)
+        selection = g_GroupingData[g_GroupingChoice][code];
+    else
+        selection = g_CivData[code];
+
+    g_Selected.isGroup = isGroup;
+    g_Selected.code = code;
+    if (g_Selected.code !== "all")
+        g_PreviousSelection = clone(g_Selected);
+
+    if (Engine.HotkeyIsPressed("selection.add"))
+    {
+        g_CustomGrouping = true;
+        // if the civ has already been selected, remove it
+        if (customCivsEmbs.indexOf(selection.embs[0]) != -1
+        && customCivsEmbs.length >= 1 || customCivsEmbs.indexOf(selection.embs[0]) != -1)
+        {
+            customCivs.splice(customCivs.indexOf(code), 1);
+
+            for (let civEmb of selection.embs)
+            {
+                let index = customCivsEmbs.indexOf(civEmb);
+                customCivsEmbs.splice(index, 1);
+            }
+        }
+        else
+        {
+            for (let civEmb of selection.embs)
+                customCivsEmbs.push(civEmb);
+
+            customCivs.push(code)
+        }
+
+        if (customCivs.length > 1)
+            g_SelectedGroupingChoice = "custom";
+        else
+        {
+            g_CustomGrouping = false;
+            code = customCivs[0];
+            g_Selected.code = customCivs[0];
+        }
+        highlightEmblems(customCivsEmbs);
+    }
+    else if (!onInit)
+    {
+        if (!onInit && code != "custom")
+            g_CustomGrouping = false;
+        customCivs = [];
+        customCivsEmbs = [];
+        if (selection)
+            for (let civEmb of selection.embs)
+                customCivsEmbs.push(civEmb);
+        customCivs.push(code);
+        if (selection)
+            highlightEmblems(selection.embs);
+        if (isGroup)
+            g_SelectedGroupingChoice = g_GroupingChoice;
+    }
+
+    g_GroupingData["custom"]["custom"].civlist = customCivs;
+    g_GroupingData["custom"]["custom"].embs = customCivsEmbs;
+
+    Engine.GetGUIObjectByName("optionRandomCultures").hidden = true;
+    Engine.GetGUIObjectByName("selectAll").checked = false;
+
+    let choice = Engine.GetGUIObjectByName("selected_text");
+
+    choice.caption = g_CustomGrouping ? sprintf(translate("Random choice between civilizations/groupings")) : isGroup ?
+                    sprintf(translate("A random %(civGroup)s civilization will be chosen"), {"civGroup": g_GroupingData[g_GroupingChoice][code].Singular}) :
+                    sprintf(translate("You have selected the %(civname)s"), {"civname": selection.Name});
+
+    displayCivInfo(code, selection, isGroup);
+}
+
+function updateSelectedText()
+{
+    let choice = Engine.GetGUIObjectByName("selected_text");
+    if (g_CustomGrouping)
+        choice.caption = sprintf(translate("Random choice between selected civilizations and groupings"));
+}
+
+function displayCivInfo(code, selection, isGroup)
+{
+    if (g_DoubleClick)
+        return;
+
+    let heading = Engine.GetGUIObjectByName("selected_heading");
+    heading.caption = g_CustomGrouping ? "Random Custom" : isGroup ?
+                    selection.Name : g_CivData[code].Name;
+
+    let civList = Engine.GetGUIObjectByName("selected_civs");
+    civList.hidden = !g_CustomGrouping;
+    civList.caption = "";
+    let civCount = 0;
+    for (let item of g_GroupingData["custom"]["custom"].civlist)
+    {
+        civList.caption += Object.keys(g_CivData).indexOf(item) > -1 ? g_CivData[item].Name : g_GroupingData[g_GroupingChoice][item].Name;
+        civList.caption += "\n";
+        civCount++;
+    }
+
+    let history = Engine.GetGUIObjectByName("selected_history");
+    if (!g_CustomGrouping)
+        history.caption = selection.History;
+
+    let size = history.parent.size;
+    size.top = 48;
+    history.parent.size = size;
+    history.parent.hidden = g_CustomGrouping;
+}
+
+function selectAllCivs()
+{
+    if (g_Selected.code == "all")
+    {
+        Engine.GetGUIObjectByName("selectAll").checked = false;
+
+        g_PreviousSelection.code = g_PreviousSelection.code || Object.keys(g_CivData)[Math.floor(Math.random() * Object.keys(g_CivData).length)];
+        g_PreviousSelection.isGroup = g_PreviousSelection.isGroup || false;
+        selectCiv(g_PreviousSelection.code, false, g_PreviousSelection.isGroup);
+        return;
+    }
+
+    Engine.GetGUIObjectByName("optionRandomCultures").hidden = false;
+
+    let embs = [];
+    for (let i=0; ; ++i)
+    {
+        if (!Engine.GetGUIObjectByName("emblem["+i+"]"))
+            break;
+        embs.push(i);
+    }
+    highlightEmblems(embs);
+
+    g_Selected.isGroup = true;
+    g_Selected.code = "all";
+
+    let heading = Engine.GetGUIObjectByName("selected_heading");
+    heading.caption = sprintf(translate("Random %(civGroup)s"), {
+            "civGroup": translateWithContext("All Civs", "All")
+        });
+
+    let civList = Engine.GetGUIObjectByName("selected_civs");
+    civList.hidden = false;
+    civList.caption = "";
+    let civCount = 0;
+    for (let civ in g_CivData)
+    {
+        civList.caption += g_CivData[civ].Name + "\n";
+        civCount++;
+    }
+
+    let history = Engine.GetGUIObjectByName("selected_history");
+    history.parent.hidden = true;
+
+    let choice = Engine.GetGUIObjectByName("selected_text");
+    choice.caption = translate("A civilization will be chosen at random");
+
+    Engine.GetGUIObjectByName("selectAll").checked = g_Selected.code == "all";
+}
+
+function highlightEmblems(embs = [])
+{
+    for (let e=0; ; ++e)
+    {
+        if (!Engine.GetGUIObjectByName("emblem["+e+"]"))
+            return;
+
+        let embImg = Engine.GetGUIObjectByName("emblem["+e+"]_img");
+        let sprite = embImg.sprite.split(":");
+        embImg.sprite = "stretched:" + ((embs.indexOf(e)<0)?"grayscale:":"") + sprite.pop();
+    }
+}
+
+function setBtnFunc(btn, func, vars = null)
+{
+    btn.onMouseLeftRelease = function () { func.apply(null, vars); };
+    btn.onMouseLeftDoubleClick = function () { returnCiv.apply(null, vars); g_DoubleClick = true; };    
+}
+
+function randomCultures()
+{
+    Engine.ConfigDB_CreateValue("user", "randomcultures", String(Engine.GetGUIObjectByName("randomCultures").checked));
+    Engine.ConfigDB_SetChanges("user", true);
+    Engine.ConfigDB_WriteFile("user", "config/user.cfg");
+}
+
+function returnCiv()
+{
+    let code = g_Selected.code;
+    let civ = {
+            "codes": [g_Selected.code],
+            "grouped": false,
+        }
+
+    if (g_CustomGrouping)
+    {
+        civ.codes = g_GroupingData["custom"]["custom"].civlist;
+        civ.grouped = true;
+        civ.group = {
+                "caption": "Custom",
+                "code": "custom",
+                "type": g_SelectedGroupingChoice,
+            };
+        
+        for (let item of civ.codes)
+        {
+            if ((Object.keys(g_CivData).indexOf(item)) == -1)
+                civ.codes.splice(civ.codes.indexOf(item), 1, g_GroupingData[g_GroupingChoice][item].civlist);
+        }
+    }
+    else if (g_Selected.isGroup && !g_CustomGrouping)
+    {
+        civ.codes = g_Selected.code == "all" ? Object.keys(g_CivData) : g_GroupingData[g_SelectedGroupingChoice][code].civlist;
+        civ.grouped = true;
+        civ.group = {
+                "caption": g_Selected.code === "all" ? "All" : g_GroupingData[g_SelectedGroupingChoice][code].Singular,
+                "code": g_Selected.code,
+                "type": g_SelectedGroupingChoice,
+            };
+    }
+    Engine.PopGuiPageCB({
+            "player": g_Player,
+            "civ": civ,
+            "randomCultures" : Engine.GetGUIObjectByName("randomCultures").checked
+        });
+}

binaries/data/mods/public/gui/civselect/civselect.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<objects>
+    <script file="gui/common/functions_civinfo.js"/>
+    <script file="gui/common/functions_global_object.js"/>
+    <script file="gui/common/functions_repeat_positioning.js"/>
+    <script file="gui/common/functions_utility.js"/>
+    <script file="gui/civselect/helpers.js"/>
+    <script file="gui/civselect/civselect.js"/>
+
+    <!-- Add a translucent black background to fade out the match page -->
+    <object type="image" z="0" sprite="bkTranslucent"/>
+
+    <object type="image" style="ModernDialog" size="50%-488 50%-360 50%+488 50%+360">
+
+        <object style="TitleText" type="text" size="50%-128 -18 50%+128 14">
+            <translatableAttribute id="caption">Civilization Selection</translatableAttribute>
+        </object>
+
+        <object size="16 32 70%-8 100%-32">
+
+            <!-- grouping selection -->
+            <object size="50% 0 100% 40">
+                <object
+                    name="groupSelectionHeading"
+                    type="text"
+                    font="sans-bold-16"
+                    textcolor="white"
+                    text_align="right"
+                    size="0 2 100%-196 32"
+                >
+                    <translatableAttribute id="caption">Group by:</translatableAttribute>
+                </object>
+
+                <object name="groupSelection" type="dropdown" style="ModernDropDown" size="100%-192 0 100% 26">
+                    <translatableAttribute id="tooltip">Choose how to group civilizations</translatableAttribute>
+                    <action on="SelectionChange">chooseGrouping(this.list_data[this.selected]);</action>
+                </object>
+            </object>
+
+            <!-- draw space -->
+            <object type="image" size="0 40 100% 100%">
+
+                <repeat count="32" var="em">
+                    <object type="text" size="4 8 4+159 100+64" font="sans-bold-24" textcolor="white" name="emblem[em]_heading"/>
+                    <object name="emblem[em]" size="4 8 4+64 8+64">
+
+                        <object type="image" style="EmblemImage" name="emblem[em]_img"/>
+                        <object type="button" style="EmblemButton" name="emblem[em]_btn" tooltip_style="sessionToolTipBold">
+                        </object>
+                    </object>
+                </repeat>
+
+                <repeat count="12" var="g">
+                    <object size="8 8 100%-8 24+72+16" name="civGroup[g]">
+                        <object
+                            name="civGroup[g]_heading"
+                            type="text"
+                            font="sans-16"
+                            textcolor="white"
+                            text_align="left"
+                            size="2 0 50% 24"
+                        >
+                            <translatableAttribute id="caption">A group:</translatableAttribute>
+                        </object>
+                        <object sprite="ModernGoldLine" type="image" size="0 24 45% 25"/>
+                    </object>
+                </repeat>
+            </object>
+
+        </object>
+
+        <object sprite="ModernDarkBoxGold" type="image" size="70%+8 32 100%-16 90%-70">
+
+            <!-- Selection Details -->
+            <object
+                name="selected_heading"
+                type="text"
+                font="sans-bold-24"
+                textcolor="white"
+                text_align="center"
+                size="0 12 100% 40"
+            />
+
+            <object
+                name="selected_civs"
+                type="text"
+                font="sans-16"
+                textcolor="white"
+                text_align="center"
+                size="4 44 100%-4 100%-4"
+            />
+
+            <object size="8 48 100%-8 100%-8" type="image" sprite="ModernDarkBoxGold">
+                <object
+                    name="selected_history"
+                    type="text"
+                    font="sans-14"
+                    textcolor="white"
+                    text_align="center"
+                    size="4 4 100%-4 100%-4"
+                />
+            </object>
+
+        </object>
+        <object
+            name="selected_text"
+            type="text"
+            font="sans-12"
+            textcolor="green"
+            text_align="center"
+            text_valign="bottom"
+            size="70%+8 100%-64 100%-16 100%-48"
+        />
+
+        <object name="optionSelectAll" size="650 589 120% 25%">
+            <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
+                <translatableAttribute id="caption">Select All:</translatableAttribute>
+            </object>
+            <object name="selectAll" size="225 5 46% -5%" type="checkbox" style="ModernTickBox">
+                <action on="Press">selectAllCivs();</action>
+                <translatableAttribute id="tooltip">A civilization will be picked from all possible civilizations (Random All).</translatableAttribute>
+            </object>
+        </object>
+
+        <object name="optionRandomCultures" size="650 619 120% 25%">
+            <object size="0 0 40% 28" type="text" style="ModernRightLabelText">
+                <translatableAttribute id="caption">Random Cultures:</translatableAttribute>
+            </object>
+            <object name="randomCultures" size="225 5 46% -5%" type="checkbox" style="ModernTickBox">
+                <action on="Press">randomCultures();</action>
+                <translatableAttribute id="tooltip">Civilizations set to "Random All" will be chosen by culture.</translatableAttribute>
+            </object>
+        </object>
+
+        <!-- Close the dialog -->
+        <object
+            type="button"
+            style="StoneButton"
+            size="70%+8 100%-44 85%-8 100%-16"
+        >
+            <translatableAttribute id="caption">Cancel</translatableAttribute>
+            <action on="Press">
+                <![CDATA[
+                    Engine.PopGuiPage();
+                ]]>
+            </action>
+        </object>
+
+        <object
+            type="button"
+            style="StoneButton"
+            size="85% 100%-44 100%-16 100%-16"
+        >
+            <translatableAttribute id="caption">Select</translatableAttribute>
+            <action on="Press">
+                <![CDATA[
+                    returnCiv();
+                ]]>
+            </action>
+        </object>
+
+    </object>
+
+</objects>

binaries/data/mods/public/gui/civselect/helpers.js

@@ +1 @@
+
+/**
+ * Arranges same-size `<repeat>`d objects in a grid. Automatically scales to object size.
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitlet The var identifying the repeat count, without the square brackets
+ * @param vMargin The gap, in px, between the rows
+ * @param hMargin The gap, in px, between the columns
+ * @param limit Array of limits, of the form `[ {from}, {to} ]`. If an empty array, then it will do all objects matching the basname
+ * @param vOffset Vertical offset from top of parent object to start drawing from
+ * @return The height difference between the top of the first element and the bottom of the last.
+ */
+function gridArrayRepeatedObjects(basename, splitlet="n", vMargin=0, hMargin=0, limit=[], vOffset=0, hOffset=0, rowLength)
+{
+    basename = basename.split("["+splitlet+"]", 2);
+
+    if (limit.length == 0)
+    {
+        limit = [0, 0, 1];
+        while (Engine.GetGUIObjectByName(basename.join("["+ (limit[1]+1) +"]")))
+        {
+            ++limit[1];
+            ++limit[2];
+        }
+    }
+    else if (limit.length < 2)
+    {
+        error("Invalid limit arguments");
+        return 0;
+    }
+    else
+        limit[2] = limit[1] - limit[0] + 1;
+
+    let firstObj = Engine.GetGUIObjectByName(basename.join("["+limit[0]+"]"));
+    let child = firstObj.getComputedSize();
+    child.width = child.right - child.left;
+    child.height = child.bottom - child.top;
+
+    let parent = firstObj.parent.getComputedSize();
+    parent.width = parent.right - parent.left - hOffset;
+
+    rowLength = rowLength || Math.floor(parent.width / child.width);
+
+    child.width += hMargin;
+    child.height += vMargin;
+
+    let i = limit[0];
+    for (let r = 0; r < Math.ceil(limit[2] / rowLength); ++r)
+    {
+        for (let c = 0; c < rowLength; ++c)
+        {
+            let newSize = new GUISize();
+            newSize.left = c * child.width + hMargin + hOffset;
+            newSize.right = (c+1) * child.width + hOffset;
+            newSize.top = r * child.height + vMargin + vOffset;
+            newSize.bottom = (r+1) * child.height + vOffset;
+            Engine.GetGUIObjectByName(basename.join("["+ i++ +"]")).size = newSize;
+
+            if (i > limit[1])
+                break;
+        }
+    }
+
+    let lastObj = Engine.GetGUIObjectByName(basename.join("["+(i-1)+"]"));
+    return (lastObj.size.bottom - firstObj.size.top);
+}
+
+/**
+ * Load Data about a grouping schema
+ * 
+ * @param attr The JSON attribute in the Civ JSON files that lists which of the groups in this schema that civ belongs to
+ * @param folder The folder containing the groups of this schema
+ */
+function loadGroupingSchema(folder, attr)
+{
+    let groupData = {};
+    let groupless = [];
+
+    for (let code of Object.keys(g_CivData))
+    {
+        let civ = g_CivData[code];
+        let nogroup = true;
+        let groups = civ[attr] || [];
+        if (typeof groups === "string")
+            groups = [ groups ];
+
+        for (let grp of groups)
+        {
+            if (groupData[grp] === undefined)
+            {
+                let data = Engine.ReadJSONFile("simulation/data/civs/"+folder+"/"+grp+".json");
+
+                if (!data)
+                    continue;
+
+                groupData[grp] = data;
+                groupData[grp].civlist = [];
+
+            }
+            groupData[grp].civlist.push(code);
+            nogroup = false;
+        }
+        if (nogroup)
+            groupless.push(code);
+
+    }
+    if (groupless.length > 0)
+        groupData.groupless = {
+            "Name" : "Ungrouped",
+            "Code" : "groupless",
+            "History" : "-",
+            "civlist": groupless
+        };
+
+    return groupData;
+}
+
+function setEmbSize(objectName, length=128)
+{
+    let objSize = Engine.GetGUIObjectByName(objectName).size;
+    objSize.right = objSize.left + length;
+    objSize.bottom = objSize.top + length;
+    Engine.GetGUIObjectByName(objectName).size = objSize;
+}
+
+function setEmbPos(objectName, x=0, y=0)
+{
+    let objSize = Engine.GetGUIObjectByName(objectName).size;
+    let wid = objSize.right - objSize.left;
+    objSize.left = x;
+    objSize.top = y;
+    Engine.GetGUIObjectByName(objectName).size = objSize;
+    setEmbSize(objectName, wid);
+}

binaries/data/mods/public/gui/civselect/setup.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<setup>
+    <tooltip name="treeTooltip"
+        anchor="top"
+        buffer_zone="4"
+        delay="50"
+        font="sans-14"
+        maxwidth="480"
+        offset="16 24"
+        sprite="bkTooltip"
+        textcolor="white"
+    />
+</setup>

binaries/data/mods/public/gui/civselect/sprites.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<sprites>
+
+    <sprite name="CivIconPress">
+        <image
+            texture="session/portraits/emblems/states/click.png"
+        />
+    </sprite>
+
+</sprites>

binaries/data/mods/public/gui/civselect/styles.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<styles>
+
+    <style name="EmblemButton"
+        sprite=""
+        sprite_over="CivIconOver"
+        sprite_pressed="CivIconPress"
+        size="0 0 100% 100%"
+        sound_pressed="audio/interface/ui/ui_button_click.ogg"
+    />
+
+    <style name="EmblemImage"
+        sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
+        size="0 0 100% 100%"
+    />
+
+    <style name="HeroImage"
+        sprite="stretched:pregame/shell/logo/wfg_logo_white.png"
+        size="0 0 32 32"
+    />
+
+</styles>

binaries/data/mods/public/gui/common/functions_repeat_positioning.js

@@ +1 @@
+/*
+    DESCRIPTION : Functions related to positioning UI elements
+    NOTES       :
+*/
+
+/**
+ * Horizontally spaces same-width objects repeated with the `<repeat>` tag
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitvar The var identifying the repeat count, without the square brackets
+ * @param margin The gap, in px, between the repeated objects
+ * @return The number of elements affected
+ */
+function horizSpaceRepeatedObjects (basename, splitvar="n", margin=0)
+{
+    basename = basename.split("["+splitvar+"]", 2);
+    for (let c = 0;;)
+    {
+        let objObj = Engine.GetGUIObjectByName(basename.join("["+ c +"]"));
+        if (!objObj)
+            return c;
+
+        let objSize = objObj.size;
+        let objWidth = objSize.right - objSize.left;
+        objSize.left = c * (objWidth + margin) + margin;
+        objSize.right = ++c * (objWidth + margin);
+        objObj.size = objSize;
+    }
+}
+
+/**
+ * Horizontally fit objects repeated with the `<repeat>` tag within a parent object
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitvar The var identifying the repeat count, without the square brackets
+ * @param margin The gap, in px, between the repeated objects
+ * @param limit The number of elements to fit
+ * @return The number of elements affected
+ */
+function horizFitRepeatedObjects(basename, splitvar="n", margin=0, limit=0)
+{
+    basename = basename.split("["+splitvar+"]", 2);
+
+    var objObj;
+    if (limit == 0)
+        do
+            objObj = Engine.GetGUIObjectByName(basename.join("["+ ++limit +"]"));
+        while (objObj !== undefined)
+
+    for (let c = 0; c < limit; ++c)
+    {
+        objObj = Engine.GetGUIObjectByName(basename.join("["+ c +"]"));
+        let objSize = objObj.size;
+        objSize.rleft = c * (100/limit);
+        objSize.rright = (c+1) * (100/limit);
+        objSize.right = -margin;
+        objObj.size = objSize;
+    }
+
+    return limit;
+}
+
+/**
+ * Vertically spaces same-height objects repeated with the `<repeat>` tag
+ * @param basename The base name of the object, such as "object[n]" or "object[a]_sub[b]"
+ * @param splitvar The var identifying the repeat count, without the square brackets
+ * @param margin The gap, in px, between the repeated objects
+ * @return The number of elements affected
+ */
+function vertiSpaceRepeatedObjects(basename, splitvar="n", margin=0)
+{
+    basename = basename.split("["+splitvar+"]", 2);
+    for (let c=0;;)
+    {
+        let objObj = Engine.GetGUIObjectByName(basename.join("["+ c +"]"));
+        if (!objObj)
+            return c;
+
+        let objSize = objObj.size;
+        let objHeight = objSize.bottom - objSize.top;
+        objSize.top = c * (objHeight + margin) + margin;
+        objSize.bottom = ++c * (objHeight + margin);
+        objObj.size = objSize;
+    }
+}
+
+/**
+ * Hide all repeated elements after a certain index
+ * @param prefix The part of the element name preceeding the index
+ * @param idx The index from which to start
+ * @param prefix The part of the element name after the index
+ */
+function hideRemaining(prefix, idx, suffix)
+{
+    for (;; ++idx)
+    {
+        let obj = Engine.GetGUIObjectByName(prefix+idx+suffix);
+        if (!obj)
+            break;
+        obj.hidden = true;
+    }
+}

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

@@ -144 +144 @@
 const g_RandomMap = '[color="' + g_ColorRandom + '"]' + translateWithContext("map selection", "Random") + "[/color]";
 
 /**
- * Placeholder item for the civ-dropdownlists.
+ * Style for the random civ strings.
  */
-const g_RandomCiv = '[color="' + g_ColorRandom + '"]' + translateWithContext("civilization", "Random") + '[/color]';
+const g_RandomCivStyle = ['[color="' + g_ColorRandom + '"]', '[/color]'];
 
 /**
+ *
+ */
+var g_RandomCivObj = {};
+
+var g_RandomCultures = Engine.ConfigDB_GetValue("user", "randomcultures") === "true";
+
+/**
  * Whether this is a single- or multiplayer match.
  */
 var g_IsNetworked;
@@ -259 +266 @@
     g_DefaultPlayerData = g_Settings.PlayerDefaults;
     g_DefaultPlayerData.shift();
     for (let i in g_DefaultPlayerData)
-        g_DefaultPlayerData[i].Civ = "random";
+        g_DefaultPlayerData[i].CivObj = {
+                "codes": [ g_DefaultPlayerData[i].Civ ],
+                "grouped": false
+        };
+        
+    g_RandomCivObj = {
+                    "codes": Object.keys(g_CivData).filter(civ => g_CivData[civ].SelectableInGameSetup),
+                    "grouped": true,
+                    "group": { "type": "none", "code": "all", "caption": translateWithContext("All Civs", "All") }
+            };
 
     setTimeout(displayGamestateNotifications, 1000);
 }
@@ -271 +287 @@
 {
     Engine.GetGUIObjectByName("cancelGame").tooltip = Engine.HasXmppClient() ? translate("Return to the lobby.") : translate("Return to the main menu.");
 
-    initCivNameList();
     initMapTypes();
     initMapFilters();
 
@@ -536 +551 @@
     for (let i = 0; i < g_MaxPlayers; ++i)
     {
         Engine.GetGUIObjectByName("playerAssignment["+i+"]").hidden = true;
-        Engine.GetGUIObjectByName("playerCiv["+i+"]").hidden = true;
         Engine.GetGUIObjectByName("playerTeam["+i+"]").hidden = true;
     }
 
@@ -622 +636 @@
         colorPicker.list_data = g_PlayerColors.map((color, index) => index);
         colorPicker.selected = -1;
         colorPicker.onSelectionChange = function() { selectPlayerColor(playerSlot, this.selected); };
-
-        Engine.GetGUIObjectByName("playerCiv["+i+"]").onSelectionChange = function() {
-            if ((this.selected != -1)&&(g_GameAttributes.mapType !== "scenario"))
-                g_GameAttributes.settings.PlayerData[playerSlot].Civ = this.list_data[this.selected];
-
-            updateGameAttributes();
-        };
     }
 }
 
@@ -808 +815 @@
     return undefined;
 }
 
-/**
- * Initialize the dropdowns containing all selectable civs (including random).
- */
-function initCivNameList()
+function setCiv(args)
 {
-    let civList = Object.keys(g_CivData).filter(civ => g_CivData[civ].SelectableInGameSetup).map(civ => ({ "name": g_CivData[civ].Name, "code": civ })).sort(sortNameIgnoreCase);
-    let civListNames = [g_RandomCiv].concat(civList.map(civ => civ.name));
-    let civListCodes = ["random"].concat(civList.map(civ => civ.code));
-
-    for (let i = 0; i < g_MaxPlayers; ++i)
-    {
-        let civ = Engine.GetGUIObjectByName("playerCiv["+i+"]");
-        civ.list = civListNames;
-        civ.list_data = civListCodes;
-        civ.selected = 0;
-    }
+    g_GameAttributes.settings.PlayerData[args.player].CivObj = args.civ;
+    g_RandomCultures = args.randomCultures;
+    updateGameAttributes();
 }
 
 /**
@@ -918 +914 @@
     if (!g_IsNetworked)
         mapSettings.CheatsEnabled = true;
 
-    // Replace unselectable civs with random civ
+    // Filter out unselectable civs
     let playerData = mapSettings.PlayerData;
     if (playerData && g_GameAttributes.mapType != "scenario")
         for (let i in playerData)
-            if (!g_CivData[playerData[i].Civ] || !g_CivData[playerData[i].Civ].SelectableInGameSetup)
-                playerData[i].Civ = "random";
+        {
+                if (!playerData[i].CivObj)
+                        continue;
+                playerData[i].CivObj.codes = playerData[i].CivObj.codes.filter((code) => {return g_CivData[code] && g_CivData[code].SelectableInGameSetup});
+                if (playerData[i].CivObj.codes.length === 0)
+                    playerData[i].CivObj = g_RandomCivObj;
+        }
 
     // Apply map settings
     let newMapData = loadMapData(mapName);
@@ -962 +963 @@
 
     playerData.forEach((pData, index) => {
         pData.Color = pData.Color || g_PlayerColors[index];
-        pData.Civ = pData.Civ || "random";
+        pData.CivObj = pData.CivObj ? pData.CivObj : (pData.Civ && pData.Civ !== "random" ? { "codes": [ pData.Civ ], "grouped": false } : g_RandomCivObj)
         pData.AI = pData.AI || "";
     });
 
@@ -1246 +1247 @@
     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);
 
-    // Determine random civs and botnames
     for (let i in g_GameAttributes.settings.PlayerData)
     {
-        // Pick a random civ of a random culture
-        let chosenCiv = g_GameAttributes.settings.PlayerData[i].Civ || "random";
-        if (chosenCiv == "random")
+        // Determine civ
+        let civs = g_GameAttributes.settings.PlayerData[i].CivObj.codes;
+        let chosenCiv = civs[Math.floor(Math.random() * civs.length)];
+
+        if (civs.length > 1)
         {
-            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_RandomCultures && g_GameAttributes.settings.PlayerData[i].CivObj.group.code == "all")
+            {
+                let culture = cultures[Math.floor(Math.random() * cultures.length)];
+                warn(uneval(culture));
+                let civs = Object.keys(g_CivData).filter(civ => g_CivData[civ].Culture == culture);
+                chosenCiv = civs[Math.floor(Math.random() * civs.length)];
+            }
+            else if (g_GameAttributes.settings.PlayerData[i].CivObj.group.code == "custom" && Object.keys(g_CivData).indexOf(chosenCiv) == -1)
+                chosenCiv = chosenCiv[Math.floor(Math.random() * chosenCiv.length)];
         }
+
         g_GameAttributes.settings.PlayerData[i].Civ = chosenCiv;
 
         // Pick one of the available botnames for the chosen civ
@@ -1417 +1426 @@
         let pName = Engine.GetGUIObjectByName("playerName["+i+"]");
         let pAssignment = Engine.GetGUIObjectByName("playerAssignment["+i+"]");
         let pAssignmentText = Engine.GetGUIObjectByName("playerAssignmentText["+i+"]");
-        let pCiv = Engine.GetGUIObjectByName("playerCiv["+i+"]");
-        let pCivText = Engine.GetGUIObjectByName("playerCivText["+i+"]");
+        //let pCivText = Engine.GetGUIObjectByName("playerCivText["+i+"]");
+        let pCivText = Engine.GetGUIObjectByName("playerCivButton["+i+"]");
         let pTeam = Engine.GetGUIObjectByName("playerTeam["+i+"]");
         let pTeamText = Engine.GetGUIObjectByName("playerTeamText["+i+"]");
         let pColor = Engine.GetGUIObjectByName("playerColor["+i+"]");
@@ -1432 +1441 @@
 
         let team = getSetting(pData, pDefs, "Team");
         let civ = getSetting(pData, pDefs, "Civ");
+        let civObj = getSetting(pData, pDefs, "CivObj");
 
         pAssignmentText.caption = pAssignment.list[0] ? pAssignment.list[Math.max(0, pAssignment.selected)] : translate("Loading...");
-        pCivText.caption = civ == "random" ? g_RandomCiv : (g_CivData[civ] ? g_CivData[civ].Name : "Unknown");
+
+        if (civObj)
+        {
+            if (civObj.grouped)
+                pCivText.caption = g_RandomCivStyle[0] + sprintf(translate("Random %(civGroup)s"), {"civGroup": civObj.group.caption }) + g_RandomCivStyle[1];
+            else if (civObj.codes.length > 1)   
+                pCivText.caption = g_RandomCivStyle[0] + translateWithContext("Selection from a group of civilizations", "Arbitrary Selection") + g_RandomCivStyle[1];
+            else
+                pCivText.caption = (g_CivData[civObj.codes[0]] ? g_CivData[civObj.codes[0]].Name : translateWithContext("Unnamed civilization", "Unknown"));
+        }
+
         pTeamText.caption = (team !== undefined && team >= 0) ? team+1 : "-";
-
-        pCiv.selected = civ ? pCiv.list_data.indexOf(civ) : 0;
         pTeam.selected = team !== undefined && team >= 0 ? team+1 : 0;
 
         hideControl("playerAssignment["+i+"]", "playerAssignmentText["+i+"]", g_IsController);
-        hideControl("playerCiv["+i+"]", "playerCivText["+i+"]", notScenario);
         hideControl("playerTeam["+i+"]", "playerTeamText["+i+"]", notScenario);
+        //Engine.GetGUIObjectByName("playerCivButton["+i+"]").hidden = !notScenario;
 
         // Allow host to chose player colors on non-scenario maps
         let pColorPicker = Engine.GetGUIObjectByName("playerColorPicker["+i+"]");
@@ -1742 +1760 @@
         // Swap civilizations if they aren't fixed
         if (g_GameAttributes.mapType != "scenario")
         {
-            [g_GameAttributes.settings.PlayerData[playerID - 1].Civ, g_GameAttributes.settings.PlayerData[newSlot].Civ] =
-                [g_GameAttributes.settings.PlayerData[newSlot].Civ, g_GameAttributes.settings.PlayerData[playerID - 1].Civ];
+            [g_GameAttributes.settings.PlayerData[playerID - 1].CivObj, g_GameAttributes.settings.PlayerData[newSlot].CivObj] =
+                [g_GameAttributes.settings.PlayerData[newSlot].CivObj, g_GameAttributes.settings.PlayerData[playerID - 1].CivObj];
         }
     }
 
@@ -1753 +1771 @@
         g_PlayerAssignments[guid].player = newPlayerID;
 
     g_GameAttributes.settings.PlayerData[newSlot].AI = "";
+    updateGameAttributes();
 }
 
 function submitChatInput()
@@ -1831 +1850 @@
 function resetCivilizations()
 {
     for (let i in g_GameAttributes.settings.PlayerData)
-        g_GameAttributes.settings.PlayerData[i].Civ = "random";
+        g_GameAttributes.settings.PlayerData[i].CivObj = g_RandomCivObj;
 
     updateGameAttributes();
 }

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

@@ -78 +78 @@
                         size="67.5%+93 0 67.5%+109 16"
                         tooltip_style="onscreenToolTip"
                     >
-                        <translatableAttribute id="tooltip">Reset any civilizations that have been selected to the default (random)</translatableAttribute>
+                        <translatableAttribute id="tooltip">Reset any civilizations that have been selected to the default (Random All)</translatableAttribute>
                         <action on="Press">resetCivilizations();</action>
                     </object>
 
@@ -119 +119 @@
                             >
                                 <translatableAttribute id="tooltip">Configure AI settings.</translatableAttribute>
                             </object>
-                            <object name="playerCiv[n]" type="dropdown" style="ModernDropDown" size="50%+69 2 85% 30" tooltip_style="onscreenToolTip">
-                                <translatableAttribute id="tooltip">Select player's civilization.</translatableAttribute>
+                            <object name="playerCivText[n]"
+                                type="text" 
+                                style="ModernLabelText"
+                                size="50%+65 0 85%-16 30"
+                            >
                             </object>
-                            <object name="playerCivText[n]" type="text" style="ModernLabelText" size="50%+65 0 85% 30"/>
+
+                            <object name="playerCivButton[n]"
+                                type="button" 
+                                style="StoneButton"
+                                size="50%+65 0 85%-16 30"
+                                tooltip_style="onscreenToolTip"
+                            >
+                                <translatableAttribute id="tooltip">Select a civilisation</translatableAttribute>
+                                <action on="MouseLeftRelease"><![CDATA[
+                                    let player = this.name.slice(16, -1);
+                                    Engine.PushGuiPage("page_civselect.xml", {
+                                        "player": player,
+                                        "civ": g_GameAttributes.settings.PlayerData[player].CivObj,
+                                        "callback": "setCiv"
+                                    });
+                                ]]></action>
+                            </object>
                             <object name="playerTeam[n]" type="dropdown" style="ModernDropDown" size="85%+5 2 100%-5 30" tooltip_style="onscreenToolTip">
                                 <translatableAttribute id="tooltip">Select player's team.</translatableAttribute>
                             </object>
+
                             <object name="playerTeamText[n]" type="text" style="ModernLabelText" size="85%+5 0 100%-5 100%"/>
                         </object>
                     </repeat>
                 </object>
             </object>
+
             <object size="24 64 100%-460 358" type="image" sprite="CoverFillDark" name="playerAssignmentsPanelCover" hidden="true"/>
+
             <!-- Map selection -->
-
             <object size="100%-425 355 100%-285 470" name="mapTypeTooltip">
                 <object type="text" style="ModernRightLabelText" size="0 0 100% 30">
                     <translatableAttribute id="caption">Map Type:</translatableAttribute>

binaries/data/mods/public/gui/page_civselect.xml

@@ +1 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page>
+    <include>common/modern/setup.xml</include>
+    <include>common/modern/styles.xml</include>
+    <include>common/modern/sprites.xml</include>
+
+    <include>common/setup.xml</include>
+    <include>common/sprite1.xml</include>
+    <include>common/styles.xml</include>
+    <include>common/common_sprites.xml</include>
+    <include>common/common_styles.xml</include>
+
+    <include>civselect/styles.xml</include>
+    <include>civselect/sprites.xml</include>
+    <include>civselect/civselect.xml</include>
+    <!-- for some reason, the setup file has to be after in
+    order to get transparency to work properly for the tooltip... -->
+<!--    <include>civselect/setup.xml</include>-->
+</page>

binaries/data/mods/public/simulation/data/civs/athen.json

@@ -1 +1 @@
 {
     "Code":"athen",
-    "Culture":"hele",
+    "Culture":["helle"],
+    "Region":["medit", "europe"],
     "Name":"Athenians",
     "Emblem":"session/portraits/emblems/emblem_athenians.png",
     "History":"As the cradle of Western civilization and the birthplace of democracy, Athens was famed as a center for the arts, learning and philosophy. The Athenians were also powerful warriors, particularly at sea. At its peak, Athens dominated a large part of the Hellenic world for several decades.",

binaries/data/mods/public/simulation/data/civs/brit.json

@@ -1 +1 @@
 {
     "Code": "brit",
-    "Culture": "celt",
+    "Culture":["celt"],
+    "Region":["europe"],
     "Name": "Britons",
     "Emblem": "session/portraits/emblems/emblem_britons.png",
     "History": "The Britons were the Celtic tribes of the British Isles. Using chariots, longswordsmen and powerful melee soldiers, they staged fearesome revolts against Rome to protect their customs and interests. Also, they built thousands of unique structures such as hill forts, crannogs and brochs.",

binaries/data/mods/public/simulation/data/civs/cart.json

@@ -1 +1 @@
 {
     "Code": "cart",
-    "Culture": "cart",
+    "Culture":["cart"],
+    "Region":["africa", "medit"],
     "Name": "Carthaginians",
     "Emblem": "session/portraits/emblems/emblem_carthaginians.png",
     "History": "Carthage, a city-state in modern-day Tunisia, was a formidable force in the western Mediterranean, eventually taking over much of North Africa and modern-day Spain in the third century B.C. The sailors of Carthage were among the fiercest contenders on the high seas, and masters of naval trade. They deployed towered War Elephants on the battlefield to fearsome effect, and had defensive walls so strong, they were never breached.",

binaries/data/mods/public/simulation/data/civs/cultures/cart.json

@@ +1 @@
+{
+    "Name" : "The Carthaginians",
+    "Code" : "cart",
+    "History" : "-",
+    "Singular" : "Carthaginian"
+}

binaries/data/mods/public/simulation/data/civs/cultures/celt.json

@@ +1 @@
+{
+    "Name" : "Celtic Tribes",
+    "Code" : "celt",
+    "History" : "At its peak (around 200 B.C.), the massive Celtic Empire spanned from Spain to Romania and Northern Italy to Scotland; although it wasn't a true empire because the Celtic people were not united by any form of government, but only in language and various social aspects. Their lack of any cohesion was probably the largest contributing factor to their ultimate submission to Rome by 100 A.D. The other contributing factors were their lack of armor and their inability to counter the mighty legions and siege weapons of Rome.",
+    "Singular" : "Celtic"
+}

binaries/data/mods/public/simulation/data/civs/cultures/helle.json

@@ +1 @@
+{
+    "Name" : "The Hellenes",
+    "Code" : "helle",
+    "History" : "The Hellenes were a people famous today for their architecture, fighting ability, and culture. The Hellenic peoples of the Dorian, Ionian, and Aeolian tribes swept into modern day Greece from 3000 B.C. to around 1100 B.C. in successive waves that eventually supplanted the previously established cultures of Mycenae and Minoan Crete. They were most active during the period of colonization that took place in the 7th and 6th centuries B.C., the Greco-Persian Wars (499-449 B.C.), the Peloponnesian War (431-404 B.C.), and the conquests of Alexander the Great (4th Century B.C.). Their civilization would endure until their final absorption by Rome in 146 B.C.",
+    "Singular" : "Hellenic"
+}

binaries/data/mods/public/simulation/data/civs/cultures/iber.json

@@ +1 @@
+{
+    "Name" : "The Iberians",
+    "Code" : "iber",
+    "History" : "-",
+    "Singular" : "Iberian"
+}

binaries/data/mods/public/simulation/data/civs/cultures/maur.json

@@ +1 @@
+{
+    "Name" : "The Mauryan Empire",
+    "Code" : "indian",
+    "History" : "-",
+    "Singular" : "Indian"
+}

binaries/data/mods/public/simulation/data/civs/cultures/pers.json

@@ +1 @@
+{
+    "Name" : "The Persian Empire",
+    "Code" : "pers",
+    "History" : "-",
+    "Singular" : "Persian"
+}

binaries/data/mods/public/simulation/data/civs/cultures/ptol.json

@@ +1 @@
+{
+    "Name" : "The Ptolemies",
+    "Code" : "ptol",
+    "History" : "-",
+    "Singular" : "Ptolemaic"
+}

binaries/data/mods/public/simulation/data/civs/cultures/rome.json

@@ +1 @@
+{
+    "Name" : "The Romans",
+    "Code" : "rome",
+    "History" : "-",
+    "Singular" : "Roman"
+}

binaries/data/mods/public/simulation/data/civs/cultures/succe.json

@@ +1 @@
+{
+    "Name" : "The Successors",
+    "Code" : "succe",
+    "History" : "The Successor kingdoms were carved out from the short-lived Macedonian Empire built by Philip of Macedon and his son, Alexander the Great. The chief three kingdoms were Ptolomaic Egypt, the Seleucid Empire, and the Kingdom of Macedon. Together, they helped propel the Eastern Mediterranean and Middle East into the Hellenistic Age - a time of internecine warfare and technological and cultural advancement.",
+    "Singular" : "Successor"
+}

binaries/data/mods/public/simulation/data/civs/cultures/iber.json

@@ +1 @@
+{
+    "Name" : "The Iberians",
+    "Code" : "iber",
+    "History" : "-",
+    "Singular" : "Iberian"
+}

binaries/data/mods/public/simulation/data/civs/gaul.json

@@ -1 +1 @@
 {
     "Code": "gaul",
-    "Culture": "celt",
+    "Culture":["celt"],
+    "Region":["europe"],
     "Name": "Gauls",
     "Emblem": "session/portraits/emblems/emblem_celts.png",
     "History": "The Gauls were the Celtic tribes of continental Europe. Dominated by a priestly class of Druids, they featured a sophisticated culture of advanced metalworking, agriculture, trade and even road engineering. With heavy infantry and cavalry, Gallic warriors valiantly resisted Caesar's campaign of conquest and Rome's authoritarian rule.",

binaries/data/mods/public/simulation/data/civs/grouping/culture.json

@@ +1 @@
+{
+    "Code": "culture",
+    "CivAttribute": "Culture",
+    "ListEntry": "By Culture",
+    "Folder": "cultures"
+}

binaries/data/mods/public/simulation/data/civs/grouping/region.json

@@ +1 @@
+{
+    "Code": "region",
+    "CivAttribute": "Region",
+    "ListEntry": "By Geographic Region",
+    "Folder": "regions"
+}

binaries/data/mods/public/simulation/data/civs/iber.json

@@ -1 +1 @@
 {
     "Code": "iber",
-    "Culture": "iber",
+    "Culture":["iber"],
+    "Region":["europe"],
     "Name": "Iberians",
     "Emblem": "session/portraits/emblems/emblem_iberians.png",
     "History": "The Iberians were a people of mysterious origins and language, with a strong tradition of horsemanship and metalworking. A relatively peaceful culture, they usually fought in other's battles only as mercenaries. However, they proved tenacious when Rome sought to take their land and freedom from them, and employed pioneering guerrilla tactics and flaming javelins as they fought back.",

binaries/data/mods/public/simulation/data/civs/mace.json

@@ -1 +1 @@
 {
     "Code":"mace",
-    "Culture":"hele",
+    "Culture":["helle", "succe"],
+    "Region":["medit", "europe"],
     "Name":"Macedonians",
     "Emblem":"session/portraits/emblems/emblem_macedonians.png",
     "History":"Macedonia was an ancient Greek kingdom, centered in the northeastern part of the Greek peninsula. Under the leadership of Alexander the Great, Macedonian forces and allies took over most of the world they knew, including Egypt, Persia and parts of the Indian subcontinent, allowing a diffusion of Hellenic and eastern cultures for years to come.",

binaries/data/mods/public/simulation/data/civs/maur.json

@@ -1 +1 @@
 {
     "Code": "maur",
-    "Culture": "maur",
+    "Culture":["maur"],
+    "Region":["asia"],
     "Name": "Mauryans",
     "Emblem": "session/portraits/emblems/emblem_mauryans.png",
     "History": "Founded in 322 B.C. by Chandragupta Maurya, the Mauryan Empire was the first to rule most of the Indian subcontinent, and was one of the largest and most populous empires of antiquity. Its military featured bowmen who used the long-range bamboo longbow, fierce female warriors, chariots, and thousands of armored war elephants. Its philosophers, especially the famous Acharya Chanakya, contributed to such varied fields such as economics, religion, diplomacy, warfare, and good governance. Under the rule of Ashoka the Great, the empire saw 40 years of peace, harmony, and prosperity.",

binaries/data/mods/public/simulation/data/civs/pers.json

@@ -1 +1 @@
 {
     "Code": "pers",
-    "Culture": "pers",
+    "Culture":["pers"],
+    "Region":["medit"],
     "Name": "Persians",
     "Emblem": "session/portraits/emblems/emblem_persians.png",
     "History": "The Persian Empire, when ruled by the Achaemenid dynasty, was one of the greatest empires of antiquity, stretching at its zenith from the Indus Valley in the east to Greece in the west. The Persians were the pioneers of empire-building of the ancient world, successfully imposing a centralized rule over various peoples with different customs, laws, religions and languages, and building a cosmopolitan army made up of contingents from each of these nations.",

binaries/data/mods/public/simulation/data/civs/ptol.json

@@ -1 +1 @@
 {
     "Code":"ptol",
-    "Culture":"ptol",
+    "Culture":["ptol"],
+    "Region":["africa"],
     "Name":"Ptolemies",
     "Emblem":"session/portraits/emblems/emblem_ptolemies.png",
     "History":"The Ptolemaic dynasty was a Macedonian Greek royal family which ruled the Ptolemaic Empire in Egypt during the Hellenistic period. Their rule lasted for 275 years, from 305 BC to 30 BC. They were the last dynasty of ancient Egypt.",

binaries/data/mods/public/simulation/data/civs/regions/africa.json

@@ +1 @@
+{
+    "Name" : "Africa",
+    "Code" : "africa",
+    "History" : "-",
+    "Singular" : "African",
+    "Emblem" : "session/portraits/emblems/grouping/region_africa.png"
+}

binaries/data/mods/public/simulation/data/civs/regions/asia.json

@@ +1 @@
+{
+    "Name" : "Asia",
+    "Code" : "asia",
+    "History" : "-",
+    "Singular" : "Asian",
+    "Emblem" : "session/portraits/emblems/grouping/region_asia.png"
+}

binaries/data/mods/public/simulation/data/civs/regions/europe.json

@@ +1 @@
+{
+    "Name" : "Europe",
+    "Code" : "europe",
+    "History" : "-",
+    "Singular" : "European",
+    "Emblem" : "session/portraits/emblems/grouping/region_europe.png"
+}

binaries/data/mods/public/simulation/data/civs/regions/medit.json

@@ +1 @@
+{
+    "Name" : "The Mediterranean",
+    "Code" : "medit",
+    "History" : "-",
+    "Singular" : "Mediterranean",
+    "Emblem" : "session/portraits/emblems/grouping/region_medi.png"
+}

binaries/data/mods/public/simulation/data/civs/rome.json

@@ -1 +1 @@
 {
     "Code": "rome",
-    "Culture": "rome",
+    "Culture":["rome"],
+    "Region":["medit", "europe"],
     "Name": "Romans",
     "Emblem": "session/portraits/emblems/emblem_romans.png",
     "History": "The Romans controlled one of the largest empires of the ancient world, stretching at its peak from southern Scotland to the Sahara Desert, and containing between 60 million and 80 million inhabitants, one quarter of the Earth's population at that time. Rome also remained one of the strongest nations on earth for almost 800 years. The Romans were the supreme builders of the ancient world, excelled at siege warfare and had an exquisite infantry and navy.",

binaries/data/mods/public/simulation/data/civs/sele.json

@@ -1 +1 @@
 {
     "Code":"sele",
-    "Culture":"sele",
+    "Culture":["succe"],
+    "Region":["medit"],
     "Name":"Seleucids",
     "Emblem":"session/portraits/emblems/emblem_seleucids.png",
     "History":"The Macedonian-Greek dynasty that ruled most of Alexander's former empire.",

binaries/data/mods/public/simulation/data/civs/spart.json

@@ -1 +1 @@
 {
     "Code":"spart",
-    "Culture":"hele",
+    "Culture":["helle"],
+    "Region":["medit", "europe"],
     "Name":"Spartans",
     "Emblem":"session/portraits/emblems/emblem_spartans.png",
     "History":"Sparta was a prominent city-state in ancient Greece, and its dominant military power on land from circa 650 B.C. Spartan culture was obsessed with military training and excellence, with rigorous training for boys beginning at age seven. Thanks to its military might, Sparta led a coalition of Greek forces during the Greco-Persian Wars, and won over Athens in the Peloponnesian Wars, though at great cost.",