Bump version

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/fit.py

@@ -755,13 +755,11 @@ class Fit:
                     self.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"),
                         "signatureRadius", value, stackingPenalties=True)
 
-                if warfareBuffID == 80:  # AOE_Beacon_caustic_cloud_local_repair
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
-                                                   "armorDamageAmount", value, stackingPenalties=True)
+                if warfareBuffID == 80:  # AOE_Beacon_caustic_cloud_inertia
+                    self.ship.boostItemAttr("agility", value, stackingPenalties=True)
 
-                if warfareBuffID == 81:  # AOE_Beacon_caustic_cloud_remote_repair
-                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"),
-                                                   "armorDamageAmount", value, stackingPenalties=True)
+                if warfareBuffID == 81:  # AOE_Beacon_caustic_cloud_velocity
+                    self.ship.boostItemAttr("maxVelocity", value, stackingPenalties=True)
 
                 if warfareBuffID == 88:  # AOE_Beacon_filament_cloud_shield_booster_shield_bonus
                     self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),

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

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

staticdata/fsd_binary/dogmaattributes.json

@@ -25852,7 +25852,7 @@
     "displayName": "Missile Damage Bonus", 
     "displayNameID": 311932, 
     "highIsGood": 1, 
-    "iconID": 0, 
+    "iconID": 1397, 
     "name": "siegeMissileDamageBonus", 
     "published": 1, 
     "stackable": 1, 
@@ -26319,7 +26319,7 @@
     "displayName": "Armor Repairer / Shield Booster Duration Bonus", 
     "displayNameID": 312084, 
     "highIsGood": 1, 
-    "iconID": 0, 
+    "iconID": 2104, 
     "name": "siegeLocalLogisticsDurationBonus", 
     "published": 1, 
     "stackable": 1, 
@@ -26334,7 +26334,7 @@
     "displayName": "Armor Repairer / Shield Booster Amount Bonus", 
     "displayNameID": 312085, 
     "highIsGood": 1, 
-    "iconID": 0, 
+    "iconID": 2104, 
     "name": "siegeLocalLogisticsAmountBonus", 
     "published": 1, 
     "stackable": 1, 

staticdata/fsd_binary/dogmaeffects.json

@@ -79525,5 +79525,69 @@
     "propulsionChance": 0, 
     "published": 0, 
     "rangeChance": 0
+  }, 
+  "8088": {
+    "disallowAutoRepeat": 0, 
+    "dischargeAttributeID": 6, 
+    "distribution": 2, 
+    "durationAttributeID": 51, 
+    "effectCategory": 2, 
+    "effectID": 8088, 
+    "effectName": "EntityChainLightning", 
+    "electronicChance": 0, 
+    "guid": "effects.AttackMode", 
+    "isAssistance": 0, 
+    "isOffensive": 1, 
+    "isWarpSafe": 0, 
+    "propulsionChance": 0, 
+    "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

@@ -16191,5 +16191,45 @@
     "name": "Quantum Cores", 
     "nameID": 569644, 
     "parentGroupID": 2202
+  }, 
+  "2750": {
+    "description": "Capital Astronautic Mutaplasmids", 
+    "descriptionID": 569939, 
+    "hasTypes": 1, 
+    "name": "Capital Astronautic Mutaplasmids", 
+    "nameID": 569938, 
+    "parentGroupID": 2439
+  }, 
+  "2751": {
+    "description": "Capital Armor Mutaplasmids", 
+    "descriptionID": 569941, 
+    "hasTypes": 1, 
+    "name": "Capital Armor Mutaplasmids", 
+    "nameID": 569940, 
+    "parentGroupID": 2437
+  }, 
+  "2752": {
+    "description": "Capital Shield Mutaplasmids", 
+    "descriptionID": 569944, 
+    "hasTypes": 1, 
+    "name": "Capital Shield Mutaplasmids", 
+    "nameID": 569943, 
+    "parentGroupID": 2438
+  }, 
+  "2753": {
+    "description": "Capital Engineering Mutaplasmids", 
+    "descriptionID": 569946, 
+    "hasTypes": 1, 
+    "name": "Capital Engineering Mutaplasmids", 
+    "nameID": 569945, 
+    "parentGroupID": 2440
+  }, 
+  "2754": {
+    "description": "Siege Module Mutaplasmids", 
+    "descriptionID": 569952, 
+    "hasTypes": 1, 
+    "name": "Siege Module Mutaplasmids", 
+    "nameID": 569951, 
+    "parentGroupID": 2512
   }
 }

staticdata/fsd_binary/requiredskillsfortypes.json

@@ -25681,5 +25681,43 @@
   }, 
   "56187": {
     "3402": 1
+  }, 
+  "56303": {
+    "3435": 5, 
+    "3449": 5
+  }, 
+  "56304": {
+    "3435": 5
+  }, 
+  "56305": {
+    "3450": 4
+  }, 
+  "56306": {
+    "3454": 4
+  }, 
+  "56307": {
+    "21803": 4
+  }, 
+  "56308": {
+    "3392": 3, 
+    "21803": 1
+  }, 
+  "56309": {
+    "21802": 4
+  }, 
+  "56310": {
+    "21802": 4
+  }, 
+  "56311": {
+    "3423": 5
+  }, 
+  "56312": {
+    "3423": 5
+  }, 
+  "56313": {
+    "22043": 1
+  }, 
+  "56362": {
+    "11584": 1
   }
 }

staticdata/fsd_lite/dbuffcollections.json

@@ -1373,39 +1373,33 @@
   }, 
   "80": {
     "aggregateMode": "Minimum", 
-    "developerDescription": "AOE_Beacon_caustic_cloud_local_repair", 
-    "displayName": "Local Armor Repairer penalty", 
+    "developerDescription": "AOE_Beacon_caustic_cloud_inertia", 
+    "displayName": "Inertia Bonus", 
     "displayNameID": 532902, 
-    "itemModifiers": [], 
-    "locationGroupModifiers": [], 
-    "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [
+    "itemModifiers": [
       {
-        "dogmaAttributeID": 84, 
-        "skillID": 3393
+        "dogmaAttributeID": 70
       }
     ], 
+    "locationGroupModifiers": [], 
+    "locationModifiers": [], 
+    "locationRequiredSkillModifiers": [], 
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
   }, 
   "81": {
     "aggregateMode": "Minimum", 
-    "developerDescription": "AOE_Beacon_caustic_cloud_remote_repair", 
-    "displayName": "Remote Armor Repairer penalty", 
+    "developerDescription": "AOE_Beacon_caustic_cloud_velocity", 
+    "displayName": "Max Velocity Bonus", 
     "displayNameID": 532901, 
     "itemModifiers": [
       {
-        "dogmaAttributeID": 84
+        "dogmaAttributeID": 37
       }
     ], 
     "locationGroupModifiers": [], 
     "locationModifiers": [], 
-    "locationRequiredSkillModifiers": [
-      {
-        "dogmaAttributeID": 84, 
-        "skillID": 16069
-      }
-    ], 
+    "locationRequiredSkillModifiers": [], 
     "operationName": "PostPercent", 
     "showOutputValueInUI": "ShowNormal"
   }, 

staticdata/phobos/metadata.json

@@ -1,10 +1,10 @@
 [
   {
     "field_name": "client_build", 
-    "field_value": 1800064
+    "field_value": 1806850
   }, 
   {
     "field_name": "dump_time", 
-    "field_value": 1599630162
+    "field_value": 1600282684
   }
 ]

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