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

Fix unittests and changed all of rpsystem to use |-type color markers.

Browse source
This commit is contained in:
Griatch 2016-09-02 00:26:18 +02:00
parent 690bc82862
commit 4f1515fc72
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
evennia/contrib/rpsystem.py
View file

@ -102,11 +102,11 @@ _NUM_SEP = "-"
# Texts # Texts
_EMOTE_NOMATCH_ERROR = \ _EMOTE_NOMATCH_ERROR = \
"""{{RNo match for {{r{ref}{{R.{{n""" """|RNo match for |r{ref}|R.|n"""
_EMOTE_MULTIMATCH_ERROR = \ _EMOTE_MULTIMATCH_ERROR = \
"""{{RMultiple possibilities for {ref}: """|RMultiple possibilities for {ref}:
{{r{reflist}{{n""" |r{reflist}|n"""
_RE_FLAGS = re.MULTILINE + re.IGNORECASE + re.UNICODE _RE_FLAGS = re.MULTILINE + re.IGNORECASE + re.UNICODE
@ -1031,7 +1031,7 @@ class CmdRecog(RPCommand): # assign personal alias to object in room
except RecogError, err: except RecogError, err:
caller.msg(err) caller.msg(err)
return return
caller.msg("%s will now remember {w%s{n as {w%s{n." % (caller.key, sdesc, alias)) caller.msg("%s will now remember |w%s|n as |w%s|n." % (caller.key, sdesc, alias))
class CmdMask(RPCommand): class CmdMask(RPCommand):
@ -1322,12 +1322,12 @@ class ContribRPObject(DefaultObject):
else: else:
things.append(key) things.append(key)
# get description, build string # get description, build string
string = "{c%s{n\n" % self.get_display_name(looker, pose=True) string = "|c%s|n\n" % self.get_display_name(looker, pose=True)
desc = self.db.desc desc = self.db.desc
if desc: if desc:
string += "%s" % desc string += "%s" % desc
if exits: if exits:
string += "\n{wExits:{n " + ", ".join(exits) string += "\n|wExits:|n " + ", ".join(exits)
if users or things: if users or things:
string += "\n " + "\n ".join(users + things) string += "\n " + "\n ".join(users + things)
return string return string
@ -1385,7 +1385,7 @@ class ContribRPCharacter(DefaultCharacter, ContribRPObject):
recog = None recog = None
sdesc = recog or (hasattr(self, "sdesc") and self.sdesc.get()) or self.key sdesc = recog or (hasattr(self, "sdesc") and self.sdesc.get()) or self.key
pose = " %s" % self.db.pose or "" if kwargs.get("pose", False) else "" pose = " %s" % self.db.pose or "" if kwargs.get("pose", False) else ""
return "{c%s{n%s%s" % (sdesc, idstr, pose) return "|c%s|n%s%s" % (sdesc, idstr, pose)
def at_object_creation(self): def at_object_creation(self):
""" """
@ -1460,7 +1460,7 @@ class ContribRPCharacter(DefaultCharacter, ContribRPObject):
the evennia.contrib.rplanguage module. the evennia.contrib.rplanguage module.
""" """
return "%s{w%s{n" % ("{W(%s)" % language if language else "", text) return "%s|w%s|n" % ("|W(%s)" % language if language else "", text)
#from evennia.contrib import rplanguage #from evennia.contrib import rplanguage
#return "{w%s{n" % rplanguage.obfuscate_language(text, level=1.0) #return "|w%s|n" % rplanguage.obfuscate_language(text, level=1.0)