From 7b32fe08ace93814144d14a2b04238bd4570f2b0 Mon Sep 17 00:00:00 2001 From: burnsypet Date: Thu, 26 Oct 2017 17:53:16 +0100 Subject: [PATCH] Stop applying neut resistance twice Energy neut/nos resistance was being applied twice when a nos or neut is projected onto a fit. I have removed the redundant resistance application in energyneutralizerfalloff.py and also in energynosferatufalloff.py as they are already being applied once in eos.saveddata.fit.addDrain. --- eos/effects/energyneutralizerfalloff.py | 3 --- eos/effects/energynosferatufalloff.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/eos/effects/energyneutralizerfalloff.py b/eos/effects/energyneutralizerfalloff.py index 37d829baa..7c1244f74 100644 --- a/eos/effects/energyneutralizerfalloff.py +++ b/eos/effects/energyneutralizerfalloff.py @@ -13,9 +13,6 @@ def handler(fit, src, context, **kwargs): hasattr(src, "amountActive")): amount = src.getModifiedItemAttr("energyNeutralizerAmount") - if 'effect' in kwargs: - amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect']) - time = src.getModifiedItemAttr("duration") fit.addDrain(src, time, amount, 0) diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/energynosferatufalloff.py index 841efb7cf..2e564df5c 100644 --- a/eos/effects/energynosferatufalloff.py +++ b/eos/effects/energynosferatufalloff.py @@ -12,9 +12,6 @@ def handler(fit, src, context, **kwargs): amount = src.getModifiedItemAttr("powerTransferAmount") time = src.getModifiedItemAttr("duration") - if 'effect' in kwargs: - amount *= ModifiedAttributeDict.getResistance(fit, kwargs['effect']) - if "projected" in context: fit.addDrain(src, time, amount, 0) elif "module" in context: