Ticket #3113: total_carried_resources_v1.6.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 "";
@@ -291 +291 @@
     totalCosts.time = Math.ceil(template.cost.time * (entity ? Engine.GuiInterfaceCall("GetBatchTime", { "entity": entity, "batchSize": trainNum }) : 1));
 
     let costs = [];
-    if (totalCosts.food) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayName("food"), "cost": totalCosts.food }));
-    if (totalCosts.wood) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayName("wood"), "cost": totalCosts.wood }));
-    if (totalCosts.metal) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayName("metal"), "cost": totalCosts.metal }));
-    if (totalCosts.stone) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayName("stone"), "cost": totalCosts.stone }));
-    if (totalCosts.population) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayName("population"), "cost": totalCosts.population }));
-    if (totalCosts.time) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayName("time"), "cost": totalCosts.time }));
+    if (totalCosts.food) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayIcon("food"), "cost": totalCosts.food }));
+    if (totalCosts.wood) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayIcon("wood"), "cost": totalCosts.wood }));
+    if (totalCosts.metal) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayIcon("metal"), "cost": totalCosts.metal }));
+    if (totalCosts.stone) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayIcon("stone"), "cost": totalCosts.stone }));
+    if (totalCosts.population) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayIcon("population"), "cost": totalCosts.population }));
+    if (totalCosts.time) costs.push(sprintf(translate("%(component)s %(cost)s"), { "component": getCostComponentDisplayIcon("time"), "cost": totalCosts.time }));
     return costs;
 }
 
@@ -351 +351 @@
             // 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
             }));
@@ -413 +413 @@
     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

@@ -341 +341 @@
     let maxCapturePoints = 0;
     let capturePoints = (new Array(9)).fill(0);
     let playerID = 0;
+    let totalResourcesCarried;
 
     for (let i = 0; i < selection.length; i++)
     {
@@ -358 +359 @@
             maxCapturePoints += entState.maxCapturePoints;
             capturePoints = entState.capturePoints.map((v, i) => v + capturePoints[i]);
         }
+
+        if (entState.resourceCarrying && entState.resourceCarrying.length !== 0)
+        {
+            if (!totalResourcesCarried)
+                totalResourcesCarried = {};
+
+            let carrying = entState.resourceCarrying[0];
+            if (totalResourcesCarried[carrying.type])
+                totalResourcesCarried[carrying.type] += carrying.amount;
+            else
+                totalResourcesCarried[carrying.type] = carrying.amount;
+        }
     }
 
     Engine.GetGUIObjectByName("healthMultiple").hidden = averageHealth <= 0;
@@ -407 +420 @@
         });
     }
 
-    Engine.GetGUIObjectByName("numberOfUnits").caption = selection.length;
+    let numberOfUnits = Engine.GetGUIObjectByName("numberOfUnits");
+    numberOfUnits.caption = selection.length;
 
+    let str = "";
+    if (totalResourcesCarried)
+        for (let res of RESOURCES)
+            if (totalResourcesCarried[res])
+                str += getCostComponentDisplayIcon(res) + totalResourcesCarried[res] + " ";
+    numberOfUnits.tooltip = str.substr(0, str.length - 1);
+
     // 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
             });
         }
@@ -979 +979 @@
     {
         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;
+            let str = data.name + "\n";
+            for (let res of RESOURCES)
+                if (data.carried[res])
+                    str += getCostComponentDisplayIcon(res) + data.carried[res] + " ";
+            
+            data.button.tooltip = str.substr(0, str.length - 1);
         }
         else
             data.button.tooltip = data.name;

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]
             }));