Index: binaries/data/mods/public/gui/session/selection_panels.js =================================================================== --- binaries/data/mods/public/gui/session/selection_panels.js +++ binaries/data/mods/public/gui/session/selection_panels.js @@ -245,8 +245,7 @@ tooltips.push( getEntityCostTooltip(template, data.player), getGarrisonTooltip(template), - getPopulationBonusTooltip(template), - showTemplateViewerOnRightClickTooltip(template) + getPopulationBonusTooltip(template) ); @@ -256,8 +255,6 @@ getRequiredTechnologyTooltip(technologyEnabled, template.requiredTechnology, GetSimState().players[data.player].civ), getNeededResourcesTooltip(neededResources)); - data.button.tooltip = tooltips.filter(tip => tip).join("\n"); - let modifier = ""; if (!technologyEnabled || limits.canBeAddedCount == 0) { @@ -272,6 +269,10 @@ else data.button.enabled = controlsPlayer(data.player); + if (data.button.enabled) + tooltips.push(showTemplateViewerOnRightClickTooltip(template)); + data.button.tooltip = tooltips.filter(tip => tip).join("\n"); + if (template.icon) data.icon.sprite = modifier + "stretched:session/portraits/" + template.icon; @@ -709,8 +710,7 @@ let tooltips = [ getEntityNamesFormatted, getEntityTooltip, - getEntityCostTooltip, - showTemplateViewerOnRightClickTooltip + getEntityCostTooltip ].map(func => func(template)); if (!requirementsPassed) @@ -755,7 +755,6 @@ tooltips.push(tip); } tooltips.push(getNeededResourcesTooltip(neededResources)); - button.tooltip = tooltips.filter(tip => tip).join("\n"); button.onPress = (t => function() { addResearchToQueue(data.item.researchFacilityId, t); @@ -794,6 +793,10 @@ else button.enabled = controlsPlayer(data.player); + if (button.enabled) + tooltips.push(showTemplateViewerOnRightClickTooltip(template)); + button.tooltip = tooltips.filter(tip => tip).join("\n"); + if (template.icon) icon.sprite = modifier + "stretched:session/portraits/" + template.icon; @@ -985,14 +988,11 @@ getSpeedTooltip ].map(func => func(template))); - tooltips.push(showTemplateViewerOnRightClickTooltip()); tooltips.push( formatBatchTrainingString(buildingsCountToTrainFullBatch, fullBatchSize, remainderBatch), getRequiredTechnologyTooltip(technologyEnabled, template.requiredTechnology, GetSimState().players[data.player].civ), getNeededResourcesTooltip(neededResources)); - data.button.tooltip = tooltips.filter(tip => tip).join("\n"); - let modifier = ""; if (!technologyEnabled || limits.canBeAddedCount == 0) { @@ -1006,6 +1006,9 @@ modifier = resourcesToAlphaMask(neededResources) + ":"; } + if (data.button.enabled) + tooltips.push(showTemplateViewerOnRightClickTooltip()); + data.button.tooltip = tooltips.filter(tip => tip).join("\n"); if (template.icon) data.icon.sprite = modifier + "stretched:session/portraits/" + template.icon; @@ -1070,10 +1073,7 @@ getEntityCostComponentsTooltipString(data.item, undefined, data.unitEntStates.length), formatLimitString(limits.entLimit, limits.entCount, limits.entLimitChangers), getRequiredTechnologyTooltip(technologyEnabled, data.item.requiredTechnology, GetSimState().players[data.player].civ), - getNeededResourcesTooltip(neededResources), - showTemplateViewerOnRightClickTooltip()); - - tooltip = tooltips.filter(tip => tip).join("\n"); + getNeededResourcesTooltip(neededResources)); data.button.onPress = function() { upgradeEntity(data.item.entity); }; } @@ -1094,6 +1094,10 @@ showTemplateDetails(data.item.entity); }; + if (data.button.enabled) + tooltips.push(showTemplateViewerOnRightClickTooltip()); + data.button.tooltip = tooltips.filter(tip => tip).join("\n"); + let modifier = ""; if (!isUpgrading) if (progress || !technologyEnabled || limits.canBeAddedCount == 0 &&