Ticket #3114: health_garrisoned_v1.patch

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

@@ -468 +468 @@
             return false;
         data.name = getEntityNames(data.template);
         data.count = data.item.ents.length;
+
+        data.health = 0;
+        data.maxHealth = 0;
+        let ents = data.item.ents;
+        for (let i = 0; i < ents.length; i++)
+        {
+            let state = GetEntityState(ents[i]);
+            data.health += state.hitpoints;
+            data.maxHealth += state.maxHitpoints;
+        }
         return true;
     },
     "setAction": function(data)

binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml

@@ -8 +8 @@
             </object>
         </repeat>
     </object>
+        <!-- Health bar of garrisoned units -->
+    <object size="-14 1 -7 100%-49" type="image" name="healthGarrison" tooltip_style="sessionToolTip">
+        <translatableAttribute id="tooltip">Hitpoints</translatableAttribute>
+        <object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+        <object type="image" sprite="healthBackground" ghost="true"/>
+        <object type="image" sprite="healthForeground" ghost="true" name="healthBarGarrison"/>
+        <object type="image" sprite="statsBarShaderVertical" ghost="true"/>
+    </object>
 </object>

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

@@ -40 +40 @@
     }
     let selection = g_Selection.toList();
 
-    var items = g_SelectionPanels[guiName].getItems(unitEntState, selection);
+    let items = g_SelectionPanels[guiName].getItems(unitEntState, selection);
 
     if (!items || !items.length)
         return;
 
-    var numberOfItems = items.length;
-    var garrisonGroups = new EntityGroups();
+    let numberOfItems = items.length;
+    let garrisonGroups = new EntityGroups();
 
     // Determine how many buttons there should be
-    var maxNumberOfItems = g_SelectionPanels[guiName].getMaxNumberOfItems();
+    let maxNumberOfItems = g_SelectionPanels[guiName].getMaxNumberOfItems();
     if (maxNumberOfItems < numberOfItems)
         numberOfItems = maxNumberOfItems;
 
@@ -58 +58 @@
     if (g_SelectionPanels[guiName].resizePanel)
         g_SelectionPanels[guiName].resizePanel(numberOfItems, rowLength);
 
+    let totalGarrisionHealth = 0;
+    let maxGarrisionHealth = 0;
+
     // Make buttons
     for (let i = 0; i < numberOfItems; ++i)
     {
-        var item = items[i];
+        let item = items[i];
 
         // If a tech has been researched it leaves an empty slot
         if (!item)
@@ -73 +76 @@
 
         // STANDARD DATA
         // add standard data
-        var data = {
+        let data = {
             "i": i,
             "item": item,
             "selection": selection,
@@ -104 +107 @@
         // add general data, and a chance to abort on faulty data
         if (g_SelectionPanels[guiName].addData)
         {
-            var success = g_SelectionPanels[guiName].addData(data);
+            let success = g_SelectionPanels[guiName].addData(data);
             if (!success)
                 continue; // ignore faulty data
         }
+        if (guiName == "Garrison")
+        {
+            totalGarrisionHealth += data.health;
+            maxGarrisionHealth += data.maxHealth;
+        }
 
         // SET CONTENT
         // run all content setters
-        for (var f in g_SelectionPanels[guiName])
+        for (let f in g_SelectionPanels[guiName])
         {
             if (f.match(/^set/))
                 g_SelectionPanels[guiName][f](data);
@@ -137 +145 @@
     // remember the number of items
     g_unitPanelButtons[guiName] = numberOfItems;
     g_SelectionPanels[guiName].used = true;
+
+    // Show health of garrisoned units
+    if (guiName == "Garrison")
+    {
+        let healthGarrison = Engine.GetGUIObjectByName("healthGarrison");
+        healthGarrison.hidden = totalGarrisionHealth <= 0;
+        if (totalGarrisionHealth > 0)
+        {
+            let garrisonedUnitsHealthBar = Engine.GetGUIObjectByName("healthBarGarrison");
+            let healthSize = garrisonedUnitsHealthBar.size;
+            healthSize.rtop = 100-100*Math.max(0, Math.min(1, totalGarrisionHealth / maxGarrisionHealth));
+            garrisonedUnitsHealthBar.size = healthSize;
+            healthGarrison.tooltip = sprintf(translate("%(label)s %(current)s / %(max)s"), {
+                "label": "[font=\"sans-bold-13\"]" + translate("Hitpoints:") + "[/font]",
+                "current": Math.ceil(totalGarrisionHealth),
+                "max": Math.ceil(maxGarrisionHealth)
+            });
+        }
+    }
 }
 
 /**