From 43f69bb1846cce078761de0c07ad580a81118aca Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 21 Apr 2016 22:20:53 -0400 Subject: [PATCH] Only show fighter abilites which have been implemented. --- eos/gamedata.py | 2 ++ gui/builtinContextMenus/fighterAbilities.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/eos/gamedata.py b/eos/gamedata.py index 3e7c213eb..5f6904a1e 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -51,6 +51,7 @@ class Effect(EqBase): Reconstructor, composes the object as we grab it from the database ''' self.__generated = False + self.__effectModule = None self.handlerName = re.sub(self.nameFilter, "", self.name).lower() @property @@ -154,6 +155,7 @@ class Effect(EqBase): return getattr(self.__effectModule, key, None) + def effectDummy(*args, **kwargs): pass diff --git a/gui/builtinContextMenus/fighterAbilities.py b/gui/builtinContextMenus/fighterAbilities.py index 8693be19a..da62c3af9 100644 --- a/gui/builtinContextMenus/fighterAbilities.py +++ b/gui/builtinContextMenus/fighterAbilities.py @@ -34,6 +34,8 @@ class FighterAbility(ContextMenu): sub = wx.Menu() for ability in self.fighter.abilities: + if not ability.effect.isImplemented: + continue menuItem = self.addAbility(rootMenu if msw else sub, ability) sub.AppendItem(menuItem) menuItem.Check(ability.active)