Skip to content

Changed SayText to accept optional colors. #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jordanbriere merged 1 commit into from
Aug 26, 2021
Merged

Changed SayText to accept optional colors. #407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions addons/source-python/packages/source-python/messages/base.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,15 +272,18 @@ class SayText2(UserMessageCreator):

def __init__(
self, message, index=0, chat=False,
param1='', param2='', param3='', param4=''):
param1='', param2='', param3='', param4='',
color=(' \x01' if UserMessage.is_protobuf() else '\x01')):
"""Initialize the SayText2 instance."""
super().__init__(
message=message, index=index, chat=chat,
param1=param1, param2=param2, param3=param3, param4=param4)

super(AttrDict, self).__setattr__("color", color)

def protobuf(self, buffer, kwargs):
"""Send the SayText2 with protobuf."""
buffer.set_string('msg_name', ' \x01' + kwargs.message)
buffer.set_string('msg_name', self.color + kwargs.message)
buffer.set_bool('chat', kwargs.chat)
buffer.set_int32('ent_idx', kwargs.index)
buffer.add_string('params', kwargs.param1)
Expand All @@ -293,7 +296,7 @@ def bitbuf(self, buffer, kwargs):
"""Send the SayText2 with bitbuf."""
buffer.write_byte(kwargs.index)
buffer.write_byte(kwargs.chat)
buffer.write_string('\x01' + kwargs.message)
buffer.write_string(self.color + kwargs.message)
buffer.write_string(kwargs.param1)
buffer.write_string(kwargs.param2)
buffer.write_string(kwargs.param3)
Expand Down Expand Up @@ -326,20 +329,24 @@ class SayText(UserMessageCreator):
translatable_fields = ['message']
reliable = True

def __init__(self, message, index=0, chat=False):
def __init__(
self, message, index=0, chat=False,
color=(' \x01' if UserMessage.is_protobuf() else '\x01')):
"""Initialize the SayText instance."""
super().__init__(message=message, index=index, chat=chat)

super(AttrDict, self).__setattr__("color", color)

def protobuf(self, buffer, kwargs):
"""Send the SayText with protobuf."""
buffer.set_int32('ent_idx', kwargs.index)
buffer.set_bool('chat', kwargs.chat)
buffer.set_string('text', ' \x01' + kwargs.message)
buffer.set_string('text', self.color + kwargs.message)

def bitbuf(self, buffer, kwargs):
"""Send the SayText with bitbuf."""
buffer.write_byte(kwargs.index)
buffer.write_string('\x01' + kwargs.message)
buffer.write_string(self.color + kwargs.message)
buffer.write_byte(kwargs.chat)


Expand Down