Ticket #2549: tooltipOptions2.patch

binaries/data/mods/public/gui/options/options.js

@@ -9 +9 @@
         [translate("Windowed Mode"), translate("Start 0 A.D. in a window"), {"config":"windowed"}, "boolean"],
         [translate("Background Pause"), translate("Pause single player games when window loses focus"), {"config":"pauseonfocusloss"}, "boolean"],
         [translate("Disable Welcome Screen"), translate("If you disable this screen completely, you may miss important announcements.\nYou can still launch it using the main menu."), {"config":"splashscreendisable"}, "boolean"],
+        [translate("Detailed Tooltips"), translate("Show detailed tooltips for trainable units in unit-producing buildings."), {"config":"showdetailedtooltips"}, "boolean"],
         [translate("Developer Overlay"), translate("Show overlay in-game with options such as reveal map, control all units, and change perspective. Designed for use by developers"), {"config":"developeroverlay.enable"}, "boolean"],
     ],
     "graphicsSetting":

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

@@ -514 +514 @@
                 var [trainEntLimit, trainEntCount, canBeAddedCount, trainEntLimitChangers] =
                     getEntityLimitAndCount(playerState, entType);
                 tooltip += formatLimitString(trainEntLimit, trainEntCount, trainEntLimitChangers);
-
+                if (Engine.ConfigDB_GetValue("user", "showdetailedtooltips") === "true")
+                {
+                    if (template.health)
+                        tooltip += "\n[font=\"sans-bold-13\"]" + translate("Health:") + "[/font] " + template.health;
+                    if (template.attack)
+                        tooltip += "\n" + getEntityAttack(template);
+                    if (template.armour)
+                        tooltip += "\n[font=\"sans-bold-13\"]" + translate("Armor:") + "[/font] " + armorTypesToText(template.armour);
+                    if (template.speed)
+                        tooltip += "\n" + getEntitySpeed(template);
+                }
                 tooltip += "[color=\"255 251 131\"]" + formatBatchTrainingString(buildingsCountToTrainFullBatch, fullBatchSize, remainderBatch) + "[/color]";
                 break;
 

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

@@ -234 +234 @@
     if (dmg.hack)
         dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
             damage: dmg.hack,
-            damageType: "[font=\"sans-12\"]" + translate("Hack") + "[/font]"
+            damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Hack") + "[/color][/font]"
         }));
     if (dmg.pierce)
         dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
             damage: dmg.pierce,
-            damageType: "[font=\"sans-12\"]" + translate("Pierce") + "[/font]"
+            damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Pierce") + "[/color][/font]"
         }));
     if (dmg.crush)
         dmgArray.push(sprintf(translate("%(damage)s %(damageType)s"), {
             damage: dmg.crush,
-            damageType: "[font=\"sans-12\"]" + translate("Crush") + "[/font]"
+            damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Crush") + "[/color][/font]"
         }));
 
     return dmgArray.join("[font=\"sans-12\"]" + translate(", ") + "[/font]");
@@ -260 +260 @@
     if (dmg.hack)
         dmgArray.push(sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), {
             damage: dmg.hack,
-            damageType: "[font=\"sans-12\"]" + translate("Hack") + "[/font]",
+            damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Hack") + "[/color][/font]",
             armorPercentage: "[font=\"sans-10\"]" + sprintf(translate("(%(armorPercentage)s)"), { armorPercentage: armorLevelToPercentageString(dmg.hack) }) + "[/font]"
         }));
     if (dmg.pierce)
         dmgArray.push(sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), {
             damage: dmg.pierce,
-            damageType: "[font=\"sans-12\"]" + translate("Pierce") + "[/font]",
+            damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Pierce") + "[/color][/font]",
             armorPercentage: "[font=\"sans-10\"]" + sprintf(translate("(%(armorPercentage)s)"), { armorPercentage: armorLevelToPercentageString(dmg.pierce) }) + "[/font]"
         }));
     if (dmg.crush)
         dmgArray.push(sprintf(translate("%(damage)s %(damageType)s %(armorPercentage)s"), {
             damage: dmg.crush,
-            damageType: "[font=\"sans-12\"]" + translate("Crush") + "[/font]",
+            damageType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Crush") + "[/color][/font]",
             armorPercentage: "[font=\"sans-10\"]" + sprintf(translate("(%(armorPercentage)s)"), { armorPercentage: armorLevelToPercentageString(dmg.crush) }) + "[/font]"
         }));
 
@@ -574 +574 @@
     {
         var label = "[font=\"sans-bold-13\"]" + translate("Speed:") + "[/font]";
         var speeds = [];
-        if (template.speed.walk) speeds.push(sprintf(translate("%(speed)s %(movementType)s"), { speed: template.speed.walk, movementType: "[font=\"sans-12\"]" + translate("Walk") + "[/font]"}));
-        if (template.speed.run) speeds.push(sprintf(translate("%(speed)s %(movementType)s"), { speed: template.speed.run, movementType: "[font=\"sans-12\"]" + translate("Run") + "[/font]"}));
+        if (template.speed.walk)
+            speeds.push(sprintf(translate("%(speed)s %(movementType)s"), { speed: template.speed.walk, movementType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Walk") + "[/color][/font]"}));
+        if (template.speed.run)
+            speeds.push(sprintf(translate("%(speed)s %(movementType)s"), { speed: template.speed.run, movementType: "[font=\"sans-10\"][color=\"orange\"]" + translate("Run") + "[/color][/font]"}));
 
         speed = sprintf(translate("%(label)s %(speeds)s"), { label: label, speeds: speeds.join(translate(", ")) })
     }
@@ -591 +593 @@
         delete template.attack['Slaughter'];
         for (var type in template.attack)
         {
+            if (type == "Charge")
+                continue; // Charging isn't implemented yet and shouldn't be displayed.
             var attack = "";
             var attackLabel = "[font=\"sans-bold-13\"]" + getAttackTypeLabel(type) + "[/font]";
             if (type == "Ranged")
@@ -600 +604 @@
                     attackLabel: attackLabel,
                     damageTypes: damageTypesToText(template.attack[type]),
                     rangeLabel: "[font=\"sans-bold-13\"]" + translate("Range:") + "[/font]",
-                    range: Math.round(template.attack[type].maxRange/4)
+                    range: Math.round(template.attack[type].maxRange) + "[font=\"sans-10\"][color=\"orange\"] " + translate("meters:") + "[/color][/font]"
                 });
             }
             else
@@ -613 +617 @@
             attacks.push(attack);
         }
     }
-    return attacks.join("\n");
+    return attacks.join(translate(", "));
 }
 
 function getEntityNames(template)
@@ -808 +812 @@
         warn(sprintf("Internationalization: Unexpected context for resource type localization found: ‘%(context)s’. This context is not supported.", { context: context }));
         return resourceCode; // It should never get here.
     }
-}
- No newline at end of file
+}