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

fix typo, add comment

Browse source
This commit is contained in:
InspectorCaracal 2022-04-25 12:58:49 -06:00 • committed by GitHub
parent 052714f82b
commit 15be72489a
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -372,11 +372,12 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False, case_
# first see if there is a number given (e.g. 1-tall) # first see if there is a number given (e.g. 1-tall)
num_identifier, _ = marker_match.groups("") # return "" if no match, rather than None num_identifier, _ = marker_match.groups("") # return "" if no match, rather than None
match_index = marker_match.start() match_index = marker_match.start()
# 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 # match the candidates against the whole search string after the marker
rquery = "".join([r"\b(" + re.escape(word.strip(punctuation)) + r").*" for word in iter(tail.split())]) rquery = "".join([r"\b(" + re.escape(word.strip(punctuation)) + r").*" for word in iter(tail.split())])
matches = ((re.search(rquery, text, _RE_FLAGS), obj, text) for obj, text in candidate_map) matches = ((re.search(rquery, text, _RE_FLAGS), obj, text) for obj, text in candidate_map)
# filter out any non-matching candidates # filter out any non-matching candidates
@ -397,7 +398,7 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False, case_
word_list.append(item) word_list.append(item)
rquery = "".join([r"\b(" + re.escape(word) + r").*" for word in word_list]) rquery = "".join([r"\b(" + re.escape(word) + r").*" for word in word_list])
# match candidates against the current set of words # match candidates against the current set of words
matches = ((re.search(re.search(rquery, text, _RE_FLAGS), obj, text) for obj, text in candidate_map) matches = ((re.search(rquery, text, _RE_FLAGS), obj, text) for obj, text in candidate_map)
matches = [(obj, match.group()) for match, obj, text in matches if match] matches = [(obj, match.group()) for match, obj, text in matches if match]
if len(matches) == 0: if len(matches) == 0:
# no matches at this length, keep previous iteration as best # no matches at this length, keep previous iteration as best