Merge branch 'singularity'

2020-01-16 14:57:44 +03:00
parent 2d5507e951 70f620c2c3
commit 465ea61b06
21 changed files with 2388848 additions and 3276744 deletions
--- a/gui/builtinViewColumns/misc.py
+++ b/gui/builtinViewColumns/misc.py
@@ -590,7 +590,7 @@ class Miscellanea(ViewColumn):
        ):
            if "Armor" in itemGroup or "Shield" in itemGroup:
                boosted_attribute = "HP"
-                reload_time = item.getAttribute("reloadTime", 0) / 1000
+                reload_time = stuff.getModifiedItemAttr("reloadTime", 0) / 1000
            elif "Capacitor" in itemGroup:
                boosted_attribute = "Cap"
                reload_time = 10