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

add @tel/loc functionality, fix unescaped | in @tel error message

Browse source
This commit is contained in:
Ryan Stein 2017-10-03 12:41:51 -04:00
parent 5ad10d7055
commit 4b9db9570c
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/commands/default/building.py
View file

@ -2324,6 +2324,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
Note that the only way to retrieve Note that the only way to retrieve
an object from a None location is by direct #dbref an object from a None location is by direct #dbref
reference. A puppeted object cannot be moved to None. reference. A puppeted object cannot be moved to None.
loc - teleport object to the target's location instead of its contents
Teleports an object somewhere. If no object is given, you yourself Teleports an object somewhere. If no object is given, you yourself
is teleported to the target location. """ is teleported to the target location. """
@ -2343,6 +2344,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
# setting switches # setting switches
tel_quietly = "quiet" in switches tel_quietly = "quiet" in switches
to_none = "tonone" in switches to_none = "tonone" in switches
to_loc = "loc" in switches
if to_none: if to_none:
# teleporting to None # teleporting to None
@ -2368,7 +2370,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
# not teleporting to None location # not teleporting to None location
if not args and not to_none: if not args and not to_none:
caller.msg("Usage: teleport[/switches] [<obj> =] <target_loc>|home") caller.msg("Usage: teleport[/switches] [<obj> =] <target_loc>||home")
return return
if rhs: if rhs:
@ -2384,6 +2386,11 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
if not destination: if not destination:
caller.msg("Destination not found.") caller.msg("Destination not found.")
return return
if to_loc:
destination = destination.location
if not destination:
caller.msg("Destination has no location.")
return
if obj_to_teleport == destination: if obj_to_teleport == destination:
caller.msg("You can't teleport an object inside of itself!") caller.msg("You can't teleport an object inside of itself!")
return return