Ticket #4061: 4061.diff

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

@@ -57 +57 @@
         "time": time,
         "second": g_TooltipTextFormats.unit[0] + translatePlural("second", "seconds", time) + g_TooltipTextFormats.unit[1]
     });
 
     // or multiple arrows shot by BuildingAI
-    if (!entState.buildingAI)
+    if (!entState.buildingAI || type != "Ranged")
         return timeString;
 
     let arrows = entState.buildingAI.arrowCount;
     let arrowString = sprintf(translatePlural("%(arrowcount)s %(arrow)s", "%(arrowcount)s %(arrow)s", arrows), {
         "arrowcount": arrows,
@@ -160 +160 @@
 {
     let attacks = [];
     if (!template.attack)
         return "";
 
-    let rateLabel = g_TooltipTextFormats.header[0] + (template.buildingAI ? translate("Interval:") : translate("Rate:")) + g_TooltipTextFormats.header[1];
-
     for (let type in template.attack)
     {
         if (type == "Slaughter")
             continue; // Slaughter is not a real attack, so do not show it.
         if (type == "Charge")
             continue; // Charging isn't implemented yet and shouldn't be displayed.
 
+        let rateLabel = g_TooltipTextFormats.header[0]
+        if (template.buildingAI && type == "Ranged")
+            rateLabel += translate("Interval:")
+        else
+            rateLabel += translate("Rate:")
+        rateLabel += g_TooltipTextFormats.header[1];
+
         let rate = sprintf(translate("%(label)s %(details)s"), {
             "label": rateLabel,
             "details": attackRateDetails(template, type)
         });