Revert "cleanup"

This reverts commit 91aaef9383.

PPYTHON_PATH

@@ -1 +0,0 @@
-"panda/python/ppython.exe"

astron/databases/air_cache/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

astron/databases/air_cache/pets_401000001.pets

@@ -0,0 +1,47 @@
+(dp1
+I4000
+(lp2
+I236
+aI34
+aI250
+aI67
+aI13
+asI1000
+(lp3
+I17
+aI118
+aI99
+aI16
+aI29
+asI9000
+(lp4
+I222
+aI104
+aI121
+aI59
+aI93
+asI2000
+(lp5
+I86
+aI139
+aI161
+aI64
+aI194
+asI5000
+(lp6
+I41
+aI130
+aI85
+aI100
+aI251
+asI3000
+(lp7
+I157
+aI215
+aI208
+aI242
+aI207
+asS'day'
+p8
+I16579
+s.

otp/avatar/Avatar.py

@@ -642,16 +642,10 @@ class Avatar(Actor, ShadowCaster):
         return Actor.loop(self, animName, restart, partName, fromFrame, toFrame)
 
 
-@magicWord(category=CATEGORY_COMMUNITY_MANAGER, types=[])
+@magicWord(category=CATEGORY_COMMUNITY_MANAGER)
 def target():
     """
     Returns the current Spellbook target.
     """
     target = spellbook.getTarget()
-    print 'called target'
+    return 'Target: %s-%d [%d]' % (target.getName(), target.doId, target.getAdminAccess())
-    print 'name: ' + target.getName()
-    thisdoid = str(int(target.doId))
-    print 'doId: ',  thisdoid
-    thisadminacc = str(int(target.getAdminAccess()))
-    print 'admin access: ', thisadminacc
-    return 'Target: %s-%d [%d]' % (target.getName(), int(target.doId), int(target.getAdminAccess()))

start-ai-server.bat

@@ -1,7 +1,5 @@
 @echo off
 
-set /P PPYTHON_PATH=<../../PPYTHON_PATH
-
 rem Define some constants for our AI server:
 set MAX_CHANNELS=999999
 set STATESERVER=4002
@@ -16,7 +14,7 @@ set BASE_CHANNEL=401000000
 
 echo ===============================
 echo Starting Toontown Stride AI server...
-echo ppython: %PPYTHON_PATH%
+echo ppython: "panda/python/ppython.exe"
 echo District name: %DISTRICT_NAME%
 echo Base channel: %BASE_CHANNEL%
 echo Max channels: %MAX_CHANNELS%
@@ -26,7 +24,7 @@ echo Event Logger IP: %EVENTLOGGER_IP%
 echo ===============================
 
 :main
-%PPYTHON_PATH% ^
+"panda/python/ppython.exe" ^
 	-m toontown.ai.ServiceStart ^
 	--base-channel %BASE_CHANNEL% ^
 	--max-channels %MAX_CHANNELS% ^

start-all.bat

@@ -1,2 +0,0 @@
-cd astron/win32
-start-all

start-astron-cluster.bat

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

start-game.bat

@@ -1,7 +1,5 @@
 @echo off
 
-set /P PPYTHON_PATH=<PPYTHON_PATH
-
 title Toontown Stride Game Launcher
 
 echo Choose your connection method!
@@ -35,7 +33,7 @@ echo.
 
 echo ===============================
 echo Starting Toontown Stride...
-echo ppython: %PPYTHON_PATH%
+echo ppython: "panda/python/ppython.exe"
 
 if %INPUT%==2 (
     echo Username: %ttsUsername%
@@ -47,9 +45,9 @@ echo Gameserver: %TTS_GAMESERVER%
 echo ===============================
 
 if %INPUT%==2 (
-    %PPYTHON_PATH% -m toontown.toonbase.ClientStartRemoteDB
+    "panda/python/ppython.exe" -m toontown.toonbase.ClientStartRemoteDB
 ) else (
-    %PPYTHON_PATH% -m toontown.toonbase.ClientStart
+    "panda/python/ppython.exe" -m toontown.toonbase.ClientStart
 )
 
 pause

start-uberdog-server.bat

@@ -1,7 +1,5 @@
 @echo off
 
-set /P PPYTHON_PATH=<../../PPYTHON_PATH
-
 rem Define some constants for our UberDOG server:
 set MAX_CHANNELS=999999
 set STATESERVER=4002
@@ -14,7 +12,7 @@ set BASE_CHANNEL=1000000
 
 echo ===============================
 echo Starting Toontown Stride UberDOG server...
-echo ppython: %PPYTHON_PATH%
+echo ppython: "panda/python/ppython.exe"
 echo Base channel: %BASE_CHANNEL%
 echo Max channels: %MAX_CHANNELS%
 echo State Server: %STATESERVER%
@@ -23,7 +21,7 @@ echo Event Logger IP: %EVENTLOGGER_IP%
 echo ===============================
 
 :main
-%PPYTHON_PATH% ^
+"panda/python/ppython.exe" ^
 	-m toontown.uberdog.ServiceStart ^
 	--base-channel %BASE_CHANNEL% ^
 	--max-channels %MAX_CHANNELS% ^