From 918a8d5f87220c2b9b4f22c36f240c6d64926c72 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Sun, 29 Aug 2010 21:09:53 +0200 Subject: [PATCH] Update eos version and use effecitve sustainable instead of sustainable for stats display --- eos | 2 +- gui/statsPane.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/eos b/eos index ad490e424..b6565e591 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit ad490e424dd3bd2b741643ab8006baf76606b468 +Subproject commit b6565e59110cf85a498a46422058bb5cee8d6995 diff --git a/gui/statsPane.py b/gui/statsPane.py index 20395296a..5b0aca9a8 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -56,7 +56,7 @@ class StatsPane(wx.Panel): ("label%sVolleyTotal", lambda: fit.weaponVolley, 1), ("label%sDpsTotal", lambda: fit.totalDPS, 1), ("label%sCapacitorCapacity", lambda: fit.ship.getModifiedItemAttr("capacitorCapacity"), 1), - ("label%sCapacitorState", lambda: "Stable at " if fit.capState else "Lasts ", 0), + ("label%sCapacitorState", lambda: "Stable at " if fit.capStable else "Lasts ", 0), ("label%sCapacitorTime", lambda: ("%.1f%%" if fit.capStable else "%ds") % fit.capState, 0), ("label%sCapacitorRecharge", lambda: fit.capRecharge, 1), ("label%sCapacitorDischarge", lambda: fit.capUsed, 1), @@ -163,12 +163,13 @@ class StatsPane(wx.Panel): for stability in ("reinforced", "sustained"): if stability == "reinforced" and fit != None: - tank = fit.sustainableTank + tank = fit.effectiveTank elif stability == "sustained" and fit != None: - tank = fit.extraAttributes + tank = fit.effectiveSustainableTank else: tank = None + for name in ("shield", "armor", "hull"): lbl = getattr(self, "labelTank%s%sActive" % (stability.capitalize(), name.capitalize())) if tank is not None: @@ -182,7 +183,7 @@ class StatsPane(wx.Panel): maxType, maxAmount = maxTank currAmount = tank["%sRepair" % tankType] if currAmount > maxAmount: - maxTank = ("%s" % tankType.capitalize(), currAmount) + maxTank = ("%s" % tankType, currAmount) maxType, maxAmount = maxTank @@ -192,7 +193,7 @@ class StatsPane(wx.Panel): self.labelMiniTankUnitReinforced.SetLabel("") bitmap = bitmapLoader.getBitmap("%s_big" % maxType, "icons") else: - self.labelMiniTankReinforced.SetLabel(maxAmount) + self.labelMiniTankReinforced.SetLabel(shorten(maxAmount, 1)) sustainable = fit.sustainableTank["%sRepair" % maxType] self.labelMiniTankSustained.SetLabel(shorten(sustainable, 1)) self.labelMiniTankUnitReinforced.SetLabel(" HP/S")