From 89656b04ad6b9a790edcddaa745f2bdb2ef4fcc9 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 11 Feb 2019 14:50:44 +0300 Subject: [PATCH] Do not export mutated items for multibuy --- eos/saveddata/module.py | 4 ++++ service/port/eft.py | 5 ++--- service/port/multibuy.py | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index c4c2f0b00..4ff5113f2 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -965,6 +965,10 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): else: return currState + @property + def isMutated(self): + return bool(self.mutators) + def __deepcopy__(self, memo): item = self.item if item is None: diff --git a/service/port/eft.py b/service/port/eft.py index 91d0b8d47..d7e4174ef 100644 --- a/service/port/eft.py +++ b/service/port/eft.py @@ -80,13 +80,12 @@ def exportEft(fit, options): modules = modsBySlotType.get(slotType, ()) for module in modules: if module.item: - mutated = bool(module.mutators) # if module was mutated, use base item name for export - if mutated: + if module.isMutated: modName = module.baseItem.name else: modName = module.item.name - if mutated and options & Options.MUTATIONS.value: + if module.isMutated and options & Options.MUTATIONS.value: mutants[mutantReference] = module mutationSuffix = ' [{}]'.format(mutantReference) mutantReference += 1 diff --git a/service/port/multibuy.py b/service/port/multibuy.py index 6a3c4425e..550721e18 100644 --- a/service/port/multibuy.py +++ b/service/port/multibuy.py @@ -45,6 +45,9 @@ def exportMultiBuy(fit, options): exportCharges = svcFit.getInstance().serviceFittingOptions["exportCharges"] for module in fit.modules: if module.item: + # Mutated items are of no use for multibuy + if module.isMutated: + continue addItem(module.item) if exportCharges and module.charge: addItem(module.charge, module.numCharges)