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

Further doc cleanup

Browse source
This commit is contained in:
Griatch 2022-01-19 23:01:54 +01:00
parent f1b970d45a
commit d00ed3f82a
6 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/source/Contribs/Contrib-Cooldowns.md
View file

@ -2,7 +2,7 @@
Contribution by owllex, 2021 Contribution by owllex, 2021
Cooldowns are used modelling rate-limited actions, like how often a Cooldowns are used to model rate-limited actions, like how often a
character can perform a given action; until a certain time has passed their character can perform a given action; until a certain time has passed their
command can not be used again. This contrib provides a simple cooldown command can not be used again. This contrib provides a simple cooldown
handler that can be attached to any typeclass. A cooldown is a lightweight persistent handler that can be attached to any typeclass. A cooldown is a lightweight persistent
@ -30,7 +30,7 @@ customize this if desired by passing a different value for the `db_attribute`
parameter. parameter.
```python ```python
from evennia.game_systems.contrib.cooldowns import Cooldownhandler from evennia.contrib.game_systems.cooldowns import Cooldownhandler
from evennia.utils.utils import lazy_property from evennia.utils.utils import lazy_property
@lazy_property @lazy_property

2
docs/source/Contribs/Contrib-Overview.md
View file

@ -213,7 +213,7 @@ look of these clothes are appended to the character's description when worn.
_Contribution by owllex, 2021_ _Contribution by owllex, 2021_
Cooldowns are used modelling rate-limited actions, like how often a Cooldowns are used to model rate-limited actions, like how often a
character can perform a given action; until a certain time has passed their character can perform a given action; until a certain time has passed their
command can not be used again. This contrib provides a simple cooldown command can not be used again. This contrib provides a simple cooldown
handler that can be attached to any typeclass. A cooldown is a lightweight persistent handler that can be attached to any typeclass. A cooldown is a lightweight persistent

3
evennia/__init__.py
View file

@ -363,9 +363,6 @@ def _init():
# delayed starts - important so as to not back-access evennia before it has # delayed starts - important so as to not back-access evennia before it has
# finished initializing # finished initializing
GLOBAL_SCRIPTS.start() GLOBAL_SCRIPTS.start()
# from .prototypes import prototypes
# prototypes.load_module_prototypes()
# del prototypes
def set_trace(term_size=(140, 80), debugger="auto"): def set_trace(term_size=(140, 80), debugger="auto"):

8
evennia/prototypes/spawner.py
View file

@ -241,15 +241,15 @@ def _get_prototype(inprot, protparents, uninherited=None, _workprot=None):
# attrs, tags have internal structure that should be inherited separately # attrs, tags have internal structure that should be inherited separately
new_prot["attrs"] = _inherit_attrs( new_prot["attrs"] = _inherit_attrs(
_workprot.get("attrs", {}), new_prot.get("attrs", {}) _workprot.get("attrs", {}), new_prot.get("attrs", [])
) )
new_prot["tags"] = _inherit_tags(_workprot.get("tags", {}), new_prot.get("tags", {})) new_prot["tags"] = _inherit_tags(_workprot.get("tags", []), new_prot.get("tags", []))
_workprot.update(new_prot) _workprot.update(new_prot)
# the inprot represents a higher level (a child prot), which should override parents # the inprot represents a higher level (a child prot), which should override parents
inprot["attrs"] = _inherit_attrs(_workprot.get("attrs", {}), inprot.get("attrs", {})) inprot["attrs"] = _inherit_attrs(_workprot.get("attrs", []), inprot.get("attrs", []))
inprot["tags"] = _inherit_tags(_workprot.get("tags", {}), inprot.get("tags", {})) inprot["tags"] = _inherit_tags(_workprot.get("tags", []), inprot.get("tags", []))
_workprot.update(inprot) _workprot.update(inprot)
if uninherited: if uninherited:
# put back the parts that should not be inherited # put back the parts that should not be inherited

2
evennia/utils/create.py
View file

@ -40,7 +40,7 @@ try:
Tag = ContentType.objects.get(app_label="typeclasses", model="tag").model_class() Tag = ContentType.objects.get(app_label="typeclasses", model="tag").model_class()
except (OperationalError, ProgrammingError): except (OperationalError, ProgrammingError):
# this is a fallback used during tests/doc building # this is a fallback used during tests/doc building
print("Couldn't initialize create managers - db not set up.") print("Database not available yet - using temporary fallback for create managers.")
from evennia.objects.models import ObjectDB from evennia.objects.models import ObjectDB
from evennia.accounts.models import AccountDB from evennia.accounts.models import AccountDB
from evennia.scripts.models import ScriptDB from evennia.scripts.models import ScriptDB

2
evennia/utils/search.py
View file

@ -55,7 +55,7 @@ try:
Tag = ContentType.objects.get(app_label="typeclasses", model="tag").model_class() Tag = ContentType.objects.get(app_label="typeclasses", model="tag").model_class()
except (OperationalError, ProgrammingError): except (OperationalError, ProgrammingError):
# this is a fallback used during tests/doc building # this is a fallback used during tests/doc building
print("Couldn't initialize search managers - db not set up.") print("Database not available yet - using temporary fallback for search managers.")
from evennia.objects.models import ObjectDB from evennia.objects.models import ObjectDB
from evennia.accounts.models import AccountDB from evennia.accounts.models import AccountDB
from evennia.scripts.models import ScriptDB from evennia.scripts.models import ScriptDB