From b0d3469f0134e80bde3d4eec3180f264730e4c09 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 26 Oct 2021 01:31:09 +0300 Subject: [PATCH] User short mutaplasmid name in mutation panel --- eos/gamedata.py | 13 ++++++++++++- gui/builtinContextMenus/itemMutations.py | 14 +++----------- gui/builtinItemStatsViews/itemMutator.py | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/eos/gamedata.py b/eos/gamedata.py index d4ad32f78..b83620e4d 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -567,7 +567,18 @@ class Group(EqBase): class DynamicItem(EqBase): - pass + + @property + def shortName(self): + name = self.item.name + keywords = ('Decayed', 'Gravid', 'Unstable', 'Radical') + for kw in keywords: + if name.startswith(f'{kw} '): + name = kw + m = re.match('(?P\S+) (?P\S+) Drone (?P\S+) Mutaplasmid', name) + if m: + name = '{} {}'.format(m.group('mutagrade'), m.group('mutatype')) + return name class DynamicItemAttribute(EqBase): diff --git a/gui/builtinContextMenus/itemMutations.py b/gui/builtinContextMenus/itemMutations.py index b401348d3..c4deec4a2 100644 --- a/gui/builtinContextMenus/itemMutations.py +++ b/gui/builtinContextMenus/itemMutations.py @@ -45,18 +45,10 @@ class ChangeItemMutation(ContextMenuSingle): menu = rootMenu if msw else sub - for item in mainItem.item.mutaplasmids: - label = item.item.name - keywords = ('Decayed', 'Gravid', 'Unstable', 'Radical') - for kw in keywords: - if item.item.name.startswith(f'{kw} '): - label = kw - m = re.match('(?P\S+) (?P\S+) Drone (?P\S+) Mutaplasmid', label) - if m: - label = '{} {}'.format(m.group('mutagrade'), m.group('mutatype')) + for mutaplasmid in mainItem.item.mutaplasmids: id = ContextMenuSingle.nextID() - self.eventIDs[id] = (item, mainItem) - mItem = wx.MenuItem(menu, id, label) + self.eventIDs[id] = (mutaplasmid, mainItem) + mItem = wx.MenuItem(menu, id, mutaplasmid.shortName) menu.Bind(wx.EVT_MENU, self.handleMenu, mItem) sub.Append(mItem) diff --git a/gui/builtinItemStatsViews/itemMutator.py b/gui/builtinItemStatsViews/itemMutator.py index c56906b8e..a49819b9a 100644 --- a/gui/builtinItemStatsViews/itemMutator.py +++ b/gui/builtinItemStatsViews/itemMutator.py @@ -33,7 +33,7 @@ class ItemMutatorPanel(wx.Panel): mutaIcon = BitmapLoader.getStaticBitmap(stuff.mutaplasmid.item.iconID, self, "icons") if mutaIcon is not None: headerSizer.Add(mutaIcon, 0, wx.LEFT, 0) - sourceItemShort = "{} {}".format(stuff.mutaplasmid.item.name.split(" ")[0], stuff.baseItem.name) + sourceItemShort = "{} {}".format(stuff.mutaplasmid.shortName, stuff.baseItem.name) sourceItemText = wx.StaticText(self, wx.ID_ANY, sourceItemShort) font = parent.GetFont() font.SetWeight(wx.BOLD)