Merge commit 'refs/tags/v1.35.0^{}' into test-3

This commit is contained in:
blitzmann
2018-02-14 22:25:45 -05:00
10 changed files with 34 additions and 10 deletions

View File

@@ -74,7 +74,7 @@ class Miscellanea(ViewColumn):
return "", None
elif itemGroup == "Booster":
stuff.getModifiedItemAttr("boosterDuration")
text = "{0} min".format(formatAmount(stuff.getModifiedItemAttr("boosterDuration")/1000/60, 3, 0, 3))
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")