From bc5a43bfb3908b026922a3a42c7f7c0ec55ddc8e Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 11 Oct 2018 21:08:26 -0400 Subject: [PATCH] tox fixes --- eos/effects/massentanglereffect5.py | 9 ++++++--- gui/attribute_gauge.py | 4 ---- service/fit.py | 1 + service/port/efs.py | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/eos/effects/massentanglereffect5.py b/eos/effects/massentanglereffect5.py index fcab5772e..8ec34a55d 100644 --- a/eos/effects/massentanglereffect5.py +++ b/eos/effects/massentanglereffect5.py @@ -4,7 +4,10 @@ type = "active" def handler(fit, src, context): fit.ship.increaseItemAttr("warpScrambleStatus", src.getModifiedItemAttr("warpScrambleStrength")) fit.ship.boostItemAttr("mass", src.getModifiedItemAttr("massBonusPercentage"), stackingPenalties=True) - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor", src.getModifiedItemAttr("speedFactorBonus"), stackingPenalties=True) - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedBoostFactor", src.getModifiedItemAttr("speedBoostFactorBonus")) - fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "activationBlocked", src.getModifiedItemAttr("activationBlockedStrenght")) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedFactor", + src.getModifiedItemAttr("speedFactorBonus"), stackingPenalties=True) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), "speedBoostFactor", + src.getModifiedItemAttr("speedBoostFactorBonus")) + fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), "activationBlocked", + src.getModifiedItemAttr("activationBlockedStrenght")) fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("maxVelocityBonus"), stackingPenalties=True) diff --git a/gui/attribute_gauge.py b/gui/attribute_gauge.py index e275b2dc2..27b5c6dbd 100644 --- a/gui/attribute_gauge.py +++ b/gui/attribute_gauge.py @@ -1,7 +1,3 @@ -import wx -import math - -from gui.utils import anim_effects import math import wx diff --git a/service/fit.py b/service/fit.py index 122b1c9ee..3cbe96fcf 100644 --- a/service/fit.py +++ b/service/fit.py @@ -558,6 +558,7 @@ class Fit(FitDeprecated): drone.amountActive = 0 changed = True + return changed # If any state was changed, recalculate attributes again # if changed: # self.recalc(fit) diff --git a/service/port/efs.py b/service/port/efs.py index 4420adc90..895cbda8a 100755 --- a/service/port/efs.py +++ b/service/port/efs.py @@ -1,5 +1,4 @@ import json -import json from math import log from logbook import Logger