From 1900216d36409dc1325ea56595cf8a2f959beb08 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 3 Dec 2019 16:31:21 +0300 Subject: [PATCH] Show spoolup part before damage distribution --- gui/builtinStatsViews/firepowerViewFull.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/builtinStatsViews/firepowerViewFull.py b/gui/builtinStatsViews/firepowerViewFull.py index e87883ed7..bd96a3350 100644 --- a/gui/builtinStatsViews/firepowerViewFull.py +++ b/gui/builtinStatsViews/firepowerViewFull.py @@ -160,15 +160,15 @@ 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): 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))) - if hasSpoolUp(preSpool, fullSpool): - 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']