converts then deletes old .sav formats

2026-08-28 23:58:07 +01:00 · 2017-08-30 15:02:58 +10:00
parent 7d8b76532e
commit bfa1739e53
7 changed files with 162 additions and 94 deletions
@@ -2,15 +2,13 @@ SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
 	init_order = INIT_ORDER_PERSISTENCE
 	flags = SS_NO_FIRE
-	var/secret_satchels
 	var/list/satchel_blacklist 		= list() //this is a typecache
 	var/list/new_secret_satchels 	= list() //these are objects
-	var/list/old_secret_satchels 		= ""
+	var/list/old_secret_satchels 	= list()

 	var/list/obj/structure/chisel_message/chisel_messages = list()
 	var/list/saved_messages = list()

-	var/trophy_sav
 	var/list/saved_trophies = list()

 /datum/controller/subsystem/persistence/Initialize()
@@ -21,30 +19,44 @@ SUBSYSTEM_DEF(persistence)
 	..()

 /datum/controller/subsystem/persistence/proc/LoadSatchels()
-	secret_satchels = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
-	if(!fexists(secret_satchels))
-		return
-	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
-	var/list/json = list()
-	json = json_decode(file2text(secret_satchels))
-	old_secret_satchels = json["data"]
 	var/placed_satchel = 0
-	if(old_secret_satchels.len)
-		if(old_secret_satchels.len >= 20) //guards against low drop pools assuring that one player cannot reliably find his own gear.
-			var/pos = rand(1, old_secret_satchels.len)
-			old_secret_satchels.Cut(pos, pos+1)
-			var/obj/item/storage/backpack/satchel/flat/F = new()
-			F.x = old_secret_satchels[pos]["x"]
-			F.y = old_secret_satchels[pos]["y"]
-			F.z = ZLEVEL_STATION
-			var/path = text2path(old_secret_satchels[pos]["saved_obj"])
-			if(!ispath(path))
-				return
-			if(isfloorturf(F.loc) && !istype(F.loc, /turf/open/floor/plating/))
-				F.hide(1)
-			new path(F)
-			placed_satchel++
-
+	var/path
+	var/obj/item/storage/backpack/satchel/flat/F = new()
+	if(fexists("data/npc_saves/SecretSatchels.sav"))
+		var/savefile/secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav")
+		secret_satchels[SSmapping.config.map_name] >> old_secret_satchels
+		fdel(secret_satchels)
+		if(old_secret_satchels)
+			old_secret_satchels = splittext(old_secret_satchels,"#")
+			if(old_secret_satchels.len >= 20)
+				var/satchel_string = pick_n_take(old_secret_satchels)
+				var/list/chosen_satchel = splittext(satchel_string,"|")
+				if(chosen_satchel.len == 3)
+					F.x = text2num(chosen_satchel[1])
+					F.y = text2num(chosen_satchel[2])
+					F.z = ZLEVEL_STATION
+					path = text2path(chosen_satchel[3])
+	else
+		var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
+		if(!fexists(json_file))
+			return
+		var/list/json = list()
+		json = json_decode(file2text(json_file))
+		old_secret_satchels = json["data"]
+		if(old_secret_satchels.len)
+			if(old_secret_satchels.len >= 20) //guards against low drop pools assuring that one player cannot reliably find his own gear.
+				var/pos = rand(1, old_secret_satchels.len)
+				old_secret_satchels.Cut(pos, pos+1)
+				F.x = old_secret_satchels[pos]["x"]
+				F.y = old_secret_satchels[pos]["y"]
+				F.z = ZLEVEL_STATION
+				path = text2path(old_secret_satchels[pos]["saved_obj"])
+	if(!ispath(path))
+		return
+	if(isfloorturf(F.loc) && !istype(F.loc, /turf/open/floor/plating/))
+		F.hide(1)
+	new path(F)
+	placed_satchel++
 	var/list/free_satchels = list()
 	for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,ZLEVEL_STATION), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,ZLEVEL_STATION)))) //Nontrivially expensive but it's roundstart only
 		if(isfloorturf(T) && !istype(T, /turf/open/floor/plating/))
@@ -58,16 +70,25 @@ SUBSYSTEM_DEF(persistence)
 		break //Who's been duping the bird?!

 /datum/controller/subsystem/persistence/proc/LoadChiselMessages()
-	var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")
-	if(!fexists(json_file))
-		return
-	var/list/json
-	json = json_decode(file2text(json_file))
+	var/list/saved_messages = list()
+	if(fexists("data/npc_saves/ChiselMessages.sav"))
+		var/savefile/chisel_messages_sav = new /savefile("data/npc_saves/ChiselMessages.sav")
+		var/saved_json
+		chisel_messages_sav[SSmapping.config.map_name] >> saved_json
+		if(!saved_json)
+			return
+		saved_messages = json_decode(saved_json)
+		fdel(chisel_messages_sav)
+	else
+		var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")
+		if(!fexists(json_file))
+			return
+		var/list/json
+		json = json_decode(file2text(json_file))

-	if(!json)
-		return
-
-	var/list/saved_messages = json["data"]
+		if(!json)
+			return
+		saved_messages = json["data"]

 	for(var/item in saved_messages)
 		if(!islist(item))
@@ -95,17 +116,23 @@ SUBSYSTEM_DEF(persistence)
 	log_world("Loaded [saved_messages.len] engraved messages on map [SSmapping.config.map_name]")

 /datum/controller/subsystem/persistence/proc/LoadTrophies()
-	trophy_sav = file("data/npc_saves/TrophyItems.json")
-	if(!fexists(trophy_sav))
-		return
-	var/list/json = list()
-	json = json_decode(file2text(trophy_sav))
-
-	if(!json)
-		return
-
-	saved_trophies = json["data"]
-
+	if(fexists("data/npc_saves/TrophyItems.sav"))
+		var/savefile/S = new /savefile("data/npc_saves/TrophyItems.sav")
+		var/saved_json
+		S >> saved_json
+		if(!saved_json)
+			return
+		saved_trophies = json_decode(saved_json)
+		fdel(S)
+	else
+		var/json_file = file("data/npc_saves/TrophyItems.json")
+		if(!fexists(json_file))
+			return
+		var/list/json = list()
+		json = json_decode(file2text(json_file))
+		if(!json)
+			return
+		saved_trophies = json["data"]
 	SetUpTrophies(saved_trophies.Copy())

 /datum/controller/subsystem/persistence/proc/SetUpTrophies(list/trophy_items)
@@ -140,6 +167,7 @@ SUBSYSTEM_DEF(persistence)

 /datum/controller/subsystem/persistence/proc/CollectSecretSatchels()
 	var/list/satchels = list()
+	satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar))
 	for(var/A in new_secret_satchels)
 		var/obj/item/storage/backpack/satchel/flat/F = A
 		if(QDELETED(F) || F.z != ZLEVEL_STATION || F.invisibility != INVISIBILITY_MAXIMUM)
@@ -159,10 +187,11 @@ SUBSYSTEM_DEF(persistence)
 		data["y"] = F.y
 		data["saved_obj"] = pick(savable_obj)
 		satchels += list(data)
+	var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
 	var/list/file_data = list()
 	file_data["data"] = satchels
-	fdel(secret_satchels)
-	WRITE_FILE(secret_satchels, json_encode(file_data))
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))

 /datum/controller/subsystem/persistence/proc/CollectChiselMessages()
 	var/json_file = file("data/npc_saves/ChiselMessages[SSmapping.config.map_name].json")
@@ -181,10 +210,11 @@ SUBSYSTEM_DEF(persistence)


 /datum/controller/subsystem/persistence/proc/CollectTrophies()
+	var/json_file = file("data/npc_saves/TrophyItems.json")
 	var/list/file_data = list()
 	file_data["data"] = saved_trophies
-	fdel(trophy_sav)
-	WRITE_FILE(trophy_sav, json_encode(file_data))
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))

 /datum/controller/subsystem/persistence/proc/SaveTrophy(obj/structure/displaycase/trophy/T)
 	if(!T.added_roundstart && T.showpiece)