Merge branch 'master' into Application-Profile-Fix

Author: GET-R3AL

.gitignore

@@ -128,5 +128,8 @@ gitversion
 *.fsdbinary
 /locale/progress.json
 
+# Generated by db_update.py
+eve.db
+
 # vscode settings
 .vscode

db_update.py

@@ -174,11 +174,9 @@ def processEveTypes():
                 # Micro Bombs (Fighters)
                 row['typeID'] in (41549, 41548, 41551, 41550) or
                 # Abyssal weather (environment)
-                row['groupID'] in (
-                    1882,
-                    1975,
-                    1971,
-                    1983)  # the "container" for the abyssal environments
+                row['groupID'] in (1882, 1975, 1971, 1983) or
+                # FW-specific proximity beacons
+                row['typeID'] in (92609, 95625)
             ):
                 newData.append(row)
         map = {'typeName_en-us': 'typeName', 'description_en-us': '_description'}
@@ -754,6 +752,25 @@ def hardcodeTrigSystemEffects():
             _hardcodeEffects(typeID, effectMap, clearEffects=True)
             eos.db.gamedata_session.flush()
 
+    def hardcodeFwProxyEffects():
+        typeBuffMap = {
+            # BC level up
+            92609: ('FW Moderate Site BC Skill Bonus', {
+                'warfareBuff1ID': 2544,
+                'warfareBuff1Value': 20}),
+            # T3D HP
+            95625: ('FW ELT-5 Site T3D HP Bonus', {
+                'warfareBuff1ID': 2545,
+                'warfareBuff1Value': 500})}
+        effectMap = {100003: 'pyfaCustomFwProxyBuffEffect'}
+        for typeID, (name, attrMap) in typeBuffMap.items():
+            item = eos.db.gamedata_session.query(eos.gamedata.Item).filter(eos.gamedata.Item.ID == typeID).one()
+            item.published = True
+            item.name = name
+            _hardcodeAttribs(typeID, attrMap)
+            _hardcodeEffects(typeID, effectMap, clearEffects=True)
+            eos.db.gamedata_session.flush()
+
 
     def hardcodeShapash():
         shapashTypeID = 1000000
@@ -901,6 +918,7 @@ def hardcodeCybele():
     hardcodeSuppressionTackleRange()
     hardcodeSovUpgradeBuffs()
     hardcodeTrigSystemEffects()
+    hardcodeFwProxyEffects()
 
     eos.db.gamedata_session.commit()
     eos.db.gamedata_engine.execute('VACUUM')

dist_assets/mac/pyfa.spec

@@ -11,6 +11,10 @@ label = subprocess.check_output([
 with open('.version', 'w+') as f:
     f.write(label.decode())
 
+# Use PYFA_VERSION from the environment (set in CI), falling back to the
+# git-describe label so local builds don't crash on a None plist value.
+pyfa_version = os.getenv('PYFA_VERSION') or label.decode()
+
 block_cipher = None
 
 added_files = [
@@ -88,7 +92,7 @@ coll = COLLECT(
 app = BUNDLE(
     coll,
     name='pyfa.app',
-    version=os.getenv('PYFA_VERSION'),
+    version=pyfa_version,
     icon=icon,
     bundle_identifier=None,
     info_plist={
@@ -97,7 +101,7 @@ app = BUNDLE(
         'CFBundleName': 'pyfa',
         'CFBundleDisplayName': 'pyfa',
         'CFBundleIdentifier': 'org.pyfaorg.pyfa',
-        'CFBundleVersion': os.getenv('PYFA_VERSION'),
-        'CFBundleShortVersionString': os.getenv('PYFA_VERSION'),
+        'CFBundleVersion': pyfa_version,
+        'CFBundleShortVersionString': pyfa_version,
     }
 )

eos/effects.py

@@ -95,6 +95,25 @@ def handler(fit, beacon, context, projectionRange, **kwargs):
                 fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
 
 
+class Effect100003(BaseEffect):
+    """
+    pyfaCustomFwProxyBuffEffect
+
+    Used by:
+    Celestials from group: Cloud (2 of 2)
+    """
+
+    runTime = 'early'
+    type = ('projected', 'passive', 'gang')
+
+    @staticmethod
+    def handler(fit, beacon, context, projectionRange, **kwargs):
+        for i in range(1, 5):
+            if id := beacon.getModifiedItemAttr(f'warfareBuff{i}ID'):
+                value = beacon.getModifiedItemAttr(f'warfareBuff{i}Value')
+                fit.addCommandBonus(id, value, beacon, kwargs['effect'], 'early')
+
+
 class Effect4(BaseEffect):
     """
     shieldBoosting
@@ -1246,6 +1265,7 @@ class Effect395(BaseEffect):
     Modules named like: Low Friction Nozzle Joints (8 of 8)
     Implant: AIR Agility Booster II
     Implant: AIR Overclocker Booster III
+    Implant: Cavalry Clash Booster
     Implant: Genolution Core Augmentation CA-4
     Implant: Quafe Zero Green Apple
     Implant: Starsi Blast! Classic
@@ -2077,7 +2097,7 @@ class Effect657(BaseEffect):
     agilityMultiplierEffect
 
     Used by:
-    Modules from group: Inertial Stabilizer (7 of 7)
+    Modules from group: Inertial Stabilizer (8 of 8)
     Modules from group: Nanofiber Internal Structure (8 of 8)
     Modules from group: Reinforced Bulkhead (8 of 8)
     """
@@ -2208,6 +2228,7 @@ class Effect699(BaseEffect):
     Implants named like: Republic Electronics 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: Astrograph Clash Booster
     Implant: Quafe Zero Classic
     Implant: Starsi Blast! Orange
     Skill: Signature Analysis
@@ -2465,6 +2486,7 @@ class Effect784(BaseEffect):
     Implants named like: Zainou 'Deadeye' Missile Bombardment MB (6 of 6)
     Modules named like: Rocket Fuel Cache Partition (8 of 8)
     Implant: Antipharmakon Toxot
+    Implant: Soaring Volatile Booster
     Skill: Missile Bombardment
     """
 
@@ -2559,6 +2581,7 @@ class Effect856(BaseEffect):
     Implants named like: Strokar Booster (2 of 2)
     Implants named like: grade Ascendancy (10 of 12)
     Modules named like: Hyperspatial Velocity Optimizer (8 of 8)
+    Implant: Cavalry Clash Booster
     Implant: Eifyr and Co. 'Rogue' Agility ZhenNiu
     """
 
@@ -6935,7 +6958,7 @@ class Effect2302(BaseEffect):
     damageControl
 
     Used by:
-    Modules from group: Damage Control (25 of 30)
+    Modules from group: Damage Control (26 of 31)
     """
 
     type = 'passive'
@@ -7447,7 +7470,7 @@ class Effect2644(BaseEffect):
     increaseSignatureRadiusOnline
 
     Used by:
-    Modules from group: Inertial Stabilizer (7 of 7)
+    Modules from group: Inertial Stabilizer (8 of 8)
     """
 
     type = 'passive'
@@ -7576,7 +7599,6 @@ class Effect2688(BaseEffect):
 
     Used by:
     Modules named like: Energy Discharge Elutriation (8 of 8)
-    Module: Imperial Navy 'Atonement' Tracking Enhancer
     """
 
     type = 'passive'
@@ -8316,7 +8338,7 @@ class Effect2794(BaseEffect):
 
     Used by:
     Modules from group: Rig Resource Processing (8 of 10)
-    Implant: Poteque 'Prospector' Salvaging SV-905
+    Implants named like: Poteque 'Prospector' Salvaging SV (2 of 2)
     """
 
     type = 'passive'
@@ -8571,6 +8593,7 @@ class Effect2847(BaseEffect):
     Implants named like: Halcyon G Booster (5 of 5)
     Implant: Antipharmakon Iokira
     Implant: Ogdin's Eye Coordination Enhancer
+    Implant: Zero-In Volatile Booster
     Skill: Motion Prediction
     """
 
@@ -13532,6 +13555,7 @@ class Effect4162(BaseEffect):
     Implants named like: grade Virtue (10 of 12)
     Modules named like: Gravity Capacitor Upgrade (8 of 8)
     Implant: AIR Astro-Rangefinding II Booster
+    Implant: Astrograph Clash Booster
     Implant: Poteque 'Prospector' Sharpeye ZhenNiu
     Skill: Astrometric Rangefinding
     Skill: Astrometrics
@@ -16062,6 +16086,7 @@ class Effect4817(BaseEffect):
     Used by:
     Implants named like: Hardpoint Booster (12 of 12)
     Implant: Poteque 'Prospector' Environmental Analysis EY-1005
+    Implant: Upcycle Volatile Booster
     """
 
     type = 'passive'
@@ -16642,6 +16667,7 @@ class Effect4951(BaseEffect):
     Implants named like: Halcyon R Booster (5 of 5)
     Implant: AIR Hardshell Booster II
     Implant: Antipharmakon Thureo
+    Implant: Hallowed Volatile Booster
     """
 
     type = 'passive'
@@ -17373,10 +17399,9 @@ class Effect5069(BaseEffect):
 
     @staticmethod
     def handler(fit, module, context, projectionRange, **kwargs):
-        fit.modules.filteredChargeBoost(
-            lambda mod: mod.charge.requiresSkill('Mercoxit Ore Processing'),
-            'specializationAsteroidYieldMultiplier',
-            module.getModifiedItemAttr('miningAmountBonus'), **kwargs)
+        fit.modules.filteredItemBoost(
+            lambda mod: mod.item.requiresSkill('Deep Core Mining'),
+            'miningAmount', module.getModifiedItemAttr('miningAmountBonus'), **kwargs)
 
 
 class Effect5079(BaseEffect):
@@ -19010,7 +19035,8 @@ class Effect5316(BaseEffect):
     shipBonusDroneHitpointsGD1
 
     Used by:
-    Variations of ship: Algos (3 of 3)
+    Ship: Algos
+    Ship: Magus
     """
 
     type = 'passive'
@@ -19676,6 +19702,7 @@ class Effect5364(BaseEffect):
     Implants named like: Haven Booster (2 of 2)
     Implant: AIR Hardshell Booster II
     Implant: Antipharmakon Kosybo
+    Implant: Tenacious Volatile Booster
     Implant: Wisdom of Gheinok
     """
 
@@ -20200,6 +20227,7 @@ class Effect5433(BaseEffect):
     Used by:
     Implants named like: Halcyon B Booster (5 of 5)
     Modules named like: Memetic Algorithm Bank (8 of 8)
+    Implant: Coherence Volatile Booster
     Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
     Implant: Neural Lace 'Bluefire' Net Ablation 960-10
     Implant: Poteque 'Prospector' Environmental Analysis EY-1005
@@ -20223,6 +20251,7 @@ class Effect5437(BaseEffect):
     Used by:
     Implants named like: Halcyon Y Booster (5 of 5)
     Modules named like: Emission Scope Sharpener (8 of 8)
+    Implant: Coherence Volatile Booster
     Implant: Poteque 'Prospector' Archaeology AC-905
     Implant: Poteque 'Prospector' Environmental Analysis EY-1005
     Skill: Archaeology
@@ -20324,6 +20353,7 @@ class Effect5459(BaseEffect):
     hackingVirusStrengthBonus
 
     Used by:
+    Implant: Coherence Volatile Booster
     Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
     Implant: Neural Lace 'Bluefire' Net Ablation 960-10
     """
@@ -35240,6 +35270,7 @@ class Effect7183(BaseEffect):
 
     Used by:
     Implants named like: Inquest 'Hedone' Entanglement Optimizer WS (3 of 3)
+    Implant: Requisition Volatile Booster
     """
 
     type = 'passive'
@@ -38046,6 +38077,23 @@ def handler(fit, ship, context, projectionRange, **kwargs):
             skill='Gallente Hauler', **kwargs)
 
 
+class Effect8328(BaseEffect):
+    """
+    relicVirusStrengthBonusPassive
+
+    Used by:
+    Implant: Coherence Volatile Booster
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.modules.filteredItemIncrease(
+            lambda mod: mod.item.requiresSkill('Archaeology'), 'virusStrength',
+            src.getModifiedItemAttr('virusStrengthBonus'), **kwargs)
+
+
 class Effect8360(BaseEffect):
     """
     shipBonusMissileReloadTimeGC2
@@ -43668,3 +43716,85 @@ def handler(fit, ship, context, projectionRange, **kwargs):
         fit.modules.filteredItemBoost(
             lambda mod: mod.item.requiresSkill('Medium Hybrid Turret'), 'damageMultiplier',
             ship.getModifiedItemAttr('eliteBonusCommandShips1'), skill='Command Ships', **kwargs)
+
+
+class Effect12908(BaseEffect):
+    """
+    shipBonusDroneHitpointsGD2
+
+    Used by:
+    Ship: Algos Navy Issue
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'shieldCapacity',
+                                     src.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer', **kwargs)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'armorHP',
+                                     src.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer', **kwargs)
+        fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill('Drones'), 'hp',
+                                     src.getModifiedItemAttr('shipBonusGD2'), skill='Gallente Destroyer', **kwargs)
+
+
+class Effect12916(BaseEffect):
+    """
+    moduleBonusBreacherPodDamageControl
+
+    Used by:
+    Module: Breach Control
+    """
+
+    type = 'active'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.ship.boostItemAttr('breacherPodDamageResistance', src.getModifiedItemAttr('breacherPodActivatedDamageReceivedPercentage'), **kwargs)
+
+
+class Effect12923(BaseEffect):
+    """
+    dScanRangeBonus
+
+    Used by:
+    Implant: SITREP Clash Booster
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        fit.ship.boostItemAttr('maxDirectionalScanRange', src.getModifiedItemAttr('dScanRangeBonus'), **kwargs)
+
+
+class Effect12924(BaseEffect):
+    """
+    proximityDbuffTacticalDestroyerHPAddEffect
+
+    Used by:
+    Ships from group: Tactical Destroyer (5 of 5)
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, src, context, projectionRange, **kwargs):
+        for attr in ('shieldCapacity', 'armorHP', 'hp'):
+            fit.ship.increaseItemAttr(attr, src.getModifiedItemAttr('proximityDbuffEffectTacticalDestroyerHP'), **kwargs)
+
+
+class Effect12940(BaseEffect):
+    """
+    capNeedBonusEffectLasersOnline
+
+    Used by:
+    Module: Imperial Navy 'Atonement' Tracking Enhancer
+    """
+
+    type = 'passive'
+
+    @staticmethod
+    def handler(fit, module, context, projectionRange, **kwargs):
+        fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == 'Energy Weapon',
+                                      'capacitorNeed', module.getModifiedItemAttr('capNeedBonus'), **kwargs)