Bump pyfa version

Addresses Issue #2265. Damage and Target Profiles for new abyssal NPC's.

dist_assets/win/pyfa-setup.iss

@@ -119,7 +119,7 @@ function PrepareToInstall(var NeedsRestart: Boolean): String;
 begin
   if(IsAppRunning( 'pyfa.exe' )) then
     begin
-      Result := 'Please close pyfa before continuing. When closed, please go back to the previous step and continue.';
+      Result := 'Please close pyfa before continuing. When closed, please go back to the previous step and continue. If you have named this installer pyfa.exe, please rename it and restart installation';
     end
   else
     begin

eos/db/migrations/upgrade44.py

@@ -0,0 +1,25 @@
+"""
+Migration 44
+
+- Signal distortion amplifier tiericide
+"""
+
+CONVERSIONS = {
+    25565: (  # Hypnos Compact Signal Distortion Amplifier I
+        25571,  # Initiated Signal Distortion Amplifier I
+        25569,  # Induced Signal Distortion Amplifier I
+        25567,  # Compulsive Signal Distortion Amplifier 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))

eos/effects.py

@@ -42,7 +42,7 @@ class Effect4(BaseEffect):
     shieldBoosting
 
     Used by:
-    Modules from group: Shield Booster (89 of 89)
+    Modules from group: Shield Booster (90 of 90)
     """
 
     runTime = 'late'
@@ -148,7 +148,7 @@ class Effect27(BaseEffect):
     armorRepair
 
     Used by:
-    Modules from group: Armor Repair Unit (100 of 100)
+    Modules from group: Armor Repair Unit (101 of 101)
     """
 
     runTime = 'late'
@@ -203,7 +203,7 @@ class Effect39(BaseEffect):
     warpDisrupt
 
     Used by:
-    Modules named like: Warp Disruptor (28 of 28)
+    Modules named like: Warp Disruptor (29 of 29)
     """
 
     type = 'projected', 'active'
@@ -374,7 +374,7 @@ class Effect58(BaseEffect):
     Modules from group: Capacitor Flux Coil (6 of 6)
     Modules from group: Capacitor Power Relay (20 of 20)
     Modules from group: Power Diagnostic System (23 of 23)
-    Modules from group: Propulsion Module (68 of 133)
+    Modules from group: Propulsion Module (69 of 135)
     Modules from group: Reactor Control Unit (22 of 22)
     """
 
@@ -1126,6 +1126,7 @@ class Effect394(BaseEffect):
     Implants named like: grade Snake (16 of 18)
     Modules named like: Auxiliary Thrusters (8 of 8)
     Implant: Quafe Zero
+    Implant: Serenity YC122.9 Season Booster - Max Velocity
     Skill: Navigation
     """
 
@@ -1150,6 +1151,7 @@ class Effect395(BaseEffect):
     Implants named like: grade Nomad (10 of 12)
     Modules named like: Low Friction Nozzle Joints (8 of 8)
     Implant: Genolution Core Augmentation CA-4
+    Implant: Serenity YC122.9 Season Booster - Agility
     Skill: Evasive Maneuvering
     Skill: Spaceship Command
     """
@@ -2440,6 +2442,7 @@ class Effect856(BaseEffect):
     Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6)
     Implants named like: grade Ascendancy (10 of 12)
     Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
+    Implant: Serenity YC122.9 Season Booster - Warp Speed
     """
 
     type = 'passive'
@@ -3737,6 +3740,7 @@ class Effect1185(BaseEffect):
     Used by:
     Implants named like: X Instinct Booster (4 of 4)
     Implants named like: grade Halo (15 of 18)
+    Implant: Serenity YC122.9 Season Booster - Signature Radius
     """
 
     type = 'passive'
@@ -4491,6 +4495,7 @@ class Effect1452(BaseEffect):
     Used by:
     Implants named like: grade Centurion (10 of 12)
     Modules named like: Particle Dispersion Projector (8 of 8)
+    Implant: Serenity YC122.9 Season Booster - EW Range
     Skill: Long Distance Jamming
     """
 
@@ -5208,7 +5213,7 @@ class Effect1720(BaseEffect):
 
     Used by:
     Modules from group: Capacitor Power Relay (20 of 20)
-    Modules from group: Shield Boost Amplifier (25 of 25)
+    Modules from group: Shield Boost Amplifier (23 of 23)
     """
 
     type = 'passive'
@@ -9223,8 +9228,8 @@ class Effect3002(BaseEffect):
     Used by:
     Modules from group: Ancillary Remote Shield Booster (4 of 4)
     Modules from group: Capacitor Booster (41 of 41)
-    Modules from group: Energy Neutralizer (54 of 54)
-    Modules from group: Energy Nosferatu (54 of 54)
+    Modules from group: Energy Neutralizer (55 of 55)
+    Modules from group: Energy Nosferatu (55 of 55)
     Modules from group: Hull Repair Unit (25 of 25)
     Modules from group: Remote Armor Repairer (39 of 39)
     Modules from group: Remote Capacitor Transmitter (35 of 35)
@@ -9468,7 +9473,7 @@ class Effect3061(BaseEffect):
     heatDamageBonus
 
     Used by:
-    Modules from group: Shield Boost Amplifier (25 of 25)
+    Modules from group: Shield Boost Amplifier (23 of 23)
     """
 
     type = 'passive'
@@ -9542,7 +9547,7 @@ class Effect3174(BaseEffect):
     Used by:
     Modules from group: Stasis Grappler (7 of 7)
     Modules from group: Stasis Web (19 of 19)
-    Modules from group: Warp Scrambler (54 of 55)
+    Modules from group: Warp Scrambler (56 of 57)
     """
 
     type = 'overheat'
@@ -9558,7 +9563,7 @@ class Effect3175(BaseEffect):
     overloadSelfSpeedBonus
 
     Used by:
-    Modules from group: Propulsion Module (133 of 133)
+    Modules from group: Propulsion Module (135 of 135)
     """
 
     type = 'overheat'
@@ -9610,8 +9615,8 @@ class Effect3200(BaseEffect):
     overloadSelfArmorDamageAmountDurationBonus
 
     Used by:
-    Modules from group: Ancillary Armor Repairer (7 of 7)
-    Modules from group: Armor Repair Unit (100 of 100)
+    Modules from group: Ancillary Armor Repairer (8 of 8)
+    Modules from group: Armor Repair Unit (101 of 101)
     """
 
     type = 'overheat'
@@ -9628,8 +9633,8 @@ class Effect3201(BaseEffect):
     overloadSelfShieldBonusDurationBonus
 
     Used by:
-    Modules from group: Ancillary Shield Booster (8 of 8)
-    Modules from group: Shield Booster (89 of 89)
+    Modules from group: Ancillary Shield Booster (9 of 9)
+    Modules from group: Shield Booster (90 of 90)
     """
 
     type = 'overheat'
@@ -11206,6 +11211,7 @@ class Effect3650(BaseEffect):
 
     Used by:
     Implants named like: grade Centurion (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - EW Range
     """
 
     type = 'passive'
@@ -11222,6 +11228,7 @@ class Effect3651(BaseEffect):
 
     Used by:
     Implants named like: grade Centurion (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - EW Range
     """
 
     type = 'passive'
@@ -11238,6 +11245,7 @@ class Effect3652(BaseEffect):
 
     Used by:
     Implants named like: grade Centurion (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - EW Range
     """
 
     type = 'passive'
@@ -11254,6 +11262,7 @@ class Effect3653(BaseEffect):
 
     Used by:
     Implants named like: grade Centurion (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - EW Range
     """
 
     type = 'passive'
@@ -11354,6 +11363,7 @@ class Effect3668(BaseEffect):
 
     Used by:
     Implants named like: grade Harvest (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - Mining Range
     """
 
     type = 'passive'
@@ -11370,6 +11380,7 @@ class Effect3669(BaseEffect):
 
     Used by:
     Implants named like: grade Harvest (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - Mining Range
     """
 
     type = 'passive'
@@ -11386,6 +11397,7 @@ class Effect3670(BaseEffect):
 
     Used by:
     Implants named like: grade Harvest (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - Mining Range
     """
 
     type = 'passive'
@@ -11402,6 +11414,7 @@ class Effect3671(BaseEffect):
 
     Used by:
     Implants named like: grade Harvest (10 of 12)
+    Implant: Serenity YC122.9 Season Booster - Mining Range
     """
 
     type = 'passive'
@@ -11418,6 +11431,7 @@ class Effect3672(BaseEffect):
 
     Used by:
     Implants named like: grade Harvest (12 of 12)
+    Implant: Serenity YC122.9 Season Booster - Mining Range
     """
 
     runTime = 'early'
@@ -13594,6 +13608,7 @@ class Effect4162(BaseEffect):
     Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
     Implants named like: grade Virtue (10 of 12)
     Modules named like: Gravity Capacitor Upgrade (8 of 8)
+    Implant: Serenity YC122.9 Season Booster - Probe Scanning Strength
     Skill: Astrometric Rangefinding
     Skill: Astrometrics
     """
@@ -16691,7 +16706,7 @@ class Effect4936(BaseEffect):
     fueledShieldBoosting
 
     Used by:
-    Modules from group: Ancillary Shield Booster (8 of 8)
+    Modules from group: Ancillary Shield Booster (9 of 9)
     """
 
     runTime = 'late'
@@ -18977,7 +18992,7 @@ class Effect5275(BaseEffect):
     fueledArmorRepair
 
     Used by:
-    Modules from group: Ancillary Armor Repairer (7 of 7)
+    Modules from group: Ancillary Armor Repairer (8 of 8)
     """
 
     runTime = 'late'
@@ -23417,7 +23432,7 @@ class Effect5934(BaseEffect):
     warpScrambleBlockMWDWithNPCEffect
 
     Used by:
-    Modules named like: Warp Scrambler (27 of 27)
+    Modules named like: Warp Scrambler (28 of 28)
     """
 
     runTime = 'early'
@@ -25147,7 +25162,7 @@ class Effect6187(BaseEffect):
     energyNeutralizerFalloff
 
     Used by:
-    Modules from group: Energy Neutralizer (54 of 54)
+    Modules from group: Energy Neutralizer (55 of 55)
     """
 
     type = 'active', 'projected'
@@ -25238,7 +25253,7 @@ class Effect6197(BaseEffect):
     energyNosferatuFalloff
 
     Used by:
-    Modules from group: Energy Nosferatu (54 of 54)
+    Modules from group: Energy Nosferatu (55 of 55)
     """
 
     runTime = 'late'
@@ -29081,7 +29096,7 @@ class Effect6582(BaseEffect):
     moduleBonusSiegeModule
 
     Used by:
-    Variations of module: Siege Module I (2 of 2)
+    Modules named like: Siege Module (3 of 3)
     """
 
     runTime = 'early'
@@ -31524,7 +31539,7 @@ class Effect6730(BaseEffect):
     moduleBonusMicrowarpdrive
 
     Used by:
-    Modules from group: Propulsion Module (68 of 133)
+    Modules from group: Propulsion Module (69 of 135)
     """
 
     runTime = 'late'
@@ -31548,7 +31563,7 @@ class Effect6731(BaseEffect):
     moduleBonusAfterburner
 
     Used by:
-    Modules from group: Propulsion Module (65 of 133)
+    Modules from group: Propulsion Module (66 of 135)
     """
 
     runTime = 'late'
@@ -37181,3 +37196,39 @@ class Effect8085(BaseEffect):
             lambda mod: mod.item.requiresSkill('Fighters'),
             'fighterAbilityMissilesExplosionRadius', container.getModifiedItemAttr('aoeCloudSizeMultiplier'),
             stackingPenalties=True, penaltyGroup='postMul', **kwargs)
+
+
+class Effect8091(BaseEffect):
+    """
+    shipBonusForceAuxiliaryG2CapBoosterStrength
+
+    Used by:
+    Ship: Ninazu
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.group.name == 'Capacitor Booster Charge',
+            'capacitorBonus', ship.getModifiedItemAttr('shipBonusForceAuxiliaryG2'),
+            skill='Gallente Carrier', **kwargs)
+
+
+class Effect8092(BaseEffect):
+    """
+    shipBonusForceAuxiliaryM2CapBoosterStrength
+
+    Used by:
+    Ship: Lif
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.group.name == 'Capacitor Booster Charge',
+            'capacitorBonus', ship.getModifiedItemAttr('shipBonusForceAuxiliaryM2'),
+            skill='Minmatar Carrier', **kwargs)

eos/saveddata/damagePattern.py

@@ -83,14 +83,17 @@ BUILTINS = OrderedDict([
     (-52, ('[Bombs]Scorch Bomb', 0, 6400, 0, 0)),
     (-53, ('[Bombs]Concussion Bomb', 0, 0, 6400, 0)),
     (-54, ('[Bombs]Shrapnel Bomb', 0, 0, 0, 6400)),
-    # Source: ticket #2067
-    (-55, ('[NPC][Abyssal]All', 130, 396, 258, 216)),
+    # Source: ticket #2067 and #2265
+    (-55, ('[NPC][Abyssal]All', 126, 427, 218, 230)),
+    (-109, ('[NPC][Abyssal]Angel', 450, 72, 80, 398)),
+    (-107, ('[NPC][Abyssal]Concord', 53, 559, 94, 295)),
     (-56, ('[NPC][Abyssal]Drifter', 250, 250, 250, 250)),
     (-57, ('[NPC][Abyssal]Drones', 250, 250, 250, 250)),
-    (-58, ('[NPC][Abyssal]Overmind', 0, 408, 592, 0)),
-    (-59, ('[NPC][Abyssal]Seeker', 406, 406, 94, 94)),
+    (-58, ('[NPC][Abyssal]Overmind', 0, 410, 590, 0)),
+    (-108, ('[NPC][Abyssal]Sansha', 569, 431, 0, 0)),
+    (-59, ('[NPC][Abyssal]Seeker', 402, 402, 98, 98)),
     (-60, ('[NPC][Abyssal]Sleeper', 313, 313, 187, 187)),
-    (-61, ('[NPC][Abyssal]Triglavian', 0, 610, 0, 390)),
+    (-61, ('[NPC][Abyssal]Triglavian', 0, 615, 0, 385)),
     (-62, ('[NPC][Asteroid]Angel Cartel', 1838, 562, 2215, 3838)),
     (-63, ('[NPC][Asteroid]Blood Raiders', 5067, 4214, 0, 0)),
     (-64, ('[NPC][Asteroid]Guristas', 0, 1828, 7413, 0)),
@@ -116,11 +119,11 @@ BUILTINS = OrderedDict([
     (-84, ('[NPC][Deadspace]Sanshas Nation', 3009, 2237, 0, 0)),
     (-85, ('[NPC][Deadspace]Serpentis', 0, 3110, 1929, 0)),
     # Source: ticket #2067
-    (-86, ('[NPC][Invasion][Invading Precursor Entities]Dread', 0, 417, 0, 583)),
-    (-87, ('[NPC][Invasion][Invading Precursor Entities]Normal Subcaps', 0, 610, 0, 390)),
-    (-88, ('[NPC][Invasion][Invading Precursor Entities]Subcaps w/missiles 0% spool up', 367, 155, 367, 112)),
-    (-89, ('[NPC][Invasion][Invading Precursor Entities]Subcaps w/missiles 50% spool up', 291, 243, 291, 175)),
-    (-90, ('[NPC][Invasion][Invading Precursor Entities]Subcaps w/missiles 100% spool up', 241, 301, 241, 217)),
+    (-86, ('[NPC][Invasion][Triglavian Entities]Dread', 0, 417, 0, 583)),
+    (-87, ('[NPC][Invasion][Triglavian Entities]Normal Subcaps', 0, 610, 0, 390)),
+    (-88, ('[NPC][Invasion][Triglavian Entities]Subcaps w/missiles 0% spool up', 367, 155, 367, 112)),
+    (-89, ('[NPC][Invasion][Triglavian Entities]Subcaps w/missiles 50% spool up', 291, 243, 291, 175)),
+    (-90, ('[NPC][Invasion][Triglavian Entities]Subcaps w/missiles 100% spool up', 241, 301, 241, 217)),
     (-91, ('[NPC][Invasion][Retaliating Amarr Entities]Dread/Subcaps', 583, 417, 0, 0)),
     (-92, ('[NPC][Invasion][Retaliating Caldari Entities]Dread', 1000, 0, 0, 0)),
     (-93, ('[NPC][Invasion][Retaliating Caldari Entities]Subcaps', 511, 21, 29, 440)),

eos/saveddata/module.py

@@ -205,6 +205,11 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             and self.__item.group.name not in self.SYSTEM_GROUPS
         ):
             return True
+        if (
+            self.__item.category.name == "Structure Module"
+            and self.__item.group.name == "Quantum Cores"
+        ):
+            return True
         if self.item.isAbyssal and not self.isMutated:
             return True
         if self.isMutated and not self.__mutaplasmid:

eos/saveddata/targetProfile.py

@@ -84,102 +84,142 @@ BUILTINS = OrderedDict([
     (-50, ('[NPC][Burner]Talos', 0.68, 0.59, 0.59, 0.43)),
     (-51, ('[NPC][Burner]Sentinel', 0.58, 0.45, 0.52, 0.66)),
     # Source: ticket #2067
-    (-52, ('[NPC][Invasion]Invading Precursor Entities', 0.422, 0.367, 0.453, 0.411)),
+    (-52, ('[NPC][Invasion]Triglavian Entities', 0.422, 0.367, 0.453, 0.411)),
     (-53, ('[NPC][Invasion]Retaliating Amarr Entities', 0.360, 0.310, 0.441, 0.602)),
     (-54, ('[NPC][Invasion]Retaliating Caldari Entities', 0.303, 0.610, 0.487, 0.401)),
     (-55, ('[NPC][Invasion]Retaliating Gallente Entities', 0.383, 0.414, 0.578, 0.513)),
     (-56, ('[NPC][Invasion]Retaliating Minmatar Entities', 0.620, 0.422, 0.355, 0.399)),
     (-57, ('[NPC][Abyssal][Dark Matter All Tiers]Drones', 0.439, 0.522, 0.529, 0.435)),
-    (-58, ('[NPC][Abyssal][Dark Matter All Tiers]Overmind', 0.626, 0.576, 0.612, 0.624)),
+    (-58, ('[NPC][Abyssal][Dark Matter All Tiers]Overmind', 0.643, 0.593, 0.624, 0.639)),
     (-59, ('[NPC][Abyssal][Dark Matter All Tiers]Seeker', 0.082, 0.082, 0.082, 0.082)),
-    (-60, ('[NPC][Abyssal][Dark Matter All Tiers]Triglavian', 0.477, 0.401, 0.449, 0.37)),
-    (-61, ('[NPC][Abyssal][Dark Matter All Tiers]Drifter', 0.403, 0.403, 0.403, 0.403)),
+    (-60, ('[NPC][Abyssal][Dark Matter All Tiers]Triglavian', 0.494, 0.41, 0.464, 0.376)),
+    (-61, ('[NPC][Abyssal][Dark Matter All Tiers]Drifter', 0.415, 0.415, 0.415, 0.415)),
     (-62, ('[NPC][Abyssal][Dark Matter All Tiers]Sleeper', 0.435, 0.435, 0.435, 0.435)),
-    (-63, ('[NPC][Abyssal][Dark Matter All Tiers]All', 0.507, 0.477, 0.502, 0.493)),
-    (-64, ('[NPC][Abyssal][Electrical T1/T2]Drones', 0.323, 0.522, 0.529, 0.435)),
-    (-65, ('[NPC][Abyssal][Electrical T1/T2]Overmind', 0.521, 0.576, 0.612, 0.624)),
-    (-66, ('[NPC][Abyssal][Electrical T1/T2]Seeker', 0, 0.082, 0.082, 0.082)),
-    (-67, ('[NPC][Abyssal][Electrical T1/T2]Triglavian', 0.333, 0.401, 0.449, 0.37)),
-    (-68, ('[NPC][Abyssal][Electrical T1/T2]Drifter', 0.267, 0.403, 0.403, 0.403)),
-    (-69, ('[NPC][Abyssal][Electrical T1/T2]Sleeper', 0.329, 0.435, 0.435, 0.435)),
-    (-70, ('[NPC][Abyssal][Electrical T1/T2]All', 0.385, 0.477, 0.502, 0.493)),
+    (-63, ('[NPC][Abyssal][Dark Matter All Tiers]All', 0.508, 0.474, 0.495, 0.488)),
+    (-64, ('[NPC][Abyssal][Electrical T0/T1/T2]Drones', 0.323, 0.522, 0.529, 0.435)),
+    (-65, ('[NPC][Abyssal][Electrical T0/T1/T2]Overmind', 0.542, 0.593, 0.624, 0.639)),
+    (-66, ('[NPC][Abyssal][Electrical T0/T1/T2]Seeker', 0, 0.082, 0.082, 0.082)),
+    (-67, ('[NPC][Abyssal][Electrical T0/T1/T2]Triglavian', 0.356, 0.41, 0.464, 0.376)),
+    (-68, ('[NPC][Abyssal][Electrical T0/T1/T2]Drifter', 0.277, 0.415, 0.415, 0.415)),
+    (-69, ('[NPC][Abyssal][Electrical T0/T1/T2]Sleeper', 0.329, 0.435, 0.435, 0.435)),
+    (-70, ('[NPC][Abyssal][Electrical T0/T1/T2]All', 0.381, 0.474, 0.495, 0.488)),
     (-71, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Drones', 0.255, 0.522, 0.529, 0.435)),
-    (-72, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Overmind', 0.457, 0.576, 0.612, 0.624)),
+    (-72, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Overmind', 0.48, 0.593, 0.624, 0.639)),
     (-73, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Seeker', 0, 0.082, 0.082, 0.082)),
-    (-74, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Triglavian', 0.241, 0.401, 0.449, 0.37)),
-    (-75, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Drifter', 0.184, 0.403, 0.403, 0.403)),
+    (-74, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Triglavian', 0.268, 0.41, 0.464, 0.376)),
+    (-75, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Drifter', 0.191, 0.415, 0.415, 0.415)),
     (-76, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Sleeper', 0.268, 0.435, 0.435, 0.435)),
-    (-77, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]All', 0.313, 0.477, 0.502, 0.493)),
-    (-78, ('[NPC][Abyssal][Electrical T4/T5]Drones', 0.193, 0.522, 0.529, 0.435)),
-    (-79, ('[NPC][Abyssal][Electrical T4/T5]Overmind', 0.398, 0.576, 0.612, 0.624)),
-    (-80, ('[NPC][Abyssal][Electrical T4/T5]Seeker', 0, 0.082, 0.082, 0.082)),
-    (-81, ('[NPC][Abyssal][Electrical T4/T5]Triglavian', 0.183, 0.401, 0.449, 0.37)),
-    (-82, ('[NPC][Abyssal][Electrical T4/T5]Drifter', 0.107, 0.403, 0.403, 0.403)),
-    (-83, ('[NPC][Abyssal][Electrical T4/T5]Sleeper', 0.215, 0.435, 0.435, 0.435)),
-    (-84, ('[NPC][Abyssal][Electrical T4/T5]All', 0.25, 0.477, 0.502, 0.493)),
-    (-85, ('[NPC][Abyssal][Firestorm T1/T2]Drones', 0.461, 0.425, 0.541, 0.443)),
-    (-86, ('[NPC][Abyssal][Firestorm T1/T2]Overmind', 0.65, 0.469, 0.625, 0.633)),
-    (-87, ('[NPC][Abyssal][Firestorm T1/T2]Seeker', 0.084, 0, 0.084, 0.084)),
-    (-88, ('[NPC][Abyssal][Firestorm T1/T2]Triglavian', 0.534, 0.266, 0.484, 0.366)),
-    (-89, ('[NPC][Abyssal][Firestorm T1/T2]Drifter', 0.422, 0.282, 0.422, 0.422)),
-    (-90, ('[NPC][Abyssal][Firestorm T1/T2]Sleeper', 0.512, 0.402, 0.512, 0.512)),
-    (-91, ('[NPC][Abyssal][Firestorm T1/T2]All', 0.541, 0.365, 0.524, 0.504)),
+    (-77, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]All', 0.308, 0.474, 0.495, 0.488)),
+    (-78, ('[NPC][Abyssal][Electrical T4/T5/T6]Drones', 0.193, 0.522, 0.529, 0.435)),
+    (-79, ('[NPC][Abyssal][Electrical T4/T5/T6]Overmind', 0.423, 0.593, 0.624, 0.639)),
+    (-80, ('[NPC][Abyssal][Electrical T4/T5/T6]Seeker', 0, 0.082, 0.082, 0.082)),
+    (-81, ('[NPC][Abyssal][Electrical T4/T5/T6]Triglavian', 0.206, 0.41, 0.464, 0.376)),
+    (-82, ('[NPC][Abyssal][Electrical T4/T5/T6]Drifter', 0.111, 0.415, 0.415, 0.415)),
+    (-83, ('[NPC][Abyssal][Electrical T4/T5/T6]Sleeper', 0.215, 0.435, 0.435, 0.435)),
+    (-84, ('[NPC][Abyssal][Electrical T4/T5/T6]All', 0.247, 0.474, 0.495, 0.488)),
+    (-85, ('[NPC][Abyssal][Firestorm T0/T1/T2]Drones', 0.461, 0.425, 0.541, 0.443)),
+    (-86, ('[NPC][Abyssal][Firestorm T0/T1/T2]Overmind', 0.666, 0.489, 0.634, 0.646)),
+    (-87, ('[NPC][Abyssal][Firestorm T0/T1/T2]Seeker', 0.084, 0, 0.084, 0.084)),
+    (-88, ('[NPC][Abyssal][Firestorm T0/T1/T2]Triglavian', 0.537, 0.269, 0.489, 0.371)),
+    (-89, ('[NPC][Abyssal][Firestorm T0/T1/T2]Drifter', 0.43, 0.289, 0.43, 0.43)),
+    (-90, ('[NPC][Abyssal][Firestorm T0/T1/T2]Sleeper', 0.512, 0.402, 0.512, 0.512)),
+    (-91, ('[NPC][Abyssal][Firestorm T0/T1/T2]All', 0.537, 0.352, 0.512, 0.495)),
     (-92, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Drones', 0.461, 0.36, 0.541, 0.443)),
-    (-93, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Overmind', 0.65, 0.391, 0.625, 0.633)),
+    (-93, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Overmind', 0.666, 0.413, 0.634, 0.646)),
     (-94, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Seeker', 0.084, 0, 0.084, 0.084)),
-    (-95, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Triglavian', 0.534, 0.161, 0.484, 0.366)),
-    (-96, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Drifter', 0.422, 0.196, 0.422, 0.422)),
+    (-95, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Triglavian', 0.537, 0.166, 0.489, 0.371)),
+    (-96, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Drifter', 0.43, 0.201, 0.43, 0.43)),
     (-97, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Sleeper', 0.512, 0.337, 0.512, 0.512)),
-    (-98, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]All', 0.541, 0.284, 0.524, 0.504)),
-    (-99, ('[NPC][Abyssal][Firestorm T4/T5]Drones', 0.461, 0.305, 0.541, 0.443)),
-    (-100, ('[NPC][Abyssal][Firestorm T4/T5]Overmind', 0.65, 0.323, 0.625, 0.633)),
-    (-101, ('[NPC][Abyssal][Firestorm T4/T5]Seeker', 0.084, 0, 0.084, 0.084)),
-    (-102, ('[NPC][Abyssal][Firestorm T4/T5]Triglavian', 0.534, 0.082, 0.484, 0.366)),
-    (-103, ('[NPC][Abyssal][Firestorm T4/T5]Drifter', 0.422, 0.114, 0.422, 0.422)),
-    (-104, ('[NPC][Abyssal][Firestorm T4/T5]Sleeper', 0.512, 0.276, 0.512, 0.512)),
-    (-105, ('[NPC][Abyssal][Firestorm T4/T5]All', 0.541, 0.214, 0.524, 0.504)),
-    (-106, ('[NPC][Abyssal][Exotic T1/T2]Drones', 0.439, 0.522, 0.417, 0.435)),
-    (-107, ('[NPC][Abyssal][Exotic T1/T2]Overmind', 0.626, 0.576, 0.496, 0.624)),
-    (-108, ('[NPC][Abyssal][Exotic T1/T2]Seeker', 0.082, 0.082, 0, 0.082)),
-    (-109, ('[NPC][Abyssal][Exotic T1/T2]Triglavian', 0.477, 0.401, 0.284, 0.37)),
-    (-110, ('[NPC][Abyssal][Exotic T1/T2]Drifter', 0.403, 0.403, 0.267, 0.403)),
-    (-111, ('[NPC][Abyssal][Exotic T1/T2]Sleeper', 0.435, 0.435, 0.329, 0.435)),
-    (-112, ('[NPC][Abyssal][Exotic T1/T2]All', 0.507, 0.477, 0.373, 0.493)),
+    (-98, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]All', 0.537, 0.269, 0.512, 0.495)),
+    (-99, ('[NPC][Abyssal][Firestorm T4/T5/T6]Drones', 0.461, 0.305, 0.541, 0.443)),
+    (-100, ('[NPC][Abyssal][Firestorm T4/T5/T6]Overmind', 0.666, 0.345, 0.634, 0.646)),
+    (-101, ('[NPC][Abyssal][Firestorm T4/T5/T6]Seeker', 0.084, 0, 0.084, 0.084)),
+    (-102, ('[NPC][Abyssal][Firestorm T4/T5/T6]Triglavian', 0.537, 0.085, 0.489, 0.371)),
+    (-103, ('[NPC][Abyssal][Firestorm T4/T5/T6]Drifter', 0.43, 0.117, 0.43, 0.43)),
+    (-104, ('[NPC][Abyssal][Firestorm T4/T5/T6]Sleeper', 0.512, 0.276, 0.512, 0.512)),
+    (-105, ('[NPC][Abyssal][Firestorm T4/T5/T6]All', 0.537, 0.201, 0.512, 0.495)),
+    (-106, ('[NPC][Abyssal][Exotic T0/T1/T2]Drones', 0.439, 0.522, 0.417, 0.435)),
+    (-107, ('[NPC][Abyssal][Exotic T0/T1/T2]Overmind', 0.643, 0.593, 0.511, 0.639)),
+    (-108, ('[NPC][Abyssal][Exotic T0/T1/T2]Seeker', 0.082, 0.082, 0, 0.082)),
+    (-109, ('[NPC][Abyssal][Exotic T0/T1/T2]Triglavian', 0.494, 0.41, 0.304, 0.376)),
+    (-110, ('[NPC][Abyssal][Exotic T0/T1/T2]Drifter', 0.415, 0.415, 0.277, 0.415)),
+    (-111, ('[NPC][Abyssal][Exotic T0/T1/T2]Sleeper', 0.435, 0.435, 0.329, 0.435)),
+    (-112, ('[NPC][Abyssal][Exotic T0/T1/T2]All', 0.508, 0.474, 0.359, 0.488)),
     (-113, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Drones', 0.439, 0.522, 0.351, 0.435)),
-    (-114, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Overmind', 0.626, 0.576, 0.419, 0.624)),
+    (-114, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Overmind', 0.643, 0.593, 0.435, 0.639)),
     (-115, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Seeker', 0.082, 0.082, 0, 0.082)),
-    (-116, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Triglavian', 0.477, 0.401, 0.176, 0.37)),
-    (-117, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Drifter', 0.403, 0.403, 0.184, 0.403)),
+    (-116, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Triglavian', 0.494, 0.41, 0.198, 0.376)),
+    (-117, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Drifter', 0.415, 0.415, 0.191, 0.415)),
     (-118, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Sleeper', 0.435, 0.435, 0.268, 0.435)),
-    (-119, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]All', 0.507, 0.477, 0.293, 0.493)),
-    (-120, ('[NPC][Abyssal][Exotic T4/T5]Drones', 0.439, 0.522, 0.293, 0.435)),
-    (-121, ('[NPC][Abyssal][Exotic T4/T5]Overmind', 0.626, 0.576, 0.344, 0.624)),
-    (-122, ('[NPC][Abyssal][Exotic T4/T5]Seeker', 0.082, 0.082, 0, 0.082)),
-    (-123, ('[NPC][Abyssal][Exotic T4/T5]Triglavian', 0.477, 0.401, 0.107, 0.37)),
-    (-124, ('[NPC][Abyssal][Exotic T4/T5]Drifter', 0.403, 0.403, 0.107, 0.403)),
-    (-125, ('[NPC][Abyssal][Exotic T4/T5]Sleeper', 0.435, 0.435, 0.215, 0.435)),
-    (-126, ('[NPC][Abyssal][Exotic T4/T5]All', 0.507, 0.477, 0.223, 0.493)),
-    (-127, ('[NPC][Abyssal][Gamma T1/T2]Drones', 0.449, 0.54, 0.549, 0.336)),
-    (-128, ('[NPC][Abyssal][Gamma T1/T2]Overmind', 0.6, 0.557, 0.601, 0.504)),
-    (-129, ('[NPC][Abyssal][Gamma T1/T2]Seeker', 0.085, 0.085, 0.085, 0)),
-    (-130, ('[NPC][Abyssal][Gamma T1/T2]Triglavian', 0.463, 0.392, 0.447, 0.193)),
-    (-131, ('[NPC][Abyssal][Gamma T1/T2]Drifter', 0.428, 0.428, 0.428, 0.287)),
-    (-132, ('[NPC][Abyssal][Gamma T1/T2]Sleeper', 0.435, 0.435, 0.435, 0.329)),
-    (-133, ('[NPC][Abyssal][Gamma T1/T2]All', 0.493, 0.472, 0.5, 0.362)),
+    (-119, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]All', 0.508, 0.474, 0.276, 0.488)),
+    (-120, ('[NPC][Abyssal][Exotic T4/T5/T6]Drones', 0.439, 0.522, 0.293, 0.435)),
+    (-121, ('[NPC][Abyssal][Exotic T4/T5/T6]Overmind', 0.643, 0.593, 0.362, 0.639)),
+    (-122, ('[NPC][Abyssal][Exotic T4/T5/T6]Seeker', 0.082, 0.082, 0, 0.082)),
+    (-123, ('[NPC][Abyssal][Exotic T4/T5/T6]Triglavian', 0.494, 0.41, 0.122, 0.376)),
+    (-124, ('[NPC][Abyssal][Exotic T4/T5/T6]Drifter', 0.415, 0.415, 0.111, 0.415)),
+    (-125, ('[NPC][Abyssal][Exotic T4/T5/T6]Sleeper', 0.435, 0.435, 0.215, 0.435)),
+    (-126, ('[NPC][Abyssal][Exotic T4/T5/T6]All', 0.508, 0.474, 0.208, 0.488)),
+    (-127, ('[NPC][Abyssal][Gamma T0/T1/T2]Drones', 0.449, 0.54, 0.549, 0.336)),
+    (-128, ('[NPC][Abyssal][Gamma T0/T1/T2]Overmind', 0.619, 0.574, 0.612, 0.522)),
+    (-129, ('[NPC][Abyssal][Gamma T0/T1/T2]Seeker', 0.085, 0.085, 0.085, 0)),
+    (-130, ('[NPC][Abyssal][Gamma T0/T1/T2]Triglavian', 0.477, 0.4, 0.461, 0.202)),
+    (-131, ('[NPC][Abyssal][Gamma T0/T1/T2]Drifter', 0.437, 0.437, 0.437, 0.295)),
+    (-132, ('[NPC][Abyssal][Gamma T0/T1/T2]Sleeper', 0.435, 0.435, 0.435, 0.329)),
+    (-133, ('[NPC][Abyssal][Gamma T0/T1/T2]All', 0.493, 0.468, 0.492, 0.35)),
     (-134, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Drones', 0.449, 0.54, 0.549, 0.264)),
-    (-135, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Overmind', 0.6, 0.557, 0.601, 0.428)),
+    (-135, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Overmind', 0.619, 0.574, 0.612, 0.449)),
     (-136, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Seeker', 0.085, 0.085, 0.085, 0)),
-    (-137, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Triglavian', 0.463, 0.392, 0.447, 0.071)),
-    (-138, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Drifter', 0.428, 0.428, 0.428, 0.2)),
+    (-137, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Triglavian', 0.477, 0.4, 0.461, 0.081)),
+    (-138, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Drifter', 0.437, 0.437, 0.437, 0.206)),
     (-139, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Sleeper', 0.435, 0.435, 0.435, 0.268)),
-    (-140, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]All', 0.493, 0.472, 0.5, 0.28)),
-    (-141, ('[NPC][Abyssal][Gamma T4/T5]Drones', 0.449, 0.54, 0.549, 0.197)),
-    (-142, ('[NPC][Abyssal][Gamma T4/T5]Overmind', 0.6, 0.557, 0.601, 0.356)),
-    (-143, ('[NPC][Abyssal][Gamma T4/T5]Seeker', 0.085, 0.085, 0.085, 0)),
-    (-144, ('[NPC][Abyssal][Gamma T4/T5]Triglavian', 0.463, 0.392, 0.447, 0.029)),
-    (-145, ('[NPC][Abyssal][Gamma T4/T5]Drifter', 0.428, 0.428, 0.428, 0.117)),
-    (-146, ('[NPC][Abyssal][Gamma T4/T5]Sleeper', 0.435, 0.435, 0.435, 0.215)),
-    (-147, ('[NPC][Abyssal][Gamma T4/T5]All', 0.493, 0.472, 0.5, 0.21))])
+    (-140, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]All', 0.493, 0.468, 0.492, 0.264)),
+    (-141, ('[NPC][Abyssal][Gamma T4/T5/T6]Drones', 0.449, 0.54, 0.549, 0.197)),
+    (-142, ('[NPC][Abyssal][Gamma T4/T5/T6]Overmind', 0.619, 0.574, 0.612, 0.379)),
+    (-143, ('[NPC][Abyssal][Gamma T4/T5/T6]Seeker', 0.085, 0.085, 0.085, 0)),
+    (-144, ('[NPC][Abyssal][Gamma T4/T5/T6]Triglavian', 0.477, 0.4, 0.461, 0.034)),
+    (-145, ('[NPC][Abyssal][Gamma T4/T5/T6]Drifter', 0.437, 0.437, 0.437, 0.121)),
+    (-146, ('[NPC][Abyssal][Gamma T4/T5/T6]Sleeper', 0.435, 0.435, 0.435, 0.215)),
+    (-147, ('[NPC][Abyssal][Gamma T4/T5/T6]All', 0.493, 0.468, 0.492, 0.196)),
+    # Source: ticket #2265
+    (-148, ('[NPC][Abyssal][Dark Matter All Tiers]Concord', 0.324, 0.318, 0.369, 0.372)),
+    (-149, ('[NPC][Abyssal][Dark Matter All Tiers]Sansha', 0.137, 0.331, 0.332, 0.322)),
+    (-150, ('[NPC][Abyssal][Dark Matter All Tiers]Angel', 0.582, 0.508, 0.457, 0.416)),
+    (-151, ('[NPC][Abyssal][Electrical T0/T1/T2]Concord', 0.121, 0.318, 0.369, 0.372)),
+    (-152, ('[NPC][Abyssal][Electrical T0/T1/T2]Sansha', 0.034, 0.331, 0.332, 0.322)),
+    (-153, ('[NPC][Abyssal][Electrical T0/T1/T2]Angel', 0.456, 0.508, 0.457, 0.416)),
+    (-154, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Concord', 0.025, 0.318, 0.369, 0.372)),
+    (-155, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Sansha', 0.018, 0.331, 0.332, 0.322)),
+    (-156, ('[NPC][Abyssal][Electrical T3 (Some T5 Rooms)]Angel', 0.373, 0.508, 0.457, 0.416)),
+    (-157, ('[NPC][Abyssal][Electrical T4/T5/T6]Concord', 0.008, 0.318, 0.369, 0.372)),
+    (-158, ('[NPC][Abyssal][Electrical T4/T5/T6]Sansha', 0.009, 0.331, 0.332, 0.322)),
+    (-159, ('[NPC][Abyssal][Electrical T4/T5/T6]Angel', 0.3, 0.508, 0.457, 0.416)),
+    (-160, ('[NPC][Abyssal][Firestorm T0/T1/T2]Concord', 0.324, 0.107, 0.369, 0.372)),
+    (-161, ('[NPC][Abyssal][Firestorm T0/T1/T2]Sansha', 0.148, 0.181, 0.329, 0.328)),
+    (-162, ('[NPC][Abyssal][Firestorm T0/T1/T2]Angel', 0.587, 0.342, 0.439, 0.39)),
+    (-163, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Concord', 0.324, 0.016, 0.369, 0.372)),
+    (-164, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Sansha', 0.148, 0.14, 0.329, 0.328)),
+    (-165, ('[NPC][Abyssal][Firestorm T3 (Some T5 Rooms)]Angel', 0.587, 0.241, 0.439, 0.39)),
+    (-166, ('[NPC][Abyssal][Firestorm T4/T5/T6]Concord', 0.324, 0.004, 0.369, 0.372)),
+    (-167, ('[NPC][Abyssal][Firestorm T4/T5/T6]Sansha', 0.148, 0.106, 0.329, 0.328)),
+    (-168, ('[NPC][Abyssal][Firestorm T4/T5/T6]Angel', 0.587, 0.172, 0.439, 0.39)),
+    (-169, ('[NPC][Abyssal][Exotic T0/T1/T2]Concord', 0.324, 0.318, 0.18, 0.372)),
+    (-170, ('[NPC][Abyssal][Exotic T0/T1/T2]Sansha', 0.137, 0.331, 0.166, 0.322)),
+    (-171, ('[NPC][Abyssal][Exotic T0/T1/T2]Angel', 0.582, 0.508, 0.295, 0.416)),
+    (-172, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Concord', 0.324, 0.318, 0.089, 0.372)),
+    (-173, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Sansha', 0.137, 0.331, 0.108, 0.322)),
+    (-174, ('[NPC][Abyssal][Exotic T3 (Some T5 Rooms)]Angel', 0.582, 0.508, 0.203, 0.416)),
+    (-175, ('[NPC][Abyssal][Exotic T4/T5/T6]Concord', 0.324, 0.318, 0.068, 0.372)),
+    (-176, ('[NPC][Abyssal][Exotic T4/T5/T6]Sansha', 0.137, 0.331, 0.073, 0.322)),
+    (-177, ('[NPC][Abyssal][Exotic T4/T5/T6]Angel', 0.582, 0.508, 0.14, 0.416)),
+    (-178, ('[NPC][Abyssal][Gamma T0/T1/T2]Concord', 0.324, 0.318, 0.369, 0.203)),
+    (-179, ('[NPC][Abyssal][Gamma T0/T1/T2]Sansha', 0.137, 0.355, 0.352, 0.16)),
+    (-180, ('[NPC][Abyssal][Gamma T0/T1/T2]Angel', 0.59, 0.528, 0.477, 0.286)),
+    (-181, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Concord', 0.324, 0.318, 0.369, 0.112)),
+    (-182, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Sansha', 0.137, 0.355, 0.352, 0.05)),
+    (-183, ('[NPC][Abyssal][Gamma T3 (Some T5 Rooms)]Angel', 0.59, 0.528, 0.477, 0.197)),
+    (-184, ('[NPC][Abyssal][Gamma T4/T5/T6]Concord', 0.324, 0.318, 0.369, 0.086)),
+    (-185, ('[NPC][Abyssal][Gamma T4/T5/T6]Sansha', 0.137, 0.355, 0.352, 0)),
+    (-186, ('[NPC][Abyssal][Gamma T4/T5/T6]Angel', 0.59, 0.528, 0.477, 0.126))])
 
 
 class TargetProfile:

gui/fitCommands/calc/module/localReplace.py

@@ -91,6 +91,8 @@ class CalcReplaceLocalModuleCommand(wx.Command):
 
     @property
     def needsGuiRecalc(self):
+        if self.unloadedCharge:
+            return True
         if self.savedStateCheckChanges is None:
             return True
         for container in self.savedStateCheckChanges:

scripts/conversion.py

@@ -16,10 +16,10 @@ rename_phrase = " renamed to "
 conversion_phrase = " converted to "
 
 text = """
-    '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
+    'Hypnos' Signal Distortion Amplifier I renamed to Hypnos Compact Signal Distortion Amplifier I
+    Initiated Signal Distortion Amplifier I converted to Hypnos Compact Signal Distortion Amplifier I
+    Induced Signal Distortion Amplifier I converted to Hypnos Compact Signal Distortion Amplifier I
+    Compulsive Signal Distortion Amplifier I converted to Hypnos Compact Signal Distortion Amplifier I
     """
 
 def main(old, new):

service/const.py

@@ -46,6 +46,7 @@ class EsiEndpoints(Enum):
     CHAR_SKILLS = "/v4/characters/{character_id}/skills/"
     CHAR_FITTINGS = "/v1/characters/{character_id}/fittings/"
     CHAR_DEL_FIT = "/v1/characters/{character_id}/fittings/{fitting_id}/"
+    DYNAMIC_ITEM = "/v1/dogma/dynamic/items/{type_id}/{item_id}/"
 
 
 @unique

service/conversions/releaseOct2020.py

@@ -0,0 +1,12 @@
+"""
+Conversion pack for October 2020 release
+"""
+
+CONVERSIONS = {
+    # Renamed items
+    "'Hypnos' Signal Distortion Amplifier I": "Hypnos Compact Signal Distortion Amplifier I",
+    # Converted items
+    "Initiated Signal Distortion Amplifier I": "Hypnos Compact Signal Distortion Amplifier I",
+    "Induced Signal Distortion Amplifier I": "Hypnos Compact Signal Distortion Amplifier I",
+    "Compulsive Signal Distortion Amplifier I": "Hypnos Compact Signal Distortion Amplifier I",
+}

service/esiAccess.py

@@ -67,12 +67,13 @@ class EsiAccess:
 
         # session request stuff
         self._session = Session()
-        self._session.headers.update({
+        self._basicHeaders = {
             'Accept': 'application/json',
             'User-Agent': (
                 'pyfa v{}'.format(config.version)
             )
-        })
+        }
+        self._session.headers.update(self._basicHeaders)
         self._session.proxies = NetworkSettings.getInstance().getProxySettingsInRequestsFormat()
 
     @property
@@ -97,6 +98,9 @@ class EsiAccess:
     def oauth_token(self):
         return '%s/oauth/token' % self.sso_url
 
+    def getDynamicItem(self, typeID, itemID):
+        return self.get(None, EsiEndpoints.DYNAMIC_ITEM.value, type_id=typeID, item_id=itemID)
+
     def getSkills(self, char):
         return self.get(char, EsiEndpoints.CHAR_SKILLS.value, character_id=char.characterID)
 
@@ -236,6 +240,11 @@ class EsiAccess:
         return json_res
 
     def _before_request(self, ssoChar):
+        self._session.headers.clear()
+        self._session.headers.update(self._basicHeaders)
+        if ssoChar is None:
+            return
+
         if ssoChar.is_token_expired():
             pyfalog.info("Refreshing token for {}".format(ssoChar.characterName))
             self.refresh(ssoChar)
@@ -256,17 +265,17 @@ class EsiAccess:
 
         return resp
 
-    def get(self, ssoChar, endpoint, *args, **kwargs):
+    def get(self, ssoChar, endpoint, **kwargs):
         self._before_request(ssoChar)
         endpoint = endpoint.format(**kwargs)
         return self._after_request(self._session.get("{}{}".format(self.esi_url, endpoint)))
 
-    def post(self, ssoChar, endpoint, json, *args, **kwargs):
+    def post(self, ssoChar, endpoint, json, **kwargs):
         self._before_request(ssoChar)
         endpoint = endpoint.format(**kwargs)
         return self._after_request(self._session.post("{}{}".format(self.esi_url, endpoint), data=json))
 
-    def delete(self, ssoChar, endpoint, *args, **kwargs):
+    def delete(self, ssoChar, endpoint, **kwargs):
         self._before_request(ssoChar)
         endpoint = endpoint.format(**kwargs)
         return self._after_request(self._session.delete("{}{}".format(self.esi_url, endpoint)))

service/port/muta.py

@@ -18,9 +18,12 @@
 # =============================================================================
 
 
+import re
+
 from eos.db.gamedata.queries import getAttributeInfo, getDynamicItem
 from eos.utils.float import floatUnerr
 from service.port.shared import fetchItem
+from service.esiAccess import EsiAccess
 
 
 def renderMutant(mutant, firstPrefix='', prefix=''):
@@ -77,3 +80,23 @@ def parseMutant(lines):
             continue
         mutations[attrInfo.ID] = value
     return baseItem, mutaplasmidItem, mutations
+
+
+def parseDynamicItemString(text):
+    m = re.search(r'<url=showinfo:(?P<typeid>\d+)//(?P<itemid>\d+)>.+</url>', text)
+    if m:
+        typeID = int(m.group('typeid'))
+        itemID = int(m.group('itemid'))
+        return typeID, itemID
+    return None
+
+
+def fetchDynamicItem(dynamicItemData):
+    typeID, itemID = dynamicItemData
+    esiData = EsiAccess().getDynamicItem(typeID, itemID).json()
+    baseItemID = esiData['source_type_id']
+    mutaplasmidID = esiData['mutator_type_id']
+    attrs = {i['attribute_id']: i['value'] for i in esiData['dogma_attributes']}
+    baseItem = fetchItem(baseItemID)
+    mutaplasmid = getDynamicItem(mutaplasmidID)
+    return baseItem, mutaplasmid, attrs

service/port/port.py

@@ -41,7 +41,7 @@ from service.port.multibuy import exportMultiBuy
 from service.port.shared import IPortUser, UserCancelException, processing_notify
 from service.port.shipstats import exportFitStats
 from service.port.xml import importXml, exportXml
-from service.port.muta import parseMutant
+from service.port.muta import parseMutant, parseDynamicItemString, fetchDynamicItem
 
 
 pyfalog = Logger(__name__)
@@ -255,6 +255,15 @@ class Port:
             return "DNA", True, (cls.importDnaAlt(m.group("dna")),)
 
         if activeFit is not None:
+
+            # Try to import mutated item from network
+            dynData = parseDynamicItemString(string)
+            if dynData is not None:
+                itemData = fetchDynamicItem(dynData)
+                if itemData is not None:
+                    baseItem, mutaplasmidItem, mutations = itemData
+                    return "FittingItem", False, ((baseItem, mutaplasmidItem, mutations),)
+
             # Try to import mutated module
             try:
                 baseItem, mutaplasmidItem, mutations = parseMutant(lines)

staticdata/fsd_binary/dogmaattributes.json

@@ -32559,6 +32559,24 @@
     "stackable": 0, 
     "unitID": 105
   }, 
+  "3096": {
+    "attributeID": 3096, 
+    "dataType": 4, 
+    "defaultValue": 0.0, 
+    "highIsGood": 0, 
+    "name": "locationListID", 
+    "published": 0, 
+    "stackable": 0
+  }, 
+  "3097": {
+    "attributeID": 3097, 
+    "dataType": 5, 
+    "defaultValue": 1.0, 
+    "highIsGood": 0, 
+    "name": "lightYearDistanceMax", 
+    "published": 0, 
+    "stackable": 0
+  }, 
   "3098": {
     "attributeID": 3098, 
     "dataType": 5, 
@@ -32590,5 +32608,15 @@
     "published": 1, 
     "stackable": 0, 
     "unitID": 116
+  }, 
+  "3102": {
+    "attributeID": 3102, 
+    "dataType": 0, 
+    "defaultValue": 0.0, 
+    "description": "when authored alongside the effectTractorBeamCan it will determine if it only tractors corpses instead of wrecks and cans", 
+    "highIsGood": 0, 
+    "name": "onlyTractorCorpses", 
+    "published": 0, 
+    "stackable": 0
   }
 }

staticdata/fsd_binary/dogmaeffects.json

@@ -79543,5 +79543,51 @@
     "published": 0, 
     "rangeAttributeID": 54, 
     "rangeChance": 0
+  }, 
+  "8091": {
+    "disallowAutoRepeat": 0, 
+    "effectCategory": 0, 
+    "effectID": 8091, 
+    "effectName": "shipBonusForceAuxiliaryG2CapBoosterStrength", 
+    "electronicChance": 0, 
+    "isAssistance": 0, 
+    "isOffensive": 0, 
+    "isWarpSafe": 0, 
+    "modifierInfo": [
+      {
+        "domain": "shipID", 
+        "func": "LocationGroupModifier", 
+        "groupID": 87, 
+        "modifiedAttributeID": 67, 
+        "modifyingAttributeID": 2315, 
+        "operation": 6
+      }
+    ], 
+    "propulsionChance": 0, 
+    "published": 0, 
+    "rangeChance": 0
+  }, 
+  "8092": {
+    "disallowAutoRepeat": 0, 
+    "effectCategory": 0, 
+    "effectID": 8092, 
+    "effectName": "shipBonusForceAuxiliaryM2CapBoosterStrength", 
+    "electronicChance": 0, 
+    "isAssistance": 0, 
+    "isOffensive": 0, 
+    "isWarpSafe": 0, 
+    "modifierInfo": [
+      {
+        "domain": "shipID", 
+        "func": "LocationGroupModifier", 
+        "groupID": 87, 
+        "modifiedAttributeID": 67, 
+        "modifyingAttributeID": 2318, 
+        "operation": 6
+      }
+    ], 
+    "propulsionChance": 0, 
+    "published": 0, 
+    "rangeChance": 0
   }
 }

staticdata/fsd_binary/marketgroups.json

@@ -16231,5 +16231,32 @@
     "name": "Siege Module Mutaplasmids", 
     "nameID": 569951, 
     "parentGroupID": 2512
+  }, 
+  "2756": {
+    "description": "Filaments that jump users out of the Triglavian Region Pochven", 
+    "descriptionID": 571036, 
+    "hasTypes": 1, 
+    "iconID": 24530, 
+    "name": "Triglavian Space Outbound", 
+    "nameID": 571035, 
+    "parentGroupID": 2456
+  }, 
+  "2757": {
+    "description": "Filaments that jump users into the Triglavian Region Pochven", 
+    "descriptionID": 571038, 
+    "hasTypes": 1, 
+    "iconID": 24530, 
+    "name": "Triglavian Space Inbound", 
+    "nameID": 571037, 
+    "parentGroupID": 2456
+  }, 
+  "2760": {
+    "description": "Special Edition Deployable Structures", 
+    "descriptionID": 571154, 
+    "hasTypes": 1, 
+    "iconID": 16, 
+    "name": "Special Edition Deployable Structures", 
+    "nameID": 571153, 
+    "parentGroupID": 1659
   }
 }

staticdata/fsd_binary/requiredskillsfortypes.json

@@ -25719,5 +25719,38 @@
   }, 
   "56362": {
     "11584": 1
+  }, 
+  "56619": {
+    "3402": 1
+  }, 
+  "56620": {
+    "3402": 1
+  }, 
+  "56621": {
+    "3402": 1
+  }, 
+  "56631": {
+    "3389": 5, 
+    "3409": 4
+  }, 
+  "56632": {
+    "3389": 5, 
+    "3409": 4
+  }, 
+  "56633": {
+    "3389": 5, 
+    "3409": 4
+  }, 
+  "56640": {
+    "3402": 1
+  }, 
+  "56659": {
+    "3402": 1
+  }, 
+  "56661": {
+    "3402": 1
+  }, 
+  "56662": {
+    "3402": 1
   }
 }

staticdata/fsd_lite/dbuffcollections.json

@@ -41,6 +41,144 @@
     "operationName": "PostMul", 
     "showOutputValueInUI": "ShowNormal"
   }, 
+  "2": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "[PROTOTYPE]Test Boost Speed", 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 37
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "3": {
+    "aggregateMode": "Minimum", 
+    "developerDescription": "Velocity penalty", 
+    "displayName": "Velocity penalty", 
+    "displayNameID": 517442, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 37
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "4": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Warp penalty", 
+    "displayName": "Warp penalty", 
+    "displayNameID": 517444, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 104
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "ModAdd", 
+    "showOutputValueInUI": "Hide"
+  }, 
+  "5": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Disallow Cloak", 
+    "displayName": "Disallow Cloak", 
+    "displayNameID": 517760, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 2454
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "ModAdd", 
+    "showOutputValueInUI": "Hide"
+  }, 
+  "6": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Disallow jump/dock", 
+    "displayName": "Disallow jump/dock", 
+    "displayNameID": 517825, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 2354
+      }, 
+      {
+        "dogmaAttributeID": 2453
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "ModAdd", 
+    "showOutputValueInUI": "Hide"
+  }, 
+  "7": {
+    "aggregateMode": "Minimum", 
+    "developerDescription": "QA Anti-targeting debuff", 
+    "displayName": "QA Anti-targeting debuff", 
+    "displayNameID": 517856, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 192
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostAssignment", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "8": {
+    "aggregateMode": "Minimum", 
+    "developerDescription": "PANIC: Shield Resistance", 
+    "displayName": "Shield Resistance", 
+    "displayNameID": 518605, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 271
+      }, 
+      {
+        "dogmaAttributeID": 272
+      }, 
+      {
+        "dogmaAttributeID": 273
+      }, 
+      {
+        "dogmaAttributeID": 274
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowInverted"
+  }, 
+  "9": {
+    "aggregateMode": "Minimum", 
+    "developerDescription": "PANIC: Shield Recharge time", 
+    "displayName": "Shield recharge time bonus", 
+    "displayNameID": 518606, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 479
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
   "10": {
     "aggregateMode": "Minimum", 
     "developerDescription": "Shield Burst: Shield Harmonizing: Shield Resistance", 
@@ -66,43 +204,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowInverted"
   }, 
-  "100": {
-    "aggregateMode": "Maximum", 
-    "developerDescription": "Weather_caustic_toxin_scan_resolution_bonus", 
-    "displayName": "Scan Resolution bonus", 
-    "displayNameID": 535079, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 564
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "PostPercent", 
-    "showOutputValueInUI": "ShowNormal"
-  }, 
-  "101": {
-    "aggregateMode": "Minimum", 
-    "developerDescription": "Industrial Core Mining Drone Signal Interference", 
-    "displayName": "Reduced Industrial Core Mining Drone Bonus", 
-    "displayNameID": 546343, 
-    "itemModifiers": [], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [
-      {
-        "dogmaAttributeID": 2585, 
-        "skillID": 28585
-      }, 
-      {
-        "dogmaAttributeID": 2586, 
-        "skillID": 28585
-      }
-    ], 
-    "operationName": "PostMul", 
-    "showOutputValueInUI": "ShowNormal"
-  }, 
   "11": {
     "aggregateMode": "Minimum", 
     "developerDescription": "Shield Burst: Active Shielding: Repair Duration/Capacitor", 
@@ -395,20 +496,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
   }, 
-  "2": {
-    "aggregateMode": "Maximum", 
-    "developerDescription": "[PROTOTYPE]Test Boost Speed", 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 37
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "PostPercent", 
-    "showOutputValueInUI": "ShowNormal"
-  }, 
   "20": {
     "aggregateMode": "Minimum", 
     "developerDescription": "Skirmish Burst: Evasive Maneuvers: Signature Radius", 
@@ -442,59 +529,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
   }, 
-  "2103": {
-    "aggregateMode": "Maximum", 
-    "developerDescription": "Damage Bonus", 
-    "displayName": "Damage bonus", 
-    "displayNameID": 551552, 
-    "itemModifiers": [], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [
-      {
-        "dogmaAttributeID": 64, 
-        "skillID": 3300
-      }, 
-      {
-        "dogmaAttributeID": 64, 
-        "skillID": 3436
-      }, 
-      {
-        "dogmaAttributeID": 114, 
-        "skillID": 3319
-      }, 
-      {
-        "dogmaAttributeID": 116, 
-        "skillID": 3319
-      }, 
-      {
-        "dogmaAttributeID": 117, 
-        "skillID": 3319
-      }, 
-      {
-        "dogmaAttributeID": 118, 
-        "skillID": 3319
-      }
-    ], 
-    "operationName": "PostPercent", 
-    "showOutputValueInUI": "ShowNormal"
-  }, 
-  "2104": {
-    "aggregateMode": "Maximum", 
-    "developerDescription": "Wreck Warp Scramble", 
-    "displayName": "Wreck Proximity Disrupting Warp Drives", 
-    "displayNameID": 553815, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 104
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "ModAdd", 
-    "showOutputValueInUI": "Hide"
-  }, 
   "22": {
     "aggregateMode": "Maximum", 
     "developerDescription": "Skirmish Burst: Rapid Deployment: AB/MWD Speed Increase", 
@@ -665,22 +699,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
   }, 
-  "3": {
-    "aggregateMode": "Minimum", 
-    "developerDescription": "Velocity penalty", 
-    "displayName": "Velocity penalty", 
-    "displayNameID": 517442, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 37
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "PostPercent", 
-    "showOutputValueInUI": "ShowNormal"
-  }, 
   "30": {
     "aggregateMode": "Minimum", 
     "developerDescription": "Weapon Disruption Burst: Turret Tracking", 
@@ -846,22 +864,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
   }, 
-  "4": {
-    "aggregateMode": "Maximum", 
-    "developerDescription": "Warp penalty", 
-    "displayName": "Warp penalty", 
-    "displayNameID": 517444, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 104
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "ModAdd", 
-    "showOutputValueInUI": "Hide"
-  }, 
   "40": {
     "aggregateMode": "Minimum", 
     "developerDescription": "Avatar Effect Generator : Kinetic resistance bonus", 
@@ -1064,22 +1066,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowInverted"
   }, 
-  "5": {
-    "aggregateMode": "Maximum", 
-    "developerDescription": "Disallow Cloak", 
-    "displayName": "Disallow Cloak", 
-    "displayNameID": 517760, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 2454
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "ModAdd", 
-    "showOutputValueInUI": "Hide"
-  }, 
   "50": {
     "aggregateMode": "Maximum", 
     "developerDescription": "Leviathan Effect Generator : Kinetic resistance penalty", 
@@ -1262,25 +1248,6 @@
     "operationName": "PostAssignment", 
     "showOutputValueInUI": "Hide"
   }, 
-  "6": {
-    "aggregateMode": "Maximum", 
-    "developerDescription": "Disallow jump/dock", 
-    "displayName": "Disallow jump/dock", 
-    "displayNameID": 517825, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 2354
-      }, 
-      {
-        "dogmaAttributeID": 2453
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "ModAdd", 
-    "showOutputValueInUI": "Hide"
-  }, 
   "60": {
     "aggregateMode": "Minimum", 
     "developerDescription": "Skirmish Burst: Evasive Maneuvers: Agility", 
@@ -1314,22 +1281,6 @@
     "operationName": "PostAssignment", 
     "showOutputValueInUI": "Hide"
   }, 
-  "7": {
-    "aggregateMode": "Minimum", 
-    "developerDescription": "QA Anti-targeting debuff", 
-    "displayName": "QA Anti-targeting debuff", 
-    "displayNameID": 517856, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 192
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "PostAssignment", 
-    "showOutputValueInUI": "ShowNormal"
-  }, 
   "79": {
     "aggregateMode": "Maximum", 
     "developerDescription": "AOE_Beacon_bioluminescence_cloud", 
@@ -1346,31 +1297,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
   }, 
-  "8": {
-    "aggregateMode": "Minimum", 
-    "developerDescription": "PANIC: Shield Resistance", 
-    "displayName": "Shield Resistance", 
-    "displayNameID": 518605, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 271
-      }, 
-      {
-        "dogmaAttributeID": 272
-      }, 
-      {
-        "dogmaAttributeID": 273
-      }, 
-      {
-        "dogmaAttributeID": 274
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "PostPercent", 
-    "showOutputValueInUI": "ShowInverted"
-  }, 
   "80": {
     "aggregateMode": "Minimum", 
     "developerDescription": "AOE_Beacon_caustic_cloud_inertia", 
@@ -1466,22 +1392,6 @@
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowInverted"
   }, 
-  "9": {
-    "aggregateMode": "Minimum", 
-    "developerDescription": "PANIC: Shield Recharge time", 
-    "displayName": "Shield recharge time bonus", 
-    "displayNameID": 518606, 
-    "itemModifiers": [
-      {
-        "dogmaAttributeID": 479
-      }
-    ], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [], 
-    "operationName": "PostPercent", 
-    "showOutputValueInUI": "ShowNormal"
-  }, 
   "90": {
     "aggregateMode": "Maximum", 
     "developerDescription": "Weather_electric_storm_EM_resistance_penalty", 
@@ -1661,5 +1571,95 @@
     "locationRequiredSkillModifiers": [], 
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowInverted"
+  }, 
+  "100": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Weather_caustic_toxin_scan_resolution_bonus", 
+    "displayName": "Scan Resolution bonus", 
+    "displayNameID": 535079, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 564
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "101": {
+    "aggregateMode": "Minimum", 
+    "developerDescription": "Industrial Core Mining Drone Signal Interference", 
+    "displayName": "Reduced Industrial Core Mining Drone Bonus", 
+    "displayNameID": 546343, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [
+      {
+        "dogmaAttributeID": 2585, 
+        "skillID": 28585
+      }, 
+      {
+        "dogmaAttributeID": 2586, 
+        "skillID": 28585
+      }
+    ], 
+    "operationName": "PostMul", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2103": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Damage Bonus", 
+    "displayName": "Damage bonus", 
+    "displayNameID": 551552, 
+    "itemModifiers": [], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [
+      {
+        "dogmaAttributeID": 64, 
+        "skillID": 3300
+      }, 
+      {
+        "dogmaAttributeID": 64, 
+        "skillID": 3436
+      }, 
+      {
+        "dogmaAttributeID": 114, 
+        "skillID": 3319
+      }, 
+      {
+        "dogmaAttributeID": 116, 
+        "skillID": 3319
+      }, 
+      {
+        "dogmaAttributeID": 117, 
+        "skillID": 3319
+      }, 
+      {
+        "dogmaAttributeID": 118, 
+        "skillID": 3319
+      }
+    ], 
+    "operationName": "PostPercent", 
+    "showOutputValueInUI": "ShowNormal"
+  }, 
+  "2104": {
+    "aggregateMode": "Maximum", 
+    "developerDescription": "Wreck Warp Scramble", 
+    "displayName": "Wreck Proximity Disrupting Warp Drives", 
+    "displayNameID": 553815, 
+    "itemModifiers": [
+      {
+        "dogmaAttributeID": 104
+      }
+    ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
+    "operationName": "ModAdd", 
+    "showOutputValueInUI": "Hide"
   }
 }

staticdata/fsd_lite/evecategories.json

@@ -11,6 +11,58 @@
     "categoryNameID": 63540, 
     "published": false
   }, 
+  "2": {
+    "categoryID": 2, 
+    "categoryName": "Celestial", 
+    "categoryNameID": 63541, 
+    "published": true
+  }, 
+  "3": {
+    "categoryID": 3, 
+    "categoryName": "Station", 
+    "categoryNameID": 63542, 
+    "published": false
+  }, 
+  "4": {
+    "categoryID": 4, 
+    "categoryName": "Material", 
+    "categoryNameID": 63543, 
+    "iconID": 22, 
+    "published": true
+  }, 
+  "5": {
+    "categoryID": 5, 
+    "categoryName": "Accessories", 
+    "categoryNameID": 63560, 
+    "iconID": 33, 
+    "published": true
+  }, 
+  "6": {
+    "categoryID": 6, 
+    "categoryName": "Ship", 
+    "categoryNameID": 63544, 
+    "published": true
+  }, 
+  "7": {
+    "categoryID": 7, 
+    "categoryName": "Module", 
+    "categoryNameID": 63545, 
+    "iconID": 67, 
+    "published": true
+  }, 
+  "8": {
+    "categoryID": 8, 
+    "categoryName": "Charge", 
+    "categoryNameID": 63546, 
+    "published": true
+  }, 
+  "9": {
+    "categoryID": 9, 
+    "categoryName": "Blueprint", 
+    "categoryNameID": 63547, 
+    "iconID": 21, 
+    "published": true
+  }, 
   "10": {
     "categoryID": 10, 
     "categoryName": "Trading", 
@@ -52,12 +104,6 @@
     "published": true, 
     "sofBuildClass": "ship"
   }, 
-  "2": {
-    "categoryID": 2, 
-    "categoryName": "Celestial", 
-    "categoryNameID": 63541, 
-    "published": true
-  }, 
   "20": {
     "categoryID": 20, 
     "categoryName": "Implant", 
@@ -104,12 +150,6 @@
     "categoryNameID": 63559, 
     "published": false
   }, 
-  "3": {
-    "categoryID": 3, 
-    "categoryName": "Station", 
-    "categoryNameID": 63542, 
-    "published": false
-  }, 
   "30": {
     "categoryID": 30, 
     "categoryName": "Apparel", 
@@ -134,25 +174,12 @@
     "categoryNameID": 63563, 
     "published": true
   }, 
-  "350001": {
-    "categoryID": 350001, 
-    "categoryName": "Infantry", 
-    "categoryNameID": 267649, 
-    "published": false
-  }, 
   "39": {
     "categoryID": 39, 
     "categoryName": "Infrastructure Upgrades", 
     "categoryNameID": 63565, 
     "published": true
   }, 
-  "4": {
-    "categoryID": 4, 
-    "categoryName": "Material", 
-    "categoryNameID": 63543, 
-    "iconID": 22, 
-    "published": true
-  }, 
   "40": {
     "categoryID": 40, 
     "categoryName": "Sovereignty Structures", 
@@ -189,13 +216,6 @@
     "categoryNameID": 63571, 
     "published": false
   }, 
-  "5": {
-    "categoryID": 5, 
-    "categoryName": "Accessories", 
-    "categoryNameID": 63560, 
-    "iconID": 33, 
-    "published": true
-  }, 
   "53": {
     "categoryID": 53, 
     "categoryName": "Effects", 
@@ -214,12 +234,6 @@
     "categoryNameID": 235965, 
     "published": false
   }, 
-  "6": {
-    "categoryID": 6, 
-    "categoryName": "Ship", 
-    "categoryNameID": 63544, 
-    "published": true
-  }, 
   "63": {
     "categoryID": 63, 
     "categoryName": "Special Edition Assets", 
@@ -238,36 +252,22 @@
     "categoryNameID": 308340, 
     "published": true
   }, 
-  "7": {
-    "categoryID": 7, 
-    "categoryName": "Module", 
-    "categoryNameID": 63545, 
-    "iconID": 67, 
-    "published": true
-  }, 
-  "8": {
-    "categoryID": 8, 
-    "categoryName": "Charge", 
-    "categoryNameID": 63546, 
-    "published": true
-  }, 
   "87": {
     "categoryID": 87, 
     "categoryName": "Fighter", 
     "categoryNameID": 510368, 
     "published": true
   }, 
-  "9": {
-    "categoryID": 9, 
-    "categoryName": "Blueprint", 
-    "categoryNameID": 63547, 
-    "iconID": 21, 
-    "published": true
-  }, 
   "91": {
     "categoryID": 91, 
     "categoryName": "SKINs", 
     "categoryNameID": 531338, 
     "published": true
+  }, 
+  "350001": {
+    "categoryID": 350001, 
+    "categoryName": "Infantry", 
+    "categoryNameID": 267649, 
+    "published": false
   }
 }

staticdata/phobos/metadata.json

@@ -1,10 +1,10 @@
 [
   {
     "field_name": "client_build", 
-    "field_value": 1805757
+    "field_value": 1822159
   }, 
   {
     "field_name": "dump_time", 
-    "field_value": 1600240135
+    "field_value": 1602577754
   }
 ]

staticdata/phobos/traits.json

@@ -9688,7 +9688,7 @@
             }, 
             {
               "number": "7.5%", 
-              "text": "bonus to Armor Repairer amount"
+              "text": "bonus to Armor Repairer and Capacitor Booster amount"
             }, 
             {
               "number": "1%", 
@@ -9742,7 +9742,7 @@
             }, 
             {
               "number": "7.5%", 
-              "text": "bonus to Shield Booster amount"
+              "text": "bonus to Shield Booster and Capacitor Booster amount"
             }, 
             {
               "number": "1%", 

version.yml

@@ -1 +1 @@
-version: v2.28.2
+version: v2.29.0