From be7e8be85b3b603e067bf4f37390996e31709508 Mon Sep 17 00:00:00 2001 From: Cameron Grout Date: Sun, 22 Feb 2015 23:52:58 +1300 Subject: [PATCH 1/2] Fix for bug #261 Missile launchers do not have a "capacitorNeed" attribute (while other capless weapon systems do), so getModifiedItemAttr will return None rather than 0. Added a check for this. --- 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 a382ae01d..3f1402671 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -737,7 +737,7 @@ class Fit(object): capAdded = 0 for mod in self.modules: if mod.state >= State.ACTIVE: - if mod.getModifiedItemAttr("capacitorNeed") != 0: + if mod.getModifiedItemAttr("capacitorNeed") != 0 and mod.getModifiedItemAttr("capacitorNeed") is not None: cycleTime = mod.rawCycleTime or 0 reactivationTime = mod.getModifiedItemAttr("moduleReactivationDelay") or 0 fullCycleTime = cycleTime + reactivationTime From e082077dfce104ad33ca45b2891bf920c17f8cbc Mon Sep 17 00:00:00 2001 From: Cameron Grout Date: Mon, 23 Feb 2015 17:02:47 +1300 Subject: [PATCH 2/2] Updated None || 0 check to meet requested style Updated for pull request #263 --- 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 3f1402671..f49c1f60e 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -737,7 +737,7 @@ class Fit(object): capAdded = 0 for mod in self.modules: if mod.state >= State.ACTIVE: - if mod.getModifiedItemAttr("capacitorNeed") != 0 and mod.getModifiedItemAttr("capacitorNeed") is not None: + if (mod.getModifiedItemAttr("capacitorNeed") or 0) != 0: cycleTime = mod.rawCycleTime or 0 reactivationTime = mod.getModifiedItemAttr("moduleReactivationDelay") or 0 fullCycleTime = cycleTime + reactivationTime