Ticket #3113: total_carried_resources_v1.4.patch

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

@@ -303 +303 @@
     let maxCapturePoints = 0;
     let capturePoints = (new Array(9)).fill(0);
     let playerID = 0;
+    let totalResourcesCarried;
 
     for (let i = 0; i < selection.length; i++)
     {
@@ -320 +321 @@
             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;
@@ -369 +382 @@
         });
     }
 
-    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 += getCostComponentDisplayName(res) + totalResourcesCarried[res] + " ";
+            }
+    numberOfUnits.tooltip = str.substr(0, str.length - 1);
 
     // Unhide Details Area
     Engine.GetGUIObjectByName("detailsAreaMultiple").hidden = false;

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 -->