From 928246a8cab668b787d17476b2a92d1091966970 Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Wed, 19 Oct 2016 14:26:46 -0700 Subject: [PATCH] Even more PEP8 fixes! Also, create a variable so we can't reference it and have it not exist. Because that would be bad. --- eos/effects/maraudermodeeffect26.py | 12 ++++++------ eos/effects/modulebonusbastionmodule.py | 12 ++++++------ eos/effects/modulebonussiegemodule.py | 10 +++++----- eos/effects/structureenergyneutralizerfalloff.py | 1 + .../structurewarpscrambleblockmwdwithnpceffect.py | 4 ++-- eos/effects/warpscrambleblockmwdwithnpceffect.py | 5 +++-- 6 files changed, 23 insertions(+), 21 deletions(-) diff --git a/eos/effects/maraudermodeeffect26.py b/eos/effects/maraudermodeeffect26.py index 724ce492b..f892a5a52 100644 --- a/eos/effects/maraudermodeeffect26.py +++ b/eos/effects/maraudermodeeffect26.py @@ -15,20 +15,20 @@ def handler(fit, module, context): stackingPenalties=penalize, penaltyGroup="preMul") # Turrets - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \ - mod.item.requiresSkill("Large Hybrid Turret") or \ + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or + mod.item.requiresSkill("Large Hybrid Turret") or mod.item.requiresSkill("Large Projectile Turret"), "maxRange", module.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True) - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \ - mod.item.requiresSkill("Large Hybrid Turret") or \ + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or + mod.item.requiresSkill("Large Hybrid Turret") or mod.item.requiresSkill("Large Projectile Turret"), "falloff", module.getModifiedItemAttr("falloffBonus"), stackingPenalties=True) # Missiles - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or \ - mod.charge.requiresSkill("Cruise Missiles") or \ + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or + mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Heavy Missiles"), "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus")) diff --git a/eos/effects/modulebonusbastionmodule.py b/eos/effects/modulebonusbastionmodule.py index cbf2e03c8..09f0bd008 100644 --- a/eos/effects/modulebonusbastionmodule.py +++ b/eos/effects/modulebonusbastionmodule.py @@ -18,20 +18,20 @@ def handler(fit, src, context): stackingPenalties=penalize, penaltyGroup="preMul") # Turrets - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \ - mod.item.requiresSkill("Large Hybrid Turret") or \ + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or + mod.item.requiresSkill("Large Hybrid Turret") or mod.item.requiresSkill("Large Projectile Turret"), "maxRange", src.getModifiedItemAttr("maxRangeBonus"), stackingPenalties=True) - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or \ - mod.item.requiresSkill("Large Hybrid Turret") or \ + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret") or + mod.item.requiresSkill("Large Hybrid Turret") or mod.item.requiresSkill("Large Projectile Turret"), "falloff", src.getModifiedItemAttr("falloffBonus"), stackingPenalties=True) # Missiles - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or \ - mod.charge.requiresSkill("Cruise Missiles") or \ + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or + mod.charge.requiresSkill("Cruise Missiles") or mod.charge.requiresSkill("Heavy Missiles"), "maxVelocity", src.getModifiedItemAttr("missileVelocityBonus")) diff --git a/eos/effects/modulebonussiegemodule.py b/eos/effects/modulebonussiegemodule.py index 885255b33..c63e33440 100644 --- a/eos/effects/modulebonussiegemodule.py +++ b/eos/effects/modulebonussiegemodule.py @@ -8,20 +8,20 @@ runTime = "early" def handler(fit, src, context): # Turrets - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or \ - mod.item.requiresSkill("Capital Hybrid Turret") or \ + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Energy Turret") or + mod.item.requiresSkill("Capital Hybrid Turret") or mod.item.requiresSkill("Capital Projectile Turret"), "damageMultiplier", src.getModifiedItemAttr("siegeTurretDamageBonus")) # Missiles for type in ("kinetic", "thermal", "explosive", "em"): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or \ - mod.charge.requiresSkill("XL Cruise Missiles") or \ + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or + mod.charge.requiresSkill("XL Cruise Missiles") or mod.charge.requiresSkill("Torpedoes"), "%sDamage" % type, src.getModifiedItemAttr("siegeMissileDamageBonus")) # Reppers - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or \ + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Shield Operation") or mod.item.requiresSkill("Capital Repair Systems"), "duration", src.getModifiedItemAttr("siegeLocalLogisticsDurationBonus")) diff --git a/eos/effects/structureenergyneutralizerfalloff.py b/eos/effects/structureenergyneutralizerfalloff.py index 63cb38251..8b6bf5846 100644 --- a/eos/effects/structureenergyneutralizerfalloff.py +++ b/eos/effects/structureenergyneutralizerfalloff.py @@ -5,6 +5,7 @@ type = "active", "projected" def handler(fit, container, context): + amount = 0 if "projected" in context and ((hasattr(container, "state") and container.state >= State.ACTIVE) or hasattr(container, "amountActive")): amount = container.getModifiedItemAttr("energyNeutralizerAmount") diff --git a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py index bc2300a68..27bf8932d 100644 --- a/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py +++ b/eos/effects/structurewarpscrambleblockmwdwithnpceffect.py @@ -1,9 +1,9 @@ +from eos.types import State + # Not used by any item runTime = "early" type = "projected", "active" -from eos.types import State - def handler(fit, module, context): if "projected" not in context: diff --git a/eos/effects/warpscrambleblockmwdwithnpceffect.py b/eos/effects/warpscrambleblockmwdwithnpceffect.py index dce99b7ce..c220fb4fd 100644 --- a/eos/effects/warpscrambleblockmwdwithnpceffect.py +++ b/eos/effects/warpscrambleblockmwdwithnpceffect.py @@ -2,11 +2,12 @@ # # Used by: # Modules named like: Warp Scrambler (26 of 26) -runTime = "early" -type = "projected", "active" from eos.types import State +runTime = "early" +type = "projected", "active" + def handler(fit, module, context): if "projected" not in context: