From 9c9a6b69fe9119bc702b7bcaad352096cffc92e2 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 27 Nov 2015 00:07:24 -0500 Subject: [PATCH] Revert "Add new nos/neut effect files, and change module/drone files to account for new attributes. This does not add the database" This reverts commit 7dbe6dbe2d55769d0fd1102b92d079ca9ed35ed6. --- eos/effects/energyneutralizerfalloff.py | 9 --------- eos/effects/energynosferatufalloff.py | 9 --------- eos/effects/shipbonusenergyneutfalloffab2.py | 4 ---- eos/effects/shipbonusenergyneutfalloffac3.py | 4 ---- eos/effects/shipbonusenergyneutfalloffad1.py | 4 ---- eos/effects/shipbonusenergyneutfalloffaf3.py | 4 ---- eos/effects/shipbonusenergyneutfalloffeaf3.py | 4 ---- eos/effects/shipbonusenergyneutfalloffrs2.py | 4 ---- eos/effects/shipbonusenergyneutfalloffrs3.py | 4 ---- eos/effects/shipbonusenergyneutoptimalab.py | 4 ---- eos/effects/shipbonusenergyneutoptimalac1.py | 4 ---- eos/effects/shipbonusenergyneutoptimalad2.py | 4 ---- eos/effects/shipbonusenergyneutoptimalaf2.py | 4 ---- eos/effects/shipbonusenergyneutoptimaleaf1.py | 4 ---- eos/effects/shipbonusenergyneutoptimalrs1.py | 4 ---- eos/effects/shipbonusenergyneutoptimalrs3.py | 4 ---- eos/effects/shipbonusenergynosfalloffab.py | 4 ---- eos/effects/shipbonusenergynosfalloffab2.py | 4 ---- eos/effects/shipbonusenergynosfalloffac3.py | 4 ---- eos/effects/shipbonusenergynosfalloffad1.py | 4 ---- eos/effects/shipbonusenergynosfalloffaf3.py | 4 ---- eos/effects/shipbonusenergynosfalloffeaf3.py | 4 ---- eos/effects/shipbonusenergynosfalloffrs2.py | 4 ---- eos/effects/shipbonusenergynosfalloffrs3.py | 4 ---- eos/effects/shipbonusenergynosoptimalac1.py | 4 ---- eos/effects/shipbonusenergynosoptimalad2.py | 4 ---- eos/effects/shipbonusenergynosoptimalaf2.py | 4 ---- eos/effects/shipbonusenergynosoptimaleaf1.py | 4 ---- eos/effects/shipbonusenergynosoptimalrs1.py | 4 ---- eos/effects/shipbonusenergynosoptimalrs3.py | 4 ---- eos/saveddata/drone.py | 4 ++-- eos/saveddata/module.py | 4 ++-- 32 files changed, 4 insertions(+), 134 deletions(-) delete mode 100644 eos/effects/energyneutralizerfalloff.py delete mode 100644 eos/effects/energynosferatufalloff.py delete mode 100644 eos/effects/shipbonusenergyneutfalloffab2.py delete mode 100644 eos/effects/shipbonusenergyneutfalloffac3.py delete mode 100644 eos/effects/shipbonusenergyneutfalloffad1.py delete mode 100644 eos/effects/shipbonusenergyneutfalloffaf3.py delete mode 100644 eos/effects/shipbonusenergyneutfalloffeaf3.py delete mode 100644 eos/effects/shipbonusenergyneutfalloffrs2.py delete mode 100644 eos/effects/shipbonusenergyneutfalloffrs3.py delete mode 100644 eos/effects/shipbonusenergyneutoptimalab.py delete mode 100644 eos/effects/shipbonusenergyneutoptimalac1.py delete mode 100644 eos/effects/shipbonusenergyneutoptimalad2.py delete mode 100644 eos/effects/shipbonusenergyneutoptimalaf2.py delete mode 100644 eos/effects/shipbonusenergyneutoptimaleaf1.py delete mode 100644 eos/effects/shipbonusenergyneutoptimalrs1.py delete mode 100644 eos/effects/shipbonusenergyneutoptimalrs3.py delete mode 100644 eos/effects/shipbonusenergynosfalloffab.py delete mode 100644 eos/effects/shipbonusenergynosfalloffab2.py delete mode 100644 eos/effects/shipbonusenergynosfalloffac3.py delete mode 100644 eos/effects/shipbonusenergynosfalloffad1.py delete mode 100644 eos/effects/shipbonusenergynosfalloffaf3.py delete mode 100644 eos/effects/shipbonusenergynosfalloffeaf3.py delete mode 100644 eos/effects/shipbonusenergynosfalloffrs2.py delete mode 100644 eos/effects/shipbonusenergynosfalloffrs3.py delete mode 100644 eos/effects/shipbonusenergynosoptimalac1.py delete mode 100644 eos/effects/shipbonusenergynosoptimalad2.py delete mode 100644 eos/effects/shipbonusenergynosoptimalaf2.py delete mode 100644 eos/effects/shipbonusenergynosoptimaleaf1.py delete mode 100644 eos/effects/shipbonusenergynosoptimalrs1.py delete mode 100644 eos/effects/shipbonusenergynosoptimalrs3.py diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py deleted file mode 100644 index 9346d4d85..000000000 --- a/eos/effects/energyneutralizerfalloff.py +++ /dev/null @@ -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) diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/energynosferatufalloff.py deleted file mode 100644 index 0ce27efa5..000000000 --- a/eos/effects/energynosferatufalloff.py +++ /dev/null @@ -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) diff --git a/eos/effects/shipbonusenergyneutfalloffab2.py b/eos/effects/shipbonusenergyneutfalloffab2.py deleted file mode 100644 index 8af831214..000000000 --- a/eos/effects/shipbonusenergyneutfalloffab2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutfalloffac3.py b/eos/effects/shipbonusenergyneutfalloffac3.py deleted file mode 100644 index 3335ea14a..000000000 --- a/eos/effects/shipbonusenergyneutfalloffac3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutfalloffad1.py b/eos/effects/shipbonusenergyneutfalloffad1.py deleted file mode 100644 index a2d60a88b..000000000 --- a/eos/effects/shipbonusenergyneutfalloffad1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutfalloffaf3.py b/eos/effects/shipbonusenergyneutfalloffaf3.py deleted file mode 100644 index 2f2b8ec4e..000000000 --- a/eos/effects/shipbonusenergyneutfalloffaf3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutfalloffeaf3.py b/eos/effects/shipbonusenergyneutfalloffeaf3.py deleted file mode 100644 index 7996fd211..000000000 --- a/eos/effects/shipbonusenergyneutfalloffeaf3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutfalloffrs2.py b/eos/effects/shipbonusenergyneutfalloffrs2.py deleted file mode 100644 index 01b630b9b..000000000 --- a/eos/effects/shipbonusenergyneutfalloffrs2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutfalloffrs3.py b/eos/effects/shipbonusenergyneutfalloffrs3.py deleted file mode 100644 index 9d920a5ae..000000000 --- a/eos/effects/shipbonusenergyneutfalloffrs3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutoptimalab.py b/eos/effects/shipbonusenergyneutoptimalab.py deleted file mode 100644 index c800ef497..000000000 --- a/eos/effects/shipbonusenergyneutoptimalab.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutoptimalac1.py b/eos/effects/shipbonusenergyneutoptimalac1.py deleted file mode 100644 index e9583c938..000000000 --- a/eos/effects/shipbonusenergyneutoptimalac1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutoptimalad2.py b/eos/effects/shipbonusenergyneutoptimalad2.py deleted file mode 100644 index ded8c9a6c..000000000 --- a/eos/effects/shipbonusenergyneutoptimalad2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutoptimalaf2.py b/eos/effects/shipbonusenergyneutoptimalaf2.py deleted file mode 100644 index b16600c1b..000000000 --- a/eos/effects/shipbonusenergyneutoptimalaf2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutoptimaleaf1.py b/eos/effects/shipbonusenergyneutoptimaleaf1.py deleted file mode 100644 index c22f74981..000000000 --- a/eos/effects/shipbonusenergyneutoptimaleaf1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutoptimalrs1.py b/eos/effects/shipbonusenergyneutoptimalrs1.py deleted file mode 100644 index ffbe0cc8d..000000000 --- a/eos/effects/shipbonusenergyneutoptimalrs1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergyneutoptimalrs3.py b/eos/effects/shipbonusenergyneutoptimalrs3.py deleted file mode 100644 index ef1bb4a6c..000000000 --- a/eos/effects/shipbonusenergyneutoptimalrs3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffab.py b/eos/effects/shipbonusenergynosfalloffab.py deleted file mode 100644 index 0f0c50c07..000000000 --- a/eos/effects/shipbonusenergynosfalloffab.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffab2.py b/eos/effects/shipbonusenergynosfalloffab2.py deleted file mode 100644 index a0c0f25fa..000000000 --- a/eos/effects/shipbonusenergynosfalloffab2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffac3.py b/eos/effects/shipbonusenergynosfalloffac3.py deleted file mode 100644 index e9170ee2b..000000000 --- a/eos/effects/shipbonusenergynosfalloffac3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffad1.py b/eos/effects/shipbonusenergynosfalloffad1.py deleted file mode 100644 index ed49e4788..000000000 --- a/eos/effects/shipbonusenergynosfalloffad1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffaf3.py b/eos/effects/shipbonusenergynosfalloffaf3.py deleted file mode 100644 index 788d0498d..000000000 --- a/eos/effects/shipbonusenergynosfalloffaf3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffeaf3.py b/eos/effects/shipbonusenergynosfalloffeaf3.py deleted file mode 100644 index c5e6e9b15..000000000 --- a/eos/effects/shipbonusenergynosfalloffeaf3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffrs2.py b/eos/effects/shipbonusenergynosfalloffrs2.py deleted file mode 100644 index 80884d071..000000000 --- a/eos/effects/shipbonusenergynosfalloffrs2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosfalloffrs3.py b/eos/effects/shipbonusenergynosfalloffrs3.py deleted file mode 100644 index 56ffdfdfb..000000000 --- a/eos/effects/shipbonusenergynosfalloffrs3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosoptimalac1.py b/eos/effects/shipbonusenergynosoptimalac1.py deleted file mode 100644 index e78f33419..000000000 --- a/eos/effects/shipbonusenergynosoptimalac1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosoptimalad2.py b/eos/effects/shipbonusenergynosoptimalad2.py deleted file mode 100644 index 3ab31c3d3..000000000 --- a/eos/effects/shipbonusenergynosoptimalad2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosoptimalaf2.py b/eos/effects/shipbonusenergynosoptimalaf2.py deleted file mode 100644 index 8d677e66c..000000000 --- a/eos/effects/shipbonusenergynosoptimalaf2.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosoptimaleaf1.py b/eos/effects/shipbonusenergynosoptimaleaf1.py deleted file mode 100644 index a75336a5d..000000000 --- a/eos/effects/shipbonusenergynosoptimaleaf1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosoptimalrs1.py b/eos/effects/shipbonusenergynosoptimalrs1.py deleted file mode 100644 index 28cdebad5..000000000 --- a/eos/effects/shipbonusenergynosoptimalrs1.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/effects/shipbonusenergynosoptimalrs3.py b/eos/effects/shipbonusenergynosoptimalrs3.py deleted file mode 100644 index 7a439c508..000000000 --- a/eos/effects/shipbonusenergynosoptimalrs3.py +++ /dev/null @@ -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") \ No newline at end of file diff --git a/eos/saveddata/drone.py b/eos/saveddata/drone.py index 507c55681..2fcb6a908 100644 --- a/eos/saveddata/drone.py +++ b/eos/saveddata/drone.py @@ -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 diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 6c3b4273a..5fbb75e1c 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -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