Ticket #4406: ai-info-v3.patch

binaries/data/config/default.cfg

@@ -29 +29 @@
 ; Show detailed tooltips (Unit stats)
 showdetailedtooltips = false
 
-; Enable/disable the splashscreen
-splashscreendisable = false
-
-; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
-splashscreenversion = 0
-
 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true
 
@@ -328 +322 @@
 cursorblinkrate = 0.5             ; Cursor blink rate in seconds (0.0 to disable blinking)
 scale = 1.0                       ; GUI scaling factor, for improved compatibility with 4K displays
 
+[gui.gamesetup]
+enabletips = true                 ; Enable/Disable tips during gamesetup (for newcomers)
+
 [gui.menu]
 limitfps = true                   ; Limit FPS in the menus and loading screen
 
@@ -341 +338 @@
 blinkduration = 1.7               ; The blink duration while pinging
 pingduration = 50.0               ; The duration for which an entity will be pinged after an attack notification
 
+[gui.splashscreen]
+enable = true                     ; Enable/disable the splashscreen
+version = 0                       ; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch
+
 [joystick]        ; EXPERIMENTAL: joystick/gamepad settings
 enable = false
 deadzone = 8192

binaries/data/mods/public/gui/gamesetup/ai.txt

@@ +1 @@
+Although reasonably easy for an experienced player, the default AI level is quite challenging for new players before they master the basic mechanisms of the game. It is advised to start by playing against a lower level (sandbox or very easy) when beginning with the game. Changing the AI level is done by clicking on the gear icon next to each AI player in the player selection panel above.

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

@@ -303 +303 @@
 
     if (g_IsNetworked)
         Engine.GetGUIObjectByName("chatInput").focus();
+    else
+        initSPTips();
 
     if (g_IsController)
     {
@@ -340 +342 @@
     g_GameAttributes.mapFilter = "default";
 }
 
+function initSPTips()
+{
+    if (Engine.ConfigDB_GetValue("user", "gui.gamesetup.enabletips") !== "true")
+        return;
+
+    Engine.GetGUIObjectByName("spTips").hidden = false;
+    Engine.GetGUIObjectByName("displaySPTips").checked = true;
+    Engine.GetGUIObjectByName("aiTips").caption = Engine.TranslateLines(Engine.ReadFile("gui/gamesetup/ai.txt"));
+}
+
+function saveSPTipsSetting()
+{
+    let enabled = String(Engine.GetGUIObjectByName("displaySPTips").checked);
+    Engine.ConfigDB_CreateValue("user", "gui.gamesetup.enabletips", enabled);
+    Engine.ConfigDB_WriteValueToFile("user", "gui.gamesetup.enabletips", enabled, "config/user.cfg");
+}
+
 /**
  * Remove empty space in case of hidden options (like cheats, rating or wonder duration)
  */

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

@@ -133 +133 @@
                 </object>
             </object>
             <object size="24 64 100%-460 358" type="image" sprite="CoverFillDark" name="playerAssignmentsPanelCover" hidden="true"/>
+
+            <object size="24 370 560 520" type="image" name="spTips" hidden="true">
+                <object size="4 10 28 34" type="image" sprite="ModernGear"/>
+                <object name="aiTips" type="text" style="ModernLeftLabelText" size="32 0 100%-20 100%-32"/>
+                <object size="30 100%-30 100% 100%-8" type="text" style="ModernLeftLabelText">
+                    <translatableAttribute id="caption">Show this message in the future</translatableAttribute>
+                </object>
+                <object name="displaySPTips" size="8 100%-30 22 100%-8" type="checkbox" style="ModernTickBox">
+                    <action on="Press">saveSPTipsSetting();</action>
+                </object>
+            </object>
             <!-- Map selection -->
 
             <object size="100%-425 355 100%-285 470" name="mapTypeTooltip">

binaries/data/mods/public/gui/options/options.json

@@ -27 +27 @@
         },
         {
             "type": "boolean",
-            "label": "Disable Welcome Screen",
+            "label": "Enable Welcome Screen",
             "tooltip": "When disabled, the welcome screen will nevertheless be shown once when a new version is available and you can always launch it from the main menu.",
-            "parameters": { "config": "splashscreendisable" }
+            "parameters": { "config": "gui.splashscreen.enable" }
         },
         {
             "type": "boolean",
+            "label": "Enable Game Setting Tips",
+            "tooltip": "Show tips when setting a game.",
+            "parameters": { "config": "gui.gamesetup.enabletips" }
+        },
+        {
+            "type": "boolean",
             "label": "Detailed Tooltips",
             "tooltip": "Show detailed tooltips for trainable units in unit-producing buildings.",
             "parameters": { "config": "showdetailedtooltips" }

binaries/data/mods/public/gui/pregame/mainmenu.js

@@ -128 +128 @@
     {
         g_ShowSplashScreens = false;
 
-        if (Engine.ConfigDB_GetValue("user", "splashscreendisable") !== "true" ||
-            Engine.ConfigDB_GetValue("user", "splashscreenversion") < Engine.GetFileMTime("gui/splashscreen/splashscreen.txt"))
+        if (Engine.ConfigDB_GetValue("user", "gui.splashscreen.enable") === "true" ||
+            Engine.ConfigDB_GetValue("user", "gui.splashscreen.version") < Engine.GetFileMTime("gui/splashscreen/splashscreen.txt"))
             Engine.PushGuiPage("page_splashscreen.xml", { "page": "splashscreen", callback : "SplashScreenClosedCallback" } );
         else
             ShowRenderPathMessage();

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

@@ -1 +1 @@
 function init(data)
 {
     Engine.GetGUIObjectByName("mainText").caption = Engine.TranslateLines(Engine.ReadFile("gui/splashscreen/" + data.page + ".txt"));
-    Engine.GetGUIObjectByName("displaySplashScreen").checked = Engine.ConfigDB_GetValue("user", "splashscreendisable") !== "true";
+    Engine.GetGUIObjectByName("displaySplashScreen").checked = Engine.ConfigDB_GetValue("user", "gui.splashscreen.enable") === "true";
 }

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

@@ -27 +27 @@
         <object name="btnOK" type="button" style="ModernButtonRed" size="18 100%-45 50%-5 100%-17" hotkey="cancel">
             <translatableAttribute id="caption">OK</translatableAttribute>
             <action on="Press"><![CDATA[
-            let disabled = "" + !Engine.GetGUIObjectByName("displaySplashScreen").checked;
-            Engine.ConfigDB_CreateValue("user", "splashscreendisable", disabled);
-            Engine.ConfigDB_WriteValueToFile("user", "splashscreendisable", disabled, "config/user.cfg"); 
+            let enabled = String(Engine.GetGUIObjectByName("displaySplashScreen").checked);
+            Engine.ConfigDB_CreateValue("user", "gui.splashscreen.enable", enabled);
+            Engine.ConfigDB_WriteValueToFile("user", "gui.splashscreen.enable", enabled, "config/user.cfg"); 
             let version = Engine.GetFileMTime("gui/splashscreen/splashscreen.txt");
-            Engine.ConfigDB_CreateValue("user", "splashscreenversion", version);
-            Engine.ConfigDB_WriteValueToFile("user", "splashscreenversion", version, "config/user.cfg");
+            Engine.ConfigDB_CreateValue("user", "gui.splashscreen.version", version);
+            Engine.ConfigDB_WriteValueToFile("user", "gui.splashscreen.version", version, "config/user.cfg");
             Engine.PopGuiPageCB();
             ]]></action>
         </object>

binaries/data/mods/public/l10n/messages.json

@@ -349 +349 @@
             {
                 "extractor": "txt",
                 "filemasks": [
+                    "gui/gamesetup/**.txt",
                     "gui/splashscreen/splashscreen.txt",
                     "gui/text/tips/**.txt"
                 ],