From cee392fa3397e848bda72bdff008cdb2f2d31aff Mon Sep 17 00:00:00 2001 From: Little Cat Date: Wed, 28 Dec 2022 02:42:55 -0400 Subject: [PATCH] spellbook: Fix preventing MW usage in tutorial. --- toontown/spellbook/ToontownMagicWordManagerAI.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/toontown/spellbook/ToontownMagicWordManagerAI.py b/toontown/spellbook/ToontownMagicWordManagerAI.py index 881caaf..25f50e8 100644 --- a/toontown/spellbook/ToontownMagicWordManagerAI.py +++ b/toontown/spellbook/ToontownMagicWordManagerAI.py @@ -77,12 +77,11 @@ class ToontownMagicWordManagerAI(DistributedObjectAI.DistributedObjectAI): self.notify.warning('requestExecuteMagicWord: Magic Word use requested but invoker avatar is non-existent!') return - # FIXME: # Same thing with the Toontorial. Magic Words are strictly forbidden here # Tell the user they can't use it because they're in the Toontorial - # if hasattr(self.air, 'tutorialManager') and avId in list(self.air.tutorialManager.avId2fsm.keys()): - # self.generateResponse(avId=avId, responseType="Tutorial") - # return + if hasattr(self.air, 'tutorialManager') and avId in self.air.tutorialManager.playerDict: + self.generateResponse(avId=avId, responseType="Tutorial") + return # Our Magic Word affectRange is either SELF (the invoker) or BOTH (invoker and a target) # Because of this, we should add the invoker to the target list