diff --git a/otp/avatar/LocalAvatar.py b/otp/avatar/LocalAvatar.py index 36a4a29b..b19d5672 100755 --- a/otp/avatar/LocalAvatar.py +++ b/otp/avatar/LocalAvatar.py @@ -1125,9 +1125,6 @@ class LocalAvatar(DistributedAvatar.DistributedAvatar, DistributedSmoothNode.Dis def d_setParent(self, parentToken): DistributedSmoothNode.DistributedSmoothNode.d_setParent(self, parentToken) - def canChat(self): - return 0 - @magicWord(category=CATEGORY_COMMUNITY_MANAGER) def run(): diff --git a/otp/chat/ChatManager.py b/otp/chat/ChatManager.py index f7ec7676..05779a5f 100755 --- a/otp/chat/ChatManager.py +++ b/otp/chat/ChatManager.py @@ -123,7 +123,7 @@ class ChatManager(DirectObject.DirectObject): def enterMainMenu(self): self.checkObscurred() - if self.localAvatar.canChat(): + if base.cr.wantTypedChat(): if self.wantBackgroundFocus: self.chatInputNormal.chatEntry['backgroundFocus'] = 1 self.acceptOnce('enterNormalChat', self.fsm.request, ['normalChat']) diff --git a/toontown/suit/Suit.py b/toontown/suit/Suit.py index 004f8f7b..ca0db861 100755 --- a/toontown/suit/Suit.py +++ b/toontown/suit/Suit.py @@ -235,12 +235,12 @@ def loadDialog(level): SuitDialogFiles = ['COG_VO_grunt', 'COG_VO_murmur', 'COG_VO_statement', - 'COG_VO_question'] + 'COG_VO_question', + 'COG_VO_exclaim'] for file in SuitDialogFiles: SuitDialogArray.append(base.loadSfx(loadPath + file + '.ogg')) SuitDialogArray.append(SuitDialogArray[2]) - SuitDialogArray.append(SuitDialogArray[2]) def loadSkelDialog(): @@ -252,11 +252,12 @@ def loadSkelDialog(): murmur = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_murmur.ogg') statement = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_statement.ogg') question = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_question.ogg') + exclaim = loader.loadSfx('phase_5/audio/sfx/Skel_COG_VO_exclaim.ogg') SkelSuitDialogArray = [grunt, murmur, statement, question, - statement, + exclaim, statement] diff --git a/toontown/toon/LocalToon.py b/toontown/toon/LocalToon.py index 5d8e211d..e559abfd 100755 --- a/toontown/toon/LocalToon.py +++ b/toontown/toon/LocalToon.py @@ -428,9 +428,6 @@ class LocalToon(DistributedToon.DistributedToon, LocalAvatar.LocalAvatar): def isLocal(self): return 1 - def canChat(self): - return 1 - def startChat(self): if self.tutorialAck: self.notify.info('calling LocalAvatar.startchat')