From b2217bb6cd164ed0885f70c6ffc0be778a020c9d Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 26 Oct 2021 12:49:27 +0300 Subject: [PATCH] Use short name only if short mutaplasmid name is available --- eos/gamedata.py | 2 +- eos/saveddata/mutatedMixin.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/eos/gamedata.py b/eos/gamedata.py index b83620e4d..145f22ad1 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -570,7 +570,7 @@ class DynamicItem(EqBase): @property def shortName(self): - name = self.item.name + name = self.item.customName keywords = ('Decayed', 'Gravid', 'Unstable', 'Radical') for kw in keywords: if name.startswith(f'{kw} '): diff --git a/eos/saveddata/mutatedMixin.py b/eos/saveddata/mutatedMixin.py index 4e41fd244..31c5dee5a 100644 --- a/eos/saveddata/mutatedMixin.py +++ b/eos/saveddata/mutatedMixin.py @@ -47,7 +47,10 @@ class MutatedMixin: @property def fullName(self): if self.isMutated: - return f'{self.mutaplasmid.shortName} {self.baseItem.customName}' + mutaShortName = self.mutaplasmid.shortName + mutaFullName = self.mutaplasmid.item.customName + if mutaShortName != mutaFullName: + return f'{self.mutaplasmid.shortName} {self.baseItem.customName}' return self.item.customName def _mutaInit(self, baseItem, mutaplasmid):