Merge branch 'master' into test-3

2018-02-14 22:07:33 -05:00
parent 23f0f48c80 0e93136157
commit c6e715aa5c
35 changed files with 116 additions and 29 deletions
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -72,6 +72,10 @@ class Miscellanea(ViewColumn):

        if itemGroup == "Ship Modifiers":
            return "", None
+        elif itemGroup == "Booster":
+            stuff.getModifiedItemAttr("boosterDuration")
+            text = "{0} min".format(formatAmount(stuff.getModifiedItemAttr("boosterDuration")/1000/60, 3, 0, 3))
+            return text, "Booster Duration"
        elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Combat Drone", "Fighter Drone"):
            trackingSpeed = stuff.getModifiedItemAttr("trackingSpeed")
            if not trackingSpeed: