Ticket #3113: total_carried_resources_v1.7.1.patch

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

@@ -1 @@
-const g_CostDisplayNames = {
+const g_CostDisplayIcons = {
     "food": '[icon="iconFood"]',
     "wood": '[icon="iconWood"]',
     "stone": '[icon="iconStone"]',
@@ -258 +258 @@
  * Translates a cost component identifier as they are used internally
  * (e.g. "population", "food", etc.) to proper display names.
  */
-function getCostComponentDisplayName(costComponentName)
+function getCostComponentDisplayIcon(costComponentName)
 {
-    if (costComponentName in g_CostDisplayNames)
-        return g_CostDisplayNames[costComponentName];
+    if (costComponentName in g_CostDisplayIcons)
+        return g_CostDisplayIcons[costComponentName];
 
     warn(sprintf("The specified cost component, ‘%(component)s’, is not currently supported.", { "component": costComponentName }));
     return "";
@@ -292 +292 @@
 
     let costs = [];
 
-    for (let type in g_CostDisplayNames)
+    for (let type in g_CostDisplayIcons)
         if (totalCosts[type])
             costs.push(sprintf(translate("%(component)s %(cost)s"), {
-                "component": getCostComponentDisplayName(type),
+                "component": getCostComponentDisplayIcon(type),
                 "cost": totalCosts[type]
             }));
 
@@ -353 +353 @@
             // Translation: This string is part of the resources cost string on
             // the tooltip for wall structures.
             out.push(sprintf(translate("%(resourceIcon)s %(minimum)s to %(resourceIcon)s %(maximum)s"), {
-                "resourceIcon": getCostComponentDisplayName(resource),
+                "resourceIcon": getCostComponentDisplayIcon(resource),
                 "minimum": resourceMin,
                 "maximum": resourceMax
             }));
@@ -415 +415 @@
     let formatted = [];
     for (let resource in resources)
         formatted.push(sprintf(translate("%(component)s %(cost)s"), {
-            "component": '[font="sans-12"]' + getCostComponentDisplayName(resource) + '[/font]',
+            "component": '[font="sans-12"]' + getCostComponentDisplayIcon(resource) + '[/font]',
             "cost": resources[resource]
         }));
 

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

@@ -338 +338 @@
     let maxCapturePoints = 0;
     let capturePoints = (new Array(g_MaxPlayers + 1)).fill(0);
     let playerID = 0;
+    let totalResourcesCarried = {};
 
     for (let i = 0; i < selection.length; ++i)
     {
@@ -355 +356 @@
             maxCapturePoints += entState.maxCapturePoints;
             capturePoints = entState.capturePoints.map((v, i) => v + capturePoints[i]);
         }
+
+        if (entState.resourceCarrying && entState.resourceCarrying.length != 0)
+        {
+            let carrying = entState.resourceCarrying[0];
+            totalResourcesCarried[carrying.type] = (totalResourcesCarried[carrying.type] || 0) + carrying.amount;
+        }
     }
 
     Engine.GetGUIObjectByName("healthMultiple").hidden = averageHealth <= 0;
@@ -404 +411 @@
         });
     }
 
-    Engine.GetGUIObjectByName("numberOfUnits").caption = selection.length;
+    let numberOfUnits = Engine.GetGUIObjectByName("numberOfUnits");
+    numberOfUnits.caption = selection.length;
 
+    numberOfUnits.tooltip = Object.keys(totalResourcesCarried).map
+                                (
+                                    res => getCostComponentDisplayIcon(res) + totalResourcesCarried[res]
+                                ).join(" ");
+
     // Unhide Details Area
     Engine.GetGUIObjectByName("detailsAreaMultiple").hidden = false;
     Engine.GetGUIObjectByName("detailsAreaSingle").hidden = true;

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

@@ -737 +737 @@
         {
             tooltip += "\n[color=\"red\"]" + translate("Insufficient population capacity:") + "\n[/color]";
             tooltip += sprintf(translate("%(population)s %(neededSlots)s"), {
-                "population": getCostComponentDisplayName("population"),
+                "population": getCostComponentDisplayIcon("population"),
                 "neededSlots": data.item.neededSlots
             });
         }
@@ -977 +977 @@
     },
     "setTooltip": function(data)
     {
+        let str = data.name;
         if (data.carried)
-        {
-            var str = data.name + "\n";
-            var ress = ["food", "wood", "stone", "metal"];
-            for (var i = 0; i < 4; ++i)
-            {
-                if (data.carried[ress[i]])
-                {
-                    str += getCostComponentDisplayName(ress[i]) + data.carried[ress[i]];
-                    if (i !== 3)
-                        str += " ";
-                }
-            }
-            data.button.tooltip = str;
-        }
-        else
-            data.button.tooltip = data.name;
+            str += "\n" + Object.keys(data.carried).map
+                                (
+                                    res => getCostComponentDisplayIcon(res) + data.carried[res]
+                                ).join(" ");
+        data.button.tooltip = str;
     },
     "setCountDisplay": function(data)
     {

binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml

@@ -19 +19 @@
 
     <!-- Total -->
     <object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon">
-    <object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits"/>
+    <object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits" tooltip_style="sessionToolTipBold"/>
     </object>
 
     <!-- Stats Bars -->

binaries/data/mods/public/gui/structree/draw.js

@@ -366 +366 @@
         let rates = [];
         for (let type in template.gather)
             rates.push(sprintf(translate("%(resourceIcon)s %(rate)s"), {
-                "resourceIcon": getCostComponentDisplayName(type),
+                "resourceIcon": getCostComponentDisplayIcon(type),
                 "rate": template.gather[type]
             }));