From 8e2892533649529ab038cfe06f2d27f3a062f13e Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 20 Dec 2015 21:08:32 -0500 Subject: [PATCH] Add civilian weapons --- scripts/jsonToSql.py | 3 ++- service/market.py | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index b2820ee7e..078b006e0 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -175,7 +175,8 @@ def main(db, json_path): eveTypes = set() for row in data["evetypes"]: # 1306 - group Ship Modifiers, for items like tactical t3 ship modes - if (row["published"] or row['groupID'] == 1306): + # (3638, 3634, 3636, 3640) - Civilian weapons + if (row["published"] or row['groupID'] == 1306 or row['typeID'] in (3638, 3634, 3636, 3640)): eveTypes.add(row["typeID"]) # ignore checker diff --git a/service/market.py b/service/market.py index 5308b5f6c..39c700ce5 100644 --- a/service/market.py +++ b/service/market.py @@ -235,7 +235,11 @@ class Market(): "Guristas Shuttle": False, "Mobile Decoy Unit": False, # Seems to be left over test mod for deployables "Tournament Micro Jump Unit": False, # Normally seen only on tournament arenas - "Council Diplomatic Shuttle": False, # CSM X celebration] + "Council Diplomatic Shuttle": False, # CSM X celebration + "Civilian Gatling Railgun": True, + "Civilian Gatling Pulse Laser": True, + "Civilian Gatling Autocannon": True, + "Civilian Light Electron Blaster": True, } # do not publish ships that we convert