Organize the repo a bit more

.gitignore

@@ -23,4 +23,4 @@ contentpacks/
 resources/
 save.dat
 ai-crash.txt
-gentokenlr.py
+gentokenlr.py

all.bat

@@ -1,5 +0,0 @@
-rem only use this with a non-remotedb
-start astron
-start ai
-start ud
-start client

astron/databases/.gitignore

@@ -1 +1 @@
-*.db
+*.db

astron/win32/start-ai-server.bat

@@ -1,4 +1,5 @@
 @echo off
+cd ../..
 
 rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH

astron/win32/start-all.bat

@@ -0,0 +1,5 @@
+rem Starts a Localhost server. This is meant for Windows. To connect to developer server, use the start-game-remotedb file for your OS.
+
+start start-astron-cluster
+start start-uberdog-server
+start start-ai-server

astron/win32/start-astron-cluster.bat

@@ -1,4 +1,5 @@
 @echo off
-cd astron
+cd..
+
 astrond --loglevel info config/cluster.yml
-pause
+pause

astron/win32/start-uberdog-server.bat

@@ -1,4 +1,5 @@
 @echo off
+cd ../..
 
 rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH

tools/.gitignore

@@ -1,2 +1,2 @@
 build
-build/*
+build/*

toontown/dna/DNAParser.py

@@ -36,10 +36,8 @@ def loadDNAFileAI(dnaStorage, file):
 def setupDoor(a, b, c, d, e, f):
     try:
         e = int(str(e).split('_')[0])
-        
     except:
         print 'setupDoor: error parsing', e
         e = 9999
-        
-    DNADoor.setupDoor(a, b, c, d, e, f)
 
+    DNADoor.setupDoor(a, b, c, d, e, f)

toontown/toon/DistributedNPCLaffRestockAI.py

@@ -89,11 +89,11 @@ class DistributedNPCLaffRestockAI(DistributedNPCToonBaseAI):
             return
         av = simbase.air.doId2do.get(avId)
         if av:
-			if av.getMaxHp() < (av.getHp() + laff):
+            if av.getMaxHp() < (av.getHp() + laff):
-				movieType = NPCToons.SELL_MOVIE_CHEATER
+                movieType = NPCToons.SELL_MOVIE_CHEATER
-				self.air.writeServerEvent('suspicious', avId, 'DistributedNPCLaffRestockAI.restock invalid restock')
+                self.air.writeServerEvent('suspicious', avId, 'DistributedNPCLaffRestockAI.restock invalid restock')
-				self.notify.warning('somebody tried to buy an invalid hp restock! avId: %s' % avId)
+                self.notify.warning('somebody tried to buy an invalid hp restock! avId: %s' % avId)
-			else:
+            else:
-				movieType = NPCToons.SELL_MOVIE_COMPLETE
+                movieType = NPCToons.SELL_MOVIE_COMPLETE
-				av.takeMoney(cost)
+                av.takeMoney(cost)
-				av.b_setHp(av.getHp() + laff)
+                av.b_setHp(av.getHp() + laff)

win32/start_game.bat

@@ -1,19 +1,23 @@
 @echo off
+cd..
+
 title TTS 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 - Loudrob
+echo #2 - Custom
-echo #3 - Steve
+echo #3 - Loudrob
-echo #4 - Custom
 echo.
 set /P INPUT=
+set server=unset
 
 if %INPUT%==1 set TTS_GAMESERVER=127.0.0.1
-if %INPUT%==2 set TTS_GAMESERVER=71.200.196.180
+if %INPUT%==3 set TTS_GAMESERVER=71.200.196.180
-if %INPUT%==3 set TTS_GAMESERVER=167.114.220.172
+
-if %INPUT%==4 (
+if %TTS_GAMESERVER%==unset (
     echo.
     set /P TTS_GAMESERVER=Gameserver: 
 )
@@ -29,4 +33,4 @@ echo Gameserver: %TTS_GAMESERVER%
 echo ===============================
 
 %PPYTHON_PATH% -m toontown.toonbase.ClientStart
-pause
+pause

win32/start_game_remotedb.bat

@@ -1,21 +1,22 @@
-@echo off
+@echo off
-
+cd..
-title TTS Remote DB Launcher
+
-rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
+title Toontown Stride RemoteDB Launcher
-set /P PPYTHON_PATH=<PPYTHON_PATH
+
-
+rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
-rem Get the user input:
+set /P PPYTHON_PATH=<PPYTHON_PATH
-set /P ttsUsername="Username: "
+
-set /P ttsPassword="Password: "
+rem Get the user input:
-echo Using Steve's dev server.
+set /P ttsUsername="Username: "
-set TTS_GAMESERVER=167.114.220.172
+set /P ttsPassword="Password: "
-
+set TTS_GAMESERVER=167.114.220.172
-echo ===============================
+
-echo Starting Toontown Stride...
+echo ===============================
-echo ppython: %PPYTHON_PATH%
+echo Starting Toontown Stride...
-echo Username: %ttsUsername%
+echo ppython: %PPYTHON_PATH%
-echo Gameserver: %TTS_GAMESERVER%
+echo Username: %ttsUsername%
-echo ===============================
+echo Gameserver: %TTS_GAMESERVER% (Steve's Dev Server)
-
+echo ===============================
-%PPYTHON_PATH% -m toontown.toonbase.ClientStartRemoteDB
+
-pause
+%PPYTHON_PATH% -m toontown.toonbase.ClientStartRemoteDB
+pause

win32/start_gui_editor.bat

@@ -1,7 +1,10 @@
 @echo off
+cd..
+
 title GUI Editor
+
+rem Read the contents of PPYTHON_PATH into %PPYTHON_PATH%:
 set /P PPYTHON_PATH=<PPYTHON_PATH
 
-:main
 %PPYTHON_PATH% -m guieditor.EditorStart
-goto main
+pause