From f111c49cc62378576dad7c22d5cd66c52d25219f Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Sun, 29 Jan 2017 00:25:42 -0800 Subject: [PATCH] wrap getting attribute in at try/except Catches if there's an attribute error. Useful when we try and get an attribute when the object doesn't even have it. --- gui/builtinViewColumns/misc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 87e4ea9db..897e6a0ab 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -496,7 +496,7 @@ class Miscellanea(ViewColumn): hpRatio = 1 if ("Ancillary" and "Armor") in itemGroup: - hpRatio *= 3 + hpRatio *= stuff.getModifiedItemAttr("chargedArmorDamageMultiplier", 1) ehp = hp * hpRatio @@ -508,6 +508,7 @@ class Miscellanea(ViewColumn): formatAmount((duration+reload_time)*number_of_cycles, 3, 0, 3), formatAmount(number_of_cycles, 3, 0, 3) ) + text = "{0} / {1}s (+{2}s)".format( formatAmount(ehp, 3, 0, 9), formatAmount(duration, 3, 0, 3),