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

Fix further bugs in menu spawn

Browse source
This commit is contained in:
Griatch 2018-08-12 13:13:13 +02:00
parent 298b2c23c6
commit fba58c4649
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
evennia/prototypes/menus.py
View file

@ -1953,12 +1953,12 @@ def _keep_diff(caller, **kwargs):
def node_apply_diff(caller, **kwargs): def node_apply_diff(caller, **kwargs):
"""Offer options for updating objects""" """Offer options for updating objects"""
def _keep_option(keyname, prototype, obj, obj_prototype, diff, objects, back_node): def _keep_option(keyname, prototype, base_obj, obj_prototype, diff, objects, back_node):
"""helper returning an option dict""" """helper returning an option dict"""
options = {"desc": "Keep {} as-is".format(keyname), options = {"desc": "Keep {} as-is".format(keyname),
"goto": (_keep_diff, "goto": (_keep_diff,
{"key": keyname, "prototype": prototype, {"key": keyname, "prototype": prototype,
"obj": obj, "obj_prototype": obj_prototype, "base_obj": base_obj, "obj_prototype": obj_prototype,
"diff": diff, "objects": objects, "back_node": back_node})} "diff": diff, "objects": objects, "back_node": back_node})}
return options return options
@ -1966,6 +1966,7 @@ def node_apply_diff(caller, **kwargs):
update_objects = kwargs.get("objects", None) update_objects = kwargs.get("objects", None)
back_node = kwargs.get("back_node", "node_index") back_node = kwargs.get("back_node", "node_index")
obj_prototype = kwargs.get("obj_prototype", None) obj_prototype = kwargs.get("obj_prototype", None)
base_obj = kwargs.get("base_obj", None)
diff = kwargs.get("diff", None) diff = kwargs.get("diff", None)
if not update_objects: if not update_objects:
@ -1976,12 +1977,12 @@ def node_apply_diff(caller, **kwargs):
if not diff: if not diff:
# use one random object as a reference to calculate a diff # use one random object as a reference to calculate a diff
obj = choice(update_objects) base_obj = choice(update_objects)
diff, obj_prototype = spawner.prototype_diff_from_object(prototype, obj) diff, obj_prototype = spawner.prototype_diff_from_object(prototype, base_obj)
text = ["Suggested changes to {} objects. ".format(len(update_objects)), text = ["Suggested changes to {} objects. ".format(len(update_objects)),
"Showing random example obj to change: {name} ({dbref}))\n".format( "Showing random example obj to change: {name} ({dbref}))\n".format(
name=obj.key, dbref=obj.dbref)] name=base_obj.key, dbref=base_obj.dbref)]
helptext = """ helptext = """
Be careful with this operation! The upgrade mechanism will try to automatically estimate Be careful with this operation! The upgrade mechanism will try to automatically estimate
@ -2001,7 +2002,7 @@ def node_apply_diff(caller, **kwargs):
continue continue
line = "{iopt} |w{key}|n: {old}{sep}{new} {change}" line = "{iopt} |w{key}|n: {old}{sep}{new} {change}"
old_val = utils.crop(str(obj_prototype[key]), width=20) old_val = str(obj_prototype.get(key, "<unset>"))
if inst == "KEEP": if inst == "KEEP":
inst = "|b{}|n".format(inst) inst = "|b{}|n".format(inst)
@ -2009,25 +2010,29 @@ def node_apply_diff(caller, **kwargs):
sep=" ", new='', change=inst)) sep=" ", new='', change=inst))
continue continue
new_val = utils.crop(str(spawner.init_spawn_value(prototype[key])), width=20) if key in prototype:
new_val = str(spawner.init_spawn_value(prototype[key]))
else:
new_val = "<unset>"
ichanges += 1 ichanges += 1
if inst in ("UPDATE", "REPLACE"): if inst in ("UPDATE", "REPLACE"):
inst = "|y{}|n".format(inst) inst = "|y{}|n".format(inst)
text.append(line.format(iopt=ichanges, key=key, old=old_val, text.append(line.format(iopt=ichanges, key=key, old=old_val,
sep=" |y->|n ", new=new_val, change=inst)) sep=" |y->|n ", new=new_val, change=inst))
options.append(_keep_option(key, prototype, options.append(_keep_option(key, prototype,
obj, obj_prototype, diff, update_objects, back_node)) base_obj, obj_prototype, diff, update_objects, back_node))
elif inst == "REMOVE": elif inst == "REMOVE":
inst = "|r{}|n".format(inst) inst = "|r{}|n".format(inst)
text.append(line.format(iopt=ichanges, key=key, old=old_val, text.append(line.format(iopt=ichanges, key=key, old=old_val,
sep=" |r->|n ", new='', change=inst)) sep=" |r->|n ", new='', change=inst))
options.append(_keep_option(key, prototype, options.append(_keep_option(key, prototype,
obj, obj_prototype, diff, update_objects, back_node)) base_obj, obj_prototype, diff, update_objects, back_node))
options.extend( options.extend(
[{"key": ("|wu|Wupdate {} objects".format(len(update_objects)), "update", "u"), [{"key": ("|wu|Wpdate {} objects".format(len(update_objects)), "update", "u"),
"goto": (_apply_diff, {"prototye": prototype, "objects": update_objects, "desc": "Update {} objects".format(len(update_objects)),
"back_node": back_node, "diff": diff})}, "goto": (_apply_diff, {"prototype": prototype, "objects": update_objects,
{"key": ("|wr|Wneset changes", "reset", "r"), "back_node": back_node, "diff": diff, "base_obj": base_obj})},
{"key": ("|wr|Weset changes", "reset", "r"),
"goto": ("node_apply_diff", {"prototype": prototype, "back_node": back_node, "goto": ("node_apply_diff", {"prototype": prototype, "back_node": back_node,
"objects": update_objects})}]) "objects": update_objects})}])