sneedgroup-holder/oldschool-toontown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cogdominium: fix sellbot field offices

Browse source
This commit is contained in:
John Cote 2020-01-08 02:14:35 -05:00
parent d4d26d5ad9
commit 5447ed529c
5 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
otp/avatar/SpeedMonitor.py
View file

@ -18,7 +18,7 @@ class SpeedMonitor:
taskMgr.remove(self._trackTask) taskMgr.remove(self._trackTask)
def _allocToken(self): def _allocToken(self):
return 'speedMonitorToken-%s-%s-%s' % (self._name, id(self), next(SpeedMonitor.SerialGen)) return 'speedMonitorToken-%s-%s-%s' % (self._name, id(self), SpeedMonitor.SerialGen.next())
def addNodepath(self, nodepath): def addNodepath(self, nodepath):
token = self._allocToken() token = self._allocToken()

2
toontown/cogdominium/CogdoElevatorMovie.py
View file

@ -45,8 +45,6 @@ class CogdoElevatorMovie(CogdoGameMovie):
for part in suit.getHeadParts(): for part in suit.getHeadParts():
part.hide() part.hide()
suit.loop('neutral')
def load(self): def load(self):
self.notify.debug('load()') self.notify.debug('load()')
CogdoGameMovie.load(self) CogdoGameMovie.load(self)

2
toontown/cogdominium/CogdoExecutiveSuiteMovies.py
View file

@ -50,8 +50,6 @@ class CogdoExecutiveSuiteIntro(CogdoGameMovie):
for part in suit.getHeadParts(): for part in suit.getHeadParts():
part.hide() part.hide()
suit.loop('neutral')
def load(self): def load(self):
self.notify.debug('load()') self.notify.debug('load()')
CogdoGameMovie.load(self) CogdoGameMovie.load(self)

2
toontown/cogdominium/CogdoMazeGameMovies.py
View file

@ -51,8 +51,6 @@ class CogdoMazeGameIntro(CogdoGameMovie):
for part in suit.getHeadParts(): for part in suit.getHeadParts():
part.hide() part.hide()
suit.loop('neutral')
def load(self): def load(self):
CogdoGameMovie.load(self) CogdoGameMovie.load(self)
self.toonDNA = ToonDNA.ToonDNA() self.toonDNA = ToonDNA.ToonDNA()

3
toontown/minigame/MazeSuit.py
View file

@ -8,6 +8,7 @@ from toontown.suit import Suit
from toontown.suit import SuitDNA from toontown.suit import SuitDNA
from toontown.toonbase import ToontownGlobals from toontown.toonbase import ToontownGlobals
from . import MazeGameGlobals from . import MazeGameGlobals
import functools
class MazeSuit(DirectObject): class MazeSuit(DirectObject):
COLL_SPHERE_NAME = 'MazeSuitSphere' COLL_SPHERE_NAME = 'MazeSuitSphere'
@ -233,7 +234,7 @@ class MazeSuit(DirectObject):
updateTics = suitList[i].getThinkTimestampTics(curTic) updateTics = suitList[i].getThinkTimestampTics(curTic)
suitUpdates.extend(list(zip(updateTics, [i] * len(updateTics)))) suitUpdates.extend(list(zip(updateTics, [i] * len(updateTics))))
suitUpdates.sort(lambda a, b: a[0] - b[0]) suitUpdates.sort(key=functools.cmp_to_key(lambda a, b: a[0] - b[0]))
if len(suitUpdates) > 0: if len(suitUpdates) > 0:
curTic = 0 curTic = 0
for i in range(len(suitUpdates)): for i in range(len(suitUpdates)):