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

Added msg_type to rpsystem.send_emote()

Browse source
This commit is contained in:
Andrew Bastien 2022-07-14 19:46:49 -04:00
parent 641811ec1c
commit 22353b2e92
1 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

41
evennia/contrib/rpg/rpsystem/rpsystem.py
View file

@ -213,6 +213,7 @@ _RE_REF_LANG = re.compile(r"\{+\##([0-9]+)\}+")
# this regex returns in groups (langname, say), where langname can be empty. # this regex returns in groups (langname, say), where langname can be empty.
_RE_LANGUAGE = re.compile(r"(?:\((\w+)\))*(\".+?\")") _RE_LANGUAGE = re.compile(r"(?:\((\w+)\))*(\".+?\")")
# the emote parser works in two steps: # the emote parser works in two steps:
# 1) convert the incoming emote into an intermediary # 1) convert the incoming emote into an intermediary
# form with all object references mapped to ids. # form with all object references mapped to ids.
@ -375,7 +376,7 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False, case_
match_index = marker_match.start() match_index = marker_match.start()
# split the emote string at the reference marker, to process everything after it # split the emote string at the reference marker, to process everything after it
head = string[:match_index] head = string[:match_index]
tail = string[match_index + 1 :] tail = string[match_index + 1:]
if search_mode: if search_mode:
# match the candidates against the whole search string after the marker # match the candidates against the whole search string after the marker
@ -421,7 +422,7 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False, case_
# save search string # save search string
matched_text = "".join(tail[1:iend]) matched_text = "".join(tail[1:iend])
# recombine remainder of emote back into a string # recombine remainder of emote back into a string
tail = "".join(tail[iend + 1 :]) tail = "".join(tail[iend + 1:])
nmatches = len(bestmatches) nmatches = len(bestmatches)
@ -513,7 +514,7 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False, case_
return string, mapping return string, mapping
def send_emote(sender, receivers, emote, msg_type = "pose", anonymous_add="first", **kwargs): def send_emote(sender, receivers, emote, msg_type="pose", anonymous_add="first", **kwargs):
""" """
Main access function for distribute an emote. Main access function for distribute an emote.
@ -1256,19 +1257,19 @@ class ContribRPObject(DefaultObject):
self.sdesc.add("Something") self.sdesc.add("Something")
def search( def search(
self, self,
searchdata, searchdata,
global_search=False, global_search=False,
use_nicks=True, use_nicks=True,
typeclass=None, typeclass=None,
location=None, location=None,
attribute_name=None, attribute_name=None,
quiet=False, quiet=False,
exact=False, exact=False,
candidates=None, candidates=None,
nofound_string=None, nofound_string=None,
multimatch_string=None, multimatch_string=None,
use_dbref=None, use_dbref=None,
): ):
""" """
Returns an Object matching a search string/condition, taking Returns an Object matching a search string/condition, taking
@ -1352,10 +1353,10 @@ class ContribRPObject(DefaultObject):
) )
if global_search or ( if global_search or (
is_string is_string
and searchdata.startswith("#") and searchdata.startswith("#")
and len(searchdata) > 1 and len(searchdata) > 1
and searchdata[1:].isdigit() and searchdata[1:].isdigit()
): ):
# only allow exact matching if searching the entire database # only allow exact matching if searching the entire database
# or unique #dbrefs # or unique #dbrefs