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

Make the move transition hooks use get_display_name to make them compatible with the rpsystem contrib as per #1051.

Browse source
This commit is contained in:
Griatch 2016-09-08 22:11:22 +02:00
parent 3d6f65fcdd
commit e373e1733b
2 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/contrib/rpsystem.py
View file

@ -1296,7 +1296,7 @@ class ContribRPObject(DefaultObject):
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 "") if kwargs.get("pose", False) else ""
return "%s%s%s" % (sdesc, idstr, pose) return "%s%s%s" % (sdesc, idstr, pose)
def return_appearance(self, looker): def return_appearance(self, looker):

23
evennia/objects/objects.py
View file

@ -1136,12 +1136,12 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
""" """
if not self.location: if not self.location:
return return
name = self.name
loc_name = ""
loc_name = self.location.name
dest_name = destination.name
string = "%s is leaving %s, heading for %s." string = "%s is leaving %s, heading for %s."
self.location.msg_contents(string % (name, loc_name, dest_name), exclude=self) location = self.location
for obj in self.location.contents:
obj.msg(string % (self.get_display_name(obj),
location.get_display_name(obj) if location else "nowhere",
destination.get_display_name(obj)))
def announce_move_to(self, source_location): def announce_move_to(self, source_location):
""" """
@ -1153,20 +1153,19 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
""" """
name = self.name
if not source_location and self.location.has_player: if not source_location and self.location.has_player:
# This was created from nowhere and added to a player's # This was created from nowhere and added to a player's
# inventory; it's probably the result of a create command. # inventory; it's probably the result of a create command.
string = "You now have %s in your possession." % name string = "You now have %s in your possession." % self.get_display_name(self.location)
self.location.msg(string) self.location.msg(string)
return return
src_name = "nowhere"
loc_name = self.location.name
if source_location:
src_name = source_location.name
string = "%s arrives to %s from %s." string = "%s arrives to %s from %s."
self.location.msg_contents(string % (name, loc_name, src_name), exclude=self) location = self.location
for obj in self.location.contents:
obj.msg(string % (self.get_display_name(obj),
location.get_display_name(obj) if location else "nowhere",
source_location.get_display_name(obj)))
def at_after_move(self, source_location): def at_after_move(self, source_location):
""" """