diff --git a/eos/gamedata.py b/eos/gamedata.py index 5f6904a1e..a2869fd84 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -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 diff --git a/eve.db b/eve.db index d61d4e61e..9e2c5bd9a 100644 Binary files a/eve.db and b/eve.db differ diff --git a/service/market.py b/service/market.py index 0d8538732..7f982b081 100644 --- a/service/market.py +++ b/service/market.py @@ -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: