diff --git a/eos/gamedata.py b/eos/gamedata.py index 16c993d2c..6bc69379c 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -594,8 +594,7 @@ class DynamicItemItem(EqBase): class MarketGroup(EqBase): def __repr__(self): return "MarketGroup(ID={}, name={}, parent={}) at {}".format( - self.ID, self.name, getattr(self.parent, "name", None), self.name, hex(id(self)) - ) + self.ID, self.name, getattr(self.parent, "name", None), hex(id(self))) class MetaGroup(EqBase): diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index d8733c6c4..b806689b6 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -71,7 +71,7 @@ def main(db, json_path): 'marketGroups': eos.gamedata.MarketGroup} fieldMapping = { - 'mapbulk_marketGroups': { + 'marketGroups': { 'id': 'marketGroupID', 'name': 'marketGroupName'}} diff --git a/service/market.py b/service/market.py index d2d1cbb6e..58477b946 100644 --- a/service/market.py +++ b/service/market.py @@ -260,12 +260,12 @@ class Market: # Dictionary of items with forced meta groups, uses following format: # Item name: (metagroup name, parent type name) self.ITEMS_FORCEDMETAGROUP = { - "'Habitat' Miner I" : ("Storyline", "Miner I"), - "'Wild' Miner I" : ("Storyline", "Miner I"), - "Medium Nano Armor Repair Unit I" : ("Tech I", "Medium Armor Repairer I"), + "'Habitat' Miner I": ("Storyline", "Miner I"), + "'Wild' Miner I": ("Storyline", "Miner I"), + "Medium Nano Armor Repair Unit I": ("Tech I", "Medium Armor Repairer I"), "Large 'Reprieve' Vestment Reconstructer I": ("Storyline", "Large Armor Repairer I"), - "Khanid Navy Torpedo Launcher" : ("Faction", "Torpedo Launcher I"), - } + "Khanid Navy Torpedo Launcher": ("Faction", "Torpedo Launcher I"), + "Dark Blood Tracking Disruptor": ("Faction", "Tracking Disruptor I")} # Parent type name: set(item names) self.ITEMS_FORCEDMETAGROUP_R = {} for item, value in list(self.ITEMS_FORCEDMETAGROUP.items()): @@ -329,13 +329,13 @@ class Market: "Structure Module", ) self.SEARCH_GROUPS = ("Ice Product",) - self.ROOT_MARKET_GROUPS = (9, # Modules + self.ROOT_MARKET_GROUPS = (9, # Ship Equipment 1111, # Rigs 157, # Drones - 11, # Ammo + 11, # Ammunition & Charges 1112, # Subsystems 24, # Implants & Boosters - 404, # Deployables + 404, # Deployable Structures 2202, # Structure Equipment 2203 # Structure Modifications )