Ticket #3395: ticket3395unitactions_7.2.diff

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

@@ -229 +229 @@
     return attacks.join("\n");
 }
 
-function getRepairRatioTooltip(ratio)
+function getRepairRateTooltip(rate)
 {
-    let unit = sprintf(translate("%(health)s / %(second)s / %(worker)s"), {
+    let detail = Math.round(rate * 10) / 10;
+    return "\n" + sprintf(translate("%(repairRateLabel)s %(detail)s %(health)s / %(second)s / %(worker)s"), {
+        "repairRateLabel": g_TooltipTextFormats.header[0] + translate("Repair Rate:") + g_TooltipTextFormats.header[1],
+        "detail": detail,
         "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("%(repairRateLabel)s %(detail)s %(unit)s"), {
-        "repairRateLabel": g_TooltipTextFormats.header[0] + translate("Repair Rate:") + g_TooltipTextFormats.header[1],
-        "detail": ratio,
-        "unit": unit
-    });
 }
 
 /**

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

@@ -262 +262 @@
     Engine.GetGUIObjectByName("attackAndArmorStats").tooltip = entState.attack ? (getAttackTooltip(entState) + "\n" + armorString) : armorString;
 
     // Repair Rate
-    if (entState.repairRatio)
-        Engine.GetGUIObjectByName("attackAndArmorStats").tooltip += getRepairRatioTooltip(entState.repairRatio);
+    if (entState.repairRate)
+        Engine.GetGUIObjectByName("attackAndArmorStats").tooltip += getRepairRateTooltip(entState.repairRate);
 
     // Icon Tooltip
     let iconTooltip = "";

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

@@ -404 +404 @@
         "obstruction": null,
         "turretParent":null,
         "promotion": null,
-        "repairTime": null,
+        "repairRate": null,
         "resourceDropsite": null,
         "resourceGatherRates": null,
         "resourceSupply": null,
@@ -487 +487 @@
 
     let cmpRepairable = Engine.QueryInterface(ent, IID_Repairable);
     if (cmpRepairable)
-        ret.repairRatio = cmpRepairable.GetRepairRatio();
+        ret.repairRate = cmpRepairable.GetRepairRate();
 
     let cmpResourceSupply = QueryMiragedInterface(ent, IID_ResourceSupply);
     if (cmpResourceSupply)

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

@@ -62 +62 @@
         return;
 
     // Calculate the amount of hitpoints that will be added (using diminushing rate when several builders)
-    let work = rate * this.buildMultiplier;
-    let repairTime = this.repairTimeRatio * cmpCost.GetBuildTime();
-    if (repairTime)
-        work *= (cmpHealth.GetMaxHitpoints() / repairTime);
+    let work = rate * this.buildMultiplier * this.GetRepairRate();
     let amount = Math.min(damage, work);
     cmpHealth.Increase(amount);
 
@@ -74 +71 @@
         Engine.PostMessage(this.entity, MT_ConstructionFinished, { "entity": this.entity, "newentity": this.entity });
 };
 
-Repairable.prototype.GetRepairRatio = function()
+Repairable.prototype.GetRepairRate = function()
 {
     let cmpHealth = Engine.QueryInterface(this.entity, IID_Health);
     let cmpCost = Engine.QueryInterface(this.entity, IID_Cost);
     let repairTime = this.repairTimeRatio * cmpCost.GetBuildTime();
-    let repairRatio = (cmpHealth.GetMaxHitpoints() / repairTime);
-    return (Math.round(repairRatio * 10 ) / 10);
+    return repairTime ? cmpHealth.GetMaxHitpoints() / repairTime : 1;
 };
 
 Engine.RegisterComponentType(IID_Repairable, "Repairable", Repairable);

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

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