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

Pass kwargs needed to overriding announce_move_to and announce_move_from in move_to

Browse source
This commit is contained in:
Tehom 2017-06-18 17:21:33 -04:00
parent 74cf15b257
commit 9dc9df4227
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/objects/objects.py
View file

@ -614,7 +614,8 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
obj.msg(text=(outmessage, outkwargs), from_obj=from_obj, **kwargs)
def move_to(self, destination, quiet=False,
emit_to_obj=None, use_destination=True, to_none=False, move_hooks=True):
emit_to_obj=None, use_destination=True, to_none=False, move_hooks=True,
msg=None, mapping=None):
"""
Moves this object to a new location.
@ -634,6 +635,8 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
move_hooks (bool): If False, turn off the calling of move-related hooks
(at_before/after_move etc) with quiet=True, this is as quiet a move
as can be done.
msg (str, optional): a replacement message.
mapping (dict, optional): additional mapping objects.
Returns:
result (bool): True/False depending on if there were problems with the move.
@ -700,7 +703,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
if not quiet:
# tell the old room we are leaving
try:
self.announce_move_from(destination)
self.announce_move_from(destination, msg=msg, mapping=mapping)
except Exception as err:
logerr(errtxt % "at_announce_move()", err)
return False
@ -715,7 +718,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
if not quiet:
# Tell the new room we are there.
try:
self.announce_move_to(source_location)
self.announce_move_to(source_location, msg=msg, mapping=mapping)
except Exception as err:
logerr(errtxt % "announce_move_to()", err)
return False