RomanNum3ral
/
open-toontown
mirror of https://github.com/open-toontown/open-toontown.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update QuietZoneState.py

This commit is contained in:
Open Toontown 2022-01-20 16:07:08 -05:00
parent f94b56bba1
commit b2e13f231c
1 changed files with 26 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
toontown/hood/QuietZoneState.py
View File

@ -138,55 +138,29 @@ class QuietZoneState(StateData.StateData):
self._setZoneCompleteCallbacks.remove(token) self._setZoneCompleteCallbacks.remove(token)
return return
if not __astron__: def handleWaitForQuietZoneResponse(self, msgType, di):
def handleWaitForQuietZoneResponse(self, msgType, di): self.notify.debug('handleWaitForQuietZoneResponse(' + 'msgType=' + str(msgType) + ', di=' + str(di) + ')')
# self.notify.debug('handleWaitForQuietZoneResponse(' + 'msgType=' + str(msgType) + ', di=' + str(di) + ')') if msgType == CLIENT_CREATE_OBJECT_REQUIRED:
if msgType == CLIENT_CREATE_OBJECT_REQUIRED: base.cr.handleQuietZoneGenerateWithRequired(di)
base.cr.handleQuietZoneGenerateWithRequired(di) elif msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER:
elif msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER: base.cr.handleQuietZoneGenerateWithRequiredOther(di)
base.cr.handleQuietZoneGenerateWithRequiredOther(di) elif msgType == CLIENT_OBJECT_UPDATE_FIELD:
elif msgType == CLIENT_OBJECT_UPDATE_FIELD: base.cr.handleQuietZoneUpdateField(di)
base.cr.handleQuietZoneUpdateField(di) elif msgType in QUIET_ZONE_IGNORED_LIST:
elif msgType in QUIET_ZONE_IGNORED_LIST: self.notify.debug('ignoring unwanted message from previous zone')
self.notify.debug('ignoring unwanted message from previous zone') else:
else: base.cr.handlePlayGame(msgType, di)
base.cr.handlePlayGame(msgType, di)
else:
def handleWaitForQuietZoneResponse(self, msgType, di):
# self.notify.debug('handleWaitForQuietZoneResponse(' + 'msgType=' + str(msgType) + ', di=' + str(di) + ')')
if msgType == CLIENT_ENTER_OBJECT_REQUIRED:
base.cr.handleQuietZoneGenerateWithRequired(di)
elif msgType == CLIENT_ENTER_OBJECT_REQUIRED_OTHER:
base.cr.handleQuietZoneGenerateWithRequiredOther(di)
elif msgType == CLIENT_OBJECT_SET_FIELD:
base.cr.handleQuietZoneUpdateField(di)
elif msgType in QUIET_ZONE_IGNORED_LIST:
self.notify.debug('ignoring unwanted message from previous zone')
else:
base.cr.handlePlayGame(msgType, di)
if not __astron__: def handleWaitForZoneRedirect(self, msgType, di):
def handleWaitForZoneRedirect(self, msgType, di): self.notify.debug('handleWaitForZoneRedirect(' + 'msgType=' + str(msgType) + ', di=' + str(di) + ')')
# self.notify.debug('handleWaitForZoneRedirect(' + 'msgType=' + str(msgType) + ', di=' + str(di) + ')') if msgType == CLIENT_CREATE_OBJECT_REQUIRED:
if msgType == CLIENT_CREATE_OBJECT_REQUIRED: base.cr.handleQuietZoneGenerateWithRequired(di)
base.cr.handleQuietZoneGenerateWithRequired(di) elif msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER:
elif msgType == CLIENT_CREATE_OBJECT_REQUIRED_OTHER: base.cr.handleQuietZoneGenerateWithRequiredOther(di)
base.cr.handleQuietZoneGenerateWithRequiredOther(di) elif msgType == CLIENT_OBJECT_UPDATE_FIELD:
elif msgType == CLIENT_OBJECT_UPDATE_FIELD: base.cr.handleQuietZoneUpdateField(di)
base.cr.handleQuietZoneUpdateField(di) else:
else: base.cr.handlePlayGame(msgType, di)
base.cr.handlePlayGame(msgType, di)
else:
def handleWaitForZoneRedirect(self, msgType, di):
# self.notify.debug('handleWaitForZoneRedirect(' + 'msgType=' + str(msgType) + ', di=' + str(di) + ')')
if msgType == CLIENT_ENTER_OBJECT_REQUIRED:
base.cr.handleQuietZoneGenerateWithRequired(di)
elif msgType == CLIENT_ENTER_OBJECT_REQUIRED_OTHER:
base.cr.handleQuietZoneGenerateWithRequiredOther(di)
elif msgType == CLIENT_OBJECT_SET_FIELD:
base.cr.handleQuietZoneUpdateField(di)
else:
base.cr.handlePlayGame(msgType, di)
def enterOff(self): def enterOff(self):
self.notify.debug('enterOff()') self.notify.debug('enterOff()')
@ -199,7 +173,7 @@ class QuietZoneState(StateData.StateData):
self._setZoneCompleteLocalCallbacks = {} self._setZoneCompleteLocalCallbacks = {}
def enterWaitForQuietZoneResponse(self): def enterWaitForQuietZoneResponse(self):
# self.notify.debug('enterWaitForQuietZoneResponse(doneStatus=' + str(self._requestStatus) + ')') self.notify.debug('enterWaitForQuietZoneResponse(doneStatus=' + str(self._requestStatus) + ')')
if not self.Disable: if not self.Disable:
base.cr.handler = self.handleWaitForQuietZoneResponse base.cr.handler = self.handleWaitForQuietZoneResponse
base.cr.handlerArgs = self._requestStatus base.cr.handlerArgs = self._requestStatus
@ -231,7 +205,7 @@ class QuietZoneState(StateData.StateData):
return return
def enterWaitForZoneRedirect(self): def enterWaitForZoneRedirect(self):
# self.notify.debug('enterWaitForZoneRedirect(requestStatus=' + str(self._requestStatus) + ')') self.notify.debug('enterWaitForZoneRedirect(requestStatus=' + str(self._requestStatus) + ')')
if not self.Disable: if not self.Disable:
base.cr.handler = self.handleWaitForZoneRedirect base.cr.handler = self.handleWaitForZoneRedirect
base.cr.handlerArgs = self._requestStatus base.cr.handlerArgs = self._requestStatus
@ -276,7 +250,7 @@ class QuietZoneState(StateData.StateData):
return return
def enterWaitForSetZoneResponse(self): def enterWaitForSetZoneResponse(self):
# self.notify.debug('enterWaitForSetZoneResponse(requestStatus=' + str(self._requestStatus) + ')') self.notify.debug('enterWaitForSetZoneResponse(requestStatus=' + str(self._requestStatus) + ')')
if not self.Disable: if not self.Disable:
messenger.send(self.getEnterWaitForSetZoneResponseMsg(), [self._requestStatus]) messenger.send(self.getEnterWaitForSetZoneResponseMsg(), [self._requestStatus])
base.cr.handlerArgs = self._requestStatus base.cr.handlerArgs = self._requestStatus
@ -295,7 +269,7 @@ class QuietZoneState(StateData.StateData):
return return
def enterWaitForSetZoneComplete(self): def enterWaitForSetZoneComplete(self):
# self.notify.debug('enterWaitForSetZoneComplete(requestStatus=' + str(self._requestStatus) + ')') self.notify.debug('enterWaitForSetZoneComplete(requestStatus=' + str(self._requestStatus) + ')')
if not self.Disable: if not self.Disable:
base.cr.handlerArgs = self._requestStatus base.cr.handlerArgs = self._requestStatus
if base.slowQuietZone: if base.slowQuietZone: