Merge pull request #12 from ioncorimenia/main
Merge fixes from ioncorimenia: Support for older export bundles from AIDCAT Don't import null value for Author's Note
This commit is contained in:
commit
2721a5e64a
|
@ -1216,6 +1216,9 @@ def importRequest():
|
||||||
file = open(importpath, "rb")
|
file = open(importpath, "rb")
|
||||||
vars.importjs = json.load(file)
|
vars.importjs = json.load(file)
|
||||||
|
|
||||||
|
if type(vars.importjs) is dict and "stories" in vars.importjs:
|
||||||
|
vars.importjs = vars.importjs["stories"]
|
||||||
|
|
||||||
# Clear Popup Contents
|
# Clear Popup Contents
|
||||||
emit('from_server', {'cmd': 'clearpopup', 'data': ''})
|
emit('from_server', {'cmd': 'clearpopup', 'data': ''})
|
||||||
|
|
||||||
|
@ -1269,7 +1272,7 @@ def importgame():
|
||||||
else:
|
else:
|
||||||
vars.prompt = ""
|
vars.prompt = ""
|
||||||
vars.memory = ref["memory"]
|
vars.memory = ref["memory"]
|
||||||
vars.authornote = ref["authorsNote"]
|
vars.authornote = ref["authorsNote"] if type(ref["authorsNote"]) is str else ""
|
||||||
vars.actions = []
|
vars.actions = []
|
||||||
vars.worldinfo = []
|
vars.worldinfo = []
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue