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

Tweak lock names to teleport/teleport_here instead

Browse source
This commit is contained in:
Griatch 2021-10-31 23:48:05 +01:00
parent fc3bf04fd8
commit b94dcbee70
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3357,9 +3357,9 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
Teleports an object somewhere. If no object is given, you yourself are
teleported to the target location.
To lock an object from being teleported, set its `move` lock, it will be
To lock an object from being teleported, set its `teleport` lock, it will be
checked with the caller. To block
a destination from being teleported to, set the destination's `move_here`
a destination from being teleported to, set the destination's `teleport_here`
lock - it will be checked with the thing being teleported. Admins and
higher permissions can always teleport.
@ -3444,14 +3444,16 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
caller.msg("%s is already at %s." % (obj_to_teleport, destination))
return
# check any move-locks
if not (caller.permissions.check("Admin") or obj_to_teleport.access(caller, "move")):
caller.msg(f"{obj_to_teleport} 'move'-lock blocks you from teleporting it anywhere.")
# check any locks
if not (caller.permissions.check("Admin") or obj_to_teleport.access(caller, "teleport")):
caller.msg(f"{obj_to_teleport} 'teleport'-lock blocks you from teleporting "
"it anywhere.")
return
if not (caller.permissions.check("Admin")
or destination.access(obj_to_teleport, "move_here")):
caller.msg(f"{destination} 'move_to'-lock blocks {obj_to_teleport} from moving there.")
or destination.access(obj_to_teleport, "teleport_here")):
caller.msg(f"{destination} 'teleport_here'-lock blocks {obj_to_teleport} from "
"moving there.")
return
# try the teleport