diff --git a/eos/effects.py b/eos/effects.py index 46d2c741d..57b259b75 100644 --- a/eos/effects.py +++ b/eos/effects.py @@ -22262,6 +22262,24 @@ class Effect5827(BaseEffect): 'maxRange', ship.getModifiedItemAttr('shipBonusAF'), skill='Amarr Frigate', **kwargs) +class Effect5852(BaseEffect): + """ + expeditionFrigateBonusOreMiningYield + + Used by: + Ship: Prospect + """ + + type = 'passive' + + @staticmethod + def handler(fit, ship, context, projectionRange, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.requiresSkill('Mining'), 'miningAmount', + ship.getModifiedItemAttr('expeditionFrigateBonusOreMiningYield'), + skill='Expedition Frigates', **kwargs) + + class Effect5853(BaseEffect): """ expeditionFrigateBonusSignatureRadius @@ -37900,3 +37918,58 @@ class Effect8311(BaseEffect): lambda drone: drone.item.requiresSkill('Drones'), layer, ship.getModifiedItemAttr('industrialCommandBonusDroneHitPoints'), skill='Industrial Command Ships', **kwargs) + + +class Effect8313(BaseEffect): + """ + miningFrigateBonusGasCloudHarvestingDuration + + Used by: + Ship: Prospect + Ship: Venture + """ + + type = 'passive' + + @staticmethod + def handler(fit, ship, context, projectionRange, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.requiresSkill('Gas Cloud Harvesting'), 'duration', + ship.getModifiedItemAttr('miningFrigateBonusGasCloudHarvestingDuration'), + skill='Mining Frigate', **kwargs) + + +class Effect8315(BaseEffect): + """ + shipRoleBonusGasHarvestingYield + + Used by: + Ship: Prospect + Ship: Venture + """ + + type = 'passive' + + @staticmethod + def handler(fit, ship, context, projectionRange, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.requiresSkill('Gas Cloud Harvesting'), 'miningAmount', + ship.getModifiedItemAttr('shipRoleBonusGasHarvestingYield'), **kwargs) + + +class Effect8317(BaseEffect): + """ + miningFrigateBonusIceHarvestingDuration + + Used by: + Ship: Endurance + """ + + type = 'passive' + + @staticmethod + def handler(fit, ship, context, projectionRange, **kwargs): + fit.modules.filteredItemBoost( + lambda mod: mod.item.requiresSkill('Ice Harvesting'), 'duration', + ship.getModifiedItemAttr('miningFrigateBonusIceHarvestingDuration'), + skill='Mining Frigate', **kwargs) diff --git a/pyfa.py b/pyfa.py index 4e4d735f2..706af752c 100755 --- a/pyfa.py +++ b/pyfa.py @@ -163,7 +163,7 @@ if __name__ == "__main__": import threading from utils.timer import CountdownTimer - timer = CountdownTimer(5) + timer = CountdownTimer(1) stoppableThreads = [] for t in threading.enumerate(): if t is not threading.main_thread() and hasattr(t, 'stop'):