From 5fd23d0933a484779b1c30093f7f68aeedb73d39 Mon Sep 17 00:00:00 2001
From: John Cote <jwcotejr@comcast.net>
Date: Sat, 23 May 2015 00:53:15 -0400
Subject: [PATCH] Remove start_game_remotedb.bat and edit start_game.bat

---
 astron/.gitignore             |  2 +-
 win32/start_game.bat          | 47 +++++++++++++++++++++++++----------
 win32/start_game_remotedb.bat | 22 ----------------
 3 files changed, 35 insertions(+), 36 deletions(-)
 delete mode 100644 win32/start_game_remotedb.bat

diff --git a/astron/.gitignore b/astron/.gitignore
index 3cd2d066..12eb8cb3 100755
--- a/astron/.gitignore
+++ b/astron/.gitignore
@@ -1,3 +1,3 @@
-# We'll want production astron to be included, but not the debug builds
+# Exclude the debug builds of Astron.
 astrond_debug
 astrond_debug.exe
diff --git a/win32/start_game.bat b/win32/start_game.bat
index 2434800b..73864548 100644
--- a/win32/start_game.bat
+++ b/win32/start_game.bat
@@ -1,36 +1,57 @@
 @echo off
 cd..
 
-title TTS Game Launcher
+title Toontown Stride Game Launcher
 
 rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH
 
-echo Choose your game server!
-echo #1 - Localhost
-echo #2 - Custom
-echo #3 - Loudrob
+echo Choose your connection method!
+echo.
+echo #1 - Localhost
+echo #2 - Dev Server
+echo #3 - Custom
 echo.
-set /P INPUT=
-set TTS_GAMESERVER=unset
 
-if %INPUT%==1 set TTS_GAMESERVER=127.0.0.1
-if %INPUT%==3 set TTS_GAMESERVER=71.200.196.180
+set /P INPUT=Selection: 
 
-if %TTS_GAMESERVER%==unset (
+if %INPUT%==1 (
+    set TTS_GAMESERVER=127.0.0.1
+) else if %INPUT%==2 (
+    set TTS_GAMESERVER=167.114.220.172
+) else if %INPUT%==3 (
     echo.
     set /P TTS_GAMESERVER=Gameserver: 
+) else exit
+
+echo.
+
+if %INPUT%==2 (
+    set /P ttsUsername="Username: "
+    set /P ttsPassword="Password: "
+) else (
+    set /P TTS_PLAYCOOKIE=Username: 
 )
 
 echo.
-set /P TTS_PLAYCOOKIE=Username: 
 
 echo ===============================
 echo Starting Toontown Stride...
 echo ppython: %PPYTHON_PATH%
-echo Username: %TTS_PLAYCOOKIE%
+
+if %INPUT%==2 (
+    echo Username: %ttsUsername%
+) else (
+    echo Username: %TTS_PLAYCOOKIE%
+)
+
 echo Gameserver: %TTS_GAMESERVER%
 echo ===============================
 
-%PPYTHON_PATH% -m toontown.toonbase.ClientStart
+if %INPUT%==2 (
+    %PPYTHON_PATH% -m toontown.toonbase.ClientStartRemoteDB
+) else (
+    %PPYTHON_PATH% -m toontown.toonbase.ClientStart
+)
+
 pause
diff --git a/win32/start_game_remotedb.bat b/win32/start_game_remotedb.bat
deleted file mode 100644
index 96948c45..00000000
--- a/win32/start_game_remotedb.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off
-cd..
-
-title Toontown Stride RemoteDB Launcher
-
-rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
-set /P PPYTHON_PATH=<PPYTHON_PATH
-
-rem Get the user input:
-set /P ttsUsername="Username: "
-set /P ttsPassword="Password: "
-set TTS_GAMESERVER=167.114.220.172
-
-echo ===============================
-echo Starting Toontown Stride...
-echo ppython: %PPYTHON_PATH%
-echo Username: %ttsUsername%
-echo Gameserver: %TTS_GAMESERVER% (Steve's Dev Server)
-echo ===============================
-
-%PPYTHON_PATH% -m toontown.toonbase.ClientStartRemoteDB
-pause