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

Escape pipes in @gender usage, fix gender substitution regex to respect escaped pipes

Browse source
This commit is contained in:
Eldritch Semblance 2017-03-23 19:13:11 +00:00 • committed by Griatch
parent 465a6336c5
commit 8520d5f78c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/contrib/gendersub.py
View file

@ -50,7 +50,7 @@ _GENDER_PRONOUN_MAP = {"male": {"s": "he",
"p": "their", "p": "their",
"a": "theirs"} "a": "theirs"}
} }
_RE_GENDER_PRONOUN = re.compile(r'(\|s|\|S|\|o|\|O|\|p|\|P|\|a|\|A)') _RE_GENDER_PRONOUN = re.compile(r'(?<!\|)\|(?!\|)[sSoOpPaA]')
# in-game command for setting the gender # in-game command for setting the gender
@ -59,7 +59,7 @@ class SetGender(Command):
Sets gender on yourself Sets gender on yourself
Usage: Usage:
@gender male|female|neutral|ambiguous @gender male||female||neutral||ambiguous
""" """
key = "@gender" key = "@gender"
@ -73,7 +73,7 @@ class SetGender(Command):
caller = self.caller caller = self.caller
arg = self.args.strip().lower() arg = self.args.strip().lower()
if not arg in ("male", "female", "neutral", "ambiguous"): if not arg in ("male", "female", "neutral", "ambiguous"):
caller.msg("Usage: @gender male|female|neutral|ambiguous") caller.msg("Usage: @gender male||female||neutral||ambiguous")
return return
caller.db.gender = arg caller.db.gender = arg
caller.msg("Your gender was set to %s." % arg) caller.msg("Your gender was set to %s." % arg)