switched from using container/module to bag_of_dicks

Also cleaned up some warnings PyCharm was throwing.
This commit is contained in:
Ebag333
2016-07-17 11:24:24 -07:00
parent 7d0f65c1f3
commit 60288204fc
5 changed files with 48 additions and 47 deletions

View File

@@ -4,16 +4,17 @@
# Drones from group: Energy Neutralizer Drone (3 of 3)
from eos.types import State
type = "active", "projected"
def handler(fit, module, context):
if "projected" in context and ((hasattr(module, "state") \
and module.state >= State.ACTIVE) or hasattr(container, "amountActive")):
amount = module.getModifiedItemAttr("energyNeutralizerAmount")
time = module.getModifiedItemAttr("duration")
def handler(fit, src, context):
if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
amount = src.getModifiedItemAttr("energyNeutralizerAmount")
time = src.getModifiedItemAttr("duration")
rigSize = fit.ship.getModifiedItemAttr("rigSize")
modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
#Signature reduction, uses the bomb formula as per CCP Larrikin

View File

@@ -4,16 +4,17 @@
# Modules from group: Energy Neutralizer (51 of 51)
from eos.types import State
type = "active", "projected"
def handler(fit, module, context):
if "projected" in context and ((hasattr(module, "state") \
and module.state >= State.ACTIVE) or hasattr(container, "amountActive")):
amount = module.getModifiedItemAttr("energyNeutralizerAmount")
time = module.getModifiedItemAttr("duration")
def handler(fit, src, context):
if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
amount = src.getModifiedItemAttr("energyNeutralizerAmount")
time = src.getModifiedItemAttr("duration")
rigSize = fit.ship.getModifiedItemAttr("rigSize")
modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
#Signature reduction, uses the bomb formula as per CCP Larrikin
@@ -36,4 +37,3 @@ def handler(fit, module, context):
amount = amount*modifierLarge
fit.addDrain(time, amount, 0)

View File

@@ -4,14 +4,16 @@
# Modules from group: Energy Nosferatu (51 of 51)
type = "active", "projected"
runTime = "late"
def handler(fit, module, context):
amount = module.getModifiedItemAttr("powerTransferAmount")
time = module.getModifiedItemAttr("duration")
def handler(fit, src, context):
amount = src.getModifiedItemAttr("powerTransferAmount")
time = src.getModifiedItemAttr("duration")
rigSize = fit.ship.getModifiedItemAttr("rigSize")
modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
if "projected" in context:
@@ -36,4 +38,4 @@ def handler(fit, module, context):
fit.addDrain(time, amount, 0)
elif "module" in context:
module.itemModifiedAttributes.force("capacitorNeed", -amount)
src.itemModifiedAttributes.force("capacitorNeed", -amount)

View File

@@ -4,16 +4,17 @@
# Drones from group: Energy Neutralizer Drone (3 of 3)
from eos.types import State
type = "active", "projected"
def handler(fit, module, context):
if "projected" in context and ((hasattr(module, "state") \
and module.state >= State.ACTIVE) or hasattr(module, "amountActive")):
amount = module.getModifiedItemAttr("energyNeutralizerAmount")
time = module.getModifiedItemAttr("energyNeutralizerDuration")
def handler(fit, src, context):
if "projected" in context and ((hasattr(src, "state") and src.state >= State.ACTIVE) or hasattr(src, "amountActive")):
amount = src.getModifiedItemAttr("energyNeutralizerAmount")
time = src.getModifiedItemAttr("energyNeutralizerDuration")
rigSize = fit.ship.getModifiedItemAttr("rigSize")
modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
#Signature reduction, uses the bomb formula as per CCP Larrikin

View File

@@ -3,24 +3,21 @@
Since fighter abilities do not have any sort of item entity in the EVE database, we must derive the abilities from the
effects, and thus this effect file contains some custom information useful only to fighters.
"""
from eos.types import State
# User-friendly name for the ability
displayName = "Energy Neutralizer"
prefix = "fighterAbilityEnergyNeutralizer"
type = "active", "projected"
def handler(fit, module, context):
def handler(fit, src, context):
if "projected" in context:
amount = module.getModifiedItemAttr("{}Amount".format(prefix))
time = module.getModifiedItemAttr("{}Duration".format(prefix))
amount = src.getModifiedItemAttr("{}Amount".format(prefix))
time = src.getModifiedItemAttr("{}Duration".format(prefix))
rigSize = fit.ship.getModifiedItemAttr("rigSize")
modifierLarge = module.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = module.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = module.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = module.getModifiedItemAttr("energyNeutralizerSignatureResolution")
modifierLarge = src.getModifiedItemAttr("entityCapacitorLevelModifierLarge")
modifierMedium = src.getModifiedItemAttr("entityCapacitorLevelModifierMedium")
modifierSmall = src.getModifiedItemAttr("entityCapacitorLevelModifierSmall")
energyNeutralizerSignatureResolution = src.getModifiedItemAttr("energyNeutralizerSignatureResolution")
signatureRadius = fit.ship.getModifiedItemAttr("signatureRadius")
#Signature reduction, uses the bomb formula as per CCP Larrikin