Bump 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/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)),

eos/saveddata/mutator.py

@@ -89,12 +89,9 @@ class Mutator(EqBase):
             # sweet, all good
             returnVal = val
         else:
-            # need to fudge the numbers a bit. Go with the value closest to base
-            if val >= 0:
-                returnVal = min(self.maxValue, max(self.minValue, val))
-            else:
-                returnVal = max(self.maxValue, min(self.minValue, val))
-
+            actualMin = min(self.minValue, self.maxValue)
+            actualMax = max(self.minValue, self.maxValue)
+            returnVal = min(actualMax, max(actualMin, val))
         return returnVal
 
     @property

eos/saveddata/targetProfile.py

@@ -90,96 +90,136 @@ BUILTINS = OrderedDict([
     (-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/builtinItemStatsViews/itemMutator.py

@@ -89,6 +89,7 @@ class ItemMutatorList(wx.ScrolledWindow):
         higOverrides = {
             ('Stasis Web', 'speedFactor'): False,
             ('Damage Control', 'duration'): True,
+            ('Siege Module', 'siegeLocalLogisticsDurationBonus'): False
         }
 
         first = True

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:

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/dynamicitemattributes.json

@@ -6350,8 +6350,8 @@
         "min": 0.9950000047683716
       }, 
       "2346": {
-        "max": 1.024999976158142, 
-        "min": 0.949999988079071
+        "max": 0.949999988079071, 
+        "min": 1.024999976158142
       }, 
       "2347": {
         "max": 1.024999976158142, 
@@ -6383,8 +6383,8 @@
         "min": 0.9800000190734863
       }, 
       "2346": {
-        "max": 1.100000023841858, 
-        "min": 0.8999999761581421
+        "max": 0.8999999761581421, 
+        "min": 1.100000023841858
       }, 
       "2347": {
         "max": 1.2000000476837158, 
@@ -6416,8 +6416,8 @@
         "min": 0.9800000190734863
       }, 
       "2346": {
-        "max": 1.0499999523162842, 
-        "min": 0.925000011920929
+        "max": 0.925000011920929, 
+        "min": 1.0499999523162842
       }, 
       "2347": {
         "max": 1.149999976158142, 

staticdata/fsd_binary/requiredskillsfortypes.json

@@ -25716,5 +25716,8 @@
   }, 
   "56313": {
     "22043": 1
+  }, 
+  "56362": {
+    "11584": 1
   }
 }

staticdata/fsd_lite/evetypes.json

@@ -552099,7 +552099,7 @@
     "typeID": 47975, 
     "typeName": "Crystalline Isogen-10", 
     "typeNameID": 535701, 
-    "volume": 0.35
+    "volume": 0.3
   }, 
   "47977": {
     "basePrice": 0.0, 
@@ -554434,6 +554434,7 @@
     "descriptionID": 536462, 
     "groupID": 1996, 
     "iconID": 21983, 
+    "isDynamicType": false, 
     "marketGroupID": 2479, 
     "mass": 0.0, 
     "portionSize": 1, 
@@ -554442,7 +554443,7 @@
     "typeID": 48112, 
     "typeName": "Zero-Point Condensate", 
     "typeNameID": 536449, 
-    "volume": 0.25
+    "volume": 0.2
   }, 
   "48113": {
     "basePrice": 32768.0, 
@@ -554588,8 +554589,10 @@
     "descriptionID": 536637, 
     "groupID": 1995, 
     "iconID": 21982, 
+    "isDynamicType": false, 
     "marketGroupID": 2480, 
     "mass": 1.0, 
+    "metaGroupID": 1, 
     "portionSize": 1, 
     "published": true, 
     "raceID": 135, 
@@ -554597,7 +554600,7 @@
     "typeID": 48121, 
     "typeName": "Triglavian Survey Database", 
     "typeNameID": 536534, 
-    "volume": 0.1
+    "volume": 0.01
   }, 
   "48122": {
     "basePrice": 112500000.0, 
@@ -573098,7 +573101,7 @@
     "description": "This sealed containment crate holds a Calm Abyssal Filament of a random weather type that can transport you to an Abyssal Deadspace pocket.", 
     "descriptionID": 543521, 
     "groupID": 1194, 
-    "iconID": 21924, 
+    "iconID": 24510, 
     "isDynamicType": false, 
     "marketGroupID": 1661, 
     "mass": 0.1, 
@@ -623346,7 +623349,7 @@
   "55855": {
     "basePrice": 0.0, 
     "capacity": 0.0, 
-    "description": "This Triglavian Survivial Suit is similar in form to those discovered in Abyssal Deadspace caches and other Triglavian sources but notably lacks the bioadaptive technology-lined full face-plate. Instead of the face-plate, a sophisticated nanoweave half-mask is incorporated into the suit's hood. This contains filter layers providing some protection to the respiratory system. It is unclear if this variant of the suit is used by Triglavians but it can be obtained by those participating in the Triglavian Proving Grounds.", 
+    "description": "This Triglavian Survival Suit is similar in form to those discovered in Abyssal Deadspace caches and other Triglavian sources but notably lacks the bioadaptive technology-lined full face-plate. Instead of the face-plate, a sophisticated nanoweave half-mask is incorporated into the suit's hood. This contains filter layers providing some protection to the respiratory system. It is unclear if this variant of the suit is used by Triglavians but it can be obtained by those participating in the Triglavian Proving Grounds.", 
     "descriptionID": 570174, 
     "groupID": 1088, 
     "iconID": 24502, 
@@ -623397,7 +623400,7 @@
   "55858": {
     "basePrice": 0.0, 
     "capacity": 0.0, 
-    "description": "This Triglavian Survivial Suit is similar in form to those discovered in Abyssal Deadspace caches and other Triglavian sources but notably lacks the bioadaptive technology-lined full face-plate. Instead of the face-plate, a sophisticated nanoweave half-mask is incorporated into the suit's hood. This contains filter layers providing some protection to the respiratory system. It is unclear if this variant of the suit is used by Triglavians but it can be obtained by those participating in the Triglavian Proving Grounds.", 
+    "description": "This Triglavian Survival Suit is similar in form to those discovered in Abyssal Deadspace caches and other Triglavian sources but notably lacks the bioadaptive technology-lined full face-plate. Instead of the face-plate, a sophisticated nanoweave half-mask is incorporated into the suit's hood. This contains filter layers providing some protection to the respiratory system. It is unclear if this variant of the suit is used by Triglavians but it can be obtained by those participating in the Triglavian Proving Grounds.", 
     "descriptionID": 570173, 
     "groupID": 1088, 
     "iconID": 24505, 
@@ -626107,7 +626110,7 @@
     "capacity": 235.0, 
     "description": "Sansha's Devoted are a rarely seen cadre of the implacable legions of the Nation but, in recent times, they have been sighted in Abyssal Deadspace. Believed to have higher numbers of more self-aware True Slaves and even True Citizens in command positions, Sansha's Devoted are an elite dispatched on missions vital to the interests of Master Kuvakei and Sansha's Nation.", 
     "descriptionID": 569360, 
-    "graphicID": 1238, 
+    "graphicID": 341, 
     "groupID": 1982, 
     "isDynamicType": false, 
     "mass": 2000000.0, 
@@ -626116,7 +626119,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56138, 
-    "typeName": "Sansha's Devoted Hunter", 
+    "typeName": "Devoted Hunter", 
     "typeNameID": 569359, 
     "volume": 20000.0
   }, 
@@ -626267,7 +626270,7 @@
   "56146": {
     "basePrice": 0.0, 
     "capacity": 0.0, 
-    "description": "Despite the best efforts of the core empires' defense forces and EDENCOM regulars, the New Eden Common Defense Initiative has been reliant on capsuleers to tilt the scales in favor of military forces defending systems from Triglavian invasion. This beret is a mark of the reliance of EDENCOM on capsuleers providing critical support in star systems under Triglavian assault and can be worn with pride by any capsuleer assisting EDENCOM.\r\n\r\nThis T-shirt has been awarded on behalf of Provost Marshal Kasiha Valkanir and is part of a matched set with the EDENCOM 'Reliant' T-Shirt also made available to supporters of EDENCOM. ", 
+    "description": "Despite the best efforts of the core empires' defense forces and EDENCOM regulars, the New Eden Common Defense Initiative has been reliant on capsuleers to tilt the scales in favor of military forces defending systems from Triglavian invasion. This beret is a mark of the reliance of EDENCOM on capsuleers providing critical support in star systems under Triglavian assault and can be worn with pride by any capsuleer assisting EDENCOM.\r\n\r\nThis T-shirt has been awarded on behalf of Provost Marshal Kasiha Valkanir and is part of a matched set with the EDENCOM 'Reliant' Beret also made available to supporters of EDENCOM. ", 
     "descriptionID": 570160, 
     "groupID": 1089, 
     "iconID": 24508, 
@@ -626284,7 +626287,7 @@
   "56147": {
     "basePrice": 0.0, 
     "capacity": 0.0, 
-    "description": "Despite the best efforts of the core empires' defense forces and EDENCOM regulars, the New Eden Common Defense Initiative has been reliant on capsuleers to tilt the scales in favor of military forces defending systems from Triglavian invasion. This beret is a mark of the reliance of EDENCOM on capsuleers providing critical support in star systems under Triglavian assault and can be worn with pride by any capsuleer assisting EDENCOM.\r\n\r\nThis T-shirt has been awarded on behalf of Provost Marshal Kasiha Valkanir and is part of a matched set with the EDENCOM 'Reliant' T-Shirt also made available to supporters of EDENCOM.", 
+    "description": "Despite the best efforts of the core empires' defense forces and EDENCOM regulars, the New Eden Common Defense Initiative has been reliant on capsuleers to tilt the scales in favor of military forces defending systems from Triglavian invasion. This beret is a mark of the reliance of EDENCOM on capsuleers providing critical support in star systems under Triglavian assault and can be worn with pride by any capsuleer assisting EDENCOM.\r\n\r\nThis T-shirt has been awarded on behalf of Provost Marshal Kasiha Valkanir and is part of a matched set with the EDENCOM 'Reliant' Beret also made available to supporters of EDENCOM.", 
     "descriptionID": 570159, 
     "groupID": 1089, 
     "iconID": 24509, 
@@ -626312,7 +626315,7 @@
     "radius": 110.0, 
     "soundID": 20118, 
     "typeID": 56148, 
-    "typeName": "Sansha's Devoted Knight", 
+    "typeName": "Devoted Knight", 
     "typeNameID": 569378, 
     "volume": 118000.0
   }, 
@@ -626560,7 +626563,7 @@
     "capacity": 235.0, 
     "description": "Sansha's Devoted are a rarely seen cadre of the implacable legions of the Nation but, in recent times, they have been sighted in Abyssal Deadspace. Believed to have higher numbers of more self-aware True Slaves and even True Citizens in command positions, Sansha's Devoted are an elite dispatched on missions vital to the interests of Master Kuvakei and Sansha's Nation.", 
     "descriptionID": 569433, 
-    "graphicID": 1238, 
+    "graphicID": 341, 
     "groupID": 1982, 
     "isDynamicType": false, 
     "mass": 2000000.0, 
@@ -626569,7 +626572,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56162, 
-    "typeName": "Sansha's Devoted Fisher", 
+    "typeName": "Devoted Fisher", 
     "typeNameID": 569432, 
     "volume": 20000.0
   }, 
@@ -626578,7 +626581,7 @@
     "capacity": 235.0, 
     "description": "Sansha's Devoted are a rarely seen cadre of the implacable legions of the Nation but, in recent times, they have been sighted in Abyssal Deadspace. Believed to have higher numbers of more self-aware True Slaves and even True Citizens in command positions, Sansha's Devoted are an elite dispatched on missions vital to the interests of Master Kuvakei and Sansha's Nation.", 
     "descriptionID": 569435, 
-    "graphicID": 1238, 
+    "graphicID": 1237, 
     "groupID": 1982, 
     "isDynamicType": false, 
     "mass": 2000000.0, 
@@ -626587,7 +626590,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56163, 
-    "typeName": "Sansha's Devoted Priest", 
+    "typeName": "Devoted Priest", 
     "typeNameID": 569434, 
     "volume": 20000.0
   }, 
@@ -626605,7 +626608,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56164, 
-    "typeName": "Sansha's Devoted Trapper", 
+    "typeName": "Devoted Trapper", 
     "typeNameID": 569436, 
     "volume": 20000.0
   }, 
@@ -626623,7 +626626,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56165, 
-    "typeName": "Sansha's Devoted Smith", 
+    "typeName": "Devoted Smith", 
     "typeNameID": 569438, 
     "volume": 20000.0
   }, 
@@ -626641,7 +626644,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56166, 
-    "typeName": "Sansha's Devoted Lookout", 
+    "typeName": "Devoted Lookout", 
     "typeNameID": 569440, 
     "volume": 20000.0
   }, 
@@ -626659,7 +626662,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56167, 
-    "typeName": "Sansha's Devoted Herald", 
+    "typeName": "Devoted Herald", 
     "typeNameID": 569442, 
     "volume": 20000.0
   }, 
@@ -626668,7 +626671,7 @@
     "capacity": 235.0, 
     "description": "Sansha's Devoted are a rarely seen cadre of the implacable legions of the Nation but, in recent times, they have been sighted in Abyssal Deadspace. Believed to have higher numbers of more self-aware True Slaves and even True Citizens in command positions, Sansha's Devoted are an elite dispatched on missions vital to the interests of Master Kuvakei and Sansha's Nation.", 
     "descriptionID": 569445, 
-    "graphicID": 1238, 
+    "graphicID": 1237, 
     "groupID": 1982, 
     "isDynamicType": false, 
     "mass": 2000000.0, 
@@ -626677,7 +626680,7 @@
     "radius": 31.0, 
     "soundID": 20902, 
     "typeID": 56168, 
-    "typeName": "Sansha's Devoted Torchbearer", 
+    "typeName": "Devoted Torchbearer", 
     "typeNameID": 569444, 
     "volume": 20000.0
   }, 
@@ -626705,7 +626708,6 @@
     "capacity": 150.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569450, 
-    "factionID": 500006, 
     "graphicID": 21490, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626725,7 +626727,6 @@
     "capacity": 150.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569452, 
-    "factionID": 500006, 
     "graphicID": 21490, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626745,7 +626746,6 @@
     "capacity": 150.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569454, 
-    "factionID": 500006, 
     "graphicID": 21490, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626765,7 +626765,6 @@
     "capacity": 150.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569456, 
-    "factionID": 500006, 
     "graphicID": 21490, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626785,7 +626784,6 @@
     "capacity": 300.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569484, 
-    "factionID": 500006, 
     "graphicID": 21489, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626805,7 +626803,6 @@
     "capacity": 300.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569486, 
-    "factionID": 500006, 
     "graphicID": 21489, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626825,7 +626822,6 @@
     "capacity": 700.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569488, 
-    "factionID": 500006, 
     "graphicID": 21864, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626845,7 +626841,6 @@
     "capacity": 700.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569490, 
-    "factionID": 500006, 
     "graphicID": 21864, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -626865,7 +626860,6 @@
     "capacity": 700.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569492, 
-    "factionID": 500006, 
     "graphicID": 21864, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -627564,7 +627558,6 @@
     "capacity": 300.0, 
     "description": "Mysterious vessels of CONCORD design have been sighted in Abyssal Deadspace, reportedly attacking on sight all witnesses to their presence in the depths of the Triglavian domains. Persistent rumors claim that a clandestine unit of CONCORD's ruthless SARO division, supposedly designated \"Disparu Troop\", has taken an interest in Triglavian technology and is attempting to acquire it covertly.", 
     "descriptionID": 569754, 
-    "factionID": 500006, 
     "graphicID": 21489, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -628328,6 +628321,8 @@
   "56295": {
     "basePrice": 0.0, 
     "capacity": 400.0, 
+    "description": "The Angel Cartel is a vast crime empire with tentacles extending well beyond its home in the Curse region and throughout known space. The Cartel's ultimate goals are unknown but a strong emphasis on the acquisition of ancient knowledge and technology has been discerned by analysts tracking the activities of its many and varied divisions. Now the Cartel has been detected in Abyssal Deadspace, with members of the mysterious Lucifer division spreading the technology-seeking tendrils of the Angels deep into the Triglavian domains.", 
+    "descriptionID": 570529, 
     "graphicID": 337, 
     "groupID": 1982, 
     "isDynamicType": false, 
@@ -628338,7 +628333,7 @@
     "radius": 170.0, 
     "soundID": 20111, 
     "typeID": 56295, 
-    "typeName": "Abyssal Cynabal", 
+    "typeName": "Lucifer Cynabal", 
     "typeNameID": 569923, 
     "volume": 101000.0
   }, 
@@ -628704,7 +628699,7 @@
     "radius": 170.0, 
     "soundID": 20111, 
     "typeID": 56315, 
-    "typeName": "Elite Abyssal Cynabal", 
+    "typeName": "Elite Lucifer Cynabal", 
     "typeNameID": 569978, 
     "volume": 101000.0
   }, 
@@ -628721,7 +628716,7 @@
     "radius": 160.0, 
     "soundID": 20111, 
     "typeID": 56316, 
-    "typeName": "Abyssal Ixion", 
+    "typeName": "Lucifer Ixion", 
     "typeNameID": 569980, 
     "volume": 101000.0
   }, 
@@ -628757,7 +628752,7 @@
     "radius": 25.0, 
     "soundID": 20108, 
     "typeID": 56346, 
-    "typeName": "Abyssal Dramiel", 
+    "typeName": "Lucifer Dramiel", 
     "typeNameID": 570055, 
     "volume": 27289.0
   }, 
@@ -628774,7 +628769,7 @@
     "radius": 25.0, 
     "soundID": 20108, 
     "typeID": 56347, 
-    "typeName": "Elite Abyssal Dramiel", 
+    "typeName": "Elite Lucifer Dramiel", 
     "typeNameID": 570089, 
     "volume": 27289.0
   }, 
@@ -628791,7 +628786,7 @@
     "radius": 30.0, 
     "soundID": 20108, 
     "typeID": 56348, 
-    "typeName": "Abyssal Fury", 
+    "typeName": "Lucifer Fury", 
     "typeNameID": 570091, 
     "volume": 27289.0
   }, 
@@ -628808,7 +628803,7 @@
     "radius": 30.0, 
     "soundID": 20108, 
     "typeID": 56349, 
-    "typeName": "Abyssal Echo", 
+    "typeName": "Lucifer Echo", 
     "typeNameID": 570094, 
     "volume": 27289.0
   }, 
@@ -628825,7 +628820,7 @@
     "radius": 30.0, 
     "soundID": 20108, 
     "typeID": 56350, 
-    "typeName": "Abyssal Medusa", 
+    "typeName": "Lucifer Medusa", 
     "typeNameID": 570096, 
     "volume": 27289.0
   }, 
@@ -628842,7 +628837,7 @@
     "radius": 30.0, 
     "soundID": 20108, 
     "typeID": 56351, 
-    "typeName": "Abyssal Burst", 
+    "typeName": "Lucifer Burst", 
     "typeNameID": 570098, 
     "volume": 27289.0
   }, 
@@ -628859,7 +628854,7 @@
     "radius": 30.0, 
     "soundID": 20108, 
     "typeID": 56352, 
-    "typeName": "Abyssal Swordspine", 
+    "typeName": "Lucifer Swordspine", 
     "typeNameID": 570100, 
     "volume": 27289.0
   }, 
@@ -628889,11 +628884,10 @@
     "descriptionID": 570186, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56354, 
@@ -628908,11 +628902,10 @@
     "descriptionID": 570188, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56355, 
@@ -628927,11 +628920,10 @@
     "descriptionID": 570190, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56356, 
@@ -628946,11 +628938,10 @@
     "descriptionID": 570192, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56357, 
@@ -628965,11 +628956,10 @@
     "descriptionID": 570194, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56358, 
@@ -628984,11 +628974,10 @@
     "descriptionID": 570196, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56359, 
@@ -629003,11 +628992,10 @@
     "descriptionID": 570198, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56360, 
@@ -629022,11 +629010,10 @@
     "descriptionID": 570200, 
     "groupID": 4050, 
     "iconID": 24498, 
-    "marketGroupID": 2747, 
     "mass": 0.0, 
     "metaLevel": 0, 
     "portionSize": 1, 
-    "published": true, 
+    "published": false, 
     "radius": 1.0, 
     "techLevel": 1, 
     "typeID": 56361, 
@@ -629034,6 +629021,42 @@
     "typeNameID": 570199, 
     "volume": 0.1
   }, 
+  "56362": {
+    "basePrice": 5000.0, 
+    "capacity": 120.0, 
+    "description": "This small container is fitted with a password-protected security lock. \r\nIt has been placed as part of GM Week celebrations and contains goodies for capsuleers who can solve the riddle of its password.", 
+    "descriptionID": 570223, 
+    "graphicID": 1173, 
+    "groupID": 340, 
+    "iconID": 1173, 
+    "isDynamicType": false, 
+    "mass": 10000.0, 
+    "portionSize": 1, 
+    "published": false, 
+    "radius": 10.0, 
+    "typeID": 56362, 
+    "typeName": "GM's Secret Stash Container", 
+    "typeNameID": 570222, 
+    "volume": 100.0
+  }, 
+  "56365": {
+    "basePrice": 0.0, 
+    "capacity": 0.0, 
+    "description": "This sealed containment crate holds a Tranquil Abyssal Filament of a random weather type that can transport you to an Abyssal Deadspace pocket.", 
+    "descriptionID": 570233, 
+    "groupID": 1194, 
+    "iconID": 21924, 
+    "marketGroupID": 1661, 
+    "mass": 0.1, 
+    "metaGroupID": 19, 
+    "portionSize": 1, 
+    "published": true, 
+    "radius": 1.0, 
+    "typeID": 56365, 
+    "typeName": "Tranquil Abyssal Filaments Crate", 
+    "typeNameID": 570232, 
+    "volume": 1.0
+  }, 
   "564": {
     "basePrice": 12000.0, 
     "capacity": 0.2, 
@@ -629179,6 +629202,51 @@
     "typeNameID": 106145, 
     "volume": 10.0
   }, 
+  "56622": {
+    "basePrice": 0.0, 
+    "capacity": 0.0, 
+    "description": "This SKIN will be applied directly to your character's SKIN collection when redeemed, instead of being placed in your inventory.", 
+    "descriptionID": 570745, 
+    "groupID": 1950, 
+    "mass": 0.0, 
+    "portionSize": 1, 
+    "published": true, 
+    "radius": 1.0, 
+    "typeID": 56622, 
+    "typeName": "Skybreaker Strikeflight Red SKIN", 
+    "typeNameID": 570744, 
+    "volume": 0.01
+  }, 
+  "56623": {
+    "basePrice": 0.0, 
+    "capacity": 0.0, 
+    "description": "This SKIN will be applied directly to your character's SKIN collection when redeemed, instead of being placed in your inventory.", 
+    "descriptionID": 570748, 
+    "groupID": 1950, 
+    "mass": 0.0, 
+    "portionSize": 1, 
+    "published": true, 
+    "radius": 1.0, 
+    "typeID": 56623, 
+    "typeName": "Stormbringer Strikeflight Red SKIN", 
+    "typeNameID": 570747, 
+    "volume": 0.01
+  }, 
+  "56624": {
+    "basePrice": 0.0, 
+    "capacity": 0.0, 
+    "description": "This SKIN will be applied directly to your character's SKIN collection when redeemed, instead of being placed in your inventory.", 
+    "descriptionID": 570751, 
+    "groupID": 1950, 
+    "mass": 0.0, 
+    "portionSize": 1, 
+    "published": true, 
+    "radius": 1.0, 
+    "typeID": 56624, 
+    "typeName": "Thunderchild Strikeflight Red SKIN", 
+    "typeNameID": 570750, 
+    "volume": 0.01
+  }, 
   "567": {
     "basePrice": 20000.0, 
     "capacity": 2.0, 

staticdata/phobos/metadata.json

@@ -1,10 +1,10 @@
 [
   {
     "field_name": "client_build", 
-    "field_value": 1801413
+    "field_value": 1810288
   }, 
   {
     "field_name": "dump_time", 
-    "field_value": 1599630922
+    "field_value": 1600799544
   }
 ]

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.2dev1
+version: v2.28.3