From 2ace6ce632911473f123e6a4e615037a45a6a824 Mon Sep 17 00:00:00 2001 From: John Cote Date: Tue, 7 Jan 2020 16:44:33 -0500 Subject: [PATCH] minigame: fix more minigame crashes --- toontown/minigame/DistributedPatternGame.py | 3 +-- toontown/minigame/DistributedPhotoGame.py | 9 +++++---- toontown/minigame/DistributedTargetGame.py | 2 +- toontown/minigame/DistributedTravelGameAI.py | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/toontown/minigame/DistributedPatternGame.py b/toontown/minigame/DistributedPatternGame.py index 69cd239..98186ea 100644 --- a/toontown/minigame/DistributedPatternGame.py +++ b/toontown/minigame/DistributedPatternGame.py @@ -14,7 +14,6 @@ from toontown.char import Char from . import ArrowKeys import random from toontown.toonbase import ToontownGlobals -import string from toontown.toonbase import TTLocalizer class DistributedPatternGame(DistributedMinigame): @@ -538,7 +537,7 @@ class DistributedPatternGame(DistributedMinigame): return self.__getRowPos(self.frontRowHome, self.frontRowXSpacing, index, len(self.avIdList)) def __setMinnieChat(self, str, giggle): - str = string.replace(str, '%s', self.getAvatar(self.localAvId).getName()) + str = str.replace('%s', self.getAvatar(self.localAvId).getName()) self.minnie.setChatAbsolute(str, CFSpeech) if giggle: self.minnie.playDialogue('statementA', 1) diff --git a/toontown/minigame/DistributedPhotoGame.py b/toontown/minigame/DistributedPhotoGame.py index dc09675..6ad90bc 100644 --- a/toontown/minigame/DistributedPhotoGame.py +++ b/toontown/minigame/DistributedPhotoGame.py @@ -1,5 +1,6 @@ from direct.directnotify import DirectNotifyGlobal from pandac.PandaModules import * +from libtoontown import * from toontown.toonbase.ToonBaseGlobal import * from .DistributedMinigame import * from direct.distributed.ClockDelta import * @@ -292,10 +293,10 @@ class DistributedPhotoGame(DistributedMinigame, PhotoGameBase.PhotoGameBase): self.queue = CollisionHandlerQueue() self.traverser = CollisionTraverser('traverser name') self.rayArray = [] - vRange = (GOODROWS - BADROWS) / 2 - for row in range(-(GOODROWS / 2), GOODROWS / 2 + 1): - for column in range(-(GOODROWS / 2), GOODROWS / 2 + 1): - goodRange = list(range(-((GOODROWS - BADROWS) / 2), (GOODROWS - BADROWS) / 2 + 1)) + vRange = (GOODROWS - BADROWS) // 2 + for row in range(-(GOODROWS // 2), GOODROWS // 2 + 1): + for column in range(-(GOODROWS // 2), GOODROWS // 2 + 1): + goodRange = list(range(-((GOODROWS - BADROWS) // 2), (GOODROWS - BADROWS) // 2 + 1)) rayQuality = 'g' if row not in goodRange or column not in goodRange: rayQuality = 'l' diff --git a/toontown/minigame/DistributedTargetGame.py b/toontown/minigame/DistributedTargetGame.py index 332f667..ec15eeb 100644 --- a/toontown/minigame/DistributedTargetGame.py +++ b/toontown/minigame/DistributedTargetGame.py @@ -821,7 +821,7 @@ class DistributedTargetGame(DistributedMinigame): open.setScale(1.5) closed = umbrella.find('**/closed_umbrella') closed.show() - hand = toon.find('**/joint_Rhold') + hand = toon.getRightHands()[0] ce = CompassEffect.make(NodePath(), CompassEffect.PRot) closed.node().setEffect(ce) closed.setHpr(0.0, 90.0, 35.0) diff --git a/toontown/minigame/DistributedTravelGameAI.py b/toontown/minigame/DistributedTravelGameAI.py index 3128e3f..d70f0ff 100644 --- a/toontown/minigame/DistributedTravelGameAI.py +++ b/toontown/minigame/DistributedTravelGameAI.py @@ -3,6 +3,7 @@ from direct.fsm import ClassicFSM, State from direct.fsm import State from . import TravelGameGlobals from toontown.toonbase import ToontownGlobals +import functools class DistributedTravelGameAI(DistributedMinigameAI): notify = directNotify.newCategory('DistributedTravelGameAI') @@ -107,7 +108,7 @@ class DistributedTravelGameAI(DistributedMinigameAI): else: return 1 - self.directionVotes.sort(voteCompare, reverse=True) + self.directionVotes.sort(key=functools.cmp_to_key(voteCompare), reverse=True) winningVotes = self.directionVotes[0][1] self.winningDirections = [] self.notify.debug('self.directionVotes = %s' % self.directionVotes)