Allow default values to be passed in for modified attributes

This commit is contained in:
Ebag333
2017-01-29 00:16:15 -08:00
parent 34c69cf10f
commit 1a0ac7bb35
2 changed files with 5 additions and 7 deletions

View File

@@ -246,10 +246,8 @@ class Item(EqBase):
def getAttribute(self, key, default=None):
if key in self.attributes:
return self.attributes[key].value
elif default:
return default
else:
return None
return default
def isType(self, type):
for effect in self.effects.itervalues():

View File

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