Ticket #3911: visible_ai_setting_v1.1.patch

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

@@ -1 +1 @@
 var g_PlayerSlot;
+var g_IsController;
 
 const g_AIDescriptions = [{
     "id": "",
@@ -10 +11 @@
 
 function init(settings)
 {
+    g_IsController = settings.callback != "";
     // Remember the player ID that we change the AI settings for
     g_PlayerSlot = settings.playerSlot;
 
-    var aiSelection = Engine.GetGUIObjectByName("aiSelection");
+    let aiSelection = Engine.GetGUIObjectByName("aiSelection");
     aiSelection.list = g_AIDescriptions.map(ai => ai.data.name);
     aiSelection.selected = g_AIDescriptions.findIndex(ai => ai.id == settings.id);
+    aiSelection.hidden = !g_IsController;
 
-    var aiDiff = Engine.GetGUIObjectByName("aiDifficulty");
+    let aiSelectionText = Engine.GetGUIObjectByName("aiSelectionText");
+    aiSelectionText.caption = aiSelection.list[aiSelection.selected];
+    aiSelectionText.hidden = g_IsController;
+
+    let aiDiff = Engine.GetGUIObjectByName("aiDifficulty");
     aiDiff.list = prepareForDropdown(g_Settings.AIDifficulties).Title;
     aiDiff.selected = settings.difficulty;
+    aiDiff.hidden = !g_IsController;
+
+    let aiDiffText = Engine.GetGUIObjectByName("aiDifficultyText");
+    aiDiffText.caption = aiDiff.list[aiDiff.selected];
+    aiDiffText.hidden = g_IsController;
 }
 
 function selectAI(idx)
@@ -29 +41 @@
 
 function returnAI()
 {
-    var idx = Engine.GetGUIObjectByName("aiSelection").selected;
+    let idx = Engine.GetGUIObjectByName("aiSelection").selected;
 
-    // Pop the page before calling the callback, so the callback runs
-    // in the parent GUI page's context
-    Engine.PopGuiPageCB({
-        "id": g_AIDescriptions[idx].id,
-        "name": g_AIDescriptions[idx].data.name,
-        "difficulty": Engine.GetGUIObjectByName("aiDifficulty").selected,
-        "playerSlot": g_PlayerSlot
-    });
+    if (g_IsController)
+        // Pop the page before calling the callback, so the callback runs
+        // in the parent GUI page's context
+        Engine.PopGuiPageCB({
+            "id": g_AIDescriptions[idx].id,
+            "name": g_AIDescriptions[idx].data.name,
+            "difficulty": Engine.GetGUIObjectByName("aiDifficulty").selected,
+            "playerSlot": g_PlayerSlot
+        });
+    else
+        Engine.PopGuiPage();
 }

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

@@ -24 +24 @@
             <object name="aiSelection" type="dropdown" style="ModernDropDown" size="50%-24 0 50%+136 28">
                 <action on="SelectionChange">selectAI(this.selected);</action>
             </object>
+            <object name="aiSelectionText" type="text" style="ModernLeftLabelText" size="50%-24 0 50%+136 28"/>
 
             <object type="text" style="ModernRightLabelText" size="-10 35 90 50%+35">
                 <translatableAttribute id="caption">AI Difficulty:</translatableAttribute>
@@ -31 +32 @@
             
             <object name="aiDifficulty" type="dropdown" style="ModernDropDown" size="50%-24 35 50%+136 63">
             </object>
+            <object name="aiDifficultyText" type="text" style="ModernLeftLabelText" size="50%-24 35 50%+136 63"/>
         </object>
 
         <object name="aiDescription" type="text" style="ModernLabelText" size="8% 90 92% 100%-60"/>

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

@@ -1499 +1499 @@
                 selection = noAssignment;
 
             // Since no human is assigned, show the AI config button
-            if (g_IsController)
-            {
-                configButton.hidden = false;
-                configButton.onpress = function() {
-                    Engine.PushGuiPage("page_aiconfig.xml", {
-                        "id": g_GameAttributes.settings.PlayerData[playerSlot].AI,
-                        "difficulty": g_GameAttributes.settings.PlayerData[playerSlot].AIDiff,
-                        "callback": "AIConfigCallback",
-                        "playerSlot": playerSlot // required by the callback function
-                    });
-                };
-            }
+            configButton.hidden = false;
+            configButton.onpress = function() {
+                Engine.PushGuiPage("page_aiconfig.xml", {
+                    "id": g_GameAttributes.settings.PlayerData[playerSlot].AI,
+                    "difficulty": g_GameAttributes.settings.PlayerData[playerSlot].AIDiff,
+                    "callback": g_IsController ? "AIConfigCallback" : "",
+                    "playerSlot": playerSlot // required by the callback function
+                });
+            };
         }
         // There was a human, so make sure we don't have any AI left
         // over in their slot, if we're in charge of the attributes