From 91fd7d3a0be191fa77e5706be26882ee8ccddb7f Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Sun, 14 May 2023 12:15:10 +0200 Subject: [PATCH] Fixes * Fixed misnamed "Jerk off naked" chibi animation, which caused it not to load. * Fixed Hermione "-Let's Duel-" menu unlock. * Fixed misnamed Tonks event vars, which caused her to not appear during the intro. * Fixed misnamed Tonks event vars in cheats, which caused her events not to get skipped when you skip the intro. * Moved temp "_cumming" variable to "hg_pf_admire_breasts_T3" as it is later checked even if you don't pick "masturbate" option. * Minor writing and blktone fixes. --- game/scripts/animations/ani_hermione_favours.rpy | 4 ++-- .../events/favors/show_me_your_tits_branches.rpy | 2 +- game/scripts/characters/hermione/events/intro.rpy | 9 ++------- game/scripts/characters/hermione/summon.rpy | 2 +- game/scripts/events/quests.rpy | 6 +++--- game/scripts/interface/cheats.rpy | 6 +++--- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/game/scripts/animations/ani_hermione_favours.rpy b/game/scripts/animations/ani_hermione_favours.rpy index ce76bad7..936f3090 100644 --- a/game/scripts/animations/ani_hermione_favours.rpy +++ b/game/scripts/animations/ani_hermione_favours.rpy @@ -1250,7 +1250,7 @@ image grope_tits_jerk_off_bottomless: pause.2 repeat -image grope tits_jerk_off_bottomless_lift_top: +image grope_tits_jerk_off_bottomless_lift_top: zoom 0.5 "characters/hermione/chibis/grope_breasts/masturbate_bottomless_lift_top_01.webp" @@ -1263,7 +1263,7 @@ image grope tits_jerk_off_bottomless_lift_top: pause.2 repeat -image grope tits_jerk_off_naked: +image grope_tits_jerk_off_naked: zoom 0.5 "characters/hermione/chibis/grope_breasts/masturbate_naked_01.webp" diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy index 16edc770..6064c3b3 100644 --- a/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy +++ b/game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy @@ -267,6 +267,7 @@ label hg_pf_admire_breasts_T2_masturbate: # Not a Call label label hg_pf_admire_breasts_T3: $ states.her.status.show_tits = True + $ _cumming = False # Checked during end label call hg_pf_admire_breasts_transition @@ -407,7 +408,6 @@ label hg_pf_admire_breasts_T3_masturbate: her @ cheeks blush "................" ("angry", "happyCl", "worried", "mid") gen "*Ngh*--" ("angry", xpos="far_left", ypos="head") - $ _cumming = False # Checked during end label menu: "-Hold it as promised-": gen "Oh, alright..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy index b7e02a16..6d7edf3d 100644 --- a/game/scripts/characters/hermione/events/intro.rpy +++ b/game/scripts/characters/hermione/events/intro.rpy @@ -809,7 +809,7 @@ label hermione_intro_E3: "\"There, there... It'll be alright.\"": her @ tears soft_blink "No it won't! This is a catastrophe!" ("mad", "happyCl", "worried", "mid") - her @ tears soft "And the worst part is that I think I might be the only one who failed... Well... {i}Almost{/i}" ("angry", "base", "base", "mid") + her @ tears soft "And the worst part is that I think I might be the only one who failed... Well... {i}Almost failed{/i}." ("angry", "base", "base", "mid") her @ tears soft "How will this make me look?" ("angry", "base", "base", "mid") her @ tears soft "I will know for sure when we get the results though..." ("normal", "base", "base", "R") her "Yes, I'm sure everyone else failed as well..." ("soft", "base", "base", "R") @@ -894,7 +894,7 @@ label hermione_intro_E4: her @ tears mascara "" ("upset", "narrow", "base", "stare", xpos="right", ypos="base") call ctc - her @ tears mascara "*huh*?" ("upset", "narrow", "base", "mid") + her @ tears mascara "*Huh*?" ("upset", "narrow", "base", "mid") her @ tears mascara "Oh, I'm already here?" ("upset", "narrow", "base", "L") her @ tears mascara "I'm sorry, sir... I..." ("upset", "narrow", "base", "down") her @ tears mascara ".................." ("angry", "narrow", "base", "down") @@ -1431,10 +1431,6 @@ label hermione_intro_E6: call her_walk("door", "base") pause.3 - # Hermione inner thoughts - show screen blktone - with d3 - if current_favor == "show_tongue": her "{size=-4}(*Hmm*...){/size}" ("annoyed", "narrow", "worried", "down", xpos="far_right", ypos="head", flip=True, trans=d3) her "{size=-4}(Students show teachers their tongues all the time...){/size}" ("soft", "base", "base", "R") @@ -1454,7 +1450,6 @@ label hermione_intro_E6: her "{size=-4}(Yes, I can say things like that easily...){/size}" ("smile", "happyCl", "base", "mid") her "{size=-4}(I guess I'm a born actress...){/size}" ("base", "happyCl", "base", "mid") - hide screen blktone call her_chibi("leave") with d3 diff --git a/game/scripts/characters/hermione/summon.rpy b/game/scripts/characters/hermione/summon.rpy index 1ae6c2fe..048ddf0b 100644 --- a/game/scripts/characters/hermione/summon.rpy +++ b/game/scripts/characters/hermione/summon.rpy @@ -85,7 +85,7 @@ label summon_hermione: call wardrobe jump hermione_requests - "-Let's Duel-" (icon="interface/icons/small/cards.webp") if states.sna.ev.cardgame.stage > 2: + "-Let's Duel-" (icon="interface/icons/small/cards.webp") if states.sna.ev.cardgame.stage >= 2: jump hermione_cardgame_menu "-Give Item-" (icon="interface/icons/small/gift.webp") if states.her.favors_unlocked: diff --git a/game/scripts/events/quests.rpy b/game/scripts/events/quests.rpy index 0a78c6c2..20542535 100644 --- a/game/scripts/events/quests.rpy +++ b/game/scripts/events/quests.rpy @@ -88,11 +88,11 @@ label quests: if game.day >= 10: if game.daytime: - if nt_event_pause == 0 and states.her.ev.intro.e5_complete and not states.her.ev.intro.e1_complete: + if nt_event_pause == 0 and states.her.ev.intro.e5_complete and not states.ton.ev.intro.e1_complete: # Tonks visits for the first time. jump tonks_intro_E1 else: - if states.her.ev.intro.e1_complete and not states.her.ev.intro.e2_complete: + if states.ton.ev.intro.e1_complete and not states.ton.ev.intro.e2_complete: # Tonks has found no evidence so far. jump tonks_intro_E2 @@ -100,7 +100,7 @@ label quests: if game.daytime: pass else: - if nt_event_pause == 0 and states.sna.ev.hangouts.tonks_e1 and not states.her.ev.intro.e3_complete: + if nt_event_pause == 0 and states.sna.ev.hangouts.tonks_e1 and not states.ton.ev.intro.e3_complete: # Tonks becomes a teacher. Summon unlocked! jump tonks_intro_E3 diff --git a/game/scripts/interface/cheats.rpy b/game/scripts/interface/cheats.rpy index ab9f0749..71612bf8 100644 --- a/game/scripts/interface/cheats.rpy +++ b/game/scripts/interface/cheats.rpy @@ -451,9 +451,9 @@ label .hermione_skip_intro: $ states.sna.ev.hangouts.tonks_e2 = True $ states.sna.ev.hangouts.tonks_e3 = True - $ states.her.ev.intro.e1_complete = True - $ states.her.ev.intro.e2_complete = True - $ states.her.ev.intro.e3_complete = True + $ states.ton.ev.intro.e1_complete = True + $ states.ton.ev.intro.e2_complete = True + $ states.ton.ev.intro.e3_complete = True $ states.her.ev.intro.convinced = True