Ticket #4026: healertooltip.5.diff

binaries/data/mods/public/globalscripts/Templates.js

@@ -222 +222 @@
         ret.garrisonHolder = {};
         if (template.GarrisonHolder.Max)
             ret.garrisonHolder.max = getEntityValue("GarrisonHolder/Max");
     }
 
+    if (template.Heal)
+    {
+        ret.heal = {};
+        if (template.Heal.HP)
+            ret.heal.hp = getEntityValue("Heal/HP");
+        if (template.Heal.Range)
+            ret.heal.range = getEntityValue("Heal/Range");
+        if (template.Heal.Rate)
+            ret.heal.rate = getEntityValue("Heal/Rate");
+    }
+
     if (template.Obstruction)
     {
         ret.obstruction = {
             "active": ("" + template.Obstruction.Active == "true"),
             "blockMovement": ("" + template.Obstruction.BlockMovement == "true"),

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

@@ -458 +458 @@
     });
 }
 
 function getHealerTooltip(template)
 {
-    if (!template.healer)
+    if (!template.heal)
         return "";
 
+    let hp = template.heal.hp.toFixed(1);
+    let range = template.heal.range.toFixed(1);
+    let rate = (template.heal.rate / 1000).toFixed(1);
+
     return [
-        sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", template.healer.HP), {
+        sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", hp), {
             "label": headerFont(translate("Heal:")),
-            "val": template.healer.HP,
+            "val": hp,
             // Translation: Short for hit points (or health points) that are healed in one healing action
-            "unit": unitFont(translatePlural("HP", "HP", template.healer.HP))
+            "unit": unitFont(translatePlural("HP", "HP", hp))
         }),
-        sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", template.healer.Range), {
+        sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", range), {
             "label": headerFont(translate("Range:")),
-            "val": template.healer.Range,
-            "unit": unitFont(translatePlural("meter", "meters", template.healer.Range))
+            "val": range,
+            "unit": unitFont(translatePlural("meter", "meters", range))
         }),
-        sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", template.healer.Rate/1000), {
+        sprintf(translatePlural("%(label)s %(val)s %(unit)s", "%(label)s %(val)s %(unit)s", rate), {
             "label": headerFont(translate("Rate:")),
-            "val": template.healer.Rate/1000,
-            "unit": unitFont(translatePlural("second", "seconds", template.healer.Rate / 1000))
+            "val": rate,
+            "unit": unitFont(translatePlural("second", "seconds", rate))
         })
     ].join(translate(", "));
 }
 
 function getAurasTooltip(template)

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

@@ -282 +282 @@
     // TODO: we should require all entities to have icons
     Engine.GetGUIObjectByName("icon").sprite = template.icon ? ("stretched:session/portraits/" + template.icon) : "bkFillBlack";
 
     Engine.GetGUIObjectByName("attackAndArmorStats").tooltip = [
         getAttackTooltip,
+        getHealerTooltip,
         getArmorTooltip,
         getRepairRateTooltip,
         getBuildRateTooltip,
         getGarrisonTooltip,
         getProjectilesTooltip

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

@@ -1004 +1004 @@
 
         if (Engine.ConfigDB_GetValue("user", "showdetailedtooltips") === "true")
             tooltips.push(
                 getHealthTooltip(template),
                 getAttackTooltip(template),
+                getHealerTooltip(template),
                 getArmorTooltip(template),
                 getGarrisonTooltip(template),
                 getProjectilesTooltip(template),
                 getSpeedTooltip(template)
             );

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

@@ -226 +226 @@
 
             return true;
         },
         "getActionInfo": function(entState, targetState)
         {
-            if (!entState.healer ||
+            if (!entState.heal ||
                 !hasClass(targetState, "Unit") || !targetState.needsHeal ||
                 !playerCheck(entState, targetState, ["Player", "Ally"]) ||
                 entState.id == targetState.id) // Healers can't heal themselves.
                 return false;
 
-            let unhealableClasses = entState.healer.unhealableClasses;
+            let unhealableClasses = entState.heal.unhealableClasses;
             if (MatchesClassList(targetState.identity.classes, unhealableClasses))
                 return false;
 
-            let healableClasses = entState.healer.healableClasses;
+            let healableClasses = entState.heal.healableClasses;
             if (!MatchesClassList(targetState.identity.classes, healableClasses))
                 return false;
 
             return { "possible": true };
         },

binaries/data/mods/public/gui/structree/load.js

@@ -78 +78 @@
                     g_Lists.techs.push(research);
             }
         }
     }
 
-    if (template.Heal)
-        unit.healer = {
-            "Range": +template.Heal.Range || 0,
-            "HP": +template.Heal.HP || 0,
-            "Rate": +template.Heal.Rate || 0
-        };
-
     if (template.Builder && template.Builder.Entities._string)
         for (let build of template.Builder.Entities._string.split(" "))
         {
             build = build.replace("{civ}", g_SelectedCiv);
             if (g_Lists.structures.indexOf(build) < 0)

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

@@ -543 +543 @@
         ret.barterMarket = { "prices": cmpBarter.GetPrices() };
     }
 
     let cmpHeal = Engine.QueryInterface(ent, IID_Heal);
     if (cmpHeal)
-        ret.healer = {
+        ret.heal = {
+            "hp": cmpHeal.GetHP(),
+            "range": cmpHeal.GetRange().max,
+            "rate": cmpHeal.GetRate(),
             "unhealableClasses": cmpHeal.GetUnhealableClasses(),
             "healableClasses": cmpHeal.GetHealableClasses(),
         };
 
     return ret;

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

@@ -45 +45 @@
     repeat = ApplyValueModificationsToEntity("Heal/Rate", repeat, this.entity);
     
     return { "prepare": prepare, "repeat": repeat };
 };
 
+Heal.prototype.GetHP = function()
+{
+    return ApplyValueModificationsToEntity("Heal/Range", +this.template.HP, this.entity);
+};
+
+Heal.prototype.GetRate = function()
+{
+    return ApplyValueModificationsToEntity("Heal/Rate", +this.template.Rate, this.entity);
+};
+
 Heal.prototype.GetRange = function()
 {
     var min = 0;
     var max = +this.template.Range;
     

binaries/data/mods/public/simulation/templates/units/maur_hero_chanakya.xml

@@ -29 +29 @@
     <Classes datatype="tokens">Human Organic Support</Classes>
     <VisibleClasses datatype="tokens">Hero Healer</VisibleClasses>
     <GenericName>Acharya Chanakya</GenericName>
     <SpecificName>Acharya Chāṇakya</SpecificName>
     <Icon>units/maur_hero_chanakya.png</Icon>
-    <Tooltip>Hero Special: "Healer" - Heal units at an accelerated rate.
-Hero Special: "Philosopher" - Research 4 special technologies only available to Chanakya.</Tooltip>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Minimap>
     <Type>hero</Type>
   </Minimap>