dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Fix json to SQL script

Browse Source
This commit is contained in:
DarkPhoenix
2019-08-20 19:33:19 +03:00
parent c7f625456e
commit e0db6eb2ad
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
eos/gamedata.py
View File

@@ -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):

2
scripts/jsonToSql.py
View File

@@ -71,7 +71,7 @@ def main(db, json_path):
'marketGroups': eos.gamedata.MarketGroup}
fieldMapping = {
'mapbulk_marketGroups': {
'marketGroups': {
'id': 'marketGroupID',
'name': 'marketGroupName'}}

16
service/market.py
View File

@@ -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
)