Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-25 09:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2021-04-24 22:48:49 +02:00
commit 7e2e0a98d5
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

@ -481,7 +481,7 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False):
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.
@ -509,7 +509,9 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
# we escape the object mappings since we'll do the language ones first
# (the text could have nested object mappings).
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:
# no self-reference in the emote - add to the end
key = "#%i" % sender.id
@ -567,7 +569,7 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
receiver_sdesc_mapping[rkey] = process_sdesc(receiver.key, receiver)
# 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)
# ------------------------------------------------------------