From 1efe4ee5e58099bb17859d56e4313529882dca82 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Sat, 5 Oct 2019 10:27:08 +0300 Subject: [PATCH] Enable showing capsules in shuttle group --- scripts/jsonToSql.py | 5 +++-- service/market.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index daa50c673..caab1d184 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -300,6 +300,7 @@ def main(db, json_path): for row in data['evetypes']: if ( row['published'] or + row['typeName'] == 'Capsule' or # group Ship Modifiers, for items like tactical t3 ship modes row['groupID'] == 1306 or # Civilian weapons @@ -313,7 +314,7 @@ def main(db, json_path): 1971, # the "container" for the abyssal environments 1983) or - # Dark Blood Tracking Disruptor (rarely but drops) + # Dark Blood Tracking Disruptor (drops, but rarely) row['typeID'] == 32416 ): eveTypes.add(row['typeID']) @@ -338,7 +339,7 @@ def main(db, json_path): jsonName == 'evetypes' and ( # Apparently people really want Civilian modules available row['typeName'].startswith('Civilian') or - row['typeName'] == 'Dark Blood Tracking Disruptor') + row['typeName'] in ('Capsule', 'Dark Blood Tracking Disruptor')) ): row['published'] = True diff --git a/service/market.py b/service/market.py index b37ca282a..bae35bbce 100644 --- a/service/market.py +++ b/service/market.py @@ -174,8 +174,8 @@ class Market: self.les_grp.description = "" self.les_grp.icon = None self.ITEMS_FORCEGROUP = { - "Opux Luxury Yacht" : self.les_grp, - # One of those is wedding present at CCP fanfest, another was hijacked from ISD guy during an event + "Capsule" : self.getGroup("Shuttle"), + "Opux Luxury Yacht" : self.les_grp, # One of those is wedding present at CCP fanfest, another was hijacked from ISD guy during an event "Silver Magnate" : self.les_grp, # Amarr Championship prize "Gold Magnate" : self.les_grp, # Amarr Championship prize "Armageddon Imperial Issue" : self.les_grp, # Amarr Championship prize