Merge branch 'master' into fix-vector-picker-dpi-scaling

2020-09-09 14:09:16 +03:00
parent 1755ab4c3f 70969cc9fb
commit 07ff43b576
12 changed files with 3381 additions and 291 deletions
--- a/eos/db/migrations/upgrade43.py
+++ b/eos/db/migrations/upgrade43.py
@@ -0,0 +1,26 @@
+"""
+Migration 43
+
+- Shield booster amplifier tiericide
+"""
+
+CONVERSIONS = {
+    16533: (  # Stalwart Restrained Shield Boost Amplifier
+        16531,  # 5a Prototype Shield Support I
+    ),
+    16535: (  # Copasetic Compact Shield Boost Amplifier
+        16529,  # Ionic Field Accelerator I
+    ),
+}
+
+
+def upgrade(saveddata_engine):
+    # Convert modules
+    for replacement_item, list in CONVERSIONS.items():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "modules" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "modules" SET "baseItemID" = ? WHERE "baseItemID" = ?',
+                                     (replacement_item, retired_item))
+            saveddata_engine.execute('UPDATE "cargo" SET "itemID" = ? WHERE "itemID" = ?',
+                                     (replacement_item, retired_item))
--- a/eos/effects.py
+++ b/eos/effects.py
@@ -26907,7 +26907,7 @@ class Effect6400(BaseEffect):

    @staticmethod
    def handler(fit, src, context, projectionRange, **kwargs):
-        groups = ('Structure Warp Scrambler', 'Structure Disruption Battery', 'Structure Stasis Webifier')
+        groups = ('Structure Warp Scrambler', 'Structure ECM Battery', 'Structure Stasis Webifier')
        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
                                      'capacitorNeed', src.getModifiedItemAttr('capNeedBonus'),
                                      skill='Structure Electronic Systems', **kwargs)
--- a/scripts/conversion.py
+++ b/scripts/conversion.py
@@ -16,192 +16,10 @@ rename_phrase = " renamed to "
 conversion_phrase = " converted to "

 text = """
-    Basic Energized EM Membrane renamed to 'Basic' EM Energized Membrane
-    Energized EM Membrane I renamed to EM Energized Membrane I
-    Energized EM Membrane II renamed to EM Energized Membrane II
-    Basic Energized Explosive Membrane renamed to 'Basic' Explosive Energized Membrane
-    Energized Explosive Membrane I renamed to Explosive Energized Membrane I
-    Energized Explosive Membrane II renamed to Explosive Energized Membrane II
-    Basic Energized Armor Layering Membrane renamed to 'Basic' Layered Energized Membrane
-    Energized Armor Layering Membrane I renamed to Layered Energized Membrane I
-    Energized Armor Layering Membrane II renamed to Layered Energized Membrane II
-    Basic Energized Kinetic Membrane renamed to 'Basic' Kinetic Energized Membrane
-    Energized Kinetic Membrane I renamed to Kinetic Energized Membrane I
-    Energized Kinetic Membrane II renamed to Kinetic Energized Membrane II
-    Basic Energized Thermal Membrane renamed to 'Basic' Thermal Energized Membrane
-    Energized Thermal Membrane I renamed to Thermal Energized Membrane I
-    Energized Thermal Membrane II renamed to Thermal Energized Membrane II
-    Basic Energized Adaptive Nano Membrane renamed to 'Basic' Multispectrum Energized Membrane
-    Energized Adaptive Nano Membrane I renamed to Multispectrum Energized Membrane I
-    Energized Adaptive Nano Membrane II renamed to Multispectrum Energized Membrane II
-    Dark Blood Energized Adaptive Nano Membrane renamed to Dark Blood Multispectrum Energized Membrane
-    True Sansha Energized Adaptive Nano Membrane renamed to True Sansha Multispectrum Energized Membrane
-    Shadow Serpentis Energized Adaptive Nano Membrane renamed to Shadow Serpentis Multispectrum Energized Membrane
-    Dark Blood Energized Kinetic Membrane renamed to Dark Blood Kinetic Energized Membrane
-    True Sansha Energized Kinetic Membrane renamed to True Sansha Kinetic Energized Membrane
-    Shadow Serpentis Energized Kinetic Membrane renamed to Shadow Serpentis Kinetic Energized Membrane
-    Dark Blood Energized Explosive Membrane renamed to Dark Blood Explosive Energized Membrane
-    True Sansha Energized Explosive Membrane renamed to True Sansha Explosive Energized Membrane
-    Shadow Serpentis Energized Explosive Membrane renamed to Shadow Serpentis Explosive Energized Membrane
-    Dark Blood Energized EM Membrane renamed to Dark Blood EM Energized Membrane
-    True Sansha Energized EM Membrane renamed to True Sansha EM Energized Membrane
-    Shadow Serpentis Energized EM Membrane renamed to Shadow Serpentis EM Energized Membrane
-    Dark Blood Energized Thermal Membrane renamed to Dark Blood Thermal Energized Membrane
-    True Sansha Energized Thermal Membrane renamed to True Sansha Thermal Energized Membrane
-    Shadow Serpentis Energized Thermal Membrane renamed to Shadow Serpentis Thermal Energized Membrane
-    Brokara's Modified Energized Adaptive Nano Membrane renamed to Brokara's Modified Multispectrum Energized Membrane
-    Tairei's Modified Energized Adaptive Nano Membrane renamed to Tairei's Modified Multispectrum Energized Membrane
-    Selynne's Modified Energized Adaptive Nano Membrane renamed to Selynne's Modified Multispectrum Energized Membrane
-    Raysere's Modified Energized Adaptive Nano Membrane renamed to Raysere's Modified Multispectrum Energized Membrane
-    Vizan's Modified Energized Adaptive Nano Membrane renamed to Vizan's Modified Multispectrum Energized Membrane
-    Ahremen's Modified Energized Adaptive Nano Membrane renamed to Ahremen's Modified Multispectrum Energized Membrane
-    Chelm's Modified Energized Adaptive Nano Membrane renamed to Chelm's Modified Multispectrum Energized Membrane
-    Draclira's Modified Energized Adaptive Nano Membrane renamed to Draclira's Modified Multispectrum Energized Membrane
-    Brokara's Modified Energized Thermal Membrane renamed to Brokara's Modified Thermal Energized Membrane
-    Tairei's Modified Energized Thermal Membrane renamed to Tairei's Modified Thermal Energized Membrane
-    Selynne's Modified Energized Thermal Membrane renamed to Selynne's Modified Thermal Energized Membrane
-    Raysere's Modified Energized Thermal Membrane renamed to Raysere's Modified Thermal Energized Membrane
-    Vizan's Modified Energized Thermal Membrane renamed to Vizan's Modified Thermal Energized Membrane
-    Ahremen's Modified Energized Thermal Membrane renamed to Ahremen's Modified Thermal Energized Membrane
-    Chelm's Modified Energized Thermal Membrane renamed to Chelm's Modified Thermal Energized Membrane
-    Draclira's Modified Energized Thermal Membrane renamed to Draclira's Modified Thermal Energized Membrane
-    Brokara's Modified Energized EM Membrane renamed to Brokara's Modified EM Energized Membrane
-    Tairei's Modified Energized EM Membrane renamed to Tairei's Modified EM Energized Membrane
-    Selynne's Modified Energized EM Membrane renamed to Selynne's Modified EM Energized Membrane
-    Raysere's Modified Energized EM Membrane renamed to Raysere's Modified EM Energized Membrane
-    Vizan's Modified Energized EM Membrane renamed to Vizan's Modified EM Energized Membrane
-    Ahremen's Modified Energized EM Membrane renamed to Ahremen's Modified EM Energized Membrane
-    Chelm's Modified Energized EM Membrane renamed to Chelm's Modified EM Energized Membrane
-    Draclira's Modified Energized EM Membrane renamed to Draclira's Modified EM Energized Membrane
-    Brokara's Modified Energized Explosive Membrane renamed to Brokara's Modified Explosive Energized Membrane
-    Tairei's Modified Energized Explosive Membrane renamed to Tairei's Modified Explosive Energized Membrane
-    Selynne's Modified Energized Explosive Membrane renamed to Selynne's Modified Explosive Energized Membrane
-    Raysere's Modified Energized Explosive Membrane renamed to Raysere's Modified Explosive Energized Membrane
-    Vizan's Modified Energized Explosive Membrane renamed to Vizan's Modified Explosive Energized Membrane
-    Ahremen's Modified Energized Explosive Membrane renamed to Ahremen's Modified Explosive Energized Membrane
-    Chelm's Modified Energized Explosive Membrane renamed to Chelm's Modified Explosive Energized Membrane
-    Draclira's Modified Energized Explosive Membrane renamed to Draclira's Modified Explosive Energized Membrane
-    Brokara's Modified Energized Kinetic Membrane renamed to Brokara's Modified Kinetic Energized Membrane
-    Tairei's Modified Energized Kinetic Membrane renamed to Tairei's Modified Kinetic Energized Membrane
-    Selynne's Modified Energized Kinetic Membrane renamed to Selynne's Modified Kinetic Energized Membrane
-    Raysere's Modified Energized Kinetic Membrane renamed to Raysere's Modified Kinetic Energized Membrane
-    Vizan's Modified Energized Kinetic Membrane renamed to Vizan's Modified Kinetic Energized Membrane
-    Ahremen's Modified Energized Kinetic Membrane renamed to Ahremen's Modified Kinetic Energized Membrane
-    Chelm's Modified Energized Kinetic Membrane renamed to Chelm's Modified Kinetic Energized Membrane
-    Draclira's Modified Energized Kinetic Membrane renamed to Draclira's Modified Kinetic Energized Membrane
-    Brynn's Modified Energized Adaptive Nano Membrane renamed to Brynn's Modified Multispectrum Energized Membrane
-    Tuvan's Modified Energized Adaptive Nano Membrane renamed to Tuvan's Modified Multispectrum Energized Membrane
-    Setele's Modified Energized Adaptive Nano Membrane renamed to Setele's Modified Multispectrum Energized Membrane
-    Cormack's Modified Energized Adaptive Nano Membrane renamed to Cormack's Modified Multispectrum Energized Membrane
-    Brynn's Modified Energized Thermal Membrane renamed to Brynn's Modified Thermal Energized Membrane
-    Tuvan's Modified Energized Thermal Membrane renamed to Tuvan's Modified Thermal Energized Membrane
-    Setele's Modified Energized Thermal Membrane renamed to Setele's Modified Thermal Energized Membrane
-    Cormack's Modified Energized Thermal Membrane renamed to Cormack's Modified Thermal Energized Membrane
-    Brynn's Modified Energized EM Membrane renamed to Brynn's Modified EM Energized Membrane
-    Tuvan's Modified Energized EM Membrane renamed to Tuvan's Modified EM Energized Membrane
-    Setele's Modified Energized EM Membrane renamed to Setele's Modified EM Energized Membrane
-    Cormack's Modified Energized EM Membrane renamed to Cormack's Modified EM Energized Membrane
-    Brynn's Modified Energized Explosive Membrane renamed to Brynn's Modified Explosive Energized Membrane
-    Tuvan's Modified Energized Explosive Membrane renamed to Tuvan's Modified Explosive Energized Membrane
-    Setele's Modified Energized Explosive Membrane renamed to Setele's Modified Explosive Energized Membrane
-    Cormack's Modified Energized Explosive Membrane renamed to Cormack's Modified Explosive Energized Membrane
-    Brynn's Modified Energized Kinetic Membrane renamed to Brynn's Modified Kinetic Energized Membrane
-    Tuvan's Modified Energized Kinetic Membrane renamed to Tuvan's Modified Kinetic Energized Membrane
-    Setele's Modified Energized Kinetic Membrane renamed to Setele's Modified Kinetic Energized Membrane
-    Cormack's Modified Energized Kinetic Membrane renamed to Cormack's Modified Kinetic Energized Membrane
-    Imperial Navy Energized Thermal Membrane renamed to Imperial Navy Thermal Energized Membrane
-    Imperial Navy Energized EM Membrane renamed to Imperial Navy EM Energized Membrane
-    Imperial Navy Energized Explosive Membrane renamed to Imperial Navy Explosive Energized Membrane
-    Imperial Navy Energized Kinetic Membrane renamed to Imperial Navy Kinetic Energized Membrane
-    Imperial Navy Energized Adaptive Nano Membrane renamed to Imperial Navy Multispectrum Energized Membrane
-    Federation Navy Energized Thermal Membrane renamed to Federation Navy Thermal Energized Membrane
-    Federation Navy Energized EM Membrane renamed to Federation Navy EM Energized Membrane
-    Federation Navy Energized Explosive Membrane renamed to Federation Navy Explosive Energized Membrane
-    Federation Navy Energized Kinetic Membrane renamed to Federation Navy Kinetic Energized Membrane
-    Federation Navy Energized Adaptive Nano Membrane renamed to Federation Navy Multispectrum Energized Membrane
-    Prototype Energized Adaptive Nano Membrane I renamed to Compact Multispectrum Energized Membrane
-    Prototype Energized Kinetic Membrane I renamed to Compact Kinetic Energized Membrane
-    Prototype Energized Explosive Membrane I renamed to Compact Explosive Energized Membrane
-    Prototype Energized EM Membrane I renamed to Compact EM Energized Membrane
-    Prototype Energized Armor Layering Membrane I renamed to Compact Layered Energized Membrane
-    Prototype Energized Thermal Membrane I renamed to Compact Thermal Energized Membrane
-    Ammatar Navy Energized Adaptive Nano Membrane renamed to Ammatar Navy Multispectrum Energized Membrane
-    Ammatar Navy Energized Kinetic Membrane renamed to Ammatar Navy Kinetic Energized Membrane
-    Ammatar Navy Energized Explosive Membrane renamed to Ammatar Navy Explosive Energized Membrane
-    Ammatar Navy Energized EM Membrane renamed to Ammatar Navy EM Energized Membrane
-    Ammatar Navy Energized Thermal Membrane renamed to Ammatar Navy Thermal Energized Membrane
-    Corelum C-Type Energized Adaptive Nano Membrane renamed to Corelum C-Type Multispectrum Energized Membrane
-    Corelum C-Type Energized Kinetic Membrane renamed to Corelum C-Type Kinetic Energized Membrane
-    Corelum C-Type Energized Explosive Membrane renamed to Corelum C-Type Explosive Energized Membrane
-    Corelum C-Type Energized EM Membrane renamed to Corelum C-Type EM Energized Membrane
-    Corelum C-Type Energized Thermal Membrane renamed to Corelum C-Type Thermal Energized Membrane
-    Corelum B-Type Energized Adaptive Nano Membrane renamed to Corelum B-Type Multispectrum Energized Membrane
-    Corelum B-Type Energized Kinetic Membrane renamed to Corelum B-Type Kinetic Energized Membrane
-    Corelum B-Type Energized Explosive Membrane renamed to Corelum B-Type Explosive Energized Membrane
-    Corelum B-Type Energized EM Membrane renamed to Corelum B-Type EM Energized Membrane
-    Corelum B-Type Energized Thermal Membrane renamed to Corelum B-Type Thermal Energized Membrane
-    Corelum A-Type Energized Adaptive Nano Membrane renamed to Corelum A-Type Multispectrum Energized Membrane
-    Corelum A-Type Energized Kinetic Membrane renamed to Corelum A-Type Kinetic Energized Membrane
-    Corelum A-Type Energized Explosive Membrane renamed to Corelum A-Type Explosive Energized Membrane
-    Corelum A-Type Energized EM Membrane renamed to Corelum A-Type EM Energized Membrane
-    Corelum A-Type Energized Thermal Membrane renamed to Corelum A-Type Thermal Energized Membrane
-    Corpum C-Type Energized Adaptive Nano Membrane renamed to Corpum C-Type Multispectrum Energized Membrane
-    Centum C-Type Energized Adaptive Nano Membrane renamed to Centum C-Type Multispectrum Energized Membrane
-    Corpum C-Type Energized Kinetic Membrane renamed to Corpum C-Type Kinetic Energized Membrane
-    Centum C-Type Energized Kinetic Membrane renamed to Centum C-Type Kinetic Energized Membrane
-    Corpum C-Type Energized Explosive Membrane renamed to Corpum C-Type Explosive Energized Membrane
-    Centum C-Type Energized Explosive Membrane renamed to Centum C-Type Explosive Energized Membrane
-    Corpum C-Type Energized EM Membrane renamed to Corpum C-Type EM Energized Membrane
-    Centum C-Type Energized EM Membrane renamed to Centum C-Type EM Energized Membrane
-    Corpum C-Type Energized Thermal Membrane renamed to Corpum C-Type Thermal Energized Membrane
-    Centum C-Type Energized Thermal Membrane renamed to Centum C-Type Thermal Energized Membrane
-    Corpum B-Type Energized Adaptive Nano Membrane renamed to Corpum B-Type Multispectrum Energized Membrane
-    Centum B-Type Energized Adaptive Nano Membrane renamed to Centum B-Type Multispectrum Energized Membrane
-    Corpum B-Type Energized Kinetic Membrane renamed to Corpum B-Type Kinetic Energized Membrane
-    Centum B-Type Energized Kinetic Membrane renamed to Centum B-Type Kinetic Energized Membrane
-    Corpum B-Type Energized Explosive Membrane renamed to Corpum B-Type Explosive Energized Membrane
-    Centum B-Type Energized Explosive Membrane renamed to Centum B-Type Explosive Energized Membrane
-    Corpum B-Type Energized Thermal Membrane renamed to Corpum B-Type Thermal Energized Membrane
-    Centum B-Type Energized Thermal Membrane renamed to Centum B-Type Thermal Energized Membrane
-    Corpum A-Type Energized Thermal Membrane renamed to Corpum A-Type Thermal Energized Membrane
-    Centum A-Type Energized Thermal Membrane renamed to Centum A-Type Thermal Energized Membrane
-    Corpum A-Type Energized EM Membrane renamed to Corpum A-Type EM Energized Membrane
-    Centum A-Type Energized EM Membrane renamed to Centum A-Type EM Energized Membrane
-    Corpum A-Type Energized Explosive Membrane renamed to Corpum A-Type Explosive Energized Membrane
-    Centum A-Type Energized Explosive Membrane renamed to Centum A-Type Explosive Energized Membrane
-    Corpum A-Type Energized Kinetic Membrane renamed to Corpum A-Type Kinetic Energized Membrane
-    Centum A-Type Energized Kinetic Membrane renamed to Centum A-Type Kinetic Energized Membrane
-    Corpum A-Type Energized Adaptive Nano Membrane renamed to Corpum A-Type Multispectrum Energized Membrane
-    Centum A-Type Energized Adaptive Nano Membrane renamed to Centum A-Type Multispectrum Energized Membrane
-    Corpum B-Type Energized EM Membrane renamed to Corpum B-Type EM Energized Membrane
-    Centum B-Type Energized EM Membrane renamed to Centum B-Type EM Energized Membrane
-    'Pilfer' Energized Adaptive Nano Membrane I renamed to 'Pilfer' Multispectrum Energized Membrane
-    'Moonshine' Energized Thermal Membrane I renamed to 'Moonshine' Thermal Energized Membrane
-    'Mafia' Energized Kinetic Membrane I renamed to 'Mafia' Kinetic Energized Membrane
-    Khanid Navy Energized Adaptive Nano Membrane renamed to Khanid Navy Multispectrum Energized Membrane
-    Khanid Navy Energized Kinetic Membrane renamed to Khanid Navy Kinetic Energized Membrane
-    Khanid Navy Energized Explosive Membrane renamed to Khanid Navy Explosive Energized Membrane
-    Khanid Navy Energized EM Membrane renamed to Khanid Navy EM Energized Membrane
-    Khanid Navy Energized Thermal Membrane renamed to Khanid Navy Thermal Energized Membrane
-    Large Compact Vorton projector renamed to Large Compact Vorton Projector
-    Experimental Energized Adaptive Nano Membrane I converted to Compact Multispectrum Energized Membrane
-    Experimental Energized Armor Layering Membrane I converted to Compact Layered Energized Membrane
-    Experimental Energized EM Membrane I converted to Compact EM Energized Membrane
-    Experimental Energized Explosive Membrane I converted to Compact Explosive Energized Membrane
-    Experimental Energized Kinetic Membrane I converted to Compact Kinetic Energized Membrane
-    Experimental Energized Thermal Membrane I converted to Compact Thermal Energized Membrane
-    Limited Energized Adaptive Nano Membrane I converted to Compact Multispectrum Energized Membrane
-    Limited Energized Armor Layering Membrane I converted to Compact Layered Energized Membrane
-    Limited Energized EM Membrane I converted to Compact EM Energized Membrane
-    Limited Energized Explosive Membrane I converted to Compact Explosive Energized Membrane
-    Limited Energized Kinetic Membrane I converted to Compact Kinetic Energized Membrane
-    Limited Energized Thermal Membrane I converted to Compact Thermal Energized Membrane
-    Upgraded Energized Adaptive Nano Membrane I converted to Compact Multispectrum Energized Membrane
-    Upgraded Energized Armor Layering Membrane I converted to Compact Layered Energized Membrane
-    Upgraded Energized EM Membrane I converted to Compact EM Energized Membrane
-    Upgraded Energized Explosive Membrane I converted to Compact Explosive Energized Membrane
-    Upgraded Energized Kinetic Membrane I converted to Compact Kinetic Energized Membrane
-    Upgraded Energized Thermal Membrane I converted to Compact Thermal Energized Membrane
+    'Stalwart' Particle Field Magnifier renamed to Stalwart Restrained Shield Boost Amplifier
+    'Copasetic' Particle Field Acceleration renamed to Copasetic Compact Shield Boost Amplifier
+    5a Prototype Shield Support I converted to Stalwart Restrained Shield Boost Amplifier
+    Ionic Field Accelerator I converted to Copasetic Compact Shield Boost Amplifier
    """

 def main(old, new):
--- a/service/conversions/releaseSep2020.py
+++ b/service/conversions/releaseSep2020.py
@@ -0,0 +1,12 @@
+"""
+Conversion pack for September 2020 release
+"""
+
+CONVERSIONS = {
+    # Renamed items
+    "'Stalwart' Particle Field Magnifier": "Stalwart Restrained Shield Boost Amplifier",
+    "'Copasetic' Particle Field Acceleration": "Copasetic Compact Shield Boost Amplifier",
+    # Converted items
+    "5a Prototype Shield Support I": "Stalwart Restrained Shield Boost Amplifier",
+    "Ionic Field Accelerator I": "Copasetic Compact Shield Boost Amplifier"
+}
--- a/staticdata/fsd_binary/dogmaattributes.json
+++ b/staticdata/fsd_binary/dogmaattributes.json
@@ -32576,5 +32576,19 @@
    "name": "shieldBoosterDurationBonus", 
    "published": 0, 
    "stackable": 0
+  }, 
+  "3101": {
+    "attributeID": 3101, 
+    "categoryID": 1, 
+    "dataType": 11, 
+    "defaultValue": 0.0, 
+    "description": "Describes which type of deed fits in this structure", 
+    "displayName": "Quantum Core Type", 
+    "displayNameID": 569361, 
+    "highIsGood": 0, 
+    "name": "structureRequiresDeedType", 
+    "published": 1, 
+    "stackable": 0, 
+    "unitID": 116
  }
 }
--- a/staticdata/fsd_binary/marketgroups.json
+++ b/staticdata/fsd_binary/marketgroups.json
@@ -16182,5 +16182,14 @@
    "name": "Proving Ground Filaments", 
    "nameID": 567624, 
    "parentGroupID": 2456
+  }, 
+  "2749": {
+    "description": "Quantum Cores are FTL communications facillities vital to the efficient operation of Upwell structures.", 
+    "descriptionID": 569752, 
+    "hasTypes": 1, 
+    "iconID": 21729, 
+    "name": "Quantum Cores", 
+    "nameID": 569644, 
+    "parentGroupID": 2202
  }
 }
--- a/staticdata/fsd_binary/requiredskillsfortypes.json
+++ b/staticdata/fsd_binary/requiredskillsfortypes.json
@@ -25645,5 +25645,41 @@
  }, 
  "55977": {
    "3402": 1
+  }, 
+  "56128": {
+    "3402": 1
+  }, 
+  "56129": {
+    "3402": 1
+  }, 
+  "56130": {
+    "3402": 1
+  }, 
+  "56179": {
+    "3402": 1
+  }, 
+  "56180": {
+    "3402": 1
+  }, 
+  "56181": {
+    "3402": 1
+  }, 
+  "56182": {
+    "3402": 1
+  }, 
+  "56183": {
+    "3402": 1
+  }, 
+  "56184": {
+    "3402": 1
+  }, 
+  "56185": {
+    "3402": 1
+  }, 
+  "56186": {
+    "3402": 1
+  }, 
+  "56187": {
+    "3402": 1
  }
 }
--- a/staticdata/fsd_binary/typedogma.json
+++ b/staticdata/fsd_binary/typedogma.json
--- a/staticdata/fsd_lite/evegroups.json
+++ b/staticdata/fsd_lite/evegroups.json
@@ -9791,6 +9791,17 @@
    "published": true, 
    "useBasePrice": true
  }, 
+  "4086": {
+    "anchorable": false, 
+    "anchored": false, 
+    "categoryID": 66, 
+    "fittableNonSingleton": false, 
+    "groupID": 4086, 
+    "groupName": "Quantum Cores", 
+    "groupNameID": 569641, 
+    "published": true, 
+    "useBasePrice": true
+  }, 
  "409": {
    "anchorable": false, 
    "anchored": false, 
--- a/staticdata/fsd_lite/evetypes.json
+++ b/staticdata/fsd_lite/evetypes.json
--- a/staticdata/phobos/metadata.json
+++ b/staticdata/phobos/metadata.json
@@ -1,10 +1,10 @@
 [
  {
    "field_name": "client_build", 
-    "field_value": 1792574
+    "field_value": 1800064
  }, 
  {
    "field_name": "dump_time", 
-    "field_value": 1598343032
+    "field_value": 1599630162
  }
 ]
--- a/staticdata/phobos/traits.json
+++ b/staticdata/phobos/traits.json
@@ -5634,6 +5634,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle"
+          }, 
+          {
+            "text": "·This structure requires an Astrahus Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -5688,6 +5691,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle"
+          }, 
+          {
+            "text": "·This structure requires a Keepstar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -5715,6 +5721,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle."
+          }, 
+          {
+            "text": "·This structure requires an Athanor Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -5750,6 +5759,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle."
+          }, 
+          {
+            "text": "·This structure requires a Tatara Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -10331,6 +10343,9 @@
          }, 
          {
            "text": "·This structure is able to maintain a low-power state indefinitely, and so will not lapse to into an abandoned state."
+          }, 
+          {
+            "text": "·This structure requires a Fortizar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -10367,6 +10382,9 @@
          }, 
          {
            "text": "·This structure is able to maintain a low-power state indefinitely, and so will not lapse to into an abandoned state."
+          }, 
+          {
+            "text": "·This structure requires a Fortizar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -10399,6 +10417,9 @@
          }, 
          {
            "text": "·This structure is able to maintain a low-power state indefinitely, and so will not lapse to into an abandoned state."
+          }, 
+          {
+            "text": "·This structure requires a Fortizar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -10435,6 +10456,9 @@
          }, 
          {
            "text": "·This structure is able to maintain a low-power state indefinitely, and so will not lapse to into an abandoned state."
+          }, 
+          {
+            "text": "·This structure requires a Fortizar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -10463,6 +10487,9 @@
          }, 
          {
            "text": "·This structure is able to maintain a low-power state indefinitely, and so will not lapse to into an abandoned state."
+          }, 
+          {
+            "text": "·This structure requires a Fortizar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -12092,6 +12119,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle"
+          }, 
+          {
+            "text": "·This structure requires a Fortizar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -16308,6 +16338,9 @@
          }, 
          {
            "text": "·Only one Upwell Palatine Keepstar may be deployed at a time in New Eden"
+          }, 
+          {
+            "text": "·This structure requires a Keepstar Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -20830,6 +20863,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle."
+          }, 
+          {
+            "text": "·This structure requires a Sotiyo Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -20863,6 +20899,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle."
+          }, 
+          {
+            "text": "·This structure requires an Azbel Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"
@@ -20892,6 +20931,9 @@
          }, 
          {
            "text": "·While this structure has at least one online service module it enters full power mode and will gain increased shield and armor hitpoints and an extra reinforcement cycle."
+          }, 
+          {
+            "text": "·This structure requires a Raitaru Upwell Quantum Core to be installed for anchoring to complete"
          }
        ], 
        "header": "Role Bonus:"