From b628f8ef9bb79d710a0647ff51a86e89f09bea94 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 3 Dec 2019 19:45:49 +0300 Subject: [PATCH] Change layout of the tooltip --- gui/builtinStatsViews/firepowerViewFull.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index bd96a3350..e772c4249 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/gui/builtinStatsViews/firepowerViewFull.py @@ -160,15 +160,18 @@ class FirepowerViewFull(StatsView): if normal is None or preSpool is None or fullSpool is None: return "" lines = [] - if hasSpoolUp(preSpool, fullSpool): - lines.append("Spool up: {}-{}".format( - formatAmount(preSpool.total, prec, lowest, highest), - formatAmount(fullSpool.total, prec, lowest, highest))) if getattr(normal, 'total', None): + lines.append("Current: {}".format(formatAmount(normal.total, prec, lowest, highest))) for dmgType in normal.names(): val = getattr(normal, dmgType, None) if val: - lines.append("{}: {}%".format(dmgType.capitalize(), formatAmount(val / normal.total * 100, 3, 0, 0))) + lines.append(" {}: {}%".format(dmgType.capitalize(), formatAmount(val / normal.total * 100, 3, 0, 0))) + if hasSpoolUp(preSpool, fullSpool): + if lines: + lines.append("") + lines.append("Spool up: {}-{}".format( + formatAmount(preSpool.total, prec, lowest, highest), + formatAmount(fullSpool.total, prec, lowest, highest))) return "\n".join(lines) defaultSpoolValue = eos.config.settings['globalDefaultSpoolupPercentage']