launcher: Use quick launcher by default

darwin/start-game.sh

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ..
 
-# TODO: Make this actually work, to change token in the meantime,
-# change the fake-playtoken variable in etc/Configrc.prc.
 export LOGIN_TOKEN=dev
 
-/usr/local/bin/python3.9 -m toontown.toonbase.ToontownStart
+/usr/local/bin/python3.9 -m toontown.launcher.QuickStartLauncher

etc/Configrc.prc

@@ -32,6 +32,7 @@ notify-level-gobj warning
 notify-level-loader warning
 notify-timestamp #t
 notify-integrate #f
+console-output 1
 default-model-extension .bam
 decompressor-step-time 0.5
 extractor-step-time 0.5
@@ -57,6 +58,3 @@ want-dev 0
 schellgames-dev 0
 text-minfilter linear_mipmap_linear
 gc-save-all 0
-
-# TEMP
-fake-playtoken dev

linux/start-game.sh

@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ..
 
-# TODO: Make this actually work, to change token in the meantime,
-# change the fake-playtoken variable in etc/Configrc.prc.
 export LOGIN_TOKEN=dev
 
-python3 -m toontown.toonbase.ToontownStart
+python3 -m toontown.launcher.QuickStartLauncher

toontown/launcher/QuickStartLauncher.py

@@ -1,9 +1,10 @@
-from panda3d.core import *
 if __debug__:
+    from panda3d.core import loadPrcFile
     loadPrcFile('etc/Configrc.prc')
 else:
     import sys
     sys.path = ['']
+
 from toontown.launcher.QuickLauncher import QuickLauncher
 launcher = QuickLauncher()
 launcher.notify.info('Reached end of StartQuickLauncher.py.')

toontown/toonbase/ToontownStart.py

@@ -1,8 +1,3 @@
-from panda3d.core import *
-
-if __debug__:
-    loadPrcFile('etc/Configrc.prc')
-
 import builtins
 
 class game:
@@ -11,14 +6,15 @@ class game:
 
 
 builtins.game = game()
+from panda3d.core import *
 import time
-import os
 import sys
-import random
-import builtins
 try:
     launcher
 except:
+    if __debug__:
+        loadPrcFile('etc/Configrc.prc')
+
     from toontown.launcher.ToontownDummyLauncher import ToontownDummyLauncher
     launcher = ToontownDummyLauncher()
     builtins.launcher = launcher
@@ -74,7 +70,6 @@ if base.musicManagerIsValid:
     DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.ogg'))
 else:
     music = None
-from . import ToontownLoader
 from direct.gui.DirectGui import *
 serverVersion = base.config.GetString('server-version', 'no_version_set')
 print('ToontownStart: serverVersion: ', serverVersion)
@@ -89,7 +84,6 @@ del music
 base.initNametagGlobals()
 base.cr = cr
 loader.endBulkLoad('init')
-from otp.friends import FriendManager
 from otp.distributed.OtpDoGlobals import *
 cr.generateGlobalObject(OTP_DO_ID_FRIEND_MANAGER, 'FriendManager')
 if not launcher.isDummy():

win32/start_game.bat

@@ -5,9 +5,7 @@ cd..
 rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH
 
-rem TODO: Make this actually work, to change token in the meantime,
-rem change the fake-playtoken variable in etc/Configrc.prc.
 set LOGIN_TOKEN=dev
 
-%PPYTHON_PATH% -m toontown.toonbase.ToontownStart
+%PPYTHON_PATH% -m toontown.launcher.QuickStartLauncher
 pause