Merge pull request #960 from Ebag333/Fueled_Booster_Misc_Column_Improvements

Add extra info for misc column for fueled boosters (cap, shield, and armor)

eos/gamedata.py

@@ -243,9 +243,14 @@ class Item(EqBase):
 
         return self.__attributes
 
-    def getAttribute(self, key):
-        if key in self.attributes:
-            return self.attributes[key].value
+    def getAttribute(self, key, default=None):
+        try:
+            if key in self.attributes:
+                return self.attributes[key].value
+            else:
+                return default
+        except AttributeError:
+            return default
 
     def isType(self, type):
         for effect in self.effects.itervalues():

eos/modifiedAttributeDict.py

@@ -25,19 +25,25 @@ cappingAttrKeyCache = {}
 
 
 class ItemAttrShortcut(object):
-    def getModifiedItemAttr(self, key):
-        if key in self.itemModifiedAttributes:
-            return self.itemModifiedAttributes[key]
-        else:
-            return None
+    def getModifiedItemAttr(self, key, default=None):
+        try:
+            if key in self.itemModifiedAttributes:
+                return self.itemModifiedAttributes[key]
+            else:
+                return default
+        except AttributeError:
+            return default
 
 
 class ChargeAttrShortcut(object):
-    def getModifiedChargeAttr(self, key):
-        if key in self.chargeModifiedAttributes:
-            return self.chargeModifiedAttributes[key]
-        else:
-            return None
+    def getModifiedChargeAttr(self, key, default=None):
+        try:
+            if key in self.chargeModifiedAttributes:
+                return self.chargeModifiedAttributes[key]
+            else:
+                return default
+        except AttributeError:
+            return default
 
 
 class ModifiedAttributeDict(collections.MutableMapping):