Bump version

dist_assets/win/pyfa.exe.manifest

@@ -10,10 +10,15 @@
   </trustInfo>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
+      <!-- Windows Vista -->
       <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+      <!-- Windows 7 -->
       <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+      <!-- Windows 8 -->
       <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+      <!-- Windows 8.1 -->
       <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 10 and Windows 11 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
     </application>
   </compatibility>

eos/effects.py

@@ -396,7 +396,7 @@ class Effect59(BaseEffect):
     cargoCapacityMultiply
 
     Used by:
-    Modules from group: Expanded Cargohold (7 of 7)
+    Modules from group: Expanded Cargohold (8 of 8)
     Modules from group: Overdrive Injector System (7 of 7)
     Modules from group: Reinforced Bulkhead (8 of 8)
     """
@@ -966,8 +966,8 @@ class Effect272(BaseEffect):
 
     Used by:
     Implants named like: Inherent Implants 'Noble' Repair Systems RS (6 of 6)
+    Implants named like: Repairer Booster (4 of 4)
     Modules named like: Nanobot Accelerator (8 of 8)
-    Implant: AIR Repairer Booster III
     Implant: Numon Family Heirloom
     Skill: Repair Systems
     """
@@ -1060,6 +1060,7 @@ class Effect290(BaseEffect):
     Used by:
     Implants named like: Frentix Booster (4 of 4)
     Implants named like: Halcyon B Booster (5 of 5)
+    Implants named like: SoCT Turret Booster (3 of 3)
     Implants named like: Zainou 'Deadeye' Sharpshooter ST (6 of 6)
     Skill: Sharpshooter
     """
@@ -1169,6 +1170,7 @@ class Effect394(BaseEffect):
     Implant: AIR Overclocker Booster II
     Implant: Quafe Zero Classic
     Implant: Serenity YC122.9 Season Booster - Max Velocity
+    Implant: Starsi Blast! Classic
     Implant: Wisdom of Gheinok
     Skill: Navigation
     """
@@ -1190,17 +1192,18 @@ class Effect395(BaseEffect):
 
     Used by:
     Modules from group: Rig Anchor (4 of 4)
+    Implants named like: Agility Booster (4 of 4)
     Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6)
     Implants named like: Grand Prix Booster (4 of 6)
     Implants named like: Halcyon G Booster (5 of 5)
     Implants named like: Halcyon Y Booster (5 of 5)
     Implants named like: grade Nomad (10 of 12)
     Modules named like: Low Friction Nozzle Joints (8 of 8)
-    Implant: AIR Agility Booster II
     Implant: AIR Overclocker Booster III
     Implant: Genolution Core Augmentation CA-4
     Implant: Quafe Zero Green Apple
     Implant: Serenity YC122.9 Season Booster - Agility
+    Implant: Starsi Blast! Classic
     Skill: Evasive Maneuvering
     Skill: Spaceship Command
     """
@@ -1335,6 +1338,7 @@ class Effect485(BaseEffect):
     Implant: Basic Capsuleer Engineering Augmentation Chip
     Implant: Genolution Core Augmentation CA-2
     Implant: Quafe Zero Green Apple
+    Implant: Starsi Blast! Orange
     Skill: Capacitor Systems Operation
     """
 
@@ -1771,6 +1775,7 @@ class Effect584(BaseEffect):
     Implants named like: 'Pyrolancea' Dose (7 of 7)
     Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
     Implants named like: Halcyon Y Booster (5 of 5)
+    Implants named like: SoCT Turret Booster (3 of 3)
     Implant: AIR Pyrolancea Booster II
     Implant: Standard Cerebral Accelerator
     """
@@ -2153,9 +2158,11 @@ class Effect699(BaseEffect):
     Used by:
     Implants named like: Halcyon B Booster (5 of 5)
     Implants named like: Halcyon R Booster (5 of 5)
+    Implants named like: SoCT Scan Booster (3 of 3)
     Implants named like: Zainou 'Gypsy' Signature Analysis SA (6 of 6)
     Modules named like: Targeting System Subcontroller (8 of 8)
     Implant: Quafe Zero Classic
+    Implant: Starsi Blast! Orange
     Skill: Signature Analysis
     """
 
@@ -2502,6 +2509,7 @@ class Effect856(BaseEffect):
     Implants named like: Grand Prix Booster (5 of 6)
     Implants named like: Halcyon B Booster (5 of 5)
     Implants named like: Serenity Limited 'Overclocker' Dose (3 of 3)
+    Implants named like: SoCT Agility Booster (3 of 3)
     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
@@ -4817,7 +4825,7 @@ class Effect1615(BaseEffect):
     shipAdvancedSpaceshipCommandAgilityBonus
 
     Used by:
-    Items from market group: Ships > Capital Ships (50 of 50)
+    Items from market group: Ships > Capital Ships (51 of 51)
     """
 
     type = 'passive'
@@ -4890,8 +4898,8 @@ class Effect1635(BaseEffect):
     capitalRepairSystemsSkillDurationBonus
 
     Used by:
+    Implants named like: Repairer Booster (4 of 4)
     Modules named like: Nanobot Accelerator (8 of 8)
-    Implant: AIR Repairer Booster III
     Skill: Capital Repair Systems
     """
 
@@ -4955,9 +4963,7 @@ class Effect1644(BaseEffect):
     skirmishCommandMindlink
 
     Used by:
-    Implant: Federation Navy Command Mindlink
+    Implants from group: Cyber Leadership (4 of 11)
-    Implant: Republic Fleet Command Mindlink
-    Implant: Skirmish Command Mindlink
     """
 
     type = 'passive'
@@ -4981,7 +4987,7 @@ class Effect1645(BaseEffect):
     shieldCommandMindlink
 
     Used by:
-    Implants from group: Cyber Leadership (4 of 10)
+    Implants from group: Cyber Leadership (4 of 11)
     """
 
     type = 'passive'
@@ -5005,9 +5011,7 @@ class Effect1646(BaseEffect):
     informationCommandMindlink
 
     Used by:
-    Implant: Caldari Navy Command Mindlink
+    Implants from group: Cyber Leadership (4 of 11)
-    Implant: Imperial Navy Command Mindlink
-    Implant: Information Command Mindlink
     """
 
     type = 'passive'
@@ -6737,7 +6741,7 @@ class Effect2252(BaseEffect):
 
     Used by:
     Ships from group: Black Ops (5 of 5)
-    Ships from group: Blockade Runner (4 of 4)
+    Ships from group: Blockade Runner (5 of 5)
     Ships from group: Covert Ops (8 of 8)
     Ships from group: Expedition Frigate (2 of 2)
     Ships from group: Force Recon Ship (9 of 9)
@@ -6786,8 +6790,8 @@ class Effect2255(BaseEffect):
     tractorBeamCan
 
     Used by:
-    Deployables from group: Mobile Tractor Unit (4 of 4)
+    Deployables from group: Mobile Tractor Unit (5 of 5)
-    Modules from group: Tractor Beam (4 of 4)
+    Modules from group: Tractor Beam (6 of 6)
     """
 
     type = 'active'
@@ -6996,6 +7000,7 @@ class Effect2432(BaseEffect):
     Implants named like: Halcyon Y Booster (5 of 5)
     Implants named like: Inherent Implants 'Squire' Capacitor Management EM (6 of 6)
     Implants named like: Mindflood Booster (4 of 4)
+    Implants named like: SoCT Capacitor Booster (3 of 3)
     Modules named like: Semiconductor Memory Cell (8 of 8)
     Implant: Antipharmakon Aeolis
     Implant: Basic Capsuleer Engineering Augmentation Chip
@@ -9490,7 +9495,7 @@ class Effect3046(BaseEffect):
     modifyMaxVelocityOfShipPassive
 
     Used by:
-    Modules from group: Expanded Cargohold (7 of 7)
+    Modules from group: Expanded Cargohold (8 of 8)
     """
 
     type = 'offline'
@@ -9505,7 +9510,7 @@ class Effect3047(BaseEffect):
     structureHPMultiplyPassive
 
     Used by:
-    Modules from group: Expanded Cargohold (7 of 7)
+    Modules from group: Expanded Cargohold (8 of 8)
     """
 
     type = 'passive'
@@ -13484,6 +13489,7 @@ class Effect4162(BaseEffect):
     Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3)
     Implants named like: Poteque 'Prospector' Sharpeye (2 of 2)
     Implants named like: Serenity Limited 'Sharpeye' Dose (3 of 3)
+    Implants named like: SoCT Scan Booster (3 of 3)
     Implants named like: grade Virtue (10 of 12)
     Modules named like: Gravity Capacitor Upgrade (8 of 8)
     Implant: AIR Astro-Rangefinding II Booster
@@ -16344,7 +16350,7 @@ class Effect4921(BaseEffect):
     microJumpDrive
 
     Used by:
-    Modules from group: Micro Jump Drive (2 of 2)
+    Modules named like: Micro Jump Drive (3 of 3)
     """
 
     type = 'active'
@@ -16627,8 +16633,8 @@ class Effect4967(BaseEffect):
     shieldBoosterDurationBonusShieldSkills
 
     Used by:
+    Implants named like: Repairer Booster (4 of 4)
     Modules named like: Core Defense Operational Solidifier (8 of 8)
-    Implant: AIR Repairer Booster III
     """
 
     type = 'passive'
@@ -18657,7 +18663,7 @@ class Effect5266(BaseEffect):
     blockadeRunnerCloakCpuPercentBonus
 
     Used by:
-    Ships from group: Blockade Runner (4 of 4)
+    Ships from group: Blockade Runner (5 of 5)
     """
 
     runTime = 'early'
@@ -20175,6 +20181,7 @@ class Effect5437(BaseEffect):
 
     Used by:
     Implants named like: Halcyon Y Booster (5 of 5)
+    Implants named like: SoCT Relic Coherence Booster (3 of 3)
     Modules named like: Emission Scope Sharpener (8 of 8)
     Implant: Poteque 'Prospector' Archaeology AC-905
     Implant: Poteque 'Prospector' Environmental Analysis EY-1005
@@ -22423,7 +22430,7 @@ class Effect5869(BaseEffect):
     eliteIndustrialWarpSpeedBonus1
 
     Used by:
-    Ships from group: Blockade Runner (4 of 4)
+    Ships from group: Blockade Runner (5 of 5)
     """
 
     type = 'passive'
@@ -22505,7 +22512,7 @@ class Effect5874(BaseEffect):
     eliteIndustrialFleetCapacity1
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     """
 
     type = 'passive'
@@ -22521,8 +22528,7 @@ class Effect5881(BaseEffect):
     eliteIndustrialShieldResists2
 
     Used by:
-    Ship: Bustard
+    Ships from group: Deep Space Transport (3 of 5)
-    Ship: Mastodon
     """
 
     type = 'passive'
@@ -22557,7 +22563,7 @@ class Effect5889(BaseEffect):
     eliteIndustrialABHeatBonus
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     Ships from group: Interceptor (4 of 10)
     """
 
@@ -22574,7 +22580,7 @@ class Effect5890(BaseEffect):
     eliteIndustrialMWDHeatBonus
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     Ships from group: Interceptor (4 of 10)
     """
 
@@ -22591,7 +22597,7 @@ class Effect5891(BaseEffect):
     eliteIndustrialArmorHardenerHeatBonus
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     """
 
     type = 'passive'
@@ -22607,7 +22613,7 @@ class Effect5892(BaseEffect):
     eliteIndustrialReactiveArmorHardenerHeatBonus
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     """
 
     type = 'passive'
@@ -22623,7 +22629,7 @@ class Effect5893(BaseEffect):
     eliteIndustrialShieldHardenerHeatBonus
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     """
 
     type = 'passive'
@@ -22639,7 +22645,7 @@ class Effect5896(BaseEffect):
     eliteIndustrialShieldBoosterHeatBonus
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     """
 
     type = 'passive'
@@ -22657,7 +22663,7 @@ class Effect5899(BaseEffect):
     eliteIndustrialArmorRepairHeatBonus
 
     Used by:
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
     """
 
     type = 'passive'
@@ -22690,7 +22696,7 @@ class Effect5901(BaseEffect):
     roleBonusBulkheadCPU
 
     Used by:
-    Ships from group: Freighter (4 of 5)
+    Ships from group: Freighter (4 of 6)
     Ships from group: Jump Freighter (4 of 4)
     """
 
@@ -24867,7 +24873,7 @@ class Effect6208(BaseEffect):
     microJumpPortalDrive
 
     Used by:
-    Module: Micro Jump Field Generator
+    Modules named like: Micro Jump Field Generator (2 of 2)
     """
 
     type = 'active'
@@ -26912,8 +26918,7 @@ class Effect6431(BaseEffect):
     fighterAbilityMissiles
 
     Used by:
-    Items from category: Fighter (48 of 82)
+    Items from category: Fighter (56 of 94)
-    Fighters from group: Light Fighter (32 of 32)
     """
 
     dealsDamage = True
@@ -26928,7 +26933,7 @@ class Effect6434(BaseEffect):
     fighterAbilityEnergyNeutralizer
 
     Used by:
-    Fighters named like: Cenobite (4 of 4)
+    Fighters named like: Cenobite (5 of 5)
     """
 
     displayName = 'Energy Neutralizer'
@@ -26957,7 +26962,7 @@ class Effect6435(BaseEffect):
     fighterAbilityStasisWebifier
 
     Used by:
-    Fighters named like: Dromi (4 of 4)
+    Fighters named like: Dromi (5 of 5)
     """
 
     displayName = 'Stasis Webifier'
@@ -26984,7 +26989,7 @@ class Effect6436(BaseEffect):
     fighterAbilityWarpDisruption
 
     Used by:
-    Fighters named like: Siren (4 of 4)
+    Fighters named like: Siren (5 of 5)
     """
 
     displayName = 'Warp Disruption'
@@ -27011,7 +27016,7 @@ class Effect6437(BaseEffect):
     fighterAbilityECM
 
     Used by:
-    Fighters named like: Scarab (4 of 4)
+    Fighters named like: Scarab (5 of 5)
     """
 
     displayName = 'ECM'
@@ -27041,7 +27046,8 @@ class Effect6439(BaseEffect):
     fighterAbilityEvasiveManeuvers
 
     Used by:
-    Fighters from group: Light Fighter (16 of 32)
+    Fighters from group: Light Fighter (12 of 24)
+    Fighters from group: Structure Light Fighter (8 of 16)
     """
 
     displayName = 'Evasive Maneuvers'
@@ -27079,7 +27085,7 @@ class Effect6440(BaseEffect):
 
     Used by:
     Fighters named like: Shadow (2 of 2)
-    Fighters named like: Siren (4 of 4)
+    Fighters named like: Siren (5 of 5)
     """
 
     displayName = 'Afterburner'
@@ -27098,7 +27104,7 @@ class Effect6441(BaseEffect):
     fighterAbilityMicroWarpDrive
 
     Used by:
-    Items from category: Fighter (44 of 82)
+    Items from category: Fighter (51 of 94)
     """
 
     displayName = 'Microwarpdrive'
@@ -27192,8 +27198,7 @@ class Effect6465(BaseEffect):
     fighterAbilityAttackM
 
     Used by:
-    Items from category: Fighter (50 of 82)
+    Items from category: Fighter (54 of 94)
-    Fighters from group: Heavy Fighter (34 of 34)
     """
 
     dealsDamage = True
@@ -27466,7 +27471,8 @@ class Effect6485(BaseEffect):
     fighterAbilityLaunchBomb
 
     Used by:
-    Fighters from group: Heavy Fighter (16 of 34)
+    Fighters from group: Heavy Fighter (8 of 17)
+    Fighters from group: Structure Heavy Fighter (8 of 17)
     """
 
     dealsDamage = True
@@ -28352,6 +28358,9 @@ class Effect6567(BaseEffect):
         fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups or
                                                   mod.item.requiresSkill('Propulsion Jamming'),
                                       'capacitorNeed', src.getModifiedItemAttr('ewCapacitorNeedBonus'), **kwargs)
+        fit.modules.filteredItemIncrease(
+            lambda mod: mod.item.requiresSkill('Capital Micro Jump Drive Operation'), 'activationBlocked',
+            src.getModifiedItemAttr('networkedSensorArrayDisallowCapitalMicroJump'), **kwargs)
 
 
 class Effect6570(BaseEffect):
@@ -31617,9 +31626,9 @@ class Effect6789(BaseEffect):
     industrialBonusDroneDamage
 
     Used by:
-    Ships from group: Blockade Runner (4 of 4)
+    Ships from group: Blockade Runner (5 of 5)
-    Ships from group: Deep Space Transport (4 of 4)
+    Ships from group: Deep Space Transport (5 of 5)
-    Ships from group: Hauler (17 of 17)
+    Ships from group: Hauler (18 of 18)
     Ships from group: Industrial Command Ship (2 of 2)
     Ship: Hulk
     Ship: Mackinaw
@@ -33556,7 +33565,7 @@ class Effect7009(BaseEffect):
     Used by:
     Structure Modules from group: Structure Citadel Service Module (2 of 2)
     Structure Modules from group: Structure Engineering Service Module (6 of 6)
-    Structure Modules from group: Structure Navigation Service Module (3 of 3)
+    Structure Modules from group: Structure FLEX Service Module (3 of 3)
     Structure Modules from group: Structure Resource Processing Service Module (4 of 4)
     Structure Module: Standup Moon Drill I
     """
@@ -36668,7 +36677,7 @@ class Effect8108(BaseEffect):
     signatureRadiusBonusOnline
 
     Used by:
-    Module: Signature Radius Suppressor I
+    Modules from group: Signature Suppressor (5 of 5)
     """
 
     type = 'passive'
@@ -36684,7 +36693,7 @@ class Effect8109(BaseEffect):
     targetSpectrumBreakerBonus
 
     Used by:
-    Module: Signature Radius Suppressor I
+    Modules from group: Signature Suppressor (5 of 5)
     """
 
     type = 'active'
@@ -38004,6 +38013,40 @@ class Effect8323(BaseEffect):
             skill='Gallente Hauler', **kwargs)
 
 
+class Effect8327(BaseEffect):
+    """
+    relicAnalyzerRangeBonusPassive
+
+    Used by:
+    Implants named like: SoCT Relic Range Booster (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Archaeology'), 'maxRange',
+            container.getModifiedItemAttr('rangeSkillBonus'), **kwargs)
+
+
+class Effect8328(BaseEffect):
+    """
+    relicVirusStrengthBonusPassive
+
+    Used by:
+    Implants named like: SoCT Relic Strength Booster (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredItemIncrease(
+            lambda mod: mod.item.requiresSkill('Archaeology'), 'virusStrength',
+            container.getModifiedItemAttr('virusStrengthBonus'), **kwargs)
+
+
 class Effect8360(BaseEffect):
     """
     shipBonusMissileReloadTimeGC2
@@ -38222,6 +38265,23 @@ class Effect8479(BaseEffect):
             container.getModifiedItemAttr('falloffBonus'), **kwargs)
 
 
+class Effect8594(BaseEffect):
+    """
+    modifyArmorDamageResistanceBonusPostPercentPassive
+
+    Used by:
+    Implants named like: SoCT Armor Booster (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, booster, context, projectionRange, **kwargs):
+        for type in ('Em', 'Explosive', 'Kinetic', 'Thermal'):
+            fit.ship.boostItemAttr(f'armor{type}DamageResonance',
+                                   booster.getModifiedItemAttr('armorDamageResistanceBonus'), **kwargs)
+
+
 class Effect11055(BaseEffect):
     """
     shipBonusBattlecruiserHeavyMissileAoeVelocityMBC1
@@ -40443,3 +40503,310 @@ class Effect12038(BaseEffect):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Small Projectile Turret'), 'falloff',
             ship.getModifiedItemAttr('shipBonus3MF'), skill='Minmatar Frigate', **kwargs)
+
+
+class Effect12050(BaseEffect):
+    """
+    shipBonusColonyResourcesHoldCapacityUH1
+
+    Used by:
+    Variations of ship: Squall (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.ship.boostItemAttr(
+            'specialColonyResourcesHoldCapacity', src.getModifiedItemAttr('shipBonusUH1'),
+            skill='Upwell Hauler', **kwargs)
+
+
+class Effect12051(BaseEffect):
+    """
+    shipMissileEMDamageUH2
+
+    Used by:
+    Variations of ship: Squall (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'emDamage', container.getModifiedItemAttr('shipBonusUH2'),
+            skill='Upwell Hauler', **kwargs)
+
+
+class Effect12052(BaseEffect):
+    """
+    shipMissileThermalDamageUH2
+
+    Used by:
+    Variations of ship: Squall (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'thermalDamage', container.getModifiedItemAttr('shipBonusUH2'),
+            skill='Upwell Hauler', **kwargs)
+
+
+class Effect12053(BaseEffect):
+    """
+    shipMissileExplosiveDamageUH2
+
+    Used by:
+    Variations of ship: Squall (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'explosiveDamage', container.getModifiedItemAttr('shipBonusUH2'),
+            skill='Upwell Hauler', **kwargs)
+
+
+class Effect12054(BaseEffect):
+    """
+    shipMissileKineticDamageUH2
+
+    Used by:
+    Variations of ship: Squall (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'kineticDamage', container.getModifiedItemAttr('shipBonusUH2'),
+            skill='Upwell Hauler', **kwargs)
+
+
+class Effect12057(BaseEffect):
+    """
+    shipBonusColonyResourcesHoldCapacityUFreighter1
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.ship.boostItemAttr(
+            'specialColonyResourcesHoldCapacity', src.getModifiedItemAttr('shipBonusUFreighter1'),
+            skill='Upwell Freighter', **kwargs)
+
+
+class Effect12058(BaseEffect):
+    """
+    shipMissileEMDamageUFreighter2
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'emDamage', container.getModifiedItemAttr('shipBonusUFreighter2'),
+            skill='Upwell Freighter', **kwargs)
+
+
+class Effect12060(BaseEffect):
+    """
+    shipMissileThermalDamageUFreighter2
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'thermalDamage', container.getModifiedItemAttr('shipBonusUFreighter2'),
+            skill='Upwell Freighter', **kwargs)
+
+
+class Effect12061(BaseEffect):
+    """
+    shipMissileExplosiveDamageUFreighter2
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'explosiveDamage', container.getModifiedItemAttr('shipBonusUFreighter2'),
+            skill='Upwell Freighter', **kwargs)
+
+
+class Effect12062(BaseEffect):
+    """
+    shipMissileKineticDamageUFreighter2
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        fit.modules.filteredChargeBoost(
+            lambda mod: mod.charge.requiresSkill('Missile Launcher Operation'),
+            'kineticDamage', container.getModifiedItemAttr('shipBonusUFreighter2'),
+            skill='Upwell Freighter', **kwargs)
+
+
+class Effect12063(BaseEffect):
+    """
+    shipRoleBonusUpwellFreighterCloakCPUPenalty
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemIncrease(
+            lambda mod: mod.item.group.name == 'Cloaking Device',
+            'cpu', ship.getModifiedItemAttr('upwellFreightercloakCPUPenalty'), **kwargs)
+
+
+class Effect12069(BaseEffect):
+    """
+    shipBonusAutoTargetingMissilesUFreighter3
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, container, context, projectionRange, **kwargs):
+        damageTypes = ('em', 'explosive', 'kinetic', 'thermal')
+        for dmgType in damageTypes:
+            fit.modules.filteredChargeBoost(
+                lambda mod: mod.charge.requiresSkill('Auto-Targeting Missiles'),
+                f'{dmgType}Damage', container.getModifiedItemAttr('shipBonusUFreighter3'),
+                skill='Upwell Freighter', **kwargs)
+
+
+class Effect12071(BaseEffect):
+    """
+    shipRoleBonusUpwellFreighterCapitalFlexHardenerFittingCapBonus
+
+    Used by:
+    Ship: Avalanche
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.group.name == 'Flex Shield Hardener',
+            'power', ship.getModifiedItemAttr('upwellFreighterCapitalFlexHardenerFittingCapBonus'), **kwargs)
+        fit.modules.filteredItemMultiply(
+            lambda mod: mod.item.group.name == 'Flex Shield Hardener',
+            'capacitorNeed', ship.getModifiedItemAttr('upwellFreighterCapitalFlexHardenerFittingCapBonus'), **kwargs)
+
+
+class Effect12072(BaseEffect):
+    """
+    eliteIndustrialUpwellNeutNosHeatBonus
+
+    Used by:
+    Ship: Torrent
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.group.name in ('Energy Neutralizer', 'Energy Nosferatu'),
+            'overloadSelfDurationBonus', ship.getModifiedItemAttr('roleBonusOverheatDST'), **kwargs)
+
+
+class Effect12098(BaseEffect):
+    """
+    jumpPortalPassengerBonusPercentSkill
+
+    Used by:
+    Skill: Capital Jump Portal Generation
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context, projectionRange, **kwargs):
+        fit.ship.boostItemAttr(
+            'conduitJumpPassengerCount',
+            skill.getModifiedItemAttr('conduitPassengerBonusPercent') * skill.level, **kwargs)
+
+
+class Effect12102(BaseEffect):
+    """
+    capitalMJDSkillCapReductionBonus
+
+    Used by:
+    Skill: Capital Micro Jump Drive Operation
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, skill, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Capital Micro Jump Drive Operation'), 'capacitorNeed',
+            skill.getModifiedItemAttr('capitalMJDCapReductionBonus') * skill.level, **kwargs)
+
+
+class Effect12127(BaseEffect):
+    """
+    shipRoleBonusUpwellHaulersMediumMissileFittingBonus
+
+    Used by:
+    Variations of ship: Squall (3 of 3)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, ship, context, projectionRange, **kwargs):
+        for attr in ('cpu', 'power'):
+            fit.modules.filteredItemMultiply(
+                lambda mod: mod.item.group.name in (
+                    'Missile Launcher Heavy Assault',
+                    'Missile Launcher Heavy',
+                    'Missile Launcher Rapid Light'),
+                attr, ship.getModifiedItemAttr('upwellHaulersMediumMissileFittingBonus'), **kwargs)

eos/gamedata.py

@@ -343,7 +343,8 @@ class Item(EqBase):
         500018: "mordu",
         500019: "sansha",
         500020: "serpentis",
-        500026: "triglavian"
+        500026: "triglavian",
+        500027: "upwell",
     }
 
     @property
@@ -351,11 +352,7 @@ class Item(EqBase):
         if self.__race is None:
 
             try:
-                if (
+                if self.category.name == 'Structure':
-                    self.category.name == 'Structure' or
-                    # Here until CCP puts their shit together
-                    self.name in ("Thunderchild", "Stormbringer", "Skybreaker")
-                ):
                     self.__race = "upwell"
                 else:
                     self.__race = self.factionMap[self.factionID]
@@ -377,7 +374,8 @@ class Item(EqBase):
                     16 : "jove",
                     32 : "sansha",  # Incrusion Sansha
                     128: "ore",
-                    135: "triglavian"
+                    135: "triglavian",
+                    168: "upwell",
                 }
                 # Race is None by default
                 race = None

gui/builtinItemStatsViews/attributeGrouping.py

@@ -72,6 +72,7 @@ AttrGroupDict = {
             "specialAmmoHoldCapacity",
             "specialCommandCenterHoldCapacity",
             "specialPlanetaryCommoditiesHoldCapacity",
+            "specialColonyResourcesHoldCapacity",
             "structureDamageLimit",
             "specialSubsystemHoldCapacity",
             "emDamageResonance",

gui/builtinStatsViews/targetingMiscViewMinimal.py

@@ -112,6 +112,7 @@ class TargetingMiscViewMinimal(StatsView):
         cargoNamesOrder = OrderedDict((
             ("fleetHangarCapacity", _t("Fleet hangar")),
             ("shipMaintenanceBayCapacity", _t("Maintenance bay")),
+            ("specialColonyResourcesHoldCapacity", _t("Infrastructure hold")),
             ("specialAmmoHoldCapacity", _t("Ammo hold")),
             ("specialFuelBayCapacity", _t("Fuel bay")),
             ("specialShipHoldCapacity", _t("Ship hold")),
@@ -134,6 +135,7 @@ class TargetingMiscViewMinimal(StatsView):
         cargoValues = {
             "main": lambda: fit.ship.getModifiedItemAttr("capacity"),
             "fleetHangarCapacity": lambda: fit.ship.getModifiedItemAttr("fleetHangarCapacity"),
+            "specialColonyResourcesHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialColonyResourcesHoldCapacity"),
             "shipMaintenanceBayCapacity": lambda: fit.ship.getModifiedItemAttr("shipMaintenanceBayCapacity"),
             "specialAmmoHoldCapacity": lambda: fit.ship.getModifiedItemAttr("specialAmmoHoldCapacity"),
             "specialFuelBayCapacity": lambda: fit.ship.getModifiedItemAttr("specialFuelBayCapacity"),

gui/builtinViewColumns/misc.py

@@ -590,7 +590,7 @@ class Miscellanea(ViewColumn):
             text = "{0}/s".format(formatAmount(capPerSec, 3, 0, 3))
             tooltip = "Energy neutralization per second"
             return text, tooltip
-        elif itemGroup in ("Micro Jump Drive", "Micro Jump Field Generators"):
+        elif itemGroup in ("Micro Jump Drive", "Micro Jump Field Generators", "Capital Mobility Modules"):
             cycleTime = stuff.getModifiedItemAttr("duration") / 1000
             text = "{0}s".format(formatAmount(cycleTime, 3, 0, 3))
             tooltip = "Spoolup time"