Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2387 from davewiththenicehat/rpsystem_send_emote_pass_kwargs

Browse source 
rpsystem.send_emote passes kwargs, uses sender as from_obj
This commit is contained in:
Griatch 2021-04-24 22:48:34 +02:00 • committed by GitHub
commit dc15460d24
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/contrib/rpsystem.py
View file

@ -480,7 +480,7 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False):
return string, mapping return string, mapping
def send_emote(sender, receivers, emote, anonymous_add="first"): def send_emote(sender, receivers, emote, anonymous_add="first", **kwargs):
""" """
Main access function for distribute an emote. Main access function for distribute an emote.
@ -508,7 +508,9 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
# we escape the object mappings since we'll do the language ones first # we escape the object mappings since we'll do the language ones first
# (the text could have nested object mappings). # (the text could have nested object mappings).
emote = _RE_REF.sub(r"{{#\1}}", emote) emote = _RE_REF.sub(r"{{#\1}}", emote)
# if anonymous_add is passed as a kwarg, collect and remove it from kwargs
if 'anonymous_add' in kwargs:
anonymous_add = kwargs.pop('anonymous_add')
if anonymous_add and not "#%i" % sender.id in obj_mapping: if anonymous_add and not "#%i" % sender.id in obj_mapping:
# no self-reference in the emote - add to the end # no self-reference in the emote - add to the end
key = "#%i" % sender.id key = "#%i" % sender.id
@ -566,7 +568,7 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
receiver_sdesc_mapping[rkey] = process_sdesc(receiver.key, receiver) receiver_sdesc_mapping[rkey] = process_sdesc(receiver.key, receiver)
# do the template replacement of the sdesc/recog {#num} markers # do the template replacement of the sdesc/recog {#num} markers
receiver.msg(sendemote.format(**receiver_sdesc_mapping)) receiver.msg(sendemote.format(**receiver_sdesc_mapping), from_obj=sender, **kwargs)
# ------------------------------------------------------------ # ------------------------------------------------------------