mirror of
https://github.com/Sneed-Group/Poodletooth-iLand
synced 2025-01-09 17:53:50 +00:00
We aren't checking root object anyways. Also TTI/TTF clients cannot join anymore.
This commit is contained in:
DenialMC
parent
de70415949
commit
791aea1d7b
3 changed files with 3 additions and 79 deletions
|
|
@ -77,13 +77,7 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
self.enterWaitForGameList,
|
||||
self.exitWaitForGameList, [
|
||||
'noConnection',
|
||||
'waitForShardList',
|
||||
'missingGameRootObject']),
|
||||
State('missingGameRootObject',
|
||||
self.enterMissingGameRootObject,
|
||||
self.exitMissingGameRootObject, [
|
||||
'waitForGameList',
|
||||
'shutdown']),
|
||||
'waitForShardList']),
|
||||
State('waitForShardList',
|
||||
self.enterWaitForShardList,
|
||||
self.exitWaitForShardList, [
|
||||
|
|
@ -411,37 +405,6 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
del self.failedToConnectBox
|
||||
return
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def enterFailedToGetServerConstants(self, e):
|
||||
self.handler = self.handleMessageType
|
||||
messenger.send('connectionIssue')
|
||||
message = OTPLocalizer.CRServerConstantsTryAgain % url.cStr()
|
||||
style = OTPDialog.TwoChoice
|
||||
dialogClass = OTPGlobals.getGlobalDialogClass()
|
||||
self.failedToGetConstantsBox = dialogClass(message=message, doneEvent='failedToGetConstantsAck', text_wordwrap=18, style=style)
|
||||
self.failedToGetConstantsBox.show()
|
||||
self.accept('failedToGetConstantsAck', self.__handleFailedToGetConstantsAck)
|
||||
self.notify.warning('Failed to get account server constants. Notifying user.')
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def __handleFailedToGetConstantsAck(self):
|
||||
doneStatus = self.failedToGetConstantsBox.doneStatus
|
||||
if doneStatus == 'ok':
|
||||
self.loginFSM.request('connect', [self.serverList])
|
||||
messenger.send('connectionRetrying')
|
||||
elif doneStatus == 'cancel':
|
||||
self.loginFSM.request('shutdown')
|
||||
else:
|
||||
self.notify.error('Unrecognized doneStatus: ' + str(doneStatus))
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def exitFailedToGetServerConstants(self):
|
||||
self.handler = None
|
||||
self.ignore('failedToGetConstantsAck')
|
||||
self.failedToGetConstantsBox.cleanup()
|
||||
del self.failedToGetConstantsBox
|
||||
return
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def enterShutdown(self, errorCode = None):
|
||||
self.handler = self.handleMessageType
|
||||
|
|
@ -457,51 +420,13 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def enterWaitForGameList(self):
|
||||
self.gameDoDirectory = self.addTaggedInterest(self.GameGlobalsId, OTP_ZONE_ID_MANAGEMENT, self.ITAG_PERM, 'game directory', event='GameList_Complete')
|
||||
self.acceptOnce('GameList_Complete', self.waitForGetGameListResponse)
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def waitForGetGameListResponse(self):
|
||||
if self.isGameListCorrect():
|
||||
self.loginFSM.request('waitForShardList')
|
||||
else:
|
||||
self.loginFSM.request('missingGameRootObject')
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def isGameListCorrect(self):
|
||||
return 1
|
||||
self.acceptOnce('GameList_Complete', self.loginFSM.request, ['waitForShardList'])
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def exitWaitForGameList(self):
|
||||
self.handler = None
|
||||
return
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def enterMissingGameRootObject(self):
|
||||
self.notify.warning('missing some game root objects.')
|
||||
self.handler = self.handleMessageType
|
||||
dialogClass = OTPGlobals.getGlobalDialogClass()
|
||||
self.missingGameRootObjectBox = dialogClass(message=OTPLocalizer.CRMissingGameRootObject, doneEvent='missingGameRootObjectBoxAck', style=OTPDialog.TwoChoice)
|
||||
self.missingGameRootObjectBox.show()
|
||||
self.accept('missingGameRootObjectBoxAck', self.__handleMissingGameRootObjectAck)
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def __handleMissingGameRootObjectAck(self):
|
||||
doneStatus = self.missingGameRootObjectBox.doneStatus
|
||||
if doneStatus == 'ok':
|
||||
self.loginFSM.request('waitForGameList')
|
||||
elif doneStatus == 'cancel':
|
||||
self.loginFSM.request('shutdown')
|
||||
else:
|
||||
self.notify.error('Unrecognized doneStatus: ' + str(doneStatus))
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def exitMissingGameRootObject(self):
|
||||
self.handler = None
|
||||
self.ignore('missingGameRootObjectBoxAck')
|
||||
self.missingGameRootObjectBox.cleanup()
|
||||
del self.missingGameRootObjectBox
|
||||
return
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def enterWaitForShardList(self):
|
||||
if not self.isValidInterestHandle(self.shardListHandle):
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from direct.distributed.MsgTypes import *
|
||||
OTP_DO_ID_FRIEND_MANAGER = 4501
|
||||
OTP_DO_ID_TOONTOWN = 4618
|
||||
OTP_DO_ID_TOONTOWN = 1337
|
||||
OTP_DO_ID_CLIENT_SERVICES_MANAGER = 4665
|
||||
OTP_DO_ID_TTU_FRIENDS_MANAGER = 4666
|
||||
OPT_DO_ID_GROUP_MANAGER = 4667
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ TextPropertiesManager.getGlobalPtr().setProperties('grey', grey)
|
|||
CRConnecting = 'Connecting...'
|
||||
CRNoConnectTryAgain = 'Could not connect to %s:%s. Try again?'
|
||||
CRNoConnectProxyNoPort = 'Could not connect to %s:%s.\n\nYou are communicating to the internet via a proxy, but your proxy does not permit connections on port %s.\n\nYou must open up this port, or disable your proxy, in order to play. If your proxy has been provided by your ISP, you must contact your ISP to request them to open up this port.'
|
||||
CRMissingGameRootObject = 'Missing some root game objects. (May be a failed network connection).\n\nTry again?'
|
||||
CRNoDistrictsTryAgain = 'No Districts are available. Try again?'
|
||||
CRRejectRemoveAvatar = 'The avatar was not able to be deleted, try again another time.'
|
||||
CRLostConnection = 'Your internet connection to the servers has been unexpectedly broken.'
|
||||
|
|
|
|||
Loading…
Reference in a new issue