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

Refactor spawn, update remaining in olc

Browse source
This commit is contained in:
Griatch 2018-07-29 16:53:54 +02:00
parent 16640fa923
commit 6126391406
3 changed files with 135 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/prototypes/spawner.py
View file

@ -553,7 +553,9 @@ def spawn(*prototypes, **kwargs):
alias_string = init_spawn_value(val, make_iter)
val = prot.pop("tags", [])
tags = init_spawn_value(val, make_iter)
tags = []
for (tag, category, data) in tags:
tags.append((init_spawn_value(val, str), category, data))
prototype_key = prototype.get('prototype_key', None)
if prototype_key:
@ -567,9 +569,11 @@ def spawn(*prototypes, **kwargs):
nattributes = dict((key.split("_", 1)[1], init_spawn_value(val, value_to_obj))
for key, val in prot.items() if key.startswith("ndb_"))
# the rest are attributes
val = prot.pop("attrs", [])
attributes = init_spawn_value(val, list)
# the rest are attribute tuples (attrname, value, category, locks)
val = make_iter(prot.pop("attrs", []))
attributes = []
for (attrname, value, category, locks) in val:
attributes.append((attrname, init_spawn_value(val), category, locks))
simple_attributes = []
for key, value in ((key, value) for key, value in prot.items()