From 89b6e8f8c34cbe3434735189b201290f8adede2b Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 14 Feb 2018 22:15:48 -0500 Subject: [PATCH] fix tox stuff --- eos/effects/elitebonusgunshipdronetracking2.py | 5 ++++- eos/effects/elitebonusgunshipemmissiledamage1.py | 5 ++++- eos/effects/elitebonusgunshipexplosionvelocity2.py | 5 ++++- eos/effects/elitebonusgunshipexplosivemissiledamage1.py | 5 ++++- eos/effects/elitebonusgunshipkineticmissiledamage1.py | 5 ++++- eos/effects/elitebonusgunshipthermalmissiledamage1.py | 5 ++++- eos/effects/modulebonusassaultdamagecontrol.py | 2 +- eos/effects/remotewebifiermaxrangebonus.py | 5 ++++- eos/effects/shipsetrofaf.py | 5 ++++- gui/builtinViewColumns/misc.py | 2 +- 10 files changed, 34 insertions(+), 10 deletions(-) diff --git a/eos/effects/elitebonusgunshipdronetracking2.py b/eos/effects/elitebonusgunshipdronetracking2.py index 9269bf8ab..10d8c753d 100644 --- a/eos/effects/elitebonusgunshipdronetracking2.py +++ b/eos/effects/elitebonusgunshipdronetracking2.py @@ -1,4 +1,7 @@ # Not used by any item type = "passive" + + def handler(fit, src, context): - fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed", src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates") + fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed", + src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates") diff --git a/eos/effects/elitebonusgunshipemmissiledamage1.py b/eos/effects/elitebonusgunshipemmissiledamage1.py index 6d411da88..ae5a4aed2 100644 --- a/eos/effects/elitebonusgunshipemmissiledamage1.py +++ b/eos/effects/elitebonusgunshipemmissiledamage1.py @@ -3,5 +3,8 @@ # Used by: # Ship: Jaguar type = "passive" + + def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", + src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") diff --git a/eos/effects/elitebonusgunshipexplosionvelocity2.py b/eos/effects/elitebonusgunshipexplosionvelocity2.py index 1946ff33b..e17de01c1 100644 --- a/eos/effects/elitebonusgunshipexplosionvelocity2.py +++ b/eos/effects/elitebonusgunshipexplosionvelocity2.py @@ -3,5 +3,8 @@ # Used by: # Ship: Jaguar type = "passive" + + def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity", src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity", + src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates") diff --git a/eos/effects/elitebonusgunshipexplosivemissiledamage1.py b/eos/effects/elitebonusgunshipexplosivemissiledamage1.py index 4eabb4ab1..626f6ce51 100644 --- a/eos/effects/elitebonusgunshipexplosivemissiledamage1.py +++ b/eos/effects/elitebonusgunshipexplosivemissiledamage1.py @@ -3,5 +3,8 @@ # Used by: # Ship: Jaguar type = "passive" + + def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", + src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") diff --git a/eos/effects/elitebonusgunshipkineticmissiledamage1.py b/eos/effects/elitebonusgunshipkineticmissiledamage1.py index 5bc9fe98b..18afde89e 100644 --- a/eos/effects/elitebonusgunshipkineticmissiledamage1.py +++ b/eos/effects/elitebonusgunshipkineticmissiledamage1.py @@ -3,5 +3,8 @@ # Used by: # Ship: Jaguar type = "passive" + + def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", + src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") diff --git a/eos/effects/elitebonusgunshipthermalmissiledamage1.py b/eos/effects/elitebonusgunshipthermalmissiledamage1.py index 15a499f08..04ee9c25d 100644 --- a/eos/effects/elitebonusgunshipthermalmissiledamage1.py +++ b/eos/effects/elitebonusgunshipthermalmissiledamage1.py @@ -3,5 +3,8 @@ # Used by: # Ship: Jaguar type = "passive" + + def handler(fit, src, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", + src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates") diff --git a/eos/effects/modulebonusassaultdamagecontrol.py b/eos/effects/modulebonusassaultdamagecontrol.py index 10a6d92b5..a7a6d9551 100644 --- a/eos/effects/modulebonusassaultdamagecontrol.py +++ b/eos/effects/modulebonusassaultdamagecontrol.py @@ -5,6 +5,7 @@ type = "active" runTime = "early" + def handler(fit, src, context): for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')): for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'): @@ -13,4 +14,3 @@ def handler(fit, src, context): booster = "%s%sDamageResonance" % (layer, damageType) src.forceItemAttr(booster, src.getModifiedItemAttr("resistanceMultiplier")) - diff --git a/eos/effects/remotewebifiermaxrangebonus.py b/eos/effects/remotewebifiermaxrangebonus.py index d60116197..19498882a 100644 --- a/eos/effects/remotewebifiermaxrangebonus.py +++ b/eos/effects/remotewebifiermaxrangebonus.py @@ -3,5 +3,8 @@ # Used by: # Implants named like: Inquest 'Eros' Stasis Webifier MR (3 of 3) type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("stasisWebRangeBonus"), stackingPenalties=True) + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", + src.getModifiedItemAttr("stasisWebRangeBonus"), stackingPenalties=True) diff --git a/eos/effects/shipsetrofaf.py b/eos/effects/shipsetrofaf.py index 61b4c79cd..32ae50ab6 100644 --- a/eos/effects/shipsetrofaf.py +++ b/eos/effects/shipsetrofaf.py @@ -3,5 +3,8 @@ # Used by: # Ship: Retribution type = "passive" + + def handler(fit, src, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "speed", src.getModifiedItemAttr("shipBonusAF"), stackingPenalties=True, skill="Amarr Frigate") + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "speed", + src.getModifiedItemAttr("shipBonusAF"), stackingPenalties=True, skill="Amarr Frigate") diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 9d0fc5518..e99e89eae 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -74,7 +74,7 @@ class Miscellanea(ViewColumn): return "", None elif itemGroup == "Booster": stuff.getModifiedItemAttr("boosterDuration") - text = "{0} min".format(formatAmount(stuff.getModifiedItemAttr("boosterDuration")/1000/60, 3, 0, 3)) + text = "{0} min".format(formatAmount(stuff.getModifiedItemAttr("boosterDuration") / 1000 / 60, 3, 0, 3)) return text, "Booster Duration" elif itemGroup in ("Energy Weapon", "Hybrid Weapon", "Projectile Weapon", "Combat Drone", "Fighter Drone"): trackingSpeed = stuff.getModifiedItemAttr("trackingSpeed")