Merge branch 'master' into mutaplasmids

# Conflicts:
#	eve.db

scripts/jsonToSql.py

@@ -213,8 +213,13 @@ def main(db, json_path):
         if (row["published"]
             or row['groupID'] == 1306  # group Ship Modifiers, for items like tactical t3 ship modes
             or row['typeName'].startswith('Civilian') # Civilian weapons
-            or row['typeID'] in (41549, 41548, 41551,41550)  # Micro Bombs (Fighters)
-            or row['groupID'] in (1882, 1975)  # Abysmal weather (environment)
+            or row['typeID'] in (41549, 41548, 41551, 41550)  # Micro Bombs (Fighters)
+            or row['groupID'] in (
+                        1882,
+                        1975,
+                        1971,
+                        1983  # the "container" for the abysmal environments
+                )  # Abysmal weather (environment)
         ):
             eveTypes.add(row["typeID"])
 
@@ -294,6 +299,7 @@ def main(db, json_path):
     # pyfa, we can do it here as a post-processing step
     eos.db.gamedata_engine.execute("UPDATE dgmtypeattribs SET value = 4.0 WHERE attributeID = ?", (1367,))
 
+    eos.db.gamedata_engine.execute("UPDATE invtypes  SET published = 0 WHERE typeName LIKE '%abyssal%'")
     print("done")
 
 if __name__ == "__main__":