From 4e2c303d3b6a7dada7171f101773ba4b4335bb75 Mon Sep 17 00:00:00 2001 From: Alexander Date: Wed, 26 Aug 2015 17:43:41 -0400 Subject: [PATCH] Add a command to allow you to max someones cog page. --- build/make.py | 2 +- dependencies/astron/config/cluster.yml | 2 +- deployment/public_client.prc | 2 +- dev/win32/start-game.bat | 7 ++++++- toontown/safezone/DistributedMMPiano.py | 4 ++-- toontown/toon/DistributedToonAI.py | 11 +++++++++++ 6 files changed, 22 insertions(+), 6 deletions(-) diff --git a/build/make.py b/build/make.py index d4248b41..49ec7293 100644 --- a/build/make.py +++ b/build/make.py @@ -104,7 +104,7 @@ class StridePackager(NiraiPackager): # Compile the engine if args.compile_cxx: - compiler = NiraiCompiler('stride.exe', libs=set(glob.glob('libpandadna/libpandadna.dir/Release/*.obj'))) + compiler = NiraiCompiler('stride.exe', libs=set(glob.glob('c:/repos/libpandadna/libpandadna.dir/Release/*.obj'))) compiler.add_nirai_files() compiler.add_source('src/stride.cxx') diff --git a/dependencies/astron/config/cluster.yml b/dependencies/astron/config/cluster.yml index 63ea9f74..c2f64c47 100644 --- a/dependencies/astron/config/cluster.yml +++ b/dependencies/astron/config/cluster.yml @@ -33,7 +33,7 @@ uberdogs: roles: - type: clientagent bind: 0.0.0.0:7199 - version: "tts-dev" + version: "stride-beta-dev-g20cbfe0" client: relocate: true add_interest: enabled diff --git a/deployment/public_client.prc b/deployment/public_client.prc index d6e68cd5..e7f833c8 100644 --- a/deployment/public_client.prc +++ b/deployment/public_client.prc @@ -4,7 +4,7 @@ # Client settings window-title Toontown Stride [Beta] -server-version SERVER_VERSION_HERE +server-version stride-beta-dev-g3af22c4 video-library-name p3ffmpeg want-dev #f preload-avatars #t diff --git a/dev/win32/start-game.bat b/dev/win32/start-game.bat index 908e6c45..76089c1c 100755 --- a/dev/win32/start-game.bat +++ b/dev/win32/start-game.bat @@ -8,6 +8,7 @@ echo #1 - Localhost echo #2 - Dev Server echo #3 - Custom echo #4 - Local RemoteDB +echo #5 - Prod Server echo. :selection @@ -21,6 +22,8 @@ if %INPUT%==1 ( set TTS_GAMESERVER=167.114.220.172 ) else if %INPUT%==4 ( set TTS_GAMESERVER=127.0.0.1 +) else if %INPUT%==5 ( + SET TTS_GAMESERVER=lw2.ez-webz.com:7198 ) else if %INPUT%==3 ( echo. set /P TTS_GAMESERVER=Gameserver: @@ -59,6 +62,7 @@ echo =============================== cd ../../ +:main if %INPUT%==2 ( "C:\Panda3D-1.10.0\python\ppython.exe" -m toontown.toonbase.ToontownStartRemoteDB ) else if %INPUT%==4 ( @@ -66,5 +70,6 @@ if %INPUT%==2 ( ) else ( "C:\Panda3D-1.10.0\python\ppython.exe" -m toontown.toonbase.ToontownStart ) - pause + +goto main diff --git a/toontown/safezone/DistributedMMPiano.py b/toontown/safezone/DistributedMMPiano.py index 1d76e156..b315640e 100755 --- a/toontown/safezone/DistributedMMPiano.py +++ b/toontown/safezone/DistributedMMPiano.py @@ -27,7 +27,7 @@ class DistributedMMPiano(DistributedObject.DistributedObject): taskMgr.doMethodLater(4, self.setupGeom, self.uniqueName('setup-geom')) def setupGeom(self, task): - geom = self.cr.playGame.getPlace().loader.geom + '''geom = self.cr.playGame.getPlace().loader.geom self.piano = geom.find('**/center_icon') if self.piano.isEmpty(): loader.notify.error('Piano not found') @@ -43,7 +43,7 @@ class DistributedMMPiano(DistributedObject.DistributedObject): base.cr.parentMgr.registerParent(ToontownGlobals.SPMinniesPiano, self.piano) self.accept('enter' + self.whitePartNodeName, self.__handleOnFloor) self.accept('exit' + self.whitePartNodeName, self.__handleOffFloor) - self.accept('entermid_fishpond', self.__handleChangeDirectionButton) + self.accept('entermid_fishpond', self.__handleChangeDirectionButton)''' self.speedUpSound = base.loadSfx('phase_6/audio/sfx/SZ_MM_gliss.ogg') self.changeDirectionSound = base.loadSfx('phase_6/audio/sfx/SZ_MM_cymbal.ogg') self.__setupSpin() diff --git a/toontown/toon/DistributedToonAI.py b/toontown/toon/DistributedToonAI.py index 7f446df9..8806b41a 100755 --- a/toontown/toon/DistributedToonAI.py +++ b/toontown/toon/DistributedToonAI.py @@ -5040,6 +5040,17 @@ def unlimitedGags(): av.setUnlimitedGags(not av.unlimitedGags) return 'Toggled unlimited gags %s for %s' % ('ON' if av.unlimitedGags else 'OFF', av.getName()) +@magicWord(category=CATEGORY_PROGRAMMER) +def maxCogpage(): + """ Max the target's cog Page.. """ + target = spellbook.getTarget() + deptCount = len(SuitDNA.suitDepts) + target.b_setCogCount(list(CogPageGlobals.COG_QUOTAS[1]) * deptCount) + cogStatus = [CogPageGlobals.COG_COMPLETE2] * SuitDNA.suitsPerDept + target.b_setCogStatus(cogStatus * deptCount) + target.b_setCogRadar([1, 1, 1, 1]) + target.b_setBuildingRadar([1, 1, 1, 1]) + @magicWord(category=CATEGORY_PROGRAMMER) def immortal(): """ Make target (if 500+) or self (if 499-) immortal. """