Sneed-Group/Poodletooth-iLand
1
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2024-12-23 03:35:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

RIP SpeedchatRelay - not used.

Browse source 
Signed-off-by: Daniel <denialmc@outlook.com>
This commit is contained in:
Daniel 2015-03-03 20:56:19 +02:00
parent 11c6aa038f
commit 0d9949b86a
20 changed files with 4 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
astron/config/clientagent-0.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/clientagent-1.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/clientagent-2.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/clientagent-3.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/clientagent-4.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/clientagent-5.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/clientagent-6.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/clientagent-7.yml
View file

@ -36,10 +36,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

4
astron/config/cluster.yml
View file

@ -39,10 +39,6 @@ uberdogs:
id: 4666
anonymous: false
- class: TTSpeedchatRelay
id: 4712
anonymous: false
- class: DistributedDeliveryManager
id: 4683
anonymous: false

5
astron/dclass/otp.dc
View file

@ -22,7 +22,6 @@ from otp.snapshot import SnapshotDispatcher/AI/UD
from otp.snapshot import SnapshotRenderer/AI/UD
from otp.uberdog import OtpAvatarManager/AI/UD
from otp.chat import ChatAgent/UD
from otp.uberdog import SpeedchatRelay/UD
from otp.distributed import CentralLogger/AI/UD
from otp.status import StatusDatabase/UD
from otp.avatar import AvatarHandle
@ -472,10 +471,6 @@ dclass SnapshotRenderer : DistributedObject {
requestRender(uint32, uint32, string);
};
dclass SpeedchatRelay : DistributedObject, TalkPath_account {
forwardSpeedchat(uint32, uint8, uint32 [], uint32, string(0-256), uint8) clsend;
};
dclass CentralLogger : DistributedObject {
sendMessage(string(0-256), string(0-1024), uint32, uint32) clsend;
logAIGarbage() airecv;

4
astron/dclass/toon.dc
View file

@ -259,7 +259,6 @@ from toontown.parties import DistributedPartyValentineJukeboxActivity/AI
from toontown.parties import DistributedPartyValentineJukebox40Activity/AI
from toontown.friends import TTPlayerFriendsManager/UD
from toontown.friends import TTUFriendsManager/UD
from toontown.uberdog import TTSpeedchatRelay/UD
from toontown.safezone import DistributedGolfKart/AI
from toontown.safezone import DistributedPicnicBasket/AI
from toontown.safezone import DistributedGameTable/AI
@ -2893,9 +2892,6 @@ dclass TTAvatarFriendsManager : AvatarFriendsManager {
dclass TTPlayerFriendsManager : PlayerFriendsManager {
};
dclass TTSpeedchatRelay : SpeedchatRelay {
};
dclass DistributedGolfKart : DistributedObject {
setState(string, int16) broadcast ram;
fillSlot0(uint32) broadcast ram;

20
otp/chat/TalkAssistant.py
View file

@ -667,24 +667,8 @@ class TalkAssistant(DirectObject.DirectObject):
return error
def sendPlayerWhisperSpeedChat(self, type, messageIndex, receiverId):
error = None
if type == SPEEDCHAT_NORMAL:
base.cr.speedchatRelay.sendSpeedchat(receiverId, messageIndex)
message = self.SCDecoder.decodeSCStaticTextMsg(messageIndex)
elif type == SPEEDCHAT_EMOTE:
base.cr.speedchatRelay.sendSpeedchatEmote(receiverId, messageIndex)
message = self.SCDecoder.decodeSCEmoteWhisperMsg(messageIndex, localAvatar.getName())
return
elif type == SPEEDCHAT_CUSTOM:
base.cr.speedchatRelay.sendSpeedchatCustom(receiverId, messageIndex)
message = self.SCDecoder.decodeSCCustomMsg(messageIndex)
if self.logWhispers:
receiverName = self.findName(receiverId, 1)
newMessage = TalkMessage(self.countMessage(), self.stampTime(), message, localAvatar.doId, localAvatar.getName(), localAvatar.DISLid, localAvatar.DISLname, None, None, receiverId, receiverName, TALK_ACCOUNT, None)
self.historyComplete.append(newMessage)
self.addToHistoryDoId(newMessage, localAvatar.doId)
messenger.send('NewOpenMessage', [newMessage])
return error
# TODO: Remove Player system
return None
def sendGuildSpeedChat(self, type, msgIndex):
error = None

2
otp/distributed/OtpDoGlobals.py
View file

@ -26,7 +26,6 @@ OTP_DO_ID_GLOBAL_PARTY_MANAGER = 4477
OTP_DO_ID_PIRATES_AVATAR_MANAGER = 4674
OTP_DO_ID_PIRATES_CREW_MANAGER = 4675
OTP_DO_ID_PIRATES_INVENTORY_MANAGER = 4677
OTP_DO_ID_PIRATES_SPEEDCHAT_RELAY = 4711
OTP_DO_ID_PIRATES_SHIP_MANAGER = 4678
OTP_DO_ID_PIRATES_TRAVEL_AGENT = 4679
OTP_DO_ID_PIRATES_FRIENDS_MANAGER = 4680
@ -34,7 +33,6 @@ OTP_DO_ID_CHAT_MANAGER = 4681
OTP_DO_ID_TOONTOWN_AVATAR_MANAGER = 4682
OTP_DO_ID_TOONTOWN_DELIVERY_MANAGER = 4683
OTP_DO_ID_TOONTOWN_TEMP_STORE_MANAGER = 4684
OTP_DO_ID_TOONTOWN_SPEEDCHAT_RELAY = 4712
OTP_DO_ID_SWITCHBOARD_MANAGER = 4685
OTP_DO_ID_AVATAR_FRIENDS_MANAGER = 4686
OTP_DO_ID_PLAYER_FRIENDS_MANAGER = 4687

26
otp/uberdog/SpeedchatRelay.py
View file

@ -1,26 +0,0 @@
from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
from direct.directnotify.DirectNotifyGlobal import directNotify
from otp.otpbase import OTPGlobals
from otp.uberdog import SpeedchatRelayGlobals
class SpeedchatRelay(DistributedObjectGlobal):
def __init__(self, cr):
DistributedObjectGlobal.__init__(self, cr)
def sendSpeedchat(self, receiverId, messageIndex):
self.sendSpeedchatToRelay(receiverId, SpeedchatRelayGlobals.NORMAL, [messageIndex])
def sendSpeedchatCustom(self, receiverId, messageIndex):
self.sendSpeedchatToRelay(receiverId, SpeedchatRelayGlobals.CUSTOM, [messageIndex])
def sendSpeedchatEmote(self, receiverId, messageIndex):
self.sendSpeedchatToRelay(receiverId, SpeedchatRelayGlobals.EMOTE, [messageIndex])
def sendSpeedchatToRelay(self, receiverId, speedchatType, parameters):
self.sendUpdate('forwardSpeedchat', [receiverId,
speedchatType,
parameters,
base.cr.accountDetailRecord.playerAccountId,
base.cr.accountDetailRecord.playerName + ' RHFM',
0])

5
otp/uberdog/SpeedchatRelayGlobals.py
View file

@ -1,5 +0,0 @@
NORMAL = 0
CUSTOM = 1
EMOTE = 2
PIRATES_QUEST = 3
TOONTOWN_QUEST = 4

9
otp/uberdog/SpeedchatRelayUD.py
View file

@ -1,9 +0,0 @@
from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObjectUD import DistributedObjectUD
class SpeedchatRelayUD(DistributedObjectUD):
notify = DirectNotifyGlobal.directNotify.newCategory("SpeedchatRelayUD")
def forwardSpeedchat(self, todo0, todo1, todo2, todo3, todo4, todo5):
pass

13
toontown/chat/TTTalkAssistant.py
View file

@ -25,17 +25,8 @@ class TTTalkAssistant(TalkAssistant):
TalkAssistant.clearHistory(self)
def sendPlayerWhisperToonTaskSpeedChat(self, taskId, toNpcId, toonProgress, msgIndex, receiverId):
error = None
base.cr.speedchatRelay.sendSpeedchatToonTask(receiverId, taskId, toNpcId, toonProgress, msgIndex)
message = TTSCDecoders.decodeTTSCToontaskMsg(taskId, toNpcId, toonProgress, msgIndex)
if self.logWhispers:
receiverName = self.findName(receiverId, 1)
newMessage = TalkMessage(self.countMessage(), self.stampTime(), message, localAvatar.doId, localAvatar.getName(), localAvatar.DISLid, localAvatar.DISLname, None, None, receiverId, receiverName, TALK_ACCOUNT, None)
self.historyComplete.append(newMessage)
self.addToHistoryDoId(newMessage, localAvatar.doId)
self.addToHistoryDISLId(newMessage, base.cr.accountDetailRecord.playerAccountId)
messenger.send('NewOpenMessage', [newMessage])
return error
# TODO: Remove Player system.
return None
def sendToonTaskSpeedChat(self, taskId, toNpcId, toonProgress, msgIndex):
error = None

3
toontown/distributed/ToontownClientRepository.py
View file

@ -34,7 +34,6 @@ from toontown.distributed import DelayDelete
from toontown.friends import FriendHandle
from toontown.friends import FriendsListPanel
from toontown.friends import ToontownFriendSecret
from toontown.uberdog import TTSpeedchatRelay
from toontown.login import DateObject
from toontown.login import AvatarChooser
from toontown.makeatoon import MakeAToon
@ -80,7 +79,6 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
self.http.setVerifySsl(HTTPClient.VSNoDateCheck)
self.__forbidCheesyEffects = 0
self.friendManager = None
self.speedchatRelay = None
self.trophyManager = None
self.bankManager = None
self.catalogManager = None
@ -99,7 +97,6 @@ class ToontownClientRepository(OTPClientRepository.OTPClientRepository):
self.avatarFriendsManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_AVATAR_FRIENDS_MANAGER, 'AvatarFriendsManager')
self.playerFriendsManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_PLAYER_FRIENDS_MANAGER, 'TTPlayerFriendsManager')
self.ttuFriendsManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TTU_FRIENDS_MANAGER, 'TTUFriendsManager')
self.speedchatRelay = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TOONTOWN_SPEEDCHAT_RELAY, 'TTSpeedchatRelay')
self.deliveryManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TOONTOWN_DELIVERY_MANAGER, 'DistributedDeliveryManager')
if config.GetBool('want-code-redemption', 1):
self.codeRedemptionManager = self.generateGlobalObject(OtpDoGlobals.OTP_DO_ID_TOONTOWN_CODE_REDEMPTION_MANAGER, 'TTCodeRedemptionMgr')

16
toontown/uberdog/TTSpeedchatRelay.py
View file

@ -1,16 +0,0 @@
from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
from direct.directnotify.DirectNotifyGlobal import directNotify
from otp.otpbase import OTPGlobals
from otp.uberdog.SpeedchatRelay import SpeedchatRelay
from otp.uberdog import SpeedchatRelayGlobals
class TTSpeedchatRelay(SpeedchatRelay):
def __init__(self, cr):
SpeedchatRelay.__init__(self, cr)
def sendSpeedchatToonTask(self, receiverId, taskId, toNpcId, toonProgress, msgIndex):
self.sendSpeedchatToRelay(receiverId, SpeedchatRelayGlobals.TOONTOWN_QUEST, [taskId,
toNpcId,
toonProgress,
msgIndex])

6
toontown/uberdog/TTSpeedchatRelayUD.py
View file

@ -1,6 +0,0 @@
from direct.directnotify import DirectNotifyGlobal
from otp.uberdog.SpeedchatRelayUD import SpeedchatRelayUD
class TTSpeedchatRelayUD(SpeedchatRelayUD):
notify = DirectNotifyGlobal.directNotify.newCategory("TTSpeedchatRelayUD")