From fd3e0bbebfe3d30d46173990254fb989054e266b Mon Sep 17 00:00:00 2001 From: Ebag333 Date: Wed, 19 Oct 2016 14:14:34 -0700 Subject: [PATCH] Formatting and spacing --- eos/effects/energydestabilizationnew.py | 2 +- eos/effects/energyneutralizerentity.py | 2 +- eos/effects/energyneutralizerfalloff.py | 2 +- eos/effects/entityenergyneutralizerfalloff.py | 2 +- eos/effects/flagshipmultirelayeffect.py | 2 +- ...ganggasharvesterandiceharvesterandmininglasercapneedbonus.py | 2 +- ...anggasharvesterandiceharvesterandmininglaserdurationbonus.py | 2 +- eos/effects/ganginformationwarfarerangebonuswithecmburst.py | 2 +- ...nglasericeharvestergasharvestersurveyscannermaxrangebonus.py | 2 +- eos/effects/gangpropulsionjammingboost.py | 2 +- eos/effects/gangsensorintegrity.py | 2 +- eos/effects/gangshieldboosteandtransportercapacitorneed.py | 2 +- eos/effects/gangshieldboosterandtransporterspeed.py | 2 +- eos/effects/gangshieldhardening.py | 2 +- eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py | 2 +- eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py | 2 +- eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py | 2 +- eos/effects/modulebonusinformationwarfarelinkreconoperation.py | 2 +- eos/effects/modulebonusinformationwarfarelinksensorintegrity.py | 2 +- .../modulebonusminingforemanlinkharvestercapacitorefficiency.py | 2 +- eos/effects/modulebonusminingforemanlinklaseroptimization.py | 2 +- .../modulebonusminingforemanlinkmininglaserfieldenhancement.py | 2 +- eos/effects/modulebonussiegewarfarelinkshieldefficiency.py | 2 +- eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py | 2 +- eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py | 2 +- .../modulebonusskirmishwarfarelinkinterdictionmaneuvers.py | 2 +- eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py | 2 +- eos/effects/shipbonustitana4fleetbonus.py | 2 +- eos/effects/shipbonustitanc4fleetbonus.py | 2 +- eos/effects/shipbonustitang4fleetbonus.py | 2 +- eos/effects/shipbonustitanm4fleetbonus.py | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/eos/effects/energydestabilizationnew.py b/eos/effects/energydestabilizationnew.py index 2ed0b08b4..6cf82afa5 100644 --- a/eos/effects/energydestabilizationnew.py +++ b/eos/effects/energydestabilizationnew.py @@ -6,7 +6,7 @@ type = "active", "projected" def handler(fit, src, context): if "projected" in context and ( - (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): + (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): multiplier = src.amountActive if hasattr(src, "amountActive") else 1 amount = src.getModifiedItemAttr("energyNeutralizerAmount") time = src.getModifiedItemAttr("duration") diff --git a/eos/effects/energyneutralizerentity.py b/eos/effects/energyneutralizerentity.py index 73238b700..8532f49df 100644 --- a/eos/effects/energyneutralizerentity.py +++ b/eos/effects/energyneutralizerentity.py @@ -9,7 +9,7 @@ type = "active", "projected" def handler(fit, src, context): if "projected" in context and ( - (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): + (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): amount = src.getModifiedItemAttr("energyNeutralizerAmount") time = src.getModifiedItemAttr("duration") diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py index f1b0418d5..212f05ffa 100644 --- a/eos/effects/energyneutralizerfalloff.py +++ b/eos/effects/energyneutralizerfalloff.py @@ -9,7 +9,7 @@ type = "active", "projected" def handler(fit, src, context): if "projected" in context and ( - (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): + (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): amount = src.getModifiedItemAttr("energyNeutralizerAmount") time = src.getModifiedItemAttr("duration") diff --git a/eos/effects/entityenergyneutralizerfalloff.py b/eos/effects/entityenergyneutralizerfalloff.py index 7ef733074..0783295cf 100644 --- a/eos/effects/entityenergyneutralizerfalloff.py +++ b/eos/effects/entityenergyneutralizerfalloff.py @@ -9,7 +9,7 @@ type = "active", "projected" def handler(fit, src, context): if "projected" in context and ( - (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): + (hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")): amount = src.getModifiedItemAttr("energyNeutralizerAmount") time = src.getModifiedItemAttr("energyNeutralizerDuration") diff --git a/eos/effects/flagshipmultirelayeffect.py b/eos/effects/flagshipmultirelayeffect.py index f3bdfde3a..17cdd48e4 100644 --- a/eos/effects/flagshipmultirelayeffect.py +++ b/eos/effects/flagshipmultirelayeffect.py @@ -10,5 +10,5 @@ def handler(fit, module, context): # If we only increased it by one, we'd get the number to stay equal # As Comman Processors use one themselves too fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator" and - "maxGroupActive" in mod.itemModifiedAttributes, + "maxGroupActive" in mod.itemModifiedAttributes, "maxGroupActive", 1) diff --git a/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py b/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py index 06ae2e090..162b2a074 100644 --- a/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py +++ b/eos/effects/ganggasharvesterandiceharvesterandmininglasercapneedbonus.py @@ -8,7 +8,7 @@ gangBoost = "miningCapacitorNeed" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser", "Ice Harvester", "Gas Cloud Harvester") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, diff --git a/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py b/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py index 76de01a22..2ffa23100 100644 --- a/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py +++ b/eos/effects/ganggasharvesterandiceharvesterandmininglaserdurationbonus.py @@ -8,7 +8,7 @@ gangBoost = "miningDuration" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser", "Ice Harvester", "Gas Cloud Harvester") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, diff --git a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py index 26b4675f5..6ce5d0c40 100644 --- a/eos/effects/ganginformationwarfarerangebonuswithecmburst.py +++ b/eos/effects/ganginformationwarfarerangebonuswithecmburst.py @@ -8,7 +8,7 @@ gangBoost = "electronicMaxRange" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Target Painter", "Weapon Disruptor", "Sensor Dampener", "ECM", "Burst Jammer") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py b/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py index 1d5ba8f52..8320e6b11 100644 --- a/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py +++ b/eos/effects/gangmininglasericeharvestergasharvestersurveyscannermaxrangebonus.py @@ -8,7 +8,7 @@ gangBoost = "miningMaxRange" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting") or mod.item.requiresSkill( "Ice Harvesting") or mod.item.requiresSkill("Mining"), "maxRange", module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/gangpropulsionjammingboost.py b/eos/effects/gangpropulsionjammingboost.py index 451f94e20..7b400afcd 100644 --- a/eos/effects/gangpropulsionjammingboost.py +++ b/eos/effects/gangpropulsionjammingboost.py @@ -8,7 +8,7 @@ gangBoost = "interdictionMaxRange" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Stasis Web", "Warp Scrambler") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/gangsensorintegrity.py b/eos/effects/gangsensorintegrity.py index 9899aef45..e4b41c809 100644 --- a/eos/effects/gangsensorintegrity.py +++ b/eos/effects/gangsensorintegrity.py @@ -9,7 +9,7 @@ gangBonus = "commandBonus" def handler(fit, module, context): if "gang" not in context: - return + return fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("commandBonus"), stackingPenalties=True) for scanType in ("Gravimetric", "Radar", "Ladar", "Magnetometric"): diff --git a/eos/effects/gangshieldboosteandtransportercapacitorneed.py b/eos/effects/gangshieldboosteandtransportercapacitorneed.py index 8b5c9fd64..d54f6d384 100644 --- a/eos/effects/gangshieldboosteandtransportercapacitorneed.py +++ b/eos/effects/gangshieldboosteandtransportercapacitorneed.py @@ -8,7 +8,7 @@ gangBoost = "shieldRepairCapacitorNeed" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost( lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/gangshieldboosterandtransporterspeed.py b/eos/effects/gangshieldboosterandtransporterspeed.py index 2b23b1c39..fa2321d2b 100644 --- a/eos/effects/gangshieldboosterandtransporterspeed.py +++ b/eos/effects/gangshieldboosterandtransporterspeed.py @@ -8,7 +8,7 @@ gangBoost = "shieldRepairDuration" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost( lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"), "duration", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/gangshieldhardening.py b/eos/effects/gangshieldhardening.py index 7937a1906..b1bd5d449 100644 --- a/eos/effects/gangshieldhardening.py +++ b/eos/effects/gangshieldhardening.py @@ -8,7 +8,7 @@ gangBoost = "shieldResistance" def handler(fit, module, context): if "gang" not in context: - return + return for damageType in ("Em", "Explosive", "Thermal", "Kinetic"): fit.ship.boostItemAttr("shield%sDamageResonance" % damageType, module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py b/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py index e48ef2fad..046f8f3ef 100644 --- a/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py +++ b/eos/effects/modulebonusarmoredwarfarelinkdamagecontrol.py @@ -10,7 +10,7 @@ gangBoost = "armorRepairCapacitorNeed" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost( lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"), "capacitorNeed", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py b/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py index f86ce5df9..d1738a803 100644 --- a/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py +++ b/eos/effects/modulebonusarmoredwarfarelinkpassivedefense.py @@ -10,7 +10,7 @@ gangBoost = "armorResistance" def handler(fit, module, context): if "gang" not in context: - return + return for damageType in ("Em", "Thermal", "Explosive", "Kinetic"): fit.ship.boostItemAttr("armor%sDamageResonance" % damageType, module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py b/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py index af25e4c6c..382886520 100644 --- a/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py +++ b/eos/effects/modulebonusarmoredwarfarelinkrapidrepair.py @@ -10,7 +10,7 @@ gangBoost = "armorRepairDuration" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost( lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Remote Armor Repair Systems"), "duration", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/modulebonusinformationwarfarelinkreconoperation.py b/eos/effects/modulebonusinformationwarfarelinkreconoperation.py index 6c642921e..039caa229 100644 --- a/eos/effects/modulebonusinformationwarfarelinkreconoperation.py +++ b/eos/effects/modulebonusinformationwarfarelinkreconoperation.py @@ -10,7 +10,7 @@ gangBoost = "electronicMaxRange" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Target Painter", "Weapon Disruptor", "Sensor Dampener", "ECM", "Burst Jammer") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py b/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py index a05a0d69f..e2c6d9c5e 100644 --- a/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py +++ b/eos/effects/modulebonusinformationwarfarelinksensorintegrity.py @@ -11,7 +11,7 @@ gangBonus = "commandBonus" def handler(fit, module, context): if "gang" not in context: - return + return fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("commandBonus"), stackingPenalties=True) for scanType in ("Gravimetric", "Radar", "Ladar", "Magnetometric"): diff --git a/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py b/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py index d95329dc5..933c1c72b 100644 --- a/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py +++ b/eos/effects/modulebonusminingforemanlinkharvestercapacitorefficiency.py @@ -8,7 +8,7 @@ gangBoost = "miningCapacitorNeed" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser", "Ice Harvester", "Gas Cloud Harvester") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, diff --git a/eos/effects/modulebonusminingforemanlinklaseroptimization.py b/eos/effects/modulebonusminingforemanlinklaseroptimization.py index a9f3706c3..8c457d34c 100644 --- a/eos/effects/modulebonusminingforemanlinklaseroptimization.py +++ b/eos/effects/modulebonusminingforemanlinklaseroptimization.py @@ -8,7 +8,7 @@ gangBoost = "miningDuration" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Mining Laser", "Strip Miner", "Frequency Mining Laser", "Ice Harvester", "Gas Cloud Harvester") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, diff --git a/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py b/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py index 8d1b84691..d655adff8 100644 --- a/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py +++ b/eos/effects/modulebonusminingforemanlinkmininglaserfieldenhancement.py @@ -8,7 +8,7 @@ gangBoost = "miningMaxRange" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting") or mod.item.requiresSkill( "Ice Harvesting") or mod.item.requiresSkill("Mining"), "maxRange", module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py b/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py index 6de2b9464..d01e05168 100644 --- a/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py +++ b/eos/effects/modulebonussiegewarfarelinkshieldefficiency.py @@ -10,7 +10,7 @@ gangBoost = "shieldRepairCapacitorNeed" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost( lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", module.getModifiedItemAttr("commandBonus")) diff --git a/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py b/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py index 6398f3319..35a7df928 100644 --- a/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py +++ b/eos/effects/modulebonussiegewarfarelinkshieldharmonizing.py @@ -10,7 +10,7 @@ gangBoost = "shieldResistance" def handler(fit, module, context): if "gang" not in context: - return + return for damageType in ("Em", "Explosive", "Thermal", "Kinetic"): fit.ship.boostItemAttr("shield%sDamageResonance" % damageType, module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py b/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py index ab097b5dc..2e62234ae 100644 --- a/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py +++ b/eos/effects/modulebonusskirmishwarfarelinkevasivemaneuvers.py @@ -10,6 +10,6 @@ gangBoost = "signatureRadius" def handler(fit, module, context): if "gang" not in context: - return + return fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("commandBonus"), stackingPenalties=True) diff --git a/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py b/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py index eb5136b37..ddf4ce6f7 100644 --- a/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py +++ b/eos/effects/modulebonusskirmishwarfarelinkinterdictionmaneuvers.py @@ -10,7 +10,7 @@ gangBoost = "interdictionMaxRange" def handler(fit, module, context): if "gang" not in context: - return + return groups = ("Stasis Web", "Warp Scrambler") fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py b/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py index d0111ef29..0675241d3 100644 --- a/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py +++ b/eos/effects/modulebonusskirmishwarfarelinkrapiddeployment.py @@ -10,7 +10,7 @@ gangBoost = "speedFactor" def handler(fit, module, context): if "gang" not in context: - return + return fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module", "speedFactor", module.getModifiedItemAttr("commandBonus"), stackingPenalties=True) diff --git a/eos/effects/shipbonustitana4fleetbonus.py b/eos/effects/shipbonustitana4fleetbonus.py index 298b50ac7..665ed5b3f 100644 --- a/eos/effects/shipbonustitana4fleetbonus.py +++ b/eos/effects/shipbonustitana4fleetbonus.py @@ -11,6 +11,6 @@ runTime = "late" def handler(fit, src, context): if "gang" not in context: - return + return fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level) diff --git a/eos/effects/shipbonustitanc4fleetbonus.py b/eos/effects/shipbonustitanc4fleetbonus.py index 7ad64416f..7120e3349 100644 --- a/eos/effects/shipbonustitanc4fleetbonus.py +++ b/eos/effects/shipbonustitanc4fleetbonus.py @@ -11,6 +11,6 @@ runTime = "late" def handler(fit, src, context): if "gang" not in context: - return + return fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level) diff --git a/eos/effects/shipbonustitang4fleetbonus.py b/eos/effects/shipbonustitang4fleetbonus.py index c042ef769..1e3ab3969 100644 --- a/eos/effects/shipbonustitang4fleetbonus.py +++ b/eos/effects/shipbonustitang4fleetbonus.py @@ -11,6 +11,6 @@ runTime = "late" def handler(fit, src, context): if "gang" not in context: - return + return fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level) diff --git a/eos/effects/shipbonustitanm4fleetbonus.py b/eos/effects/shipbonustitanm4fleetbonus.py index 604eeaac4..3cb74a1c9 100644 --- a/eos/effects/shipbonustitanm4fleetbonus.py +++ b/eos/effects/shipbonustitanm4fleetbonus.py @@ -11,6 +11,6 @@ runTime = "late" def handler(fit, src, context): if "gang" not in context: - return + return fit.ship.boostItemAttr(gangBoost, src.getModifiedItemAttr(gangBonus) * src.parent.character.getSkill(gangBonusSkill).level)