From b1210852719beca7b13b4891ffb6600832ba118d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 2 May 2019 04:34:49 +0300 Subject: [PATCH] Unfuck EFT import --- eos/modifiedAttributeDict.py | 6 +----- service/port/eft.py | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py index 1202a4295..18f9adff8 100644 --- a/eos/modifiedAttributeDict.py +++ b/eos/modifiedAttributeDict.py @@ -259,11 +259,7 @@ class ModifiedAttributeDict(collections.MutableMapping): dv = attrInfo.defaultValue default = defaultValuesCache[key] = dv if dv is not None else 0.0 - val = self.__intermediary.get(key, - self.__preAssigns.get(key, - self.getOriginal(key, default) - ) - ) + val = self.__intermediary.get(key, self.__preAssigns.get(key, self.getOriginal(key, default))) # We'll do stuff in the following order: # preIncrease > multiplier > stacking penalized multipliers > postIncrease diff --git a/service/port/eft.py b/service/port/eft.py index 257c585a2..b794bbb31 100644 --- a/service/port/eft.py +++ b/service/port/eft.py @@ -255,7 +255,7 @@ def importEft(lines): fit.modules.replaceRackPosition(i, m) sFit = svcFit.getInstance() sFit.recalc(fit) - sFit.fill() + sFit.fill(fit) # Other stuff for modRack in ( @@ -459,7 +459,7 @@ def importEftCfg(shipname, lines, iportuser): # Recalc to get slot numbers correct for T3 cruisers sFit = svcFit.getInstance() sFit.recalc(fitobj) - sFit.fill() + sFit.fill(fitobj) for module in moduleList: if module.fits(fitobj):