diff --git a/toontown/chat/ToontownChatManager.py b/toontown/chat/ToontownChatManager.py index 80301e3f..b0b89382 100755 --- a/toontown/chat/ToontownChatManager.py +++ b/toontown/chat/ToontownChatManager.py @@ -130,15 +130,9 @@ class ToontownChatManager(ChatManager.ChatManager): if avatarId: self.enterWhisperChat(avatarName, avatarId) self.whisperFrame.hide() - return def enterNormalChat(self): - if not base.cr.wantTypedChat(): - self.fsm.request('mainMenu') - return - result = ChatManager.ChatManager.enterNormalChat(self) - if result == None: - self.notify.warning('something went wrong in enterNormalChat, falling back to main menu') + if not base.cr.wantTypedChat() or not base.localAvatar.getTutorialAck() or not ChatManager.ChatManager.enterNormalChat(self): self.fsm.request('mainMenu') def enterWhisperChat(self, avatarName, avatarId): diff --git a/toontown/quest/QuestParser.py b/toontown/quest/QuestParser.py index db41baba..fbe13bc4 100755 --- a/toontown/quest/QuestParser.py +++ b/toontown/quest/QuestParser.py @@ -406,8 +406,11 @@ class NPCMoviePlayer(DirectObject.DirectObject): self.closePreviousChapter(iList) chapterList = [] self.currentEvent = nextEvent + elif command == 'TUTORIAL_ACK_DONE': + iList.append(Func(base.localAvatar.setTutorialAck, True)) else: notify.warning('Unknown command token: %s for scriptId: %s on line: %s' % (command, self.scriptId, lineNum)) + self.closePreviousChapter(chapterList) if timeoutList: diff --git a/toontown/quest/QuestScripts.py b/toontown/quest/QuestScripts.py index 18d1b2da..77f59772 100755 --- a/toontown/quest/QuestScripts.py +++ b/toontown/quest/QuestScripts.py @@ -253,7 +253,8 @@ WAIT 0.5 WRTREPARENTTO chatNormalButton topLeft LERP_POS chatNormalButton 0.068 0 -0.072 0.6 LERP_SCALE chatNormalButton 1.179 1.179 1.179 0.6 -WAIT 0.6 +WAIT 0.6 +TUTORIAL_ACK_DONE LOCAL_CHAT_CONFIRM npc QuestScriptTutorialBlocker_7 "CFReversed" LOCAL_CHAT_CONFIRM npc QuestScriptTutorialBlocker_8 1 "CFReversed" LOOP_ANIM npc "walk" diff --git a/toontown/toon/DistributedToon.py b/toontown/toon/DistributedToon.py index 3c37d63c..cb8cd4c6 100755 --- a/toontown/toon/DistributedToon.py +++ b/toontown/toon/DistributedToon.py @@ -592,6 +592,9 @@ class DistributedToon(DistributedPlayer.DistributedPlayer, Toon.Toon, Distribute def setTutorialAck(self, tutorialAck): self.tutorialAck = tutorialAck + + def getTutorialAck(self): + return self.tutorialAck def setEarnedExperience(self, earnedExp): self.earnedExperience = earnedExp