Rework Tutorial Tom's movie

toontown/building/DistributedTutorialInterior.py

@@ -127,7 +127,7 @@ class DistributedTutorialInterior(DistributedObject.DistributedObject):
             self.cr.doId2do[self.npcId].clearMat()
         self.createSuit()
         base.localAvatar.setPosHpr(-2, 12, 0, -10, 0, 0)
-        self.cr.doId2do[self.npcId].setChatAbsolute(TTLocalizer.QuestScriptTutorialMickey_4, CFSpeech)
+        self.cr.doId2do[self.npcId].setChatAbsolute(TTLocalizer.QuestScript101_0, CFSpeech)
         place = base.cr.playGame.getPlace()
         if place and hasattr(place, 'fsm') and place.fsm.getCurrentState().getName():
             self.notify.info('Tutorial movie: Place ready.')

toontown/quest/QuestParser.py

@@ -322,10 +322,6 @@ class NPCMoviePlayer(DirectObject.DirectObject):
                     self.parseLoad(line)
                 elif command == 'LOAD_SFX':
                     self.parseLoadSfx(line)
-                elif command == 'LOAD_DIALOGUE':
-                    self.parseLoadDialogue(line)
-                elif command == 'LOAD_CC_DIALOGUE':
-                    self.parseLoadCCDialogue(line)
                 elif command == 'LOAD_CHAR':
                     self.parseLoadChar(line)
                 elif command == 'LOAD_CLASSIC_CHAR':
@@ -461,8 +457,6 @@ class NPCMoviePlayer(DirectObject.DirectObject):
                     self.closePreviousChapter(iList)
                     chapterList = []
                     self.currentEvent = nextEvent
-                elif command == 'SET_MUSIC_VOLUME':
-                    iList.append(self.parseSetMusicVolume(line))
                 else:
                     notify.warning('Unknown command token: %s for scriptId: %s on line: %s' % (command, self.scriptId, lineNum))
 
@@ -492,31 +486,6 @@ class NPCMoviePlayer(DirectObject.DirectObject):
         sfx = base.loadSfx(fileName)
         self.setVar(varName, sfx)
 
-    def parseLoadDialogue(self, line):
-        token, varName, fileName = line
-        if varName == 'tomDialogue_01':
-            notify.debug('VarName tomDialogue getting added. Tutorial Ack: %d' % base.localAvatar.tutorialAck)
-        if base.config.GetString('language', 'english') == 'japanese':
-            dialogue = base.loadSfx(fileName)
-        else:
-            dialogue = None
-        self.setVar(varName, dialogue)
-        return
-
-    def parseLoadCCDialogue(self, line):
-        token, varName, filenameTemplate = line
-        if self.toon.getStyle().gender == 'm':
-            classicChar = 'mickey'
-        else:
-            classicChar = 'minnie'
-        filename = filenameTemplate % classicChar
-        if base.config.GetString('language', 'english') == 'japanese':
-            dialogue = base.loadSfx(filename)
-        else:
-            dialogue = None
-        self.setVar(varName, dialogue)
-        return
-
     def parseLoadChar(self, line):
         token, name, charType = line
         char = Char.Char()
@@ -1048,42 +1017,6 @@ class NPCMoviePlayer(DirectObject.DirectObject):
 
         return Sequence(Func(grabCurTrackAccess), LerpFunctionInterval(updateGagLevel, fromData=1, toData=7, duration=0.3), WaitInterval(3.5), LerpFunctionInterval(updateGagLevel, fromData=7, toData=1, duration=0.3), Func(restoreTrackAccess), Func(messenger.send, 'doneThrowSquirtPreview'))
 
-    def parseSetMusicVolume(self, line):
-        if base.config.GetString('language', 'english') == 'japanese':
-            try:
-                loader = base.cr.playGame.place.loader
-                type = 'music'
-                duration = 0
-                fromLevel = 1.0
-                if len(line) == 2:
-                    token, level = line
-                elif len(line) == 3:
-                    token, level, type = line
-                elif len(line) == 4:
-                    token, level, type, duration = line
-                elif len(line) == 5:
-                    token, level, type, duration, fromLevel = line
-                if type == 'battleMusic':
-                    music = loader.battleMusic
-                elif type == 'activityMusic':
-                    music = loader.activityMusic
-                else:
-                    music = loader.music
-                if duration == 0:
-                    return Func(music.setVolume, level)
-                else:
-
-                    def setVolume(level):
-                        music.setVolume(level)
-
-                    return LerpFunctionInterval(setVolume, fromData=fromLevel, toData=level, duration=duration)
-            except AttributeError:
-                pass
-
-        else:
-            return Wait(0.0)
-
-
 searchPath = DSearchPath()
 if __debug__:	 
     searchPath.appendDirectory(Filename('../resources/phase_3/etc'))

toontown/toonbase/TTLocalizerEnglish.py

@@ -5531,21 +5531,14 @@ V2InvasionBulletin1 = lToonHQ + ': There is a Cog invasion in progress!!!'
 V2InvasionBulletin2 = lToonHQ + ': A major firmware update has been released to the Cogs!!!'
 V2InvasionBulletin3 = lToonHQ + ': Version 2.0 Cogs have taken over Toontown!!!'
 LeaderboardTitle = 'Toon Platoon'
-QuestScriptTutorialMickey_1 = 'Toontown has a new citizen! Do you have some extra gags?'
+QuestScript101_0 = 'Come here! Use the arrow keys to move.'
-QuestScriptTutorialMickey_2 = 'Sure, %s!'
-QuestScriptTutorialMickey_3 = 'Tutorial Tom will tell you all about the Cogs.\x07Gotta go!'
-QuestScriptTutorialMickey_4 = "Hello, new citizen! Welcome to Toontown! Come over here so I can tell you what's been going on in town recently. Use the arrow keys to move."
-QuestScriptTutorialMinnie_1 = 'Toontown has a new citizen! Do you have some extra gags?'
-QuestScriptTutorialMinnie_2 = 'Sure, %s!'
-QuestScriptTutorialMinnie_3 = 'Tutorial Tom will tell you all about the Cogs.\x07Gotta go!'
 QuestScript101_1 = 'These are Cogs. They are robots that are trying to take over Toontown.'
 QuestScript101_2 = 'There are many different kinds of Cogs and...'
 QuestScript101_3 = '...they turn happy Toon buildings...'
 QuestScript101_4 = '...into ugly Cog buildings!'
 QuestScript101_5 = "But Cogs can't take a joke!"
 QuestScript101_6 = 'A good gag will stop them.'
-QuestScript101_7 = 'There are lots of gags, but take these to start.'
+QuestScript101_8 = 'You also need a Laff meter.'
-QuestScript101_8 = 'Oh! You also need a Laff meter!'
 QuestScript101_9 = "If your Laff meter gets too low, you'll be sad!"
 QuestScript101_10 = 'A happy Toon is a healthy Toon!'
 QuestScript101_11 = "OH NO! There's a Cog outside my shop!"
@@ -5569,7 +5562,7 @@ QuestScriptTutorialBlocker_3 = "Oh! You don't know how to use SpeedChat!"
 QuestScriptTutorialBlocker_4 = 'Click on the button to say something.'
 QuestScriptTutorialBlocker_5 = 'Very good!\x07Where you are going there are many Toons to talk to.'
 QuestScriptTutorialBlocker_6 = "If you want to chat with other Toons using the keyboard, there's another button you can use."
-QuestScriptTutorialBlocker_7 = "It's called the SpeedChat Plus button. You need to turn on Speedchat Plus in your Account Manager on the Toontown United Website to use it."
+QuestScriptTutorialBlocker_7 = "It's called the SpeedChat Plus button."
 QuestScriptTutorialBlocker_8 = 'Good luck! See you later!'
 QuestScriptGagShop_1 = 'Welcome to the Gag Shop!'
 QuestScriptGagShop_1a = 'This is where Toons come to buy gags to use against the Cogs.'