From 5efd3158471e96d470fe23d4bb6e49dfd5c81508 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Thu, 28 Mar 2024 15:48:16 +0000 Subject: [PATCH] Bug fixes, Save Compatibility, Secularisation --- .../characters/cho/events/quidditch/gryffindor_match.rpy | 2 +- game/scripts/characters/luna/events/favors/talk_to_me.rpy | 2 +- game/scripts/characters/luna/favors.rpy | 8 ++++---- game/scripts/characters/susan/wardrobe_reactions.rpy | 2 +- game/scripts/utility/updater.rpy | 2 -- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index dae3653e..79900d1a 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -2000,7 +2000,7 @@ label gryffindor_match_return: gen "...{w=0.8}{nw}" ("base", xpos="far_left", ypos="head") gen "...{w=0.8}{nw}" ("angry", xpos="far_left", ypos="head") - hoo "Prison? No, not that, thank heavens." ("open", "shocked", "shocked", "mid") + hoo "Prison? No, not that, thank Merlin." ("open", "shocked", "shocked", "mid") hoo "But she could kiss getting into any sort of professional league goodbye." ("open", "shocked", "base", "down") gen "Kiss--" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/luna/events/favors/talk_to_me.rpy b/game/scripts/characters/luna/events/favors/talk_to_me.rpy index 01497f8a..2f7cdcd0 100644 --- a/game/scripts/characters/luna/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/luna/events/favors/talk_to_me.rpy @@ -1261,7 +1261,7 @@ label ll_pf_talk_T4_E1_repeat: show lun_talk eyes_closed as cg with d3 - lun "Oh...{w=0.4} Thank heavens..." + lun "Oh...{w=0.4} Thank Merlin..." show lun_talk eyebrows_surprised eyes_base_down mouth_soft as cg with d3 diff --git a/game/scripts/characters/luna/favors.rpy b/game/scripts/characters/luna/favors.rpy index e3ba02da..a5c3436f 100644 --- a/game/scripts/characters/luna/favors.rpy +++ b/game/scripts/characters/luna/favors.rpy @@ -20,10 +20,10 @@ default lun_ev_play_with_yourself_t3_e3 = Event(id="lun_ev_play_with_yourself_t3 default lun_ev_play_with_yourself_t3_e4 = Event(id="lun_ev_play_with_yourself_t3_e4", label="ll_pf_masturbate_T3_E4_repeat", req="states.lun.tier == 3", queue="lun_eventqueue_play_with_yourself", autoenqueue=True, autodequeue=False) default lun_ev_play_with_yourself_t4_e1 = Event(id="lun_ev_play_with_yourself_t4_e1", label="ll_pf_masturbate_T4_E1_repeat", req="states.lun.tier >= 4", queue="lun_eventqueue_play_with_yourself", autoenqueue=True, autodequeue=False) -default lun_ev_blowjob_t4_e1 = Event(id="lun_ev_blowjob_t4_e1", label="ll_pf_blowjob_T4_E1_intro", req="states.lun:tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) -default lun_ev_blowjob_t4_e2 = Event(id="lun_ev_blowjob_t4_e2", label="ll_pf_blowjob_T4_E2_intro", req="states.lun:tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) -default lun_ev_blowjob_t4_e3 = Event(id="lun_ev_blowjob_t4_e3", label="ll_pf_blowjob_T4_E3_intro", req="states.lun:tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) -default lun_ev_blowjob_t4_e4 = Event(id="lun_ev_blowjob_t4_e4", label="ll_pf_blowjob_T4_E4_repeat", req="states.lun:tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False) +default lun_ev_blowjob_t4_e1 = Event(id="lun_ev_blowjob_t4_e1", label="ll_pf_blowjob_T4_E1_intro", req="states.lun.tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) +default lun_ev_blowjob_t4_e2 = Event(id="lun_ev_blowjob_t4_e2", label="ll_pf_blowjob_T4_E2_intro", req="states.lun.tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) +default lun_ev_blowjob_t4_e3 = Event(id="lun_ev_blowjob_t4_e3", label="ll_pf_blowjob_T4_E3_intro", req="states.lun.tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) +default lun_ev_blowjob_t4_e4 = Event(id="lun_ev_blowjob_t4_e4", label="ll_pf_blowjob_T4_E4_repeat", req="states.lun.tier >= 4", queue="lun_eventqueue_blowjob", autoenqueue=True, autodequeue=False) define luna_favors = [ ("lun_eventqueue_talk_to_me", "Talk to me!"), diff --git a/game/scripts/characters/susan/wardrobe_reactions.rpy b/game/scripts/characters/susan/wardrobe_reactions.rpy index f43130b6..0ad7efa2 100644 --- a/game/scripts/characters/susan/wardrobe_reactions.rpy +++ b/game/scripts/characters/susan/wardrobe_reactions.rpy @@ -215,7 +215,7 @@ label sus_reaction_equip_outfit_fail(item): gen "Put your latex underwear on for me." ("base", xpos="far_left", ypos="head") sus @ cheeks blush "The-- The what?!?" ("angry", "wide", "shocked", "mid") gen "These!" ("grin", xpos="far_left", ypos="head") - sus @ cheeks blush "Oh, heavens!" ("clench", "wide", "base", "down") + sus @ cheeks blush "Oh, by Merlin's beard!" ("clench", "wide", "base", "down") sus @ cheeks blush "I can't wear these!" ("open", "happyCl", "worried", "mid") gen "Of course you can! I made sure to have them made specifically for your size of--" ("base", xpos="far_left", ypos="head") gen "I mean, your size!" ("angry", xpos="far_left", ypos="head") diff --git a/game/scripts/utility/updater.rpy b/game/scripts/utility/updater.rpy index cfc81517..80fea2d3 100644 --- a/game/scripts/utility/updater.rpy +++ b/game/scripts/utility/updater.rpy @@ -211,8 +211,6 @@ init python: doll.body.matrix = IdentityMatrix() - delattr(store, "achievements_dict") - if current > latest: raise Exception("Loaded save file is incompatible. (Save Version: {}, Game Version: {})".format(current, latest))