Ticket #3655: 3655_auraTooltip.patch

File 3655_auraTooltip.patch, 2.8 KB (added by s0600204, 8 years ago)

Proposed fix.

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

    diff --git a/binaries/data/mods/public/globalscripts/Templates.js b/binaries/data/mods/public/globalscripts/Templates.js
index 47b045a..b2a84e6 100644
    a b function GetTemplateDataHelper(template, player)  
    120120    if (template.Auras)
    121121    {
    122122        ret.auras = {};
    123         for each (var aura in template.Auras)
     123        for (let auraID in template.Auras)
     124        {
     125            let aura = template.Auras[auraID];
    124126            if (aura.AuraName)
    125                 ret.auras[aura.AuraName] = aura.AuraDescription || null;
     127                ret.auras[auraID] = {
     128                    "name": aura.AuraName,
     129                    "description": aura.AuraDescription || null
     130                };
     131        }
    126132    }
    127133
    128134    if (template.BuildRestrictions)

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

    diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js
index 126d62d..1086709 100644
    a b function getAurasTooltip(template)  
    478478    for (let aura in template.auras)
    479479        txt += '\n' + sprintf(translate("%(auralabel)s %(aurainfo)s"), {
    480480            "auralabel": g_TooltipTextFormats.header[0] + sprintf(translate("%(auraname)s:"), {
    481                 "auraname": translate(aura)
     481                "auraname": translate(template.auras[aura].name)
    482482            }) + g_TooltipTextFormats.header[1],
    483             "aurainfo": g_TooltipTextFormats.body[0] + translate(template.auras[aura]) + g_TooltipTextFormats.body[1]
     483            "aurainfo": g_TooltipTextFormats.body[0] + translate(template.auras[aura].description) + g_TooltipTextFormats.body[1]
    484484        });
    485485    return txt;
    486486}

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

    diff --git a/binaries/data/mods/public/gui/session/selection_panels.js b/binaries/data/mods/public/gui/session/selection_panels.js
index a8c3ba9..92434a0 100644
    a b g_SelectionPanels.Construction = {  
    336336    {
    337337        var tooltip = getEntityNamesFormatted(data.template);
    338338        tooltip += getVisibleEntityClassesFormatted(data.template);
     339        tooltip += getAurasTooltip(data.template);
    339340
    340341        if (data.template.tooltip)
    341342            tooltip += "\n[font=\"sans-13\"]" + data.template.tooltip + "[/font]";
    … … g_SelectionPanels.Training = {  
    10981099
    10991100        tooltip += getEntityNamesFormatted(data.template);
    11001101        tooltip += getVisibleEntityClassesFormatted(data.template);
    1101 
    1102         if (data.template.auras)
    1103         {
    1104             for (var auraName in data.template.auras)
    1105             {
    1106                 tooltip += "\n[font=\"sans-bold-13\"]" + translate(auraName) + "[/font]";
    1107                 if (data.template.auras[auraName])
    1108                     tooltip += ": " + translate(data.template.auras[auraName]);
    1109             }
    1110         }
     1102        tooltip += getAurasTooltip(data.template);
    11111103
    11121104        if (data.template.tooltip)
    11131105            tooltip += "\n[font=\"sans-13\"]" + data.template.tooltip + "[/font]";