Ticket #3841: 3841_ingame_summary_v1.patch

binaries/data/mods/public/gui/session/menu.js

@@ -617 +617 @@
     pauseGame();
 
     let extendedSimState = Engine.GuiInterfaceCall("GetExtendedSimulationState");
+    let playersToShow = [];
+
+    if (g_ViewedPlayer < 1 || extendedSimState.players[g_ViewedPlayer].state != "active")
+        playersToShow = extendedSimState.players;
+    else
+        for (let player in g_Players)
+            if (player == 0 || player == g_ViewedPlayer || extendedSimState.players[g_ViewedPlayer].hasSharedLos && g_Players[player].isMutualAlly[g_ViewedPlayer])
+                playersToShow.push(extendedSimState.players[player]);
+
     Engine.PushGuiPage("page_summary.xml", {
         "sim": {
             "mapSettings": g_GameAttributes.settings,
-            "playerStates": extendedSimState.players,
+            "playerStates": playersToShow,
             "timeElapsed" : extendedSimState.timeElapsed
         },
         "gui": {

binaries/data/mods/public/gui/session/menu.xml

@@ -48 +48 @@
             style="StoneButtonFancy"
             size="0 96 100% 124"
             tooltip_style="sessionToolTip"
-            enabled="false"
         >
             <translatableAttribute id="caption">Summary</translatableAttribute>
             <action on="Press">openGameSummary();</action>

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

@@ -480 +480 @@
     // Disable stuff observers shouldn't use
     Engine.GetGUIObjectByName("pauseButton").enabled = !g_IsObserver || !g_IsNetworked;
     Engine.GetGUIObjectByName("menuResignButton").enabled = !g_IsObserver;
-    Engine.GetGUIObjectByName("summaryButton").enabled = g_IsObserver;
 }
 
 function reportPerformance(time)
@@ -933 +932 @@
     debug.caption = text.replace(/\[/g, "\\[");
 }
 
+function getAllyStatTooltip(resource)
+{
+    let playersState = GetSimState().players;
+    let ret = "";
+    for (let player in playersState)
+        if (player != 0 && player != g_ViewedPlayer &&
+            (g_ViewedPlayer < 1 || playersState[g_ViewedPlayer].state != "active" ||
+                playersState[g_ViewedPlayer].hasSharedLos && g_Players[player].isMutualAlly[g_ViewedPlayer]))
+            ret += '\n[color="'+ rgbToGuiColor(g_Players[player].color) +'"]' + playersState[player].name + '[/color]: ' +
+                (resource == "pop" ? 
+                    (playersState[player].popCount + "/" + playersState[player].popLimit) :
+                    playersState[player].resourceCounts[resource]);
+    return ret;
+}
+
 function updatePlayerDisplay()
 {
     let playerState = GetSimState().players[g_ViewedPlayer];
@@ -939 +953 @@
     if (!playerState)
         return;
 
-    Engine.GetGUIObjectByName("resourceFood").caption = Math.floor(playerState.resourceCounts.food);
-    Engine.GetGUIObjectByName("resourceWood").caption = Math.floor(playerState.resourceCounts.wood);
-    Engine.GetGUIObjectByName("resourceStone").caption = Math.floor(playerState.resourceCounts.stone);
-    Engine.GetGUIObjectByName("resourceMetal").caption = Math.floor(playerState.resourceCounts.metal);
+    let translatedResources = {
+        "food": translate("Food"),
+        "wood": translate("Wood"),
+        "stone": translate("Stone"),
+        "metal": translate("Metal")
+    }
+    for (let res of RESOURCES)
+    {
+        Engine.GetGUIObjectByName("resource_" + res).caption = Math.floor(playerState.resourceCounts[res]);
+        Engine.GetGUIObjectByName(res).tooltip = translatedResources[res] + getAllyStatTooltip(res);
+    }
     Engine.GetGUIObjectByName("resourcePop").caption = playerState.popCount + "/" + playerState.popLimit;
     Engine.GetGUIObjectByName("population").tooltip = translate("Population (current / limit)") + "\n" +
-                    sprintf(translate("Maximum population: %(popCap)s"), { "popCap": playerState.popMax });
+                    sprintf(translate("Maximum population: %(popCap)s"), { "popCap": playerState.popMax }) +
+                    getAllyStatTooltip("pop");
 
     g_IsTrainingBlocked = playerState.trainingBlocked;
 }

binaries/data/mods/public/gui/session/top_panel/resource_food.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="food" size="10 0 100 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <translatableAttribute id="tooltip">Food</translatableAttribute>
         <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/food.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceFood"/>
+        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_food"/>
 </object>

binaries/data/mods/public/gui/session/top_panel/resource_metal.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="metal" size="280 0 370 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <translatableAttribute id="tooltip">Metal</translatableAttribute>
         <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/metal.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceMetal"/>
+        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_metal"/>
 </object>

binaries/data/mods/public/gui/session/top_panel/resource_stone.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="stone" size="190 0 280 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <translatableAttribute id="tooltip">Stone</translatableAttribute>
         <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/stone.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceStone"/>
+        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_stone"/>
 </object>

binaries/data/mods/public/gui/session/top_panel/resource_wood.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="wood" size="100 0 190 100%" type="image" style="resourceCounter" tooltip_style="sessionToolTipBold">
-        <translatableAttribute id="tooltip">Wood</translatableAttribute>
         <object size="0 -4 40 36" type="image" sprite="stretched:session/icons/resources/wood.png" ghost="true"/>
-        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resourceWood"/>
+        <object size="32 0 100% 100%-2" type="text" style="resourceText" name="resource_wood"/>
 </object>

binaries/data/mods/public/simulation/components/GuiInterface.js

@@ -106 +106 @@
             "teamsLocked": cmpPlayer.GetLockTeams(),
             "cheatsEnabled": cmpPlayer.GetCheatsEnabled(),
             "disabledTemplates": cmpPlayer.GetDisabledTemplates(),
+            "hasSharedLos": cmpPlayer.HasSharedLos(),
             "hasSharedDropsites": cmpPlayer.HasSharedDropsites(),
             "phase": phase,
             "isAlly": allies,

binaries/data/mods/public/simulation/components/Player.js

@@ -34 +34 @@
     this.teamsLocked = false;
     this.state = "active"; // game state - one of "active", "defeated", "won"
     this.diplomacy = [];    // array of diplomatic stances for this player with respect to other players (including gaia and self)
+    this.sharedLos = false;
     this.sharedDropsites = false;
     this.formations = [];
     this.startCam = undefined;
@@ -545 +546 @@
     return this.startCam !== undefined;
 };
 
+Player.prototype.HasSharedLos = function()
+{
+    return this.sharedLos;
+};
+
 Player.prototype.HasSharedDropsites = function()
 {
     return this.sharedDropsites;
@@ -702 +708 @@
 Player.prototype.OnResearchFinished = function(msg)
 {
     if (msg.tech == this.template.SharedLosTech)
+    {
         this.UpdateSharedLos();
+        this.sharedLos = true;
+    }
     else if (msg.tech == this.template.SharedDropsitesTech)
         this.sharedDropsites = true;
 };