Ticket #3395: ticket3394unitactions_3.2.diff

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

@@ -157 +157 @@
     else
         var rateLabel = txtFormats.header[0] + translate("Rate:") + txtFormats.header[1];
 
-    for (var type in template.attack)
+    for (let type in template.attack)
     {
         if (type == "Slaughter")
             continue; // Slaughter is not a real attack, so do not show it.
@@ -219 +219 @@
     return attacks.join("\n");
 }
 
+function getRepairTimeRatioTooltip(ratio)
+{
+    var unit = sprintf(translate("%(health)s / %(second)s / %(worker)s"), {
+                health: txtFormats.unit[0] + translate("Health") + txtFormats.unit[1],
+                second: txtFormats.unit[0] + translate("second") + txtFormats.unit[1],
+                worker: txtFormats.unit[0] + translate("worker") + txtFormats.unit[1]
+            });
+
+    return "\n" + sprintf(translate("%(repairRateLabel)s %(detail)s %(unit)s"), {
+                repairRateLabel: txtFormats.header[0] + translate("Repair Rate:") + txtFormats.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

@@ -254 +254 @@
     var armorString = getArmorTooltip(entState.armour);
 
     // Attack and Armor
-    if ("attack" in entState && entState.attack)
+    if (entState.attack)
         Engine.GetGUIObjectByName("attackAndArmorStats").tooltip = getAttackTooltip(entState) + "\n" + armorString;
     else
         Engine.GetGUIObjectByName("attackAndArmorStats").tooltip = armorString;
 
+    // Repair Rate
+    if (entState.repairTimeRatio)
+        Engine.GetGUIObjectByName("attackAndArmorStats").tooltip += getRepairTimeRatioTooltip(entState.repairTimeRatio);
+
     // Icon Tooltip
     var iconTooltip = "";
 

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

@@ -677 +677 @@
                     count += state.garrisonHolder.entities.length;
             }
             return {
-                "tooltip": translate("Unload All"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Unload All") + "[/font]\n" + translate("Release all garrisoned units"),
                 "icon": "garrison-out.png",
                 "count": count,
             };
@@ -705 +705 @@
                     
 
             return {
-                "tooltip": translate("Delete"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Delete") + "[/font]\n" + translate("Destroy everything selected"),
                 "icon": "kill_small.png"
             };
         },
@@ -731 +731 @@
             if (!entState.unitAI)
                 return false;
             return {
-                "tooltip": translate("Stop"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Stop") + "[/font]\n" + translate("Cancel all existing orders"),
                 "icon": "stop.png"
             };
         },
@@ -749 +749 @@
             if (!entState.unitAI || entState.turretParent)
                 return false;
             return {
-                "tooltip": translate("Garrison"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Garrison") + "[/font]\n" + translate("Lock selected units inside and shoot arrows from warships and defensive buildings"),
                 "icon": "garrison.png"
             };
         },
@@ -770 +770 @@
             if (!p.garrisonHolder || p.garrisonHolder.entities.indexOf(entState.id) == -1)
                 return false;
             return {
-                "tooltip": translate("Unload"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Unload") + "[/font]\n" + translate("Release one unit"),
                 "icon": "garrison-out.png"
             };
         },
@@ -786 +786 @@
             if (!entState.builder)
                 return false;
             return {
-                "tooltip": translate("Repair"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Repair") + "[/font]\n" + translate("Restore health, rate depends on structure"),
                 "icon": "repair.png"
             };
         },
@@ -803 +803 @@
             if (!entState.rallyPoint)
                 return false;
             return {
-                "tooltip": translate("Focus on Rally Point"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Focus on Rally Point") + "[/font]\n" + translate("Move camera to entity"),
                 "icon": "focus-rally.png"
             };
         },
@@ -826 +826 @@
             if (!entState.unitAI || !entState.unitAI.hasWorkOrders)
                 return false;
             return {
-                "tooltip": translate("Back to Work"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Back to Work") + "[/font]\n" + translate("Order unit the last given task"),
                 "icon": "production.png"
             };
         },
@@ -842 +842 @@
             if (!entState.unitAI || !entState.unitAI.canGuard || entState.unitAI.isGuarding)
                 return false;
             return {
-                "tooltip": translate("Guard"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Guard") + "[/font]\n" + translate("Follow another entity, repair/heal it and protect when attacked"),
                 "icon": "add-guard.png"
             };
         },
@@ -859 +859 @@
             if (!entState.unitAI || !entState.unitAI.isGuarding)
                 return false;
             return {
-                "tooltip": translate("Remove guard"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Remove guard") +"[/font]\n" + translate("Stop guarding"),
                 "icon": "remove-guard.png"
             };
         },
@@ -910 +910 @@
                 }
             }
             return {
-                "tooltip": translate("Unload All"),
+                "tooltip": '[font="sans-bold-16"]' + translate("Unload All") + "[/font]\n" + translate("Release all garrisoned units"),
                 "icon": "garrison-out.png",
                 "count": count,
             };

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

@@ -343 +343 @@
     
     var cmpOwnership = Engine.QueryInterface(ent, IID_Ownership);
     if (cmpOwnership)
-    {
         ret.player = cmpOwnership.GetOwner();
-    }
 
     var cmpRallyPoint = Engine.QueryInterface(ent, IID_RallyPoint);
     if (cmpRallyPoint)
-    {
         ret.rallyPoint = {'position': cmpRallyPoint.GetPositions()[0]}; // undefined or {x,z} object
-    }
 
     var cmpGarrisonHolder = Engine.QueryInterface(ent, IID_GarrisonHolder);
     if (cmpGarrisonHolder)
@@ -433 +429 @@
         "obstruction": null,
         "turretParent":null,
         "promotion": null,
+        "repairTimeRatio": null,
         "resourceDropsite": null,
         "resourceGatherRates": null,
         "resourceSupply": null,
@@ -489 +486 @@
 
     var cmpArmour = Engine.QueryInterface(ent, IID_DamageReceiver);
     if (cmpArmour)
-    {
         ret.armour = cmpArmour.GetArmourStrengths();
-    }
 
     var cmpAuras = Engine.QueryInterface(ent, IID_Auras)
     if (cmpAuras)
-    {
         ret.auras = cmpAuras.GetDescriptions();
-    }
 
     var cmpBuildingAI = Engine.QueryInterface(ent, IID_BuildingAI);
     if (cmpBuildingAI)
@@ -523 +516 @@
     if (cmpPosition && cmpPosition.GetTurretParent() != INVALID_ENTITY)
         ret.turretParent = cmpPosition.GetTurretParent();
 
+    var cmpRepairTimeRatio = Engine.QueryInterface(ent, IID_Repairable);
+        if (cmpRepairTimeRatio)
+            ret.repairTimeRatio = cmpRepairTimeRatio.GetRepairTimeRatio();
+
     var cmpResourceSupply = QueryMiragedInterface(ent, IID_ResourceSupply);
     if (cmpResourceSupply)
     {
@@ -539 +536 @@
 
     var cmpResourceGatherer = Engine.QueryInterface(ent, IID_ResourceGatherer);
     if (cmpResourceGatherer)
-    {
         ret.resourceGatherRates = cmpResourceGatherer.GetGatherRates();
-    }
     
     var cmpResourceDropsite = Engine.QueryInterface(ent, IID_ResourceDropsite);
     if (cmpResourceDropsite)

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

@@ -74 +74 @@
         Engine.PostMessage(this.entity, MT_ConstructionFinished, { "entity": this.entity, "newentity": this.entity });
 };
 
+Repairable.prototype.GetRepairTimeRatio = function()
+{
+    return this.repairTimeRatio;
+};
+
 Engine.RegisterComponentType(IID_Repairable, "Repairable", Repairable);

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

@@ -508 +508 @@
     obstruction: null,
     turretParent: null,
     promotion: null,
+    repairTimeRatio: null,
     resourceDropsite: null,
     resourceGatherRates: null,
     resourceSupply: null,