From 585dff5132dbc05f29858c63781e565cfba50192 Mon Sep 17 00:00:00 2001 From: Loudrob Date: Thu, 4 Jun 2015 19:59:27 -0400 Subject: [PATCH] Default account-server secret for remotedb. --- dev/win32/start-game.bat | 10 +++++++++- toontown/toonbase/ClientStartRemoteDB.py | 4 ++-- toontown/uberdog/ClientServicesManagerUD.py | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev/win32/start-game.bat b/dev/win32/start-game.bat index 5a7aa569..8092dbb0 100644 --- a/dev/win32/start-game.bat +++ b/dev/win32/start-game.bat @@ -7,6 +7,7 @@ echo. echo #1 - Localhost echo #2 - Dev Server echo #3 - Custom +echo #4 - Local RemoteDB echo. :selection @@ -18,9 +19,11 @@ if %INPUT%==1 ( set TTS_GAMESERVER=127.0.0.1 ) else if %INPUT%==2 ( set TTS_GAMESERVER=167.114.220.172 +) else if %INPUT%==4 ( + set TTS_GAMESERVER=127.0.0.1 ) else if %INPUT%==3 ( echo. - set /P TTS_GAMESERVER=Gameserver: + set /P TTS_GAMESERVER=Gameserver: ) else ( goto selection ) @@ -30,6 +33,9 @@ echo. if %INPUT%==2 ( set /P ttsUsername="Username: " set /P ttsPassword="Password: " +) else if %INPUT%==4 ( + set /P ttsUsername="Username: " + set /P ttsPassword="Password: " ) else ( set /P TTS_PLAYCOOKIE=Username: ) @@ -53,6 +59,8 @@ cd ../../ if %INPUT%==2 ( "dependencies/panda/python/ppython.exe" -m toontown.toonbase.ClientStartRemoteDB +) else if %INPUT%==4 ( + "dependencies/panda/python/ppython.exe" -m toontown.toonbase.ClientStartRemoteDB ) else ( "dependencies/panda/python/ppython.exe" -m toontown.toonbase.ClientStart ) diff --git a/toontown/toonbase/ClientStartRemoteDB.py b/toontown/toonbase/ClientStartRemoteDB.py index df27236d..db1401a9 100755 --- a/toontown/toonbase/ClientStartRemoteDB.py +++ b/toontown/toonbase/ClientStartRemoteDB.py @@ -24,6 +24,6 @@ else: print response['reason'] else: os.environ['TTS_PLAYCOOKIE'] = response['token'] - + # Start the game: - import toontown.toonbase.ClientStart \ No newline at end of file + import toontown.toonbase.ClientStart diff --git a/toontown/uberdog/ClientServicesManagerUD.py b/toontown/uberdog/ClientServicesManagerUD.py index 3388a75d..e6c6d6ab 100755 --- a/toontown/uberdog/ClientServicesManagerUD.py +++ b/toontown/uberdog/ClientServicesManagerUD.py @@ -40,7 +40,7 @@ def entropyIdeal(length): return -length * prob * math.log(prob) / math.log(2.0) accountDBType = config.GetString('accountdb-type', 'developer') -accountServerSecret = config.GetString('account-server-secret', 'dev') +accountServerSecret = config.GetString('account-server-secret', '9sj6816aj1hs795j') # Changed in server distribution. accountServerHashAlgo = config.GetString('account-server-hash-algo', 'sha512') if accountDBType == 'remote': if accountServerSecret == 'dev':