Ticket #3395: ticket3395unitactions_6.diff

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

@@ -244 +244 @@
     });
 }
 
+function getBuildRatioTooltip(ratio)
+{
+    let unit = sprintf(translate("%(health)s / %(second)s / %(worker)s"), {
+        "health": g_TooltipTextFormats.unit[0] + translate("health") + g_TooltipTextFormats.unit[1],
+        "second": g_TooltipTextFormats.unit[0] + translate("second") + g_TooltipTextFormats.unit[1],
+        "worker": g_TooltipTextFormats.unit[0] + translate("worker") + g_TooltipTextFormats.unit[1]
+    });
+
+    return "\n" + sprintf(translate("%(buildRateLabel)s %(detail)s %(unit)s"), {
+        "buildRateLabel": g_TooltipTextFormats.header[0] + translate("Build Rate:") + g_TooltipTextFormats.header[1],
+        "detail": ratio,
+        "unit": unit
+    });
+}
+
 /**
  * Translates a cost component identifier as they are used internally
  * (e.g. "population", "food", etc.) to proper display names.

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

@@ -265 +265 @@
     if (entState.repairRatio)
         Engine.GetGUIObjectByName("attackAndArmorStats").tooltip += getRepairRatioTooltip(entState.repairRatio);
 
+    // Build Rate
+    if (entState.buildRatio)
+        Engine.GetGUIObjectByName("attackAndArmorStats").tooltip += getBuildRatioTooltip(entState.buildRatio);
+
     // Icon Tooltip
     let iconTooltip = "";
 

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

@@ -254 +254 @@
     // Add an appropriate proportion of hitpoints
     var cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
     var maxHealth = cmpHealth.GetMaxHitpoints();
-    var deltaHP = Math.max(work, Math.min(maxHealth, Math.floor(maxHealth * (amount * this.buildMultiplier))));
+    var deltaHP = Math.max(work, Math.min(maxHealth, Math.floor(maxHealth * amount * this.buildMultiplier)));
     if (deltaHP > 0)
     {
         cmpHealth.Increase(deltaHP);
@@ -344 +344 @@
     }
 };
 
+Foundation.prototype.GetBuildRatio = function() 
+{ 
+    let cmpHealth = Engine.QueryInterface(this.entity, IID_Health); 
+    let cmpCost = Engine.QueryInterface(this.entity, IID_Cost); 
+    let buildRatio = cmpHealth.GetMaxHitpoints() / cmpCost.GetBuildTime(); 
+    return (Math.round(buildRatio * 10 ) / 10); 
+}; 
+
 Engine.RegisterComponentType(IID_Foundation, "Foundation", Foundation);
 

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

@@ -404 +404 @@
         "obstruction": null,
         "turretParent":null,
         "promotion": null,
-        "repairTime": null,
+        "repairRatio": null,
+        "buildRatio": null,
         "resourceDropsite": null,
         "resourceGatherRates": null,
         "resourceSupply": null,
@@ -489 +490 @@
     if (cmpRepairable)
         ret.repairRatio = cmpRepairable.GetRepairRatio();
 
+    let cmpFoundation = Engine.QueryInterface(ent, IID_Foundation);
+    if (cmpFoundation)
+        ret.buildRatio = cmpFoundation.GetBuildRatio();
+
     let cmpResourceSupply = QueryMiragedInterface(ent, IID_ResourceSupply);
     if (cmpResourceSupply)
         ret.resourceSupply = {

binaries/data/mods/public/simulation/components/tests/test_GuiInterface.js

@@ -510 +510 @@
     obstruction: null,
     turretParent: null,
     promotion: null,
-    repairTime: null,
+    repairRatio: null,
+    buildRatio: null,
     resourceDropsite: null,
     resourceGatherRates: null,
     resourceSupply: null,