dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Revert "Add new nos/neut effect files, and change module/drone files to account for new attributes. This does not add the database"

Browse Source 
This reverts commit 7dbe6dbe2d.
This commit is contained in:
blitzmann
2015-11-27 00:07:24 -05:00
parent 7dbe6dbe2d
commit 9c9a6b69fe
32 changed files with 4 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eos/effects/energyneutralizerfalloff.py
View File

@@ -1,9 +0,0 @@
from eos.types import State
type = "active", "projected"
def handler(fit, container, context):
if "projected" in context and ((hasattr(container, "state") \
and container.state >= State.ACTIVE) or hasattr(container, "amountActive")):
multiplier = container.amountActive if hasattr(container, "amountActive") else 1
amount = container.getModifiedItemAttr("energyDestabilizationAmount")
time = container.getModifiedItemAttr("duration")
fit.addDrain(time, amount * multiplier, 0)

9
eos/effects/energynosferatufalloff.py
View File

@@ -1,9 +0,0 @@
type = "active", "projected"
runTime = "late"
def handler(fit, module, context):
amount = module.getModifiedItemAttr("powerTransferAmount")
time = module.getModifiedItemAttr("duration")
if "projected" in context:
fit.addDrain(time, amount, 0)
elif "module" in context:
module.itemModifiedAttributes.force("capacitorNeed", -amount)

4
eos/effects/shipbonusenergyneutfalloffab2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")

4
eos/effects/shipbonusenergyneutfalloffac3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonus3AC"), skill="Amarr Cruiser")

4
eos/effects/shipbonusenergyneutfalloffad1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")

4
eos/effects/shipbonusenergyneutfalloffaf3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")

4
eos/effects/shipbonusenergyneutfalloffeaf3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"falloffEffectiveness", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships")

4
eos/effects/shipbonusenergyneutfalloffrs2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"falloffEffectiveness", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")

4
eos/effects/shipbonusenergyneutfalloffrs3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"falloffEffectiveness", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")

4
eos/effects/shipbonusenergyneutoptimalab.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"maxRange", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")

4
eos/effects/shipbonusenergyneutoptimalac1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"maxRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")

4
eos/effects/shipbonusenergyneutoptimalad2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"maxRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")

4
eos/effects/shipbonusenergyneutoptimalaf2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"maxRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")

4
eos/effects/shipbonusenergyneutoptimaleaf1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")

4
eos/effects/shipbonusenergyneutoptimalrs1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"maxRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")

4
eos/effects/shipbonusenergyneutoptimalrs3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Neutralizer",
"maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")

4
eos/effects/shipbonusenergynosfalloffab.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusAB"), skill="Amarr Battleship")

4
eos/effects/shipbonusenergynosfalloffab2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusAB2"), skill="Amarr Battleship")

4
eos/effects/shipbonusenergynosfalloffac3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonus3AC"), skill="Amarr Cruiser")

4
eos/effects/shipbonusenergynosfalloffad1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonusAD1"), skill="Amarr Destroyer")

4
eos/effects/shipbonusenergynosfalloffaf3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("shipBonus3AF"), skill="Amarr Frigate")

4
eos/effects/shipbonusenergynosfalloffeaf3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip3"), skill="Electronic Attack Ships")

4
eos/effects/shipbonusenergynosfalloffrs2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")

4
eos/effects/shipbonusenergynosfalloffrs3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"falloffEffectiveness", ship.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")

4
eos/effects/shipbonusenergynosoptimalac1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"maxRange", ship.getModifiedItemAttr("shipBonusAC"), skill="Amarr Cruiser")

4
eos/effects/shipbonusenergynosoptimalad2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"maxRange", ship.getModifiedItemAttr("shipBonusAD2"), skill="Amarr Destroyer")

4
eos/effects/shipbonusenergynosoptimalaf2.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"maxRange", ship.getModifiedItemAttr("shipBonus2AF"), skill="Amarr Frigate")

4
eos/effects/shipbonusenergynosoptimaleaf1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"maxRange", ship.getModifiedItemAttr("eliteBonusElectronicAttackShip1"), skill="Electronic Attack Ships")

4
eos/effects/shipbonusenergynosoptimalrs1.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"maxRange", ship.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")

4
eos/effects/shipbonusenergynosoptimalrs3.py
View File

@@ -1,4 +0,0 @@
type = "passive"
def handler(fit, ship, context):
fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Nosferatu",
"maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1"), skill="Recon Ships")

4
eos/saveddata/drone.py
View File

@@ -172,7 +172,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
# Put them in the attrs tuple.
@property
def falloff(self):
attrs = ("falloff", "falloffEffectiveness")
attrs = ("falloff",)
for attr in attrs:
falloff = self.getModifiedItemAttr(attr)
if falloff is not None: return falloff
@@ -201,7 +201,7 @@ class Drone(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
# Do not allow to apply offensive modules on ship with offensive module immunite, with few exceptions
# (all effects which apply instant modification are exception, generally speaking)
if item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1:
offensiveNonModifiers = set(("energyDestabilizationNew", "leech", "energyNosferatuFalloff", "energyNeutralizerFalloff"))
offensiveNonModifiers = set(("energyDestabilizationNew", "leech"))
if not offensiveNonModifiers.intersection(set(item.effects)):
return False
# If assistive modules are not allowed, do not let to apply these altogether

4
eos/saveddata/module.py
View File

@@ -254,7 +254,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
@property
def falloff(self):
attrs = ("falloff", "shipScanFalloff", "falloffEffectiveness")
attrs = ("falloff", "shipScanFalloff")
for attr in attrs:
falloff = self.getModifiedItemAttr(attr)
if falloff is not None: return falloff
@@ -469,7 +469,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
# Do not allow to apply offensive modules on ship with offensive module immunite, with few exceptions
# (all effects which apply instant modification are exception, generally speaking)
if item.offensive and projectedOnto.ship.getModifiedItemAttr("disallowOffensiveModifiers") == 1:
offensiveNonModifiers = set(("energyDestabilizationNew", "leech", "energyNosferatuFalloff", "energyNeutralizerFalloff"))
offensiveNonModifiers = set(("energyDestabilizationNew", "leech"))
if not offensiveNonModifiers.intersection(set(item.effects)):
return False
# If assistive modules are not allowed, do not let to apply these altogether