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

Fix so process_sdesc is called with the correct obj.

Browse source
This commit is contained in:
Griatch 2016-09-01 23:39:23 +02:00
parent 7e451951fa
commit f883c9d087
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
evennia/contrib/rpsystem.py
View file

@ -478,11 +478,18 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
# broadcast emote to everyone # broadcast emote to everyone
for receiver in receivers: for receiver in receivers:
# we make a temporary copy that we can modify # we make a temporary copy that we can modify
# add color to sdesc strings
try:
process_sdesc = receiver.process_sdesc
except AttributeError:
process_sdesc = _dummy_process
try: try:
recog_get = receiver.recog.get recog_get = receiver.recog.get
mapping = dict((ref, recog_get(obj)) for ref, obj in obj_mapping.items()) mapping = dict((ref, recog_get(obj)) for ref, obj in obj_mapping.items())
except AttributeError: except AttributeError:
mapping = dict((ref, obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key) mapping = dict((ref, process_sdesc(obj.sdesc.get(), obj)
if hasattr(obj, "sdesc") else process_sdesc(obj.key, obj))
for ref, obj in obj_mapping.items()) for ref, obj in obj_mapping.items())
# handle the language mapping, which always produce different keys ##nn # handle the language mapping, which always produce different keys ##nn
try: try:
@ -497,12 +504,6 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
if rkey in mapping: if rkey in mapping:
mapping[rkey] = receiver.key mapping[rkey] = receiver.key
# add color to sdesc strings
try:
process_sdesc = receiver.process_sdesc
except AttributeError:
process_sdesc = _dummy_process
mapping = dict((key, process_sdesc(val, receiver)) mapping = dict((key, process_sdesc(val, receiver))
for key, val in mapping.iteritems()) for key, val in mapping.iteritems())
@ -1059,7 +1060,7 @@ class CmdMask(RPCommand):
caller.msg("You are already wearing a mask.") caller.msg("You are already wearing a mask.")
return return
sdesc = _RE_CHAREND.sub("", self.args) sdesc = _RE_CHAREND.sub("", self.args)
sdesc = "%s {H[masked]{n" % sdesc sdesc = "%s |H[masked]|n" % sdesc
if len(sdesc) > 60: if len(sdesc) > 60:
caller.msg("Your masked sdesc is too long.") caller.msg("Your masked sdesc is too long.")
return return
@ -1404,14 +1405,14 @@ class ContribRPCharacter(DefaultCharacter, ContribRPObject):
Args: Args:
sdesc (str): The sdesc to display. sdesc (str): The sdesc to display.
obj (Object): The object to which the adjoining sdesc obj (Object): The object to which the adjoining sdesc
belongs (can be yourself). belongs (can be yourself). This is not used by default.
Returns: Returns:
sdesc (str): The processed sdesc ready sdesc (str): The processed sdesc ready
for display. for display.
""" """
return "{b%s{n" % sdesc return "|b%s|n" % sdesc
def process_language(self, text, speaker, language, **kwargs): def process_language(self, text, speaker, language, **kwargs):
""" """