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

chat: dymanically allow prefixes

Browse source
This commit is contained in:
Little Cat 2021-07-09 01:35:56 -03:00
parent 5fccccd206
commit 2f764e00a7
No known key found for this signature in database
GPG key ID: 68CC2B4D0E5AF41C
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
toontown/chat/TTChatInputWhiteList.py
View file

@ -175,7 +175,12 @@ class TTChatInputWhiteList(ChatInputWhiteListFrame):
def applyFilter(self, keyArgs, strict = False): def applyFilter(self, keyArgs, strict = False):
text = self.chatEntry.get(plain=True) text = self.chatEntry.get(plain=True)
if len(text) > 0 and text[0] in ['~', '>']: prefixes = []
if base.cr.magicWordManager and base.cr.wantMagicWords:
prefixes.append(base.cr.magicWordManager.chatPrefix)
if config.GetBool('exec-chat', 0):
prefixes.append('>')
if len(text) > 0 and text[0] in prefixes:
self.okayToSubmit = True self.okayToSubmit = True
else: else:
words = text.split(' ') words = text.split(' ')

3
toontown/spellbook/ToontownMagicWordManager.py
View file

@ -49,8 +49,7 @@ class ToontownMagicWordManager(DistributedObject.DistributedObject):
DistributedObject.DistributedObject.announceGenerate(self) DistributedObject.DistributedObject.announceGenerate(self)
# Only use a custom Magic Word activator if the index is allowed # Only use a custom Magic Word activator if the index is allowed
# TODO: Uncomment after adding settings support activatorIndex = base.settings.getSetting('magic-word-activator', 0)
activatorIndex = 0 # base.settings.getInt('game', 'magic-word-activator', 0)
if 0 <= activatorIndex <= (len(PREFIX_ALLOWED) - 1): if 0 <= activatorIndex <= (len(PREFIX_ALLOWED) - 1):
self.chatPrefix = PREFIX_ALLOWED[activatorIndex] self.chatPrefix = PREFIX_ALLOWED[activatorIndex]