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

Make turnbased combat work

Browse source
This commit is contained in:
Griatch 2023-05-15 19:34:38 +02:00
parent ea7a3c83d7
commit f70fd64478
7 changed files with 139 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/utils/evmenu.py
View file

@ -889,6 +889,9 @@ class EvMenu:
if not nodename:
# no nodename return. Re-run current node
nodename = self.nodename
elif nodename_or_callable is None:
# repeat current node
nodename = self.nodename
else:
# the nodename given directly
nodename = nodename_or_callable
@ -934,7 +937,6 @@ class EvMenu:
if options:
options = [options] if isinstance(options, dict) else options
for inum, dic in enumerate(options):
# homogenize the options dict
keys = make_iter(dic.get("key"))
desc = dic.get("desc", dic.get("text", None))
@ -1326,7 +1328,6 @@ def list_node(option_generator, select=None, pagesize=10):
return None, kwargs
def _list_node(caller, raw_string, **kwargs):
option_list = (
option_generator(caller) if callable(option_generator) else option_generator
)