diff --git a/PPYTHON_PATH b/PPYTHON_PATH new file mode 100644 index 00000000..48943fdf --- /dev/null +++ b/PPYTHON_PATH @@ -0,0 +1 @@ +"panda/python/ppython.exe" \ No newline at end of file diff --git a/astron/databases/air_cache/.gitignore b/astron/databases/air_cache/.gitignore new file mode 100755 index 00000000..d6b7ef32 --- /dev/null +++ b/astron/databases/air_cache/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/astron/databases/air_cache/pets_401000001.pets b/astron/databases/air_cache/pets_401000001.pets deleted file mode 100644 index d700191f..00000000 --- a/astron/databases/air_cache/pets_401000001.pets +++ /dev/null @@ -1,47 +0,0 @@ -(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. \ No newline at end of file diff --git a/astron/logs/.gitignore b/astron/logs/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/astron/logs/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/astron/msvcp120.dll b/astron/msvcp120.dll deleted file mode 100644 index a237d2d7..00000000 Binary files a/astron/msvcp120.dll and /dev/null differ diff --git a/astron/msvcr120.dll b/astron/msvcr120.dll deleted file mode 100644 index 8c36149a..00000000 Binary files a/astron/msvcr120.dll and /dev/null differ diff --git a/start-ai-server.bat b/astron/win32/start-ai-server.bat old mode 100644 new mode 100755 similarity index 91% rename from start-ai-server.bat rename to astron/win32/start-ai-server.bat index a3da0290..a6ec1ec8 --- a/start-ai-server.bat +++ b/astron/win32/start-ai-server.bat @@ -1,5 +1,7 @@ @echo off +set /P PPYTHON_PATH=<../../PPYTHON_PATH + rem Define some constants for our AI server: set MAX_CHANNELS=999999 set STATESERVER=4002 @@ -14,7 +16,7 @@ set BASE_CHANNEL=401000000 echo =============================== echo Starting Toontown Stride AI server... -echo ppython: "panda/python/ppython.exe" +echo ppython: %PPYTHON_PATH% echo District name: %DISTRICT_NAME% echo Base channel: %BASE_CHANNEL% echo Max channels: %MAX_CHANNELS% @@ -24,7 +26,7 @@ echo Event Logger IP: %EVENTLOGGER_IP% echo =============================== :main -"panda/python/ppython.exe" ^ +%PPYTHON_PATH% ^ -m toontown.ai.ServiceStart ^ --base-channel %BASE_CHANNEL% ^ --max-channels %MAX_CHANNELS% ^ diff --git a/start-astron-cluster.bat b/astron/win32/start-astron-cluster.bat similarity index 84% rename from start-astron-cluster.bat rename to astron/win32/start-astron-cluster.bat index 3a2e606b..4caf8d2a 100644 --- a/start-astron-cluster.bat +++ b/astron/win32/start-astron-cluster.bat @@ -1,4 +1,4 @@ @echo off -cd astron/ +cd .. astrond --loglevel info config/cluster.yml pause diff --git a/start-uberdog-server.bat b/astron/win32/start-uberdog-server.bat similarity index 90% rename from start-uberdog-server.bat rename to astron/win32/start-uberdog-server.bat index d187ec7e..af66d4ef 100644 --- a/start-uberdog-server.bat +++ b/astron/win32/start-uberdog-server.bat @@ -1,5 +1,7 @@ @echo off +set /P PPYTHON_PATH=<../../PPYTHON_PATH + rem Define some constants for our UberDOG server: set MAX_CHANNELS=999999 set STATESERVER=4002 @@ -12,7 +14,7 @@ set BASE_CHANNEL=1000000 echo =============================== echo Starting Toontown Stride UberDOG server... -echo ppython: "panda/python/ppython.exe" +echo ppython: %PPYTHON_PATH% echo Base channel: %BASE_CHANNEL% echo Max channels: %MAX_CHANNELS% echo State Server: %STATESERVER% @@ -21,7 +23,7 @@ echo Event Logger IP: %EVENTLOGGER_IP% echo =============================== :main -"panda/python/ppython.exe" ^ +%PPYTHON_PATH% ^ -m toontown.uberdog.ServiceStart ^ --base-channel %BASE_CHANNEL% ^ --max-channels %MAX_CHANNELS% ^ diff --git a/otp/avatar/Avatar.py b/otp/avatar/Avatar.py index e832bcad..dc5a9bbc 100755 --- a/otp/avatar/Avatar.py +++ b/otp/avatar/Avatar.py @@ -642,10 +642,16 @@ class Avatar(Actor, ShadowCaster): return Actor.loop(self, animName, restart, partName, fromFrame, toFrame) -@magicWord(category=CATEGORY_COMMUNITY_MANAGER) +@magicWord(category=CATEGORY_COMMUNITY_MANAGER, types=[]) def target(): """ Returns the current Spellbook target. """ target = spellbook.getTarget() - return 'Target: %s-%d [%d]' % (target.getName(), target.doId, target.getAdminAccess()) + print 'called target' + 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())) diff --git a/start-all.bat b/start-all.bat new file mode 100755 index 00000000..a6ebe80c --- /dev/null +++ b/start-all.bat @@ -0,0 +1,2 @@ +cd astron/win32 +start-all \ No newline at end of file diff --git a/start-game.bat b/start-game.bat old mode 100644 new mode 100755 index 29d6681a..e0aeff34 --- a/start-game.bat +++ b/start-game.bat @@ -1,5 +1,7 @@ @echo off +set /P PPYTHON_PATH=