mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2025-01-09 17:53:50 +00:00
Only start chat in tutorial after talking to Flippy
This commit is contained in:
parent
2662ca6d3f
commit
99083861c3
4 changed files with 9 additions and 8 deletions
|
@ -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):
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue