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

Fixing typo in lock definitions for @dig as well as docstrings. Patch by sergi.reyner. Resolves issue 186.

Browse source
This commit is contained in:
Griatch 2011-09-08 10:41:55 +00:00
parent 3aad32d7b4
commit 7237be87c6
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/default/building.py
View file

@ -618,7 +618,7 @@ class CmdDig(ObjManipCommand):
typeclass = settings.BASE_ROOM_TYPECLASS typeclass = settings.BASE_ROOM_TYPECLASS
# create room # create room
lockstring = "control:id(%s) or perm(Immortal); delete:id(%s) or perm(Wizard); edit:id(%s) or perm(Wizard)" lockstring = "control:id(%s) or perm(Immortals); delete:id(%s) or perm(Wizards); edit:id(%s) or perm(Wizards)"
lockstring = lockstring % (caller.dbref, caller.dbref, caller.dbref) lockstring = lockstring % (caller.dbref, caller.dbref, caller.dbref)
new_room = create.create_object(typeclass, room["name"], new_room = create.create_object(typeclass, room["name"],

10
src/locks/lockhandler.py
View file

@ -58,18 +58,18 @@ Example:
We want to limit who may edit a particular object (let's call this access_type We want to limit who may edit a particular object (let's call this access_type
for 'edit', it depends on what the command is looking for). We want this to for 'edit', it depends on what the command is looking for). We want this to
only work for those with the Permission 'Builder'. So we use our lock only work for those with the Permission 'Builders'. So we use our lock
function above and call it like this: function above and call it like this:
'edit:perm(Builder)' 'edit:perm(Builders)'
Here, the lock-function perm() will be called (accessing_obj and accessed_obj are added Here, the lock-function perm() will be called (accessing_obj and accessed_obj are added
automatically, you only need to add the args/kwargs, if any). automatically, you only need to add the args/kwargs, if any).
If we wanted to make sure the accessing object was BOTH a Builder and a GoodGuy, we If we wanted to make sure the accessing object was BOTH a Builders and a GoodGuy, we
could use AND: could use AND:
'edit:perm(Builder) AND perm(GoodGuy)' 'edit:perm(Builders) AND perm(GoodGuy)'
To allow EITHER Builders and GoodGuys, we replace AND with OR. perm() is just one example, To allow EITHER Builders and GoodGuys, we replace AND with OR. perm() is just one example,
the lock function can do anything and compare any properties of the calling object to the lock function can do anything and compare any properties of the calling object to
@ -80,7 +80,7 @@ decide if the lock is passed or not.
To make these work, add the string to the lockhandler of the object you want To make these work, add the string to the lockhandler of the object you want
to apply the lock to: to apply the lock to:
obj.lockhandler.add('edit:perm(Builder)') obj.lockhandler.add('edit:perm(Builders)')
From then on, a command that wants to check for 'edit' access on this From then on, a command that wants to check for 'edit' access on this
object would do something like this: object would do something like this: