diff --git a/eos/gamedata.py b/eos/gamedata.py index 67713bf95..6b7aae34f 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -284,8 +284,6 @@ class Item(EqBase): @property def requiredSkills(self): if self.__requiredSkills is None: - # This import should be here to make sure it's fully initialized - from eos import db requiredSkills = OrderedDict() self.__requiredSkills = requiredSkills # Map containing attribute IDs we may need for required skills @@ -296,7 +294,7 @@ class Item(EqBase): # { attributeID : attributeValue } skillAttrs = {} # Get relevant attribute values from db (required skill IDs and levels) for our item - for attrInfo in db.directAttributeRequest((self.ID,), tuple(combinedAttrIDs)): + for attrInfo in eos.db.directAttributeRequest((self.ID,), tuple(combinedAttrIDs)): attrID = attrInfo[1] attrVal = attrInfo[2] skillAttrs[attrID] = attrVal @@ -307,7 +305,7 @@ class Item(EqBase): skillID = int(skillAttrs[srqIDAtrr]) skillLvl = skillAttrs[srqLvlAttr] # Fetch item from database and fill map - item = db.getItem(skillID) + item = eos.db.getItem(skillID) requiredSkills[item] = skillLvl return self.__requiredSkills