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

Remove prototype init from evennia init

Browse source
This commit is contained in:
Griatch 2022-01-03 22:22:19 +01:00
parent 498a031662
commit 1593a92d46
5 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/__init__.py
View file

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

14
evennia/commands/default/tests.py
View file

@ -1669,8 +1669,8 @@ class TestBuilding(EvenniaCommandTest):
self.call(building.CmdScripts(), "Obj", "No scripts defined on Obj")
self.call(
building.CmdScripts(),
"Obj = scripts.Script",
"Script scripts.Script successfully added"
"Obj = scripts.scripts.DefaultScript",
"Script scripts.scripts.DefaultScript successfully added"
)
self.call(
building.CmdScripts(),
@ -1690,25 +1690,25 @@ class TestBuilding(EvenniaCommandTest):
self.call(building.CmdScripts(), "/stop Obj", "Script on Obj Stopped - ")
self.call(
building.CmdScripts(), "Obj = scripts.Script",
"Script scripts.Script successfully added",
building.CmdScripts(), "Obj = scripts.scripts.DefaultScript",
"Script scripts.scripts.DefaultScript successfully added",
inputs=["Y"]
)
self.call(
building.CmdScripts(),
"/start Obj = scripts.Script",
"/start Obj = scripts.scripts.DefaultScript",
"Script on Obj Started ",
inputs=["Y"]
)
self.call(
building.CmdScripts(),
"/stop Obj = scripts.Script",
"/stop Obj = scripts.scripts.DefaultScript",
"Script on Obj Stopped ",
inputs=["Y"]
)
self.call(
building.CmdScripts(),
"/delete Obj = scripts.Script",
"/delete Obj = scripts.scripts.DefaultScript",
"Script on Obj Deleted ",
inputs=["Y"]
)

2
evennia/contrib/base_systems/menu_login/menu_login.py
View file

@ -244,7 +244,7 @@ class CmdUnloggedinLook(Command):
"""
EvMenu(
self.caller,
"evennia.contrib.base_systems.menu_login",
"evennia.contrib.base_systems.menu_login.menu_login",
startnode="node_enter_username",
auto_look=False,
auto_quit=False,

3
evennia/contrib/utils/fieldfill/__init__.py
View file

@ -5,3 +5,6 @@ FieldFill contrib - Tim Ashley Jenkins 2018
from .fieldfill import FieldEvMenu # noqa
from .fieldfill import CmdTestMenu # noqa
from .fieldfill import init_fill_field # noqa
from .fieldfill import form_template_to_dict # noqa
from .fieldfill import display_formdata # noqa

4
evennia/utils/evmenu.py
View file

@ -1335,6 +1335,9 @@ def list_node(option_generator, select=None, pagesize=10):
```python
def select(caller, selection, available_choices=None, **kwargs):
'''
This will be called by all auto-generated options except any 'extra_options'
you return from the node (those you need to handle normally).
Args:
caller (Object or Account): User of the menu.
selection (str): What caller chose in the menu
@ -1344,6 +1347,7 @@ def list_node(option_generator, select=None, pagesize=10):
Returns:
tuple, str or None: A tuple (nextnodename, **kwargs) or just nextnodename. Return
`None` to go back to the listnode.
'''
# (do something with `selection` here)