From 6ca7a22c3ee93a4d06f441cbb3d0f4c0576dad54 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 6 Jun 2019 17:29:10 +0300 Subject: [PATCH] Add info about effective capacitor which takes into consideration neut resistance --- gui/builtinStatsViews/capacitorViewFull.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gui/builtinStatsViews/capacitorViewFull.py b/gui/builtinStatsViews/capacitorViewFull.py index fef8e86e2..fb5acd1a9 100644 --- a/gui/builtinStatsViews/capacitorViewFull.py +++ b/gui/builtinStatsViews/capacitorViewFull.py @@ -111,11 +111,15 @@ class CapacitorViewFull(StatsView): ("label%sCapacitorResist", lambda: (1 - fit.ship.getModifiedItemAttr("energyWarfareResistance", 1)) * 100, 3, 0, 0, False, '%'), ) if fit is not None: + cap_amount = fit.ship.getModifiedItemAttr("capacitorCapacity") cap_recharge = fit.capRecharge cap_use = fit.capUsed + neut_res = fit.ship.getModifiedItemAttr("energyWarfareResistance", 1) else: + cap_amount = 0 cap_recharge = 0 cap_use = 0 + neut_res = 1 panel = "Full" for labelName, value, prec, lowest, highest, forceSign, unit in stats: @@ -135,7 +139,10 @@ class CapacitorViewFull(StatsView): formatAmount(cap_use, 3, 0, 3)) label.SetToolTip(wx.ToolTip(label_tooltip)) if labelName == 'label%sCapacitorResist': - label.SetToolTip(wx.ToolTip('Neutralizer resistance')) + texts = ['Neutralizer resistance'] + if cap_amount > 0 and neut_res < 1: + texts.append('Effective capacity: {} GJ'.format(formatAmount(cap_amount / neut_res, 3, 0, 9))) + label.SetToolTip(wx.ToolTip('\n'.join(texts))) capState = fit.capState if fit is not None else 0 capStable = fit.capStable if fit is not None else False