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

Fix some bugs in rpsystem, pertaining to (the relevant parts of) #1112.

Browse source
This commit is contained in:
Griatch 2016-11-01 21:00:41 +01:00
parent 76db10c2c5
commit de041f1048
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/contrib/rpsystem.py
View file

@ -479,9 +479,9 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
obj_mapping[key] = sender obj_mapping[key] = sender
if anonymous_add == 'first': if anonymous_add == 'first':
possessive = "" if emote.startswith('\'') else " " possessive = "" if emote.startswith('\'') else " "
emote = "%s%s%s" % ("{%s}" % key, possessive, emote) emote = "%s%s%s" % ("{{%s}}" % key, possessive, emote)
else: else:
emote = "%s [%s]" % (emote, "{%s}" % key) emote = "%s [%s]" % (emote, "{{%s}}" % key)
# broadcast emote to everyone # broadcast emote to everyone
for receiver in receivers: for receiver in receivers:
@ -1391,7 +1391,7 @@ class ContribRPCharacter(DefaultCharacter, ContribRPObject):
except AttributeError: except AttributeError:
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 "is here.") 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):