From 653628c90c6cb641493bc818e5d923a73a8d0551 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 4 Jul 2023 19:43:37 +0100 Subject: [PATCH] Improve save compatibility warning --- game/scripts/gui/preferences.rpy | 7 +++++++ game/scripts/gui/save_files.rpy | 7 +++++-- game/scripts/utility/updater.rpy | 35 -------------------------------- 3 files changed, 12 insertions(+), 37 deletions(-) diff --git a/game/scripts/gui/preferences.rpy b/game/scripts/gui/preferences.rpy index 18a7a639..76d01658 100644 --- a/game/scripts/gui/preferences.rpy +++ b/game/scripts/gui/preferences.rpy @@ -322,6 +322,13 @@ define gui.CONFIRM_DELETE_SAVES = """{color=#7a0000}Warning!{/color} auto saves, quick saves, and manual saves.{/size}\n Are you sure?""" +define gui.SAVE_INCOMPATIBLE_WARNING = """{color=#7a0000}Warning!{/color} +{size=-4}The save file you are attempting to load is not compatible +with the current game version. While you can try loading it, +doing so may result in unexpected crashes and bugs. + +Proceed anyway?""" + init python: def delete_persistent(): renpy.loadsave.location.unlink_persistent() diff --git a/game/scripts/gui/save_files.rpy b/game/scripts/gui/save_files.rpy index 7055f610..5be285e3 100644 --- a/game/scripts/gui/save_files.rpy +++ b/game/scripts/gui/save_files.rpy @@ -69,7 +69,10 @@ screen file_slots(title): $ slot = i + 1 button: - action FileAction(slot) + if not FileCompatible(slot) and title == "Load": + action Confirm(gui.SAVE_INCOMPATIBLE_WARNING, FileAction(slot)) + else: + action FileAction(slot) has fixed @@ -93,7 +96,7 @@ screen file_slots(title): text "Day: {}".format(day) text "Playtime: {}H {}M {}S".format(hours, minutes, seconds) else: - text "INCOMPATIBLE" color "#f00" + text "INCOMPATIBLE VERSION" color "#f00" textbutton "{font=[gui.glyph_font]}✘{/font}": style "slot_delete_button" diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index 924f11d4..dec0e805 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -78,41 +78,6 @@ init python: # if current <= 1.431: # # code - if current <= 1.4501: - if states.ton.unlocked and not states.ton.ev.intro.e1_complete: - states.ton.ev.intro.e1_complete = True - states.ton.ev.intro.e2_complete = True - states.ton.ev.intro.e3_complete = True - - for i in states.dolls: - i = getattr(renpy.store, i) - - for j in i.outfits: - j.group.sort() - - j._hash = j.generate_hash() - - if hasattr(states.her.ev.yule_ball, "completed"): - states.her.ev.yule_ball.complete = states.her.ev.yule_ball.completed - del states.her.ev.yule_ball.completed - - if hasattr(states.her.ev.suck_it, "cock_kiss"): - states.her.ev.give_me_a_handy.cock_kiss = states.her.ev.suck_it.cock_kiss - del states.her.ev.suck_it.cock_kiss - - hooch_chibi.hide() - - if current <= 1.4502: - - renpy.music.stop("sound2") - - cho_top_school2.level = 0 - cho_top_school3.level = 0 - - cho_outfit_bikini.desc = "It's like a regular sized bikini that's shrunk in the wash." - - cho_panties_lace1.level = 14 - if current > latest: raise Exception("Loaded save file is incompatible. (Save Version: {}, Game Version: {})".format(current, latest))