mirror of
https://github.com/KoboldAI/KoboldAI-Client.git
synced 2025-02-17 12:10:49 +01:00
Make sure vars.wifolders_u
is set up properly on loading a save
This commit is contained in:
parent
e67c058f2f
commit
63bb76b073
16
aiserver.py
16
aiserver.py
@ -3867,6 +3867,8 @@ def loadRequest(loadpath, filename=None):
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"] is not None):
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
num += 1
|
num += 1
|
||||||
|
|
||||||
for uid in vars.wifolders_l + [None]:
|
for uid in vars.wifolders_l + [None]:
|
||||||
@ -3877,6 +3879,8 @@ def loadRequest(loadpath, filename=None):
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"] is not None):
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
stablesortwi()
|
stablesortwi()
|
||||||
vars.worldinfo_i = [wi for wi in vars.worldinfo if wi["init"]]
|
vars.worldinfo_i = [wi for wi in vars.worldinfo if wi["init"]]
|
||||||
|
|
||||||
@ -4072,6 +4076,8 @@ def importgame():
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"]) is not None:
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
num += 1
|
num += 1
|
||||||
|
|
||||||
for uid in vars.wifolders_l + [None]:
|
for uid in vars.wifolders_l + [None]:
|
||||||
@ -4082,6 +4088,8 @@ def importgame():
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"] is not None):
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
stablesortwi()
|
stablesortwi()
|
||||||
vars.worldinfo_i = [wi for wi in vars.worldinfo if wi["init"]]
|
vars.worldinfo_i = [wi for wi in vars.worldinfo if wi["init"]]
|
||||||
|
|
||||||
@ -4151,6 +4159,8 @@ def importAidgRequest(id):
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"]) is not None:
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
num += 1
|
num += 1
|
||||||
|
|
||||||
for uid in vars.wifolders_l + [None]:
|
for uid in vars.wifolders_l + [None]:
|
||||||
@ -4161,6 +4171,8 @@ def importAidgRequest(id):
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"] is not None):
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
stablesortwi()
|
stablesortwi()
|
||||||
vars.worldinfo_i = [wi for wi in vars.worldinfo if wi["init"]]
|
vars.worldinfo_i = [wi for wi in vars.worldinfo if wi["init"]]
|
||||||
|
|
||||||
@ -4210,6 +4222,8 @@ def wiimportrequest():
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"]) is not None:
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
num += 1
|
num += 1
|
||||||
for uid in [None]:
|
for uid in [None]:
|
||||||
vars.worldinfo.append({"key": "", "keysecondary": "", "content": "", "comment": "", "folder": uid, "num": None, "init": False, "selective": False, "constant": False, "uid": None})
|
vars.worldinfo.append({"key": "", "keysecondary": "", "content": "", "comment": "", "folder": uid, "num": None, "init": False, "selective": False, "constant": False, "uid": None})
|
||||||
@ -4219,6 +4233,8 @@ def wiimportrequest():
|
|||||||
break
|
break
|
||||||
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
vars.worldinfo_u[uid] = vars.worldinfo[-1]
|
||||||
vars.worldinfo[-1]["uid"] = uid
|
vars.worldinfo[-1]["uid"] = uid
|
||||||
|
if(vars.worldinfo[-1]["folder"] is not None):
|
||||||
|
vars.wifolders_u[vars.worldinfo[-1]["folder"]].append(vars.worldinfo[-1])
|
||||||
|
|
||||||
print("{0}".format(vars.worldinfo[0]))
|
print("{0}".format(vars.worldinfo[0]))
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user