Merge branch 'develop' into enhancement/remove-pandac-pandamodules
This commit is contained in:
commit
9a95da5bfb
1 changed files with 3 additions and 4 deletions
|
@ -77,12 +77,11 @@ class ToontownMagicWordManagerAI(DistributedObjectAI.DistributedObjectAI):
|
||||||
self.notify.warning('requestExecuteMagicWord: Magic Word use requested but invoker avatar is non-existent!')
|
self.notify.warning('requestExecuteMagicWord: Magic Word use requested but invoker avatar is non-existent!')
|
||||||
return
|
return
|
||||||
|
|
||||||
# FIXME:
|
|
||||||
# Same thing with the Toontorial. Magic Words are strictly forbidden here
|
# 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
|
# 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()):
|
if hasattr(self.air, 'tutorialManager') and avId in self.air.tutorialManager.playerDict:
|
||||||
# self.generateResponse(avId=avId, responseType="Tutorial")
|
self.generateResponse(avId=avId, responseType="Tutorial")
|
||||||
# return
|
return
|
||||||
|
|
||||||
# Our Magic Word affectRange is either SELF (the invoker) or BOTH (invoker and a target)
|
# 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
|
# Because of this, we should add the invoker to the target list
|
||||||
|
|
Loading…
Reference in a new issue