Removed guilds

This commit is contained in:
DenialMC 2015-04-23 00:47:13 +03:00
parent 478fdfebc2
commit b2f2e96716
16 changed files with 35 additions and 1431 deletions

View file

@ -10,7 +10,6 @@ from otp.avatar import DistributedAvatar/AI/UD
from otp.avatar import DistributedPlayer/AI from otp.avatar import DistributedPlayer/AI
from otp.friends import FriendManager/AI from otp.friends import FriendManager/AI
from otp.friends import PlayerFriendsManager/UD from otp.friends import PlayerFriendsManager/UD
from otp.friends import GuildManager/AI/UD
from otp.friends import FriendInfo from otp.friends import FriendInfo
from otp.friends import AvatarFriendInfo from otp.friends import AvatarFriendInfo
from otp.distributed import DistributedDistrict/AI/UD from otp.distributed import DistributedDistrict/AI/UD
@ -313,70 +312,6 @@ dclass LeaderBoard : LeaderBoardReceiver {
getTopTenRespondTo(string, uint32); getTopTenRespondTo(string, uint32);
}; };
dclass GuildManager : DistributedObject, LeaderBoardReceiver, TalkPath_group {
online();
guildRejectInvite(uint32, uint32);
invitationFrom(uint32, string, uint32, string);
requestInvite(uint32) airecv clsend;
memberList() airecv clsend;
createGuild() airecv clsend;
acceptInvite() airecv clsend;
declineInvite() airecv clsend;
setWantName(string(0-256)) airecv clsend;
removeMember(uint32) airecv clsend;
changeRank(uint32, uint8) airecv clsend;
changeRankAvocate(uint32) airecv clsend;
statusRequest() airecv clsend;
requestLeaderboardTopTen() airecv clsend;
guildStatusUpdate(uint32, string(0-256), uint8);
guildNameReject(uint32);
guildNameChange(string, uint8);
receiveMember(MemberInfo);
receiveMembersDone();
guildAcceptInvite(uint32);
guildDeclineInvite(uint32);
updateRep(uint32, uint32);
leaderboardTopTen(leaderBoardRecord []);
recvAvatarOnline(uint32, string, uint32, uint32);
recvAvatarOffline(uint32, string);
sendChat(string(0-256), uint8, uint32) airecv clsend;
sendWLChat(string(0-256), uint8, uint32) airecv clsend;
sendSC(uint16) airecv clsend;
sendSCQuest(uint16, uint16, uint16) airecv clsend;
recvChat(uint32, string, uint8, uint32);
recvWLChat(uint32, string, uint8, uint32);
recvSC(uint32, uint16);
recvSCQuest(uint32, uint16, uint16, uint16);
sendTokenRequest() airecv clsend;
recvTokenGenerated(string);
recvTokenInviteValue(string, int8);
sendTokenForJoinRequest(string(0-256), string(0-256)) airecv clsend;
recvTokenRedeemMessage(string);
recvTokenRedeemedByPlayerMessage(string);
sendTokenRValue(string(0-256), int8) airecv clsend;
sendPermToken() airecv clsend;
sendNonPermTokenCount() airecv clsend;
recvPermToken(string);
recvNonPermTokenCount(uint8);
sendClearTokens(uint8) airecv clsend;
sendAvatarBandId(uint32, uint32, uint32);
recvMemberAdded(MemberInfo, uint32, string);
notifyGuildKicksMaxed();
recvMemberRemoved(uint32, uint32, string, string);
recvMemberUpdateName(uint32, string);
recvMemberUpdateRank(uint32, uint32, string, string, uint8, bool);
recvMemberUpdateBandId(uint32, uint32, uint32);
avatarOnline(uint32, uint16);
avatarOffline(uint32);
reflectTeleportQuery(uint32, uint32, uint32, uint32, uint32) clsend airecv;
teleportQuery(uint32, uint32, uint32, uint32, uint32);
reflectTeleportResponse(uint32, int8, uint32, uint32, uint32) clsend airecv;
teleportResponse(uint32, int8, uint32, uint32, uint32);
requestGuildMatesList(uint32, uint32, uint32);
updateAvatarName(uint32, string);
avatarDeleted(uint32);
};
dclass PlayerFriendsManager : DistributedObject, TalkPath_account { dclass PlayerFriendsManager : DistributedObject, TalkPath_account {
requestInvite(uint32, uint32, uint8) airecv clsend; requestInvite(uint32, uint32, uint8) airecv clsend;
invitationFrom(uint32, string); invitationFrom(uint32, string);

View file

@ -1,8 +1,7 @@
PIRATES_CARDGAME = 1 PIRATES_CARDGAME = 1
PIRATES_CREW = 2 PIRATES_CREW = 2
PIRATES_GUILD = 3 PIRATES_FRIENDS = 3
PIRATES_FRIENDS = 4 PIRATES_BAND = 4
PIRATES_BAND = 5 PIRATES_PVP_RESPAWN = 5
PIRATES_PVP_RESPAWN = 6 PIRATES_TREASUREMAP = 6
PIRATES_TREASUREMAP = 7 PIRATES_SHIPPVP = 7
PIRATES_SHIPPVP = 8

View file

@ -1,31 +1,27 @@
import string import string
NORMAL_CHAT = 1 NORMAL_CHAT = 1
WHISPER_CHAT = 2 WHISPER_CHAT = 2
GUILD_CHAT = 3 CREW_CHAT = 3
CREW_CHAT = 4 SHIPPVP_CHAT = 4
SHIPPVP_CHAT = 5
ERROR_NONE = None ERROR_NONE = None
ERROR_NO_OPEN_CHAT = 1 ERROR_NO_OPEN_CHAT = 1
ERROR_NOT_FRIENDS = 2 ERROR_NOT_FRIENDS = 2
ERROR_NO_RECEIVER = 3 ERROR_NO_RECEIVER = 3
ERROR_NO_GUILD_CHAT = 4 ERROR_NO_CREW_CHAT = 4
ERROR_NO_CREW_CHAT = 5 ERROR_NO_SHIPPVP_CHAT = 5
ERROR_NO_SHIPPVP_CHAT = 6
TYPEDCHAT = 0 TYPEDCHAT = 0
SPEEDCHAT_NORMAL = 1 SPEEDCHAT_NORMAL = 1
SPEEDCHAT_EMOTE = 2 SPEEDCHAT_EMOTE = 2
SPEEDCHAT_CUSTOM = 3 SPEEDCHAT_CUSTOM = 3
SYSTEMCHAT = 4 SYSTEMCHAT = 4
GAMECHAT = 5 GAMECHAT = 5
GUILDCHAT = 6 PARTYCHAT = 6
PARTYCHAT = 7 SPEEDCHAT_QUEST = 7
SPEEDCHAT_QUEST = 8 FRIEND_UPDATE = 8
FRIEND_UPDATE = 9 CREW_UPDATE = 9
CREW_UPDATE = 10 AVATAR_UNAVAILABLE = 10
GUILD_UPDATE = 11 SHIPPVPCHAT = 11
AVATAR_UNAVAILABLE = 12 GMCHAT = 12
SHIPPVPCHAT = 13
GMCHAT = 14
ChatEvent = 'ChatEvent' ChatEvent = 'ChatEvent'
NormalChatEvent = 'NormalChatEvent' NormalChatEvent = 'NormalChatEvent'
SCChatEvent = 'SCChatEvent' SCChatEvent = 'SCChatEvent'

View file

@ -117,13 +117,6 @@ class ChatInputWhiteListFrame(FSM.FSM, DirectFrame):
def exitAllChat(self): def exitAllChat(self):
pass pass
def enterGuildChat(self):
self['focus'] = 1
self.show()
def exitGuildChat(self):
pass
def enterCrewChat(self): def enterCrewChat(self):
self['focus'] = 1 self['focus'] = 1
self.show() self.show()
@ -231,8 +224,6 @@ class ChatInputWhiteListFrame(FSM.FSM, DirectFrame):
base.talkAssistant.sendPlayerWhisperWLChat(text, self.whisperId) base.talkAssistant.sendPlayerWhisperWLChat(text, self.whisperId)
elif state == 'AvatarWhisper': elif state == 'AvatarWhisper':
base.talkAssistant.sendAvatarWhisperWLChat(text, self.whisperId) base.talkAssistant.sendAvatarWhisperWLChat(text, self.whisperId)
elif state == 'GuildChat':
base.talkAssistant.sendAvatarGuildWLChat(text)
elif state == 'CrewChat': elif state == 'CrewChat':
base.talkAssistant.sendAvatarCrewWLChat(text) base.talkAssistant.sendAvatarCrewWLChat(text)
elif len(text) > 0 and text[0] == '~': elif len(text) > 0 and text[0] == '~':

View file

@ -40,12 +40,10 @@ class TalkAssistant(DirectObject.DirectObject):
self.historyComplete = [] self.historyComplete = []
self.historyOpen = [] self.historyOpen = []
self.historyUpdates = [] self.historyUpdates = []
self.historyGuild = []
self.historyByDoId = {} self.historyByDoId = {}
self.historyByDISLId = {} self.historyByDISLId = {}
self.floodDataByDoId = {} self.floodDataByDoId = {}
self.spamDictByDoId = {} self.spamDictByDoId = {}
self.labelGuild = OTPLocalizer.TalkGuild
self.handleDict = {} self.handleDict = {}
self.messageCount = 0 self.messageCount = 0
self.shownWhiteListWarning = 0 self.shownWhiteListWarning = 0
@ -300,16 +298,6 @@ class TalkAssistant(DirectObject.DirectObject):
return True return True
return False return False
def checkGuildTypedChat(self):
if localAvatar.guildId:
return True
return False
def checkGuildSpeedChat(self):
if localAvatar.guildId:
return True
return False
def receiveOpenTalk(self, senderAvId, avatarName, accountId, accountName, message, scrubbed = 0): def receiveOpenTalk(self, senderAvId, avatarName, accountId, accountName, message, scrubbed = 0):
error = None error = None
if not avatarName and senderAvId: if not avatarName and senderAvId:
@ -375,26 +363,6 @@ class TalkAssistant(DirectObject.DirectObject):
messenger.send('NewOpenMessage', [newMessage]) messenger.send('NewOpenMessage', [newMessage])
return error return error
def receiveGuildTalk(self, senderAvId, fromAC, avatarName, message, scrubbed = 0):
error = None
if not self.isThought(message):
accountName = self.findName(fromAC, 1)
newMessage = TalkMessage(self.countMessage(), self.stampTime(), message, senderAvId, avatarName, fromAC, accountName, None, None, None, None, TALK_GUILD, None)
reject = self.addToHistoryDoId(newMessage, senderAvId)
if reject == 1:
newMessage.setBody(OTPLocalizer.AntiSpamInChat)
if reject != 2:
isSpam = self.spamDictByDoId.get(senderAvId) and reject
if not isSpam:
self.historyComplete.append(newMessage)
self.historyGuild.append(newMessage)
messenger.send('NewOpenMessage', [newMessage])
if newMessage.getBody() == OTPLocalizer.AntiSpamInChat:
self.spamDictByDoId[senderAvId] = 1
else:
self.spamDictByDoId[senderAvId] = 0
return error
def receiveGMTalk(self, avatarId, avatarName, accountId, accountName, message, scrubbed = 0): def receiveGMTalk(self, avatarId, avatarName, accountId, accountName, message, scrubbed = 0):
error = None error = None
if not avatarName and avatarId: if not avatarName and avatarId:
@ -459,24 +427,6 @@ class TalkAssistant(DirectObject.DirectObject):
messenger.send('NewOpenMessage', [newMessage]) messenger.send('NewOpenMessage', [newMessage])
return error return error
def receiveGuildMessage(self, message, senderAvId, senderName):
error = None
if not self.isThought(message):
newMessage = TalkMessage(self.countMessage(), self.stampTime(), message, senderAvId, senderName, None, None, None, None, None, None, TALK_GUILD, None)
self.historyComplete.append(newMessage)
self.historyGuild.append(newMessage)
messenger.send('NewOpenMessage', [newMessage])
return error
def receiveGuildUpdateMessage(self, message, senderId, senderName, receiverId, receiverName, extraInfo = None):
error = None
if not self.isThought(message):
newMessage = TalkMessage(self.countMessage(), self.stampTime(), message, senderId, senderName, None, None, receiverId, receiverName, None, None, INFO_GUILD, extraInfo)
self.historyComplete.append(newMessage)
self.historyGuild.append(newMessage)
messenger.send('NewOpenMessage', [newMessage])
return error
def receiveFriendUpdate(self, friendId, friendName, isOnline): def receiveFriendUpdate(self, friendId, friendName, isOnline):
if isOnline: if isOnline:
onlineMessage = OTPLocalizer.FriendOnline onlineMessage = OTPLocalizer.FriendOnline
@ -500,20 +450,6 @@ class TalkAssistant(DirectObject.DirectObject):
messenger.send('NewOpenMessage', [newMessage]) messenger.send('NewOpenMessage', [newMessage])
return return
def receiveGuildUpdate(self, memberId, memberName, isOnline):
if base.cr.identifyFriend(memberId) is None:
if isOnline:
onlineMessage = OTPLocalizer.GuildMemberOnline
else:
onlineMessage = OTPLocalizer.GuildMemberOffline
newMessage = TalkMessage(self.countMessage(), self.stampTime(), onlineMessage, memberId, memberName, None, None, None, None, None, None, UPDATE_GUILD, None)
self.addHandle(memberId, newMessage)
self.historyComplete.append(newMessage)
self.historyUpdates.append(newMessage)
self.historyGuild.append(newMessage)
messenger.send('NewOpenMessage', [newMessage])
return
def receiveOpenSpeedChat(self, type, messageIndex, senderAvId, name = None): def receiveOpenSpeedChat(self, type, messageIndex, senderAvId, name = None):
error = None error = None
if not name and senderAvId: if not name and senderAvId:
@ -614,15 +550,6 @@ class TalkAssistant(DirectObject.DirectObject):
0]) 0])
return error return error
def sendGuildTalk(self, message):
error = None
if self.checkGuildTypedChat():
base.cr.guildManager.sendTalk(message)
else:
print 'Guild chat error'
error = ERROR_NO_GUILD_CHAT
return error
def sendOpenSpeedChat(self, type, messageIndex): def sendOpenSpeedChat(self, type, messageIndex):
error = None error = None
if type == SPEEDCHAT_NORMAL: if type == SPEEDCHAT_NORMAL:
@ -666,15 +593,6 @@ class TalkAssistant(DirectObject.DirectObject):
# TODO: Remove Player system # TODO: Remove Player system
return None return None
def sendGuildSpeedChat(self, type, msgIndex):
error = None
if self.checkGuildSpeedChat():
base.cr.guildManager.sendSC(msgIndex)
else:
print 'Guild Speedchat error'
error = ERROR_NO_GUILD_CHAT
return error
def getWhisperReplyId(self): def getWhisperReplyId(self):
if self.lastWhisper: if self.lastWhisper:
toPlayer = 0 toPlayer = 0

View file

@ -1,19 +1,16 @@
TALK_NONE = 0 TALK_NONE = 0
TALK_OPEN = 1 TALK_OPEN = 1
TALK_WHISPER = 2 TALK_WHISPER = 2
TALK_ACCOUNT = 13 TALK_PARTY = 3
TALK_GM = 14 TALK_PVP = 4
AVATAR_THOUGHT = 16 UPDATE_FRIEND = 5
TALK_GUILD = 3 UPDATE_PARTY = 6
TALK_PARTY = 4 UPDATE_PVP = 7
TALK_PVP = 5 INFO_SYSTEM = 8
UPDATE_GUILD = 6 INFO_GAME = 9
UPDATE_FRIEND = 7 INFO_AVATAR_UNAVAILABLE = 10
UPDATE_PARTY = 8 TALK_ACCOUNT = 11
UPDATE_PVP = 9 TALK_GM = 12
INFO_SYSTEM = 10 INFO_OPEN = 13
INFO_GAME = 11 AVATAR_THOUGHT = 14
INFO_AVATAR_UNAVAILABLE = 12 INFO_DEV = 15
INFO_OPEN = 15
INFO_DEV = 17
INFO_GUILD = 18

View file

@ -2,14 +2,14 @@
from pandac.PandaModules import * from pandac.PandaModules import *
hashVal = 2712424547L hashVal = 1239960628
from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot from toontown.coghq import DistributedCashbotBossSafe, DistributedCashbotBossCrane, DistributedBattleFactory, DistributedCashbotBossTreasure, DistributedCogHQDoor, DistributedSellbotHQDoor, DistributedFactoryElevatorExt, DistributedMintElevatorExt, DistributedLawOfficeElevatorExt, DistributedLawOfficeElevatorInt, LobbyManager, DistributedMegaCorp, DistributedFactory, DistributedLawOffice, DistributedLawOfficeFloor, DistributedLift, DistributedDoorEntity, DistributedSwitch, DistributedButton, DistributedTrigger, DistributedCrushableEntity, DistributedCrusherEntity, DistributedStomper, DistributedStomperPair, DistributedLaserField, DistributedGolfGreenGame, DistributedSecurityCamera, DistributedMover, DistributedElevatorMarker, DistributedBarrelBase, DistributedGagBarrel, DistributedBeanBarrel, DistributedHealBarrel, DistributedGrid, ActiveCell, DirectionalCell, CrusherCell, DistributedCrate, DistributedSinkingPlatform, BattleBlocker, DistributedMint, DistributedMintRoom, DistributedMintBattle, DistributedStage, DistributedStageRoom, DistributedStageBattle, DistributedLawbotBossGavel, DistributedLawbotCannon, DistributedLawbotChair, DistributedCogKart, DistributedCountryClub, DistributedCountryClubRoom, DistributedMoleField, DistributedCountryClubBattle, DistributedMaze, DistributedFoodBelt, DistributedBanquetTable, DistributedGolfSpot
from toontown.golf import DistributedPhysicsWorld, DistributedGolfHole, DistributedGolfCourse from toontown.golf import DistributedPhysicsWorld, DistributedGolfHole, DistributedGolfCourse
from toontown.building import DistributedAnimatedProp, DistributedTrophyMgr, DistributedBuilding, DistributedBuildingQueryMgr, DistributedToonInterior, DistributedToonHallInterior, DistributedSuitInterior, DistributedHQInterior, DistributedGagshopInterior, DistributedPetshopInterior, DistributedKartShopInterior, DistributedLibraryInterior, DistributedDoor, DistributedKnockKnockDoor, DistributedElevator, DistributedElevatorFSM, DistributedElevatorExt, DistributedElevatorInt, DistributedElevatorFloor, DistributedBossElevator, DistributedVPElevator, DistributedCFOElevator, DistributedCJElevator, DistributedBBElevator, DistributedBoardingParty, DistributedTutorialInterior, DistributedClubElevator from toontown.building import DistributedAnimatedProp, DistributedTrophyMgr, DistributedBuilding, DistributedBuildingQueryMgr, DistributedToonInterior, DistributedToonHallInterior, DistributedSuitInterior, DistributedHQInterior, DistributedGagshopInterior, DistributedPetshopInterior, DistributedKartShopInterior, DistributedLibraryInterior, DistributedDoor, DistributedKnockKnockDoor, DistributedElevator, DistributedElevatorFSM, DistributedElevatorExt, DistributedElevatorInt, DistributedElevatorFloor, DistributedBossElevator, DistributedVPElevator, DistributedCFOElevator, DistributedCJElevator, DistributedBBElevator, DistributedBoardingParty, DistributedTutorialInterior, DistributedClubElevator
from toontown.uberdog.DistributedPartyManager import DistributedPartyManager from toontown.uberdog.DistributedPartyManager import DistributedPartyManager
from otp.friends import FriendManager, PlayerFriendsManager, GuildManager, FriendInfo, AvatarFriendInfo from otp.friends import FriendManager, PlayerFriendsManager, FriendInfo, AvatarFriendInfo
from otp.level import DistributedLevel, DistributedEntity, DistributedInteractiveEntity from otp.level import DistributedLevel, DistributedEntity, DistributedInteractiveEntity
from toontown.shtiker import DeleteManager, PurchaseManager, NewbiePurchaseManager from toontown.shtiker import DeleteManager, PurchaseManager, NewbiePurchaseManager
from toontown.groups import GroupManager from toontown.groups import GroupManager

View file

@ -18,7 +18,6 @@ OTP_DO_ID_FAIRIES = 4619
OTP_DO_ID_CARS = 4620 OTP_DO_ID_CARS = 4620
OTP_DO_ID_AVATARS = 4630 OTP_DO_ID_AVATARS = 4630
OTP_DO_ID_FRIENDS = 4640 OTP_DO_ID_FRIENDS = 4640
OTP_DO_ID_GUILDS = 4650
OTP_DO_ID_ESCROW = 4660 OTP_DO_ID_ESCROW = 4660
OTP_DO_ID_CLIENT_SERVICES_MANAGER = 4665 OTP_DO_ID_CLIENT_SERVICES_MANAGER = 4665
OTP_DO_ID_TTU_FRIENDS_MANAGER = 4666 OTP_DO_ID_TTU_FRIENDS_MANAGER = 4666
@ -46,7 +45,6 @@ OTP_DO_ID_TOONTOWN_NON_REPEATABLE_RANDOM_SOURCE = 4697
OTP_DO_ID_AI_TRADE_AVATAR = 4698 OTP_DO_ID_AI_TRADE_AVATAR = 4698
OTP_DO_ID_TOONTOWN_WHITELIST_MANAGER = 4699 OTP_DO_ID_TOONTOWN_WHITELIST_MANAGER = 4699
OTP_DO_ID_PIRATES_MATCH_MAKER = 4700 OTP_DO_ID_PIRATES_MATCH_MAKER = 4700
OTP_DO_ID_PIRATES_GUILD_MANAGER = 4701
OTP_DO_ID_PIRATES_AWARD_MAKER = 4702 OTP_DO_ID_PIRATES_AWARD_MAKER = 4702
OTP_DO_ID_PIRATES_CODE_REDEMPTION = 4703 OTP_DO_ID_PIRATES_CODE_REDEMPTION = 4703
OTP_DO_ID_PIRATES_SETTINGS_MANAGER = 4704 OTP_DO_ID_PIRATES_SETTINGS_MANAGER = 4704

View file

@ -1,407 +0,0 @@
from direct.distributed.DistributedObjectGlobal import DistributedObjectGlobal
from direct.directnotify.DirectNotifyGlobal import directNotify
from otp.distributed import OtpDoGlobals
from otp.otpbase import OTPLocalizer
from otp.otpbase import OTPGlobals
from otp.avatar.AvatarHandle import AvatarHandle
from otp.ai import AIInterestHandles
GUILDRANK_VETERAN = 4
GUILDRANK_GM = 3
GUILDRANK_OFFICER = 2
GUILDRANK_MEMBER = 1
import Queue
class GuildMemberInfo(AvatarHandle):
def __init__(self, name, isOnline, rank, bandId):
self.name = name
self.rank = rank
self.bandId = bandId
self.onlineYesNo = isOnline
def getName(self):
return self.name
def getRank(self):
return self.rank
def getBandId(self):
return self.bandId
def isOnline(self):
return self.onlineYesNo
def isUnderstandable(self):
return True
@report(types=['deltaStamp', 'args'], dConfigParam='teleport')
def sendTeleportQuery(self, sendToId, localBandMgrId, localBandId, localGuildId, localShardId):
base.cr.guildManager.d_reflectTeleportQuery(sendToId, localBandMgrId, localBandId, localGuildId, localShardId)
@report(types=['deltaStamp', 'args'], dConfigParam='teleport')
def sendTeleportResponse(self, available, shardId, instanceDoId, areaDoId, sendToId = None):
base.cr.guildManager.d_reflectTeleportResponse(available, shardId, instanceDoId, areaDoId, sendToId)
class GuildManager(DistributedObjectGlobal):
notify = directNotify.newCategory('GuildManager')
def __init__(self, cr):
DistributedObjectGlobal.__init__(self, cr)
self.id2Name = {}
self.id2BandId = {}
self.id2Rank = {}
self.id2Online = {}
self.pendingMsgs = []
self.whiteListEnabled = base.config.GetBool('whitelist-chat-enabled', 1)
self.emailNotification = 0
self.emailNotificationAddress = None
self.receivingNewList = False
self.spamGateOpen = True
return
def _allowMemberList(self, task):
self.spamGateOpen = True
return task.done
def memberList(self):
if self.spamGateOpen:
self.sendUpdate('memberList', [])
self.spamGateOpen = False
taskMgr.doMethodLater(60.0, self._allowMemberList, 'allowMemberList')
def createGuild(self):
messenger.send('declineGuildInvitation')
self.sendUpdate('createGuild', [])
def setWantName(self, newName):
self.sendUpdate('setWantName', [newName])
def removeMember(self, avatarId):
self.sendUpdate('removeMember', [avatarId])
def changeRank(self, avatarId, rank):
self.sendUpdate('changeRank', [avatarId, rank])
def changeRankAvocate(self, avatarId):
self.sendUpdate('changeRankAvocate', [avatarId])
def statusRequest(self):
self.sendUpdate('statusRequest', [])
def requestLeaderboardTopTen(self):
self.sendUpdate('requestLeaderboardTopTen', [])
def sendRequestInvite(self, avatarId):
self.sendUpdate('requestInvite', [avatarId])
def sendAcceptInvite(self):
self.sendUpdate('acceptInvite', [])
def sendDeclineInvite(self):
self.sendUpdate('declineInvite', [])
def sendTalk(self, msgText, chatFlags = 0):
self.sendUpdate('setTalkGroup', [0,
0,
'',
msgText,
[],
0])
def setTalkGroup(self, fromAv, fromAC, avatarName, chat, mods, flags):
if hasattr(base, 'localAvatar'):
message, scrubbed = localAvatar.scrubTalk(chat, mods)
base.talkAssistant.receiveGuildTalk(fromAv, fromAC, avatarName, message, scrubbed)
def sendSC(self, msgIndex):
self.sendUpdate('sendSC', [msgIndex])
def sendSCQuest(self, questInt, msgType, taskNum):
self.sendUpdate('sendSCQuest', [questInt, msgType, taskNum])
def sendTokenRequest(self):
self.sendUpdate('sendTokenRequest', [])
def sendTokenForJoinRequest(self, token):
name = base.localAvatar.getName()
self.sendUpdate('sendTokenForJoinRequest', [token, name])
def isInGuild(self, avId):
return avId in self.id2Name
def getRank(self, avId):
return self.id2Rank.get(avId)
def getBandId(self, avId):
return self.id2BandId.get(avId)
def getMemberInfo(self, avId):
if self.isInGuild(avId):
return GuildMemberInfo(self.id2Name[avId], self.id2Online[avId], self.id2Rank[avId], self.id2BandId[avId])
return None
def getOptionsFor(self, avId):
if self.isInGuild(avId):
myRank = self.id2Rank.get(localAvatar.doId, localAvatar.getGuildRank())
hisRank = self.id2Rank[avId]
canpromote = False
candemote = False
cankick = False
if myRank == GUILDRANK_GM:
canpromote = True
candemote = True
cankick = True
if myRank > GUILDRANK_MEMBER and myRank != GUILDRANK_VETERAN and (hisRank <= GUILDRANK_MEMBER or hisRank == GUILDRANK_VETERAN):
cankick = True
return (canpromote, candemote, cankick)
else:
return None
return None
def updateTokenRValue(self, tokenString, rValue):
rValue = int(rValue)
self.sendUpdate('sendTokenRValue', [tokenString, rValue])
if rValue == -1:
base.localAvatar.guiMgr.guildPage.receivePermTokenValue(tokenString)
def requestPermToken(self):
self.sendUpdate('sendPermToken', [])
def requestNonPermTokenCount(self):
self.sendUpdate('sendNonPermTokenCount', [])
def requestClearTokens(self, type):
self.sendUpdate('sendClearTokens', [type])
def receiveMember(self, member):
if not self.receivingNewList:
self.receivingNewList = True
self.newList = []
self.newList.append(member)
def clearMembers(self):
self.newList = []
self.receiveMembersDone()
def receiveMembersDone(self):
self.receivingNewList = False
memberlist = self.newList
self.newList = []
self.id2Name = {}
self.id2Rank = {}
self.id2BandId = {}
for guy in memberlist:
id = guy[0]
name = guy[1]
rank = guy[2]
isOnline = guy[3]
self.id2Name[id] = name
self.id2Rank[id] = rank
self.id2Online[id] = isOnline
self.id2BandId[id] = tuple(guy[4:6])
for id, msg in self.pendingMsgs:
if not base.localAvatar.isIgnored(id):
base.talkAssistant.receiveGuildMessage(msg, id, self.id2Name.get(id, 'Unknown'))
if localAvatar.getGuildId():
self.accept(self.cr.StopVisibilityEvent, self.handleLogout)
else:
self.ignore(self.cr.StopVisibilityEvent)
if hasattr(base, 'localAvatar'):
base.localAvatar.guiMgr.guildPage.receiveMembers(memberlist)
messenger.send('guildMemberUpdated', sentArgs=[localAvatar.doId])
def guildStatusUpdate(self, guildId, guildName, guildRank):
if hasattr(base, 'localAvatar'):
base.localAvatar.guildStatusUpdate(guildId, guildName, guildRank)
self.memberList()
def guildNameReject(self, guildId):
if hasattr(base, 'localAvatar'):
base.localAvatar.guildNameReject(guildId)
def guildNameChange(self, guildName, changeStatus):
if hasattr(base, 'localAvatar'):
base.localAvatar.guildNameChange(guildName, changeStatus)
def guildNameUpdate(self, avatarId, guildName):
print 'DEBUG - guildNameUpdate for ', avatarId, ' to ', guildName
def invitationFrom(self, avatarId, avatarName, guildId, guildName):
print 'GM invitationFrom %s(%d)' % (avatarName, avatarId)
if hasattr(base, 'localAvatar'):
base.localAvatar.guiMgr.handleGuildInvitation(avatarId, avatarName, guildId, guildName)
def retractInvite(self, avatarId):
print 'GM retraction'
def guildAcceptInvite(self, avatarId):
print 'sending accept event'
messenger.send(OTPGlobals.GuildAcceptInviteEvent, [avatarId])
def leaderboardTopTen(self, stuff):
base.localAvatar.guiMgr.handleTopTen(stuff)
def guildRejectInvite(self, avatarId, reason):
messenger.send(OTPGlobals.GuildRejectInviteEvent, [avatarId, reason])
def rejectInvite(self, avatarId, reason):
pass
def recvSC(self, senderId, msgIndex):
senderName = self.id2Name.get(senderId, None)
if senderName:
if not base.localAvatar.isIgnored(senderId):
displayMess = '%s %s %s' % (senderName, OTPLocalizer.GuildPrefix, OTPLocalizer.SpeedChatStaticText[msgIndex])
message = OTPLocalizer.SpeedChatStaticText[msgIndex]
base.talkAssistant.receiveGuildMessage(message, senderId, senderName)
else:
self.pendingMsgs.append([senderId, OTPLocalizer.SpeedChatStaticText[msgIndex]])
self.memberList()
return
def recvSCQuest(self, senderId, questInt, msgType, taskNum):
senderName = self.id2Name.get(senderId, None)
message = base.talkAssistant.SCDecoder.decodeSCQuestMsgInt(questInt, msgType, taskNum)
if senderName:
if not base.localAvatar.isIgnored(senderId):
displayMess = '%s %s %s' % (senderName, OTPLocalizer.GuildPrefix, message)
base.talkAssistant.receiveGuildMessage(message, senderId, senderName)
else:
self.pendingMsgs.append([senderId, message])
self.memberList()
return
def recvAvatarOnline(self, avatarId, avatarName, bandManagerId, bandId):
self.id2Online[avatarId] = True
if hasattr(base, 'localAvatar') and avatarId != base.localAvatar.doId:
if not base.localAvatar.isIgnored(avatarId):
base.talkAssistant.receiveGuildUpdate(avatarId, avatarName, True)
else:
return
messenger.send('guildMemberOnlineStatus', [avatarId, 1])
def recvAvatarOffline(self, avatarId, avatarName):
self.id2BandId[avatarId] = (0, 0)
self.id2Online[avatarId] = False
if hasattr(base, 'localAvatar') and avatarId != base.localAvatar.doId:
if not base.localAvatar.isIgnored(avatarId):
base.talkAssistant.receiveGuildUpdate(avatarId, avatarName, False)
messenger.send('guildMemberOnlineStatus', [avatarId, 0])
def recvMemberAdded(self, memberInfo, inviterId, inviterName):
avatarId, avatarName, rank, isOnline, bandManagerId, bandId = memberInfo
self.id2Name[avatarId] = avatarName
self.id2Rank[avatarId] = rank
self.id2BandId[avatarId] = (bandManagerId, bandId)
self.id2Online[avatarId] = isOnline
if hasattr(base, 'localAvatar'):
base.localAvatar.guiMgr.guildPage.addMember(memberInfo)
messenger.send('guildMemberUpdated', sentArgs=[avatarId])
def recvMemberRemoved(self, avatarId, senderId, avatarName, senderName):
if avatarId == localAvatar.doId:
self.clearMembers()
else:
self.id2Name.pop(avatarId, None)
self.id2Rank.pop(avatarId, None)
self.id2BandId.pop(avatarId, None)
self.id2Online.pop(avatarId, None)
if hasattr(base, 'localAvatar'):
base.localAvatar.guiMgr.guildPage.removeMember(avatarId)
messenger.send('guildMemberUpdated', sentArgs=[avatarId])
return
def recvMemberUpdateRank(self, avatarId, senderId, avatarName, senderName, rank, promote):
self.id2Rank[avatarId] = rank
if hasattr(base, 'localAvatar') and base.localAvatar.guiMgr:
base.localAvatar.guiMgr.guildPage.updateGuildMemberRank(avatarId, rank)
messenger.send('guildMemberUpdated', sentArgs=[avatarId])
def recvMemberUpdateBandId(self, avatarId, bandManagerId, bandId):
self.id2BandId[avatarId] = (bandManagerId, bandId)
messenger.send('guildMemberUpdated', sentArgs=[avatarId])
def recvTokenInviteValue(self, tokenValue, preExistPerm):
if hasattr(base, 'localAvatar') and base.localAvatar.guiMgr:
base.localAvatar.guiMgr.guildPage.displayInviteGuild(tokenValue, preExistPerm)
def recvTokenRedeemMessage(self, guildName):
if hasattr(base, 'localAvatar') and base.localAvatar.guiMgr:
if guildName == '***ERROR - GUILD CODE INVALID***':
base.localAvatar.guiMgr.guildPage.displayRedeemErrorMessage(OTPLocalizer.GuildRedeemErrorInvalidToken)
elif guildName == '***ERROR - GUILD FULL***':
base.localAvatar.guiMgr.guildPage.displayRedeemErrorMessage(OTPLocalizer.GuildRedeemErrorGuildFull)
else:
base.localAvatar.guiMgr.guildPage.displayRedeemConfirmMessage(guildName)
def recvTokenRedeemedByPlayerMessage(self, redeemerName):
if hasattr(base, 'localAvatar') and base.localAvatar.guiMgr:
base.localAvatar.guiMgr.guildPage.notifyTokenGeneratorOfRedeem(redeemerName)
def recvPermToken(self, token):
if hasattr(base, 'localAvatar') and base.localAvatar.guiMgr:
if token == '0':
base.localAvatar.guiMgr.guildPage.receivePermTokenValue(None)
else:
base.localAvatar.guiMgr.guildPage.receivePermTokenValue(token)
return
def requestEmailNotificationPref(self):
self.sendUpdate('sendRequestEmailNotificationPref', [])
def respondEmailNotificationPref(self, notify, emailAddress):
self.emailNotification = notify
if emailAddress == 'None':
self.emailNotificationAddress = None
else:
self.emailNotificationAddress = emailAddress
return
def getEmailNotificationPref(self):
return [self.emailNotification, self.emailNotificationAddress]
def requestEmailNotificationPrefUpdate(self, notify, emailAddress):
self.sendUpdate('sendEmailNotificationPrefUpdate', [notify, emailAddress])
self.emailNotification = notify
if emailAddress == 'None':
self.emailNotificationAddress = None
else:
self.emailNotificationAddress = emailAddress
return
def recvNonPermTokenCount(self, tCount):
if hasattr(base, 'localAvatar') and base.localAvatar.guiMgr:
base.localAvatar.guiMgr.guildPage.receiveNonPermTokenCount(tCount)
@report(types=['deltaStamp', 'args'], dConfigParam='teleport')
def d_reflectTeleportQuery(self, sendToId, localBandMgrId, localBandId, localGuildId, localShardId):
self.sendUpdate('reflectTeleportQuery', [sendToId,
localBandMgrId,
localBandId,
localGuildId,
localShardId])
@report(types=['deltaStamp', 'args'], dConfigParam='teleport')
def teleportQuery(self, requesterId, requesterBandMgrId, requesterBandId, requesterGuildId, requesterShardId):
if self.cr.teleportMgr:
self.cr.teleportMgr.handleAvatarTeleportQuery(requesterId, requesterBandMgrId, requesterBandId, requesterGuildId, requesterShardId)
@report(types=['deltaStamp', 'args'], dConfigParam='teleport')
def d_reflectTeleportResponse(self, available, shardId, instanceDoId, areaDoId, sendToId):
self.sendUpdate('reflectTeleportResponse', [sendToId,
available,
shardId,
instanceDoId,
areaDoId])
@report(types=['deltaStamp', 'args'], dConfigParam='teleport')
def teleportResponse(self, responderId, available, shardId, instanceDoId, areaDoId):
if self.cr.teleportMgr:
self.cr.teleportMgr.handleAvatarTeleportResponse(responderId, available, shardId, instanceDoId, areaDoId)
@report(types=['args'], dConfigParam='guildmgr')
def handleLogout(self, *args, **kw):
self.cr.removeAIInterest(AIInterestHandles.PIRATES_GUILD)

View file

@ -1,189 +0,0 @@
from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObjectAI import DistributedObjectAI
class GuildManagerAI(DistributedObjectAI):
notify = DirectNotifyGlobal.directNotify.newCategory("GuildManagerAI")
def online(self):
pass
def guildRejectInvite(self, todo0, todo1):
pass
def invitationFrom(self, todo0, todo1, todo2, todo3):
pass
def requestInvite(self, todo0):
pass
def memberList(self):
pass
def createGuild(self):
pass
def acceptInvite(self):
pass
def declineInvite(self):
pass
def setWantName(self, todo0):
pass
def removeMember(self, todo0):
pass
def changeRank(self, todo0, todo1):
pass
def changeRankAvocate(self, todo0):
pass
def statusRequest(self):
pass
def requestLeaderboardTopTen(self):
pass
def guildStatusUpdate(self, todo0, todo1, todo2):
pass
def guildNameReject(self, todo0):
pass
def guildNameChange(self, todo0, todo1):
pass
def receiveMember(self, todo0):
pass
def receiveMembersDone(self):
pass
def guildAcceptInvite(self, todo0):
pass
def guildDeclineInvite(self, todo0):
pass
def updateRep(self, todo0, todo1):
pass
def leaderboardTopTen(self, todo0):
pass
def recvAvatarOnline(self, todo0, todo1, todo2, todo3):
pass
def recvAvatarOffline(self, todo0, todo1):
pass
def sendChat(self, todo0, todo1, todo2):
pass
def sendWLChat(self, todo0, todo1, todo2):
pass
def sendSC(self, todo0):
pass
def sendSCQuest(self, todo0, todo1, todo2):
pass
def recvChat(self, todo0, todo1, todo2, todo3):
pass
def recvWLChat(self, todo0, todo1, todo2, todo3):
pass
def recvSC(self, todo0, todo1):
pass
def recvSCQuest(self, todo0, todo1, todo2, todo3):
pass
def sendTokenRequest(self):
pass
def recvTokenGenerated(self, todo0):
pass
def recvTokenInviteValue(self, todo0, todo1):
pass
def sendTokenForJoinRequest(self, todo0, todo1):
pass
def recvTokenRedeemMessage(self, todo0):
pass
def recvTokenRedeemedByPlayerMessage(self, todo0):
pass
def sendTokenRValue(self, todo0, todo1):
pass
def sendPermToken(self):
pass
def sendNonPermTokenCount(self):
pass
def recvPermToken(self, todo0):
pass
def recvNonPermTokenCount(self, todo0):
pass
def sendClearTokens(self, todo0):
pass
def sendAvatarBandId(self, todo0, todo1, todo2):
pass
def recvMemberAdded(self, todo0, todo1, todo2):
pass
def notifyGuildKicksMaxed(self):
pass
def recvMemberRemoved(self, todo0, todo1, todo2, todo3):
pass
def recvMemberUpdateName(self, todo0, todo1):
pass
def recvMemberUpdateRank(self, todo0, todo1, todo2, todo3, todo4, todo5):
pass
def recvMemberUpdateBandId(self, todo0, todo1, todo2):
pass
def avatarOnline(self, todo0, todo1):
pass
def avatarOffline(self, todo0):
pass
def reflectTeleportQuery(self, todo0, todo1, todo2, todo3, todo4):
pass
def teleportQuery(self, todo0, todo1, todo2, todo3, todo4):
pass
def reflectTeleportResponse(self, todo0, todo1, todo2, todo3, todo4):
pass
def teleportResponse(self, todo0, todo1, todo2, todo3, todo4):
pass
def requestGuildMatesList(self, todo0, todo1, todo2):
pass
def updateAvatarName(self, todo0, todo1):
pass
def avatarDeleted(self, todo0):
pass

View file

@ -1,189 +0,0 @@
from direct.directnotify import DirectNotifyGlobal
from direct.distributed.DistributedObjectUD import DistributedObjectUD
class GuildManagerUD(DistributedObjectUD):
notify = DirectNotifyGlobal.directNotify.newCategory("GuildManagerUD")
def online(self):
pass
def guildRejectInvite(self, todo0, todo1):
pass
def invitationFrom(self, todo0, todo1, todo2, todo3):
pass
def requestInvite(self, todo0):
pass
def memberList(self):
pass
def createGuild(self):
pass
def acceptInvite(self):
pass
def declineInvite(self):
pass
def setWantName(self, todo0):
pass
def removeMember(self, todo0):
pass
def changeRank(self, todo0, todo1):
pass
def changeRankAvocate(self, todo0):
pass
def statusRequest(self):
pass
def requestLeaderboardTopTen(self):
pass
def guildStatusUpdate(self, todo0, todo1, todo2):
pass
def guildNameReject(self, todo0):
pass
def guildNameChange(self, todo0, todo1):
pass
def receiveMember(self, todo0):
pass
def receiveMembersDone(self):
pass
def guildAcceptInvite(self, todo0):
pass
def guildDeclineInvite(self, todo0):
pass
def updateRep(self, todo0, todo1):
pass
def leaderboardTopTen(self, todo0):
pass
def recvAvatarOnline(self, todo0, todo1, todo2, todo3):
pass
def recvAvatarOffline(self, todo0, todo1):
pass
def sendChat(self, todo0, todo1, todo2):
pass
def sendWLChat(self, todo0, todo1, todo2):
pass
def sendSC(self, todo0):
pass
def sendSCQuest(self, todo0, todo1, todo2):
pass
def recvChat(self, todo0, todo1, todo2, todo3):
pass
def recvWLChat(self, todo0, todo1, todo2, todo3):
pass
def recvSC(self, todo0, todo1):
pass
def recvSCQuest(self, todo0, todo1, todo2, todo3):
pass
def sendTokenRequest(self):
pass
def recvTokenGenerated(self, todo0):
pass
def recvTokenInviteValue(self, todo0, todo1):
pass
def sendTokenForJoinRequest(self, todo0, todo1):
pass
def recvTokenRedeemMessage(self, todo0):
pass
def recvTokenRedeemedByPlayerMessage(self, todo0):
pass
def sendTokenRValue(self, todo0, todo1):
pass
def sendPermToken(self):
pass
def sendNonPermTokenCount(self):
pass
def recvPermToken(self, todo0):
pass
def recvNonPermTokenCount(self, todo0):
pass
def sendClearTokens(self, todo0):
pass
def sendAvatarBandId(self, todo0, todo1, todo2):
pass
def recvMemberAdded(self, todo0, todo1, todo2):
pass
def notifyGuildKicksMaxed(self):
pass
def recvMemberRemoved(self, todo0, todo1, todo2, todo3):
pass
def recvMemberUpdateName(self, todo0, todo1):
pass
def recvMemberUpdateRank(self, todo0, todo1, todo2, todo3, todo4, todo5):
pass
def recvMemberUpdateBandId(self, todo0, todo1, todo2):
pass
def avatarOnline(self, todo0, todo1):
pass
def avatarOffline(self, todo0):
pass
def reflectTeleportQuery(self, todo0, todo1, todo2, todo3, todo4):
pass
def teleportQuery(self, todo0, todo1, todo2, todo3, todo4):
pass
def reflectTeleportResponse(self, todo0, todo1, todo2, todo3, todo4):
pass
def teleportResponse(self, todo0, todo1, todo2, todo3, todo4):
pass
def requestGuildMatesList(self, todo0, todo1, todo2):
pass
def updateAvatarName(self, todo0, todo1):
pass
def avatarDeleted(self, todo0):
pass

View file

@ -306,10 +306,6 @@ PeriodOnlyAfterLetter = 'You can use a period in your name, but only after a let
ApostropheOnlyAfterLetter = 'You can use an apostrophe in your name, but only after a letter.' ApostropheOnlyAfterLetter = 'You can use an apostrophe in your name, but only after a letter.'
NoNumbersInTheMiddle = 'Numeric digits may not appear in the middle of a word.' NoNumbersInTheMiddle = 'Numeric digits may not appear in the middle of a word.'
ThreeWordsOrLess = 'Your name must be three words or fewer.' ThreeWordsOrLess = 'Your name must be three words or fewer.'
GuildUpdateMembersEvent = 'guildUpdateMembersEvent'
GuildInvitationEvent = 'guildInvitationEvent'
GuildAcceptInviteEvent = 'guildAcceptInviteEvent'
GuildRejectInviteEvent = 'guildRejectInviteEvent'
AvatarFriendAddEvent = 'avatarFriendAddEvent' AvatarFriendAddEvent = 'avatarFriendAddEvent'
AvatarNewFriendAddEvent = 'avatarNewFriendAddEvent' AvatarNewFriendAddEvent = 'avatarNewFriendAddEvent'
AvatarFriendUpdateEvent = 'avatarFriendUpdateEvent' AvatarFriendUpdateEvent = 'avatarFriendUpdateEvent'

View file

@ -214,66 +214,12 @@ SCMenuSellbotInvasion = 'SELLBOT INVASION'
SCMenuFieldOffice = 'FIELD OFFICES' SCMenuFieldOffice = 'FIELD OFFICES'
SCMenuIdesOfMarch = 'GREEN' SCMenuIdesOfMarch = 'GREEN'
ScMenuBugs = 'Bugs' ScMenuBugs = 'Bugs'
GuildMemberTitle = 'Member Options'
GuildMemberPromote = 'Make Officer'
GuildMemberPromoteInvite = 'Make Veteran'
GuildMemberDemoteInvite = 'Demote to Veteran'
GuildMemberGM = 'Make Guildmaster'
GuildMemberGMConfirm = 'Confirm'
GuildMemberDemote = 'Demote to Member'
GuildMemberKick = 'Remove Member'
GuildMemberCancel = lCancel
GuildMemberOnline = 'has come online.'
GuildMemberOffline = 'has gone offline.'
GuildPrefix = '(G):'
GuildNewMember = 'New Guild Member'
GuildMemberUnknown = 'Unknown'
GuildMemberGMMessage = 'Warning! Would you like to give up leadership of your guild and make %s your guild master?\n\nYou will become an officer'
GuildInviteeOK = lOK
GuildInviteeNo = lNo
GuildInviteeInvitation = '%s is inviting you to join %s.'
GuildRedeemErrorInvalidToken = 'Sorry, that code is invalid. Please try again.'
GuildRedeemErrorGuildFull = 'Sorry, this guild has too many members already.'
FriendInviteeTooManyFriends = '%s would like to be your friend, but you already have too many friends on your list!' FriendInviteeTooManyFriends = '%s would like to be your friend, but you already have too many friends on your list!'
FriendInviteeInvitation = '%s would like to be your friend.' FriendInviteeInvitation = '%s would like to be your friend.'
FriendInviteeInvitationPlayer = "%s's player would like to be your friend." FriendInviteeInvitationPlayer = "%s's player would like to be your friend."
FriendNotifictation = '%s is now your friend.' FriendNotifictation = '%s is now your friend.'
FriendInviteeOK = lOK FriendInviteeOK = lOK
FriendInviteeNo = lNo FriendInviteeNo = lNo
GuildInviterWentAway = '%s is no longer present.'
GuildInviterAlready = '%s is already in a guild.'
GuildInviterBusy = '%s is busy right now.'
GuildInviterNotYet = 'Invite %s to join your guild?'
GuildInviterCheckAvailability = 'Inviting %s to join your guild.'
GuildInviterOK = lOK
GuildInviterNo = lNo
GuildInviterCancel = lCancel
GuildInviterYes = lYes
GuildInviterTooFull = 'Guild has reached maximum size.'
GuildInviterNo = lNo
GuildInviterClickToon = 'Click on the pirate you would like to invite.'
GuildInviterTooMany = 'This is a bug'
GuildInviterNotAvailable = '%s is busy right now; try again later.'
GuildInviterGuildSaidNo = '%s has declined your guild invitation.'
GuildInviterAlreadyInvited = '%s has already been invited.'
GuildInviterEndGuildship = 'Remove %s from the guild?'
GuildInviterFriendsNoMore = '%s has left the guild.'
GuildInviterSelf = 'You are already in the guild!'
GuildInviterIgnored = '%s is ignoring you.'
GuildInviterAsking = 'Asking %s to join the guild.'
GuildInviterGuildSaidYes = '%s has joined the guild!'
GuildInviterFriendKickedOut = '%s has kicked out %s from the Guild.'
GuildInviterFriendKickedOutP = '%s have kicked out %s from the Guild.'
GuildInviterFriendInvited = '%s has invited %s to the Guild.'
GuildInviterFriendInvitedP = '%s have invited %s to the Guild.'
GuildInviterFriendPromoted = '%s has promoted %s to the rank of %s.'
GuildInviterFriendPromotedP = '%s have promoted %s to the rank of %s.'
GuildInviterFriendDemoted = '%s has demoted %s to the rank of %s.'
GuildInviterFriendDemotedP = '%s have demoted %s to the rank of %s.'
GuildInviterFriendPromotedGM = '%s has named %s as the new %s'
GuildInviterFriendPromotedGMP = '%s have named %s as the new %s'
GuildInviterFriendDemotedGM = '%s has been named by %s as the new GuildMaster who became the rank of %s'
GuildInviterFriendDemotedGMP = '%s have been named by %s as the new GuildMaster who beaome the rank of %s'
FriendOnline = 'has come online.' FriendOnline = 'has come online.'
FriendOffline = 'has gone offline.' FriendOffline = 'has gone offline.'
FriendInviterOK = lOK FriendInviterOK = lOK
@ -310,7 +256,6 @@ FriendInviterFriendSaidNoNewFriends = "%s isn't looking for new friends right no
FriendInviterOtherTooMany = '%s has too many friends already!' FriendInviterOtherTooMany = '%s has too many friends already!'
FriendInviterMaybe = '%s was unable to answer.' FriendInviterMaybe = '%s was unable to answer.'
FriendInviterDown = 'Cannot make friends now.' FriendInviterDown = 'Cannot make friends now.'
TalkGuild = 'G'
TalkParty = 'P' TalkParty = 'P'
TalkPVP = 'PVP' TalkPVP = 'PVP'
AntiSpamInChat = '***Spamming***' AntiSpamInChat = '***Spamming***'
@ -411,7 +356,7 @@ SuitBrushOffs = {'f': ["I'm late for a meeting."],
"You're in no position to meet with me.", "You're in no position to meet with me.",
'Talk to my assistant.', 'Talk to my assistant.',
"I'll pretend I don't see you Toon.", "I'll pretend I don't see you Toon.",
"There's a restraining order coming your way"]} "There's a restraining order coming your way."]}
SuitFaceoffTaunts = {'b': ['Do you have a donation for me?', SuitFaceoffTaunts = {'b': ['Do you have a donation for me?',
"I'm going to make you a sore loser.", "I'm going to make you a sore loser.",
"I'm going to leave you high and dry.", "I'm going to leave you high and dry.",
@ -1819,272 +1764,6 @@ SpeedChatStaticTextToontown = {100: 'Hi!',
30450: "It's easy to be green!", 30450: "It's easy to be green!",
30451: 'Visit Green Bean Jeans and you can be green too!', 30451: 'Visit Green Bean Jeans and you can be green too!',
30452: "It's on Oak Street in Daisy Gardens."} 30452: "It's on Oak Street in Daisy Gardens."}
SpeedChatStaticTextPirates = {50001: 'Aye',
50002: 'Nay',
50003: 'Yes',
50004: 'No',
50005: 'Ok',
50100: 'Gangway!',
50101: 'Blimey!',
50102: 'Well blow me down!',
50103: 'Walk the plank!',
50104: 'Dead men tell no tales....',
50105: 'Shiver me timbers!',
50106: "Salty as a Kraken's kiss.",
50107: 'Treasure be the measure of our pleasure!',
50108: "I don't fear death - I attune it.",
50700: 'Ahoy!',
50701: 'Ahoy, mate!',
50702: 'Yo-Ho-Ho',
50703: 'Avast!',
50704: 'Hey Bucko.',
50800: 'Until next time.',
50801: 'May fair winds find ye.',
50802: 'Godspeed.',
50900: 'How are ye, mate?',
50901: '',
51000: "It's like the sky is raining gold doubloons!",
51001: 'May a stiff wind be at our backs, the sun on our faces and our cannons fire true!',
51100: 'I be sailing some rough waters today.',
51200: 'Me apologies, mate.',
51201: 'Sorry.',
51202: 'Sorry, I was busy before.',
51203: 'Sorry, I already have plans.',
51204: "Sorry, I don't need to do that.",
51300: 'Attack the weakest one!',
51301: 'Attack the strongest one!',
51302: 'Attack me target!',
51303: 'I be needing help!',
51304: "I can't do any damage!",
51305: 'I think we be in trouble.',
51306: 'Surround the most powerful one.',
51307: 'We should retreat.',
51308: 'Run for it!',
51400: 'Fire a Broadside!',
51401: 'Port Side! (left)',
51402: 'Starboard Side! (right)',
51403: 'Incoming!',
51404: 'Come about!',
51405: 'Broadside! Take Cover!',
51406: 'To the Cannons!',
51407: 'Open fire!',
51408: 'Hold yer fire!',
51409: 'Aim for the masts!',
51410: 'Aim for the hull!',
51411: 'Prepare to board!',
51412: "She's coming about.",
51413: 'Ramming speed!',
51414: "We've got her on the run.",
51415: 'We be taking on water!',
51416: "We can't take anymore!",
51417: "I don't have a shot!",
51418: "Let's find port for repair.",
51419: 'Man overboard!',
51420: 'Enemy spotted.',
51421: 'Handsomely now, mates!',
50400: "Let's set sail.",
50401: "Let's get out of here.",
51500: "Let's sail to Port Royal.",
51501: "Let's sail to Tortuga.",
51502: "Let's sail to Padres Del Fuego.",
51503: "Let's sail to Devil's Anvil.",
51504: "Let's sail to Kingshead.",
51505: "Let's sail to Isla Perdida.",
51506: "Let's sail to Cuba.",
51507: "Let's sail to Tormenta.",
51508: "Let's sail to Outcast Isle.",
51509: "Let's sail to Driftwood.",
51510: "Let's sail to Cutthroat.",
51511: "Let's sail to Rumrunner's Isle.",
51512: "Let's sail to Isla Cangrejos.",
51600: "Let's head into town.",
51601: "Let's go to the docks.",
51602: "Let's head to the tavern.",
51800: "Let's go to Fort Charles.",
51801: "Let's go to the Governor's Mansion.",
52500: 'Where be I, mate?',
51700: 'Yer already there.',
51701: "I don't know.",
51702: 'Yer on the wrong island.',
51703: "That's in town.",
51704: 'Look just outside of town.',
51705: 'Ye will have to search through the jungle.',
51706: 'Deeper inland.',
51707: 'Oh, that be by the coast.',
50200: 'Bilge rat!',
50201: 'Scurvy dog!',
50202: 'See ye in Davy Jones locker!',
50203: 'Scoundrel!',
50204: 'Landlubber!',
50205: 'Addle-minded fool!',
50206: 'You need a sharp sword and sharper wits.',
50207: 'Ye be one doubloon short of a full hull mate!',
50208: "Watch yer tongue or I'll pickle it with sea salt!",
50209: 'Touch me loot and you get the boot!',
50210: 'The horizon be as empty as yer head.',
50211: "You're a canvas shy of a full sail, aren't ye mate?",
50300: 'Fine shooting mate!',
50301: 'A well placed blow!',
50302: 'Nice shot!',
50303: 'Well met!',
50304: 'We showed them!',
50305: 'Yer not so bad yerself!',
50306: 'A fine plunder haul!',
52400: 'May luck be my lady.',
52401: 'I think these cards be marked!',
52402: 'Blimey cheater!',
51900: "That's a terrible flop!",
51901: 'Trying to buy the hand, are ye?',
51902: 'Ye be bluffing.',
51903: "I don't think ye had it.",
51904: 'Saved by the river.',
52600: 'Hit me.',
52601: 'Can I get another dealer?',
53101: 'I caught a fish!',
53102: 'I saw a Legendary Fish!',
53103: 'What did you catch?',
53104: 'This will make a whale of a tale!',
53105: 'That was a beauty!',
53106: 'Arr, the sea is treacherous today.',
53107: 'What a bountiful haul of fish!',
53110: 'Do you have the Legendary Lure?',
53111: 'Have you ever caught a Legendary Fish?',
53112: 'Can you sail on a fishing boat?',
53113: 'Where is the Fishing Master?',
53114: 'Have you completed your fish collection?',
53120: 'Fire at my target!',
53121: 'Fire at the ship closest to the shore!',
53122: "There's a ship getting away!",
53123: 'Fire at the big ships!',
53124: 'Fire at the small ships!',
53125: 'More are coming!',
53126: "We're not going to last much longer!",
53127: 'Shoot the barrels!',
53128: "We've got new ammo!",
53129: 'Sturdy defense, mates!',
53141: 'Look at the potion I made!',
53142: 'Have you completed your potion collection?',
53143: 'Where is the Gypsy?',
53144: 'What potion is that?',
53145: 'This potion was easy enough.',
53146: "This potion was hard brewin', I tell ye!",
53160: 'We need someone to bilge pump!',
53161: 'We need someone to scrub!',
53162: 'We need someone to saw!',
53163: 'We need someone to brace!',
53164: 'We need someone to hammer!',
53165: 'We need someone to patch!',
53166: "I'll do it!",
53167: "Keep it up, this ship won't repair itself!",
53168: 'Great job repairing the ship!',
52100: 'Want to group up?',
52101: 'Join me crew?',
52200: 'Fight some skeletons?',
52201: 'Fight some crabs?',
52300: "How 'bout a game of Mayhem?",
52301: 'Join me Mayhem game.',
52302: 'Want to start a Mayhem game?',
52303: 'Want to start a team battle game?',
52304: 'Join me team battle game.',
52350: 'Join my Cannon Defense.',
52351: 'Want to start a Cannon Defense?',
52352: 'Can you lend me a hand with Repair?',
52353: 'We need to Repair the ship now!',
52354: 'Care to catch some fish?',
52355: 'Want to go fishing with me?',
52356: "Join me crew for some fishin'?",
52357: 'Time to brew some potions!',
52358: 'You should try your hand at brewing potions.',
52000: '',
52000: '',
52700: '',
53000: '',
52800: '',
52900: '',
50500: '',
50600: '',
60100: 'Hi!',
60101: 'Hello!',
60102: 'Hey!',
60103: 'Yo!',
60104: 'Hi everybody!',
60105: 'How are you doing?',
60106: "What's Up?",
60200: 'Bye!',
60201: 'Later!',
60202: 'See ya!',
60203: "I'll be right back.",
60204: 'I need to go.',
60300: ':-)',
60301: 'Cool!',
60302: 'Yeah!',
60303: 'Ha ha!',
60304: 'Sweet!',
60305: 'Yeah!',
60306: 'That rocks!',
60307: 'Funky!',
60308: 'Awesome!',
60309: 'Wow!',
60400: ':-(',
60401: 'Doh!',
60402: 'Aw man!',
60403: 'Ouch!',
60404: 'Bummer!',
60500: 'Where are you?',
60501: "Let's go to the Gateway Store.",
60502: "Let's go to the Disco Hall.",
60503: "Let's go to Toontown.",
60504: "Let's go to Pirates of the Carribean.",
60505: 'Flip coin',
60506: 'Dance',
60507: 'Chant 1',
60508: 'Chant 2',
60509: 'Dance a jig',
60510: 'Sleep',
60511: 'Flex',
60512: 'Play Lute',
60513: 'Play Flute',
60514: 'Frustrated',
60515: 'Searching',
60516: 'Yawn',
60517: 'Kneel',
60518: 'Sweep',
60519: 'Primp',
60520: 'Yawn',
60521: 'Dance',
60522: 'No',
60523: 'Yes',
60524: 'Laugh',
60525: 'Clap',
60526: 'Smile',
60527: 'Anger',
60528: 'Fear',
60529: 'Sad',
60530: 'Celebrate',
60668: 'Celebrate',
60669: 'Sleep',
60602: 'Angry',
60614: 'Clap',
60622: 'Scared',
60640: 'Laugh',
60652: 'Sad',
60657: 'Smile',
60664: 'Wave',
60665: 'Wink',
60666: 'Yawn',
60669: 'Sleep',
60670: 'Dance',
60676: 'Flirt',
60677: 'Zombie dance',
60678: 'Noisemaker',
60671: "Hello, I'm a Pirate, and I'm here to steal your heart.",
60672: "I just found the treasure I've been searching for.",
60673: "If you were a booger, I'd pick you first.",
60674: 'Come to Tortuga often?',
60675: 'Do you have a map? I just keep getting lost in your eyes.',
65000: 'Yes',
65001: 'No',
60909: 'Check Hand'}
SpeedChatStaticText = SpeedChatStaticTextCommon SpeedChatStaticText = SpeedChatStaticTextCommon
Emotes_Root = 'EMOTES' Emotes_Root = 'EMOTES'
Emotes_Dances = 'Dances' Emotes_Dances = 'Dances'
@ -2629,48 +2308,6 @@ SCMenuCustomCogIndices = {'bf': (20005, 20014),
'rb': (20320, 20329), 'rb': (20320, 20329),
'sc': (20330, 20331), 'sc': (20330, 20331),
'sd': (20341, 20350)} 'sd': (20341, 20350)}
PSCMenuExpressions = 'EXPRESSIONS'
PSCMenuGreetings = 'GREETINGS'
PSCMenuGoodbyes = 'GOODBYES'
PSCMenuFriendly = 'FRIENDLY'
PSCMenuHappy = 'HAPPY'
PSCMenuSad = 'SAD'
PSCMenuSorry = 'SORRY'
PSCMenuCombat = 'COMBAT'
PSCMenuSeaCombat = 'SEA COMBAT'
PSCMenuPlaces = 'PLACES'
PSCMenuLetsSail = "LET'S SAIL..."
PSCMenuLetsHeadTo = "LET'S HEAD TO..."
PSCMenuHeadToPortRoyal = 'PORT ROYAL'
PSCMenuWhereIs = 'WHERE IS ..?'
PSCMenuWhereIsPortRoyal = 'PORT ROYAL'
PSCMenuWhereIsTortuga = 'TORTUGA'
PSCMenuWhereIsPadresDelFuego = 'PADRES DEL FUEGO'
PSCMenuWhereIsLasPulgas = 'LAS PULGAS'
PSCMenuWhereIsLosPadres = 'LOS PADRES'
PSCMenuDirections = 'DIRECTIONS'
PSCMenuInsults = 'INSULTS'
PSCMenuCompliments = 'COMPLIMENTS'
PSCMenuCardGames = 'CARD GAMES'
PSCMenuPoker = 'POKER'
PSCMenuBlackjack = 'BLACKJACK'
PSCMenuMinigames = 'MINIGAMES'
PSCMenuFishing = 'FISHING'
PSCMenuCannonDefense = 'CANNON DEFENSE'
PSCMenuPotions = 'POTION BREWING'
PSCMenuRepair = 'REPAIR'
PSCMenuInvitations = 'INVITATIONS'
PSCMenuVersusPlayer = 'VERSUS'
PSCMenuHunting = 'HUNTING'
PSCMenuQuests = 'QUESTS'
PSCMenuGM = 'GM'
PSCMenuShips = 'SHIPS'
PSCMenuAdventures = 'ADVENTURE'
GWSCMenuHello = 'GREETINGS'
GWSCMenuBye = 'GOODBYES'
GWSCMenuHappy = 'HAPPY'
GWSCMenuSad = 'SAD'
GWSCMenuPlaces = 'PLACES'
RandomButton = 'Randomize' RandomButton = 'Randomize'
TypeANameButton = 'Type Name' TypeANameButton = 'Type Name'
PickANameButton = 'Pick-A-Name' PickANameButton = 'Pick-A-Name'

View file

@ -1,78 +1,3 @@
class RejectCode: class RejectCode:
TIMEOUT = 65535
NO_GUILD = 10000
MAY_NOT_JOIN_GUILD = 10001
MAY_NOT_INVITE_GUILD = 10002
NO_MEMBERSHIP = 10003
GUILD_FULL = 10004
LEAVE_CURRENT_GUILD_FIRST = 10005
ALREADY_IN_GUILD = 10006
JOIN_OWN_GUILD = 10007
NOT_IN_A_GUILD = 10008
OTHER_AVATAR_NO_MEMBERSHIP = 10009
OTHER_AVATAR_NO_GUILD = 10010
OTHER_AVATAR_NO_GUILD_FOUND = 10011
ALREADY_HAS_GUILD = 10012
MAY_NOT_CREATE_GUILD = 10013
BUSY = 10014
NO_CREW = 20000
MAY_NOT_JOIN_CREW = 20001
JOIN_OWN_CREW = 20002
NOT_IN_A_CREW = 20003
MAY_NOT_INVITE_CREW = 20004
ALREADY_IN_CREW = 20005
ALREADY_INVITED_TO_CREW = 20006
NOT_CAPTAIN_OF_CREW = 20007
NO_SELF_CREW_INVITE = 20008
CREW_INVITATION_DECLINED = 20009
ALREADY_LOCKED = 20010
NOT_LOCKED = 20011
NOT_YOUR_LOCK = 20012
YOUR_CREW_IS_LOCKED = 20013
OTHER_CREW_IS_LOCKED = 20014
NOT_IN_YOUR_CREW = 20015
NO_TRADE = 30000
NOT_YOUR_TRADE = 30001
TRADE_NOT_ACTIVE = 30002
AVATAR_NOT_HERE = 30003
MAY_NOT_TRADE = 30004
NO_SELF_TRADE = 30005
OTHER_AVATAR_NOT_HERE = 30006
OTHER_AVATAR_MAY_NOT_TRADE = 30007
NO_INVENTORY = 40000
CONTENT_TYPE_NOT_ALLOWED = 40001
HAS_NONE_OF_THAT_TYPE = 40002
NO_MORE_SLOTS = 40003
SLOT_TYPE_NOT_FOUND = 40004
OVERFLOW = 40005
UNDERFLOW = 40006
MULTIPLE_OF_SAME_ITEM = 40007
MAY_NOT_DESTROY = 40008
NO_REMOVE = 40009
NOT_YOUR_DO_ID = 40010
NO_AVATAR = 50000
NOT_YOUR_AVATAR = 50001
BAD_DELETE_PASSWORD = 50002
MAY_NOT_LIST_AVATARS = 50003
MAY_NOT_CREATE_AVATAR = 50004
MAY_NOT_REMOVE_AVATAR = 50005
SLOT_OUT_OF_RANGE = 50006
SLOT_TAKEN = 50007
INVALID_ACCOUNT = 50008
AVATAR_ONLINE = 50009
MAX_AVATAR_LIMIT = 50010
NO_LOCK_ON_SLOT = 50011
NO_FRIENDS_LIST = 60000
FRIENDS_LIST_NOT_HANDY = 60001
INVITEE_NOT_ONLINE = 60002
ALREADY_INVITED = 60003
ALREADY_YOUR_FRIEND = 60004
FRIENDS_LIST_FULL = 60005 FRIENDS_LIST_FULL = 60005
OTHER_FRIENDS_LIST_FULL = 60006
ALREADY_NOT_YOUR_FRIEND = 60007
INVITATION_DECLINED = 60008 INVITATION_DECLINED = 60008
NOT_YOUR_FRIENDS_LIST = 60009
ALREADY_FRIENDS_WITH_SELF = 60010
MAY_NOT_OPEN_INVITE = 60011

View file

@ -17136,8 +17136,6 @@ WHITELIST = [
'guil', 'guil',
'guila', 'guila',
'guild', 'guild',
'guild1',
'guild14',
'guilded', 'guilded',
'guilders', 'guilders',
'guildhall', 'guildhall',
@ -29957,7 +29955,6 @@ WHITELIST = [
'silences', 'silences',
'silencing', 'silencing',
'silent', 'silent',
'silentguild',
'silently', 'silently',
'silents', 'silents',
'silenus', 'silenus',

View file

@ -135,7 +135,7 @@ class BoardingGroupInvitingPanel(BoardingGroupInviterPanelBase):
self.dialogName = 'BoardingGroupInvitingPanel' self.dialogName = 'BoardingGroupInvitingPanel'
self.inviterText = TTLocalizer.BoardingInvitingMessage % self.avatarName self.inviterText = TTLocalizer.BoardingInvitingMessage % self.avatarName
self.panelStyle = TTDialog.CancelOnly self.panelStyle = TTDialog.CancelOnly
self.buttonTextList = [OTPLocalizer.GuildInviterCancel] self.buttonTextList = [OTPLocalizer.lCancel]
def handleButton(self, value): def handleButton(self, value):
self.boardingParty.requestCancelInvite(self.avId) self.boardingParty.requestCancelInvite(self.avId)
@ -163,4 +163,4 @@ class BoardingGroupInvitationRejectedPanel(BoardingGroupInviterPanelBase):
self.dialogName = 'BoardingGroupInvitationRejectedPanel' self.dialogName = 'BoardingGroupInvitationRejectedPanel'
self.inviterText = TTLocalizer.BoardingInvitationRejected % self.avatarName self.inviterText = TTLocalizer.BoardingInvitationRejected % self.avatarName
self.panelStyle = TTDialog.Acknowledge self.panelStyle = TTDialog.Acknowledge
self.buttonTextList = [OTPLocalizer.GuildInviterOK] self.buttonTextList = [OTPLocalizer.lOK]