diff --git a/db_update.py b/db_update.py index a25124166..e1c9064d7 100644 --- a/db_update.py +++ b/db_update.py @@ -122,9 +122,10 @@ def update_db(): if ( # Apparently people really want Civilian modules available (row['typeName'].startswith('Civilian') and "Shuttle" not in row['typeName']) or - row['typeName'] in ('Capsule', 'Dark Blood Tracking Disruptor') + row['typeName'] == 'Capsule' ): row['published'] = True + # Nearly useless and clutter search results too much elif row['typeName'].startswith('Limited Synth '): row['published'] = False @@ -138,11 +139,11 @@ def update_db(): row['typeID'] in (41549, 41548, 41551, 41550) or # Abyssal weather (environment) row['groupID'] in ( - 1882, - 1975, - 1971, - # the "container" for the abyssal environments - 1983) + 1882, + 1975, + 1971, + # the "container" for the abyssal environments + 1983) ): newData.append(row) diff --git a/eos/db/migrations/upgrade39.py b/eos/db/migrations/upgrade39.py index becc537d2..412052c10 100644 --- a/eos/db/migrations/upgrade39.py +++ b/eos/db/migrations/upgrade39.py @@ -2,6 +2,7 @@ Migration 39 - Shield amplifier tiericide +- CCP getting rid of DB TDs due to exploits """ CONVERSIONS = { @@ -16,6 +17,9 @@ CONVERSIONS = { ), 1800: ( # 'Basic' Thermal Shield Amplifier 9566, # Supplemental Thermal Dissipation Amplifier + ), + 22933: ( # 'Investor' Tracking Disruptor I + 32416, # Dark Blood Tracking Disruptor ) } diff --git a/eos/effects.py b/eos/effects.py index df3e5135c..99afde442 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -21997,7 +21997,6 @@ class Effect5754(BaseEffect): Used by: Modules named like: Tracking Computer (19 of 19) Variations of module: Tracking Disruptor I (6 of 6) - Module: Dark Blood Tracking Disruptor """ type = 'overheat' @@ -27229,7 +27228,6 @@ class Effect6424(BaseEffect): Used by: Variations of module: Tracking Disruptor I (6 of 6) - Module: Dark Blood Tracking Disruptor """ type = 'projected', 'active' diff --git a/service/conversions/releaseJun2020.py b/service/conversions/releaseJun2020.py index 2dbe06065..adea31d1d 100644 --- a/service/conversions/releaseJun2020.py +++ b/service/conversions/releaseJun2020.py @@ -93,4 +93,5 @@ CONVERSIONS = { "Supplemental Explosive Deflection Amplifier": "'Basic' Explosive Shield Amplifier", "Supplemental Kinetic Deflection Amplifier": "'Basic' Kinetic Shield Amplifier", "Supplemental Thermal Dissipation Amplifier": "'Basic' Thermal Shield Amplifier", + "Dark Blood Tracking Disruptor": "'Investor' Tracking Disruptor I" } diff --git a/service/market.py b/service/market.py index 5cf8e5134..9c07af84e 100644 --- a/service/market.py +++ b/service/market.py @@ -359,7 +359,6 @@ class Market: "'Habitat' Miner I": ("Storyline", "Miner I"), "'Wild' Miner I": ("Storyline", "Miner I"), "Khanid Navy Torpedo Launcher": ("Faction", "Torpedo Launcher I"), - "Dark Blood Tracking Disruptor": ("Faction", "Tracking Disruptor I"), "Dread Guristas Standup Variable Spectrum ECM": ("Structure Faction", "Standup Variable Spectrum ECM I"), "Dark Blood Standup Heavy Energy Neutralizer": ("Structure Faction", "Standup Heavy Energy Neutralizer I")} # Parent type name: set(item names)