From 5457c311480276323fef46896655b5784b477b4c Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Wed, 17 Apr 2019 10:03:49 +0300 Subject: [PATCH] Use already existing method in module validator --- eos/saveddata/module.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py index 8189f761e..53f611ddb 100644 --- a/eos/saveddata/module.py +++ b/eos/saveddata/module.py @@ -192,14 +192,15 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut): # todo: validate baseItem as well if it's set. if self.isEmpty: return False - return self.__item is None or \ - (self.__item.category.name not in ("Module", "Subsystem", "Structure Module") and - self.__item.group.name not in self.SYSTEM_GROUPS) or \ - (self.item.isAbyssal and (not self.baseItemID or not self.mutaplasmidID)) + return ( + self.__item is None or ( + self.__item.category.name not in ("Module", "Subsystem", "Structure Module") and + self.__item.group.name not in self.SYSTEM_GROUPS) or + (self.item.isAbyssal and not self.isMutated)) @property def isMutated(self): - return self.baseItemID or self.mutaplasmidID + return self.baseItemID and self.mutaplasmidID @property def numCharges(self):