Take care of empty market groups

This commit is contained in:
blitzmann
2016-05-01 19:06:34 -04:00
parent 854476db76
commit 57b9b916ed
3 changed files with 11 additions and 1 deletions

View File

@@ -402,7 +402,10 @@ class Icon(EqBase):
pass
class MarketGroup(EqBase):
pass
def __repr__(self):
return u"MarketGroup(ID={}, name={}, parent={}) at {}".format(
self.ID, self.name, getattr(self.parent, "name", None), self.name, hex(id(self))
).encode('utf8')
class MetaGroup(EqBase):
pass

BIN
eve.db

Binary file not shown.

View File

@@ -318,6 +318,11 @@ class Market():
self.ITEMS_FORCEDMARKETGROUP_R = self.__makeRevDict(self.ITEMS_FORCEDMARKETGROUP)
self.FORCEDMARKETGROUP = {
685: False, # Ship Equipment > Electronic Warfare > ECCM
681: False, # Ship Equipment > Electronic Warfare > Sensor Backup Arrays
}
# Misc definitions
# 0 is for items w/o meta group
self.META_MAP = OrderedDict([("normal", frozenset((0, 1, 2, 14))),
@@ -594,6 +599,8 @@ class Market():
"""Check market group validity"""
# The only known case when group can be invalid is
# when it's declared to have types, but it doesn't contain anything
if mg.ID in self.FORCEDMARKETGROUP:
return self.FORCEDMARKETGROUP[mg.ID]
if mg.hasTypes and not self.marketGroupHasTypesCheck(mg):
return False
else: