From 4f77dff6ddbf974b3d2a4cf2af9412023cdb14ae Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sun, 11 Dec 2016 20:25:55 +0100 Subject: [PATCH 1/2] fixed parameters in call when adding neuts to structures. --- eos/effects/structureenergyneutralizerfalloff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/effects/structureenergyneutralizerfalloff.py b/eos/effects/structureenergyneutralizerfalloff.py index 8b6bf5846..673630a6b 100644 --- a/eos/effects/structureenergyneutralizerfalloff.py +++ b/eos/effects/structureenergyneutralizerfalloff.py @@ -10,4 +10,4 @@ def handler(fit, container, context): and container.state >= State.ACTIVE) or hasattr(container, "amountActive")): amount = container.getModifiedItemAttr("energyNeutralizerAmount") time = container.getModifiedItemAttr("duration") - fit.addDrain(time, amount, 0) + fit.addDrain(container, time, amount, 0) From 0ba88d081ac472dd3d0d993de9f260ed3673ce4a Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Sun, 11 Dec 2016 21:56:17 +0100 Subject: [PATCH 2/2] wrong index in tuple. Array looks normally so: (RunTime, Value, etc., etc.) ("normal", -10, ..., ...) I guess "RunTime" got added and this is an artifact as it is rarely called. Fixes Orca-Mining-Boost onto itself and other ships. --- eos/saveddata/fit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 7f4607488..1fe345be0 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -451,7 +451,7 @@ class Fit(object): # (abs is old method, ccp now provides the aggregate function in their data) print "Add command bonus: ", warfareBuffID, " - value: ", value - if warfareBuffID not in self.commandBonuses or abs(self.commandBonuses[warfareBuffID][0]) < abs(value): + if warfareBuffID not in self.commandBonuses or abs(self.commandBonuses[warfareBuffID][1]) < abs(value): self.commandBonuses[warfareBuffID] = (runTime, value, module, effect) def __runCommandBoosts(self, runTime="normal"):