From 238712e62c766465f25c3ece68c2a93f57b87ead Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sat, 13 Dec 2014 18:39:06 -0500 Subject: [PATCH] Add consumption info for siege/cyno module in misc column (resolves #219) --- gui/builtinViewColumns/misc.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index dd83ea22c..75b127bbd 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -23,7 +23,7 @@ from gui.viewColumn import ViewColumn from gui import bitmapLoader from gui.utils.numberFormatter import formatAmount from gui.utils.listFormatter import formatList -from service.fit import Fit +from service.fit import Fit, Market import wx @@ -424,6 +424,15 @@ class Miscellanea(ViewColumn): text = "{0}s".format(cycleTime) tooltip = "Spoolup time" return text, tooltip + elif itemGroup in ("Siege Module", "Cynosural Field"): + amt = stuff.getModifiedItemAttr("consumptionQuantity") + if amt: + typeID = stuff.getModifiedItemAttr("consumptionType") + item = Market.getInstance().getItem(typeID) + text = "{0} units".format(formatAmount(amt, 3, 0, 3)) + return text, item.name + else: + return "", None elif itemGroup in ("Fueled Armor Repairer", "Fueled Shield Booster"): hp = stuff.hpBeforeReload cycles = stuff.numShots