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

Validate prototype parent before chosing it

Browse source
This commit is contained in:
Griatch 2018-07-25 19:51:48 +02:00
parent e09576812f
commit f27673b741
3 changed files with 54 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/prototypes/spawner.py
View file

@ -161,13 +161,14 @@ def _get_prototype(dic, prot, protparents):
return prot
def flatten_prototype(prototype):
def flatten_prototype(prototype, validate=False):
"""
Produce a 'flattened' prototype, where all prototype parents in the inheritance tree have been
merged into a final prototype.
Args:
prototype (dict): Prototype to flatten. Its `prototype_parent` field will be parsed.
validate (bool, optional): Validate for valid keys etc.
Returns:
flattened (dict): The final, flattened prototype.
@ -175,7 +176,8 @@ def flatten_prototype(prototype):
"""
if prototype:
protparents = {prot['prototype_key'].lower(): prot for prot in protlib.search_prototype()}
protlib.validate_prototype(prototype, None, protparents, is_prototype_base=True)
protlib.validate_prototype(prototype, None, protparents,
is_prototype_base=validate, strict=validate)
return _get_prototype(prototype, {}, protparents)
return {}