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

Handle drop with drop:holds() lock. Default to pass for backwards-compatibilty while on Evennia 0.9. See #1868

Browse source
This commit is contained in:
Griatch 2019-09-08 20:17:04 +02:00
parent d92efb6e67
commit 9e3285a791
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -2,6 +2,9 @@
## Evennia 1.0 (2019-) (WIP) ## Evennia 1.0 (2019-) (WIP)
- new `drop:holds()` lock default to limit dropping nonsensical things. Access check
defaults to True for backwards-compatibility in 0.9, will be False in 1.0
### Already in master ### Already in master
- `py` command now reroutes stdout to output results in-game client. `py` - `py` command now reroutes stdout to output results in-game client. `py`

18
evennia/objects/objects.py
View file

@ -194,7 +194,8 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
""" """
# lockstring of newly created objects, for easy overloading. # lockstring of newly created objects, for easy overloading.
# Will be formatted with the appropriate attributes. # Will be formatted with the appropriate attributes.
lockstring = "control:id({account_id}) or perm(Admin);delete:id({account_id}) or perm(Admin)" lockstring = ("control:id({account_id}) or perm(Admin);"
"delete:id({account_id}) or perm(Admin)")
objects = ObjectManager() objects = ObjectManager()
@ -1132,13 +1133,14 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
self.locks.add(";".join([ self.locks.add(";".join([
"control:perm(Developer)", # edit locks/permissions, delete "control:perm(Developer)", # edit locks/permissions, delete
"examine:perm(Builder)", # examine properties "examine:perm(Builder)", # examine properties
"view:all()", # look at object (visibility) "view:all()", # look at object (visibility)
"edit:perm(Admin)", # edit properties/attributes "edit:perm(Admin)", # edit properties/attributes
"delete:perm(Admin)", # delete object "delete:perm(Admin)", # delete object
"get:all()", # pick up object "get:all()", # pick up object
"drop:holds()" # drop only that which you hold
"call:true()", # allow to call commands on this object "call:true()", # allow to call commands on this object
"tell:perm(Admin)", # allow emits to this object "tell:perm(Admin)", # allow emits to this object
"puppet:pperm(Developer)"])) # lock down puppeting only to staff by default "puppet:pperm(Developer)"])) # lock down puppeting only to staff by default
def basetype_posthook_setup(self): def basetype_posthook_setup(self):
@ -1752,6 +1754,12 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
before it is even started. before it is even started.
""" """
if not self.locks.get("drop"):
# TODO: This if-statment will be removed in Evennia 1.0
return True
if not self.access(dropper, 'drop', default=False):
dropper.msg(f"You cannot drop {self.get_display_name(dropper)}")
return False
return True return True
def at_drop(self, dropper, **kwargs): def at_drop(self, dropper, **kwargs):