From 640ff67bcaf20ce437e663c66b12dd246d876f27 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Wed, 28 Jun 2023 14:06:42 +0200 Subject: [PATCH] Fixes * Replaced public_voyer status with public_stripping * Fixed blowjob T4 fail variant event label naming. * Fixed missing 'ask her to do x' blurbs for blowjob fail event variants --- .../cho/events/favors/inspect_her_body_tier3.rpy | 2 +- .../hermione/events/favors/show_me_your_panties.rpy | 2 +- game/scripts/characters/hermione/events/favors/suck_it.rpy | 7 +++++-- .../characters/hermione/events/favors/talk_to_me.rpy | 2 +- game/scripts/characters/hermione/favors.rpy | 6 +++--- game/scripts/characters/hermione/vars.rpy | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy index 3e109799..09c956b6 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy @@ -2923,7 +2923,7 @@ label cc_pf_strip_T3_intro_E3: her "" ("grin", "narrow", "base", "mid") ton "I sometimes stroll around the school grounds, disguised as one of the girls... Wearing nothing but a school robe..." - if states.her.status.public_voyer: + if states.her.status.public_stripping: her "" ("crooked_smile", "narrow", "base", "down") ton "And If you ever had a boy say he got some tits flashed at him by Miss Granger... Then it was most likely me." cho @ cheeks blush "That's awesome!" ("grin", "base", "base", "L") diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy index a88fbd03..05754b52 100644 --- a/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy +++ b/game/scripts/characters/hermione/events/favors/show_me_your_panties.rpy @@ -50,7 +50,7 @@ label end_hg_pf_admire_panties: if not _events_completed_any: # First time her "Another {number=current_payout} points..." ("base", "narrow", "worried", "down") - her "Can't wait to tell the guys!" ("smile", "happyCl", "base", "mid") + her "I can't wait to tell the guys!" ("smile", "happyCl", "base", "mid") her "Except that I can't actually tell them about any of this..." ("annoyed", "narrow", "angry", "R") pause 1.0 diff --git a/game/scripts/characters/hermione/events/favors/suck_it.rpy b/game/scripts/characters/hermione/events/favors/suck_it.rpy index d09d7f57..68cda635 100644 --- a/game/scripts/characters/hermione/events/favors/suck_it.rpy +++ b/game/scripts/characters/hermione/events/favors/suck_it.rpy @@ -77,6 +77,9 @@ label end_hg_pf_blowjob: ### Fail Events ### label hg_pf_blowjob_fail: + + call start_hg_pf_blowjob + her "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade) gen "[name_hermione_genie]?" ("base", xpos="far_left", ypos="head") her "Yes, [name_genie_hermione]?" ("base", "base", "base", "mid") @@ -90,7 +93,7 @@ label hg_pf_blowjob_fail: # Event 1 (i) - Hermione refuses. # Event 2 (r) - Repeat. -label hg_pf_blowjob_T4_fail_intro: +label hg_pf_blowjob_T4_intro_fail: call start_hg_pf_blowjob @@ -128,7 +131,7 @@ label hg_pf_blowjob_T4_fail_intro: jump end_hermione_event -label hg_pf_blowjob_T4_fail_repeat: +label hg_pf_blowjob_T4_repeat_fail: call start_hg_pf_blowjob diff --git a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy index d5dac088..22ca6d5e 100644 --- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy @@ -171,7 +171,7 @@ label hg_pf_talk_T1: # Call label with d3 pause.8 else: - gen "*snore*........" ("base", xpos="far_left", ypos="head") + gen "*Snore*........" ("base", xpos="far_left", ypos="head") her "[name_genie_hermione]?" ("angry", "base", "angry", "mid") gen "Yes, yes, I'm totally listening..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/favors.rpy b/game/scripts/characters/hermione/favors.rpy index 9b4b7622..bd2ba539 100644 --- a/game/scripts/characters/hermione/favors.rpy +++ b/game/scripts/characters/hermione/favors.rpy @@ -67,8 +67,8 @@ default her_ev_titjob_t6_e2 = Event(id="titjob_t6_e2", label="hg_pf_titjob_T6_in default her_ev_titjob_t6_e3 = Event(id="titjob_t6_e3", label="hg_pf_titjob_T6_repeat", priority=7, req="states.her.tier >= 6", queue="her_eventqueue_titjob", autoenqueue=True, autodequeue=False, ignore_labels=["hg_pf_titjob_2", "hg_pf_titjob_2_cumming", "hg_pf_titjob_2_continue"]) default her_ev_blowjob_t1_to_t3_e1 = Event(id="blowjob_t1_to_t3_e1", label="hg_pf_blowjob_fail", priority=5, req="states.her.tier < 4", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False) -default her_ev_blowjob_t4_e1 = Event(id="blowjob_t4_e1", label="hg_pf_blowjob_T4_fail_intro", priority=5, req="states.her.tier == 4", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) -default her_ev_blowjob_t4_e2 = Event(id="blowjob_t4_e2", label="hg_pf_blowjob_T4_fail_repeat", priority=6, req="states.her.tier == 4", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False) +default her_ev_blowjob_t4_e1 = Event(id="blowjob_t4_e1", label="hg_pf_blowjob_T4_intro_fail", priority=5, req="states.her.tier == 4", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False) +default her_ev_blowjob_t4_e2 = Event(id="blowjob_t4_e2", label="hg_pf_blowjob_T4_repeat_fail", priority=6, req="states.her.tier == 4", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False) default her_ev_blowjob_t5_e1 = Event(id="blowjob_t5_e1", label="hg_pf_blowjob_T5_intro_E1", priority=5, req="states.her.tier == 5", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False, ignore_labels=["hg_pf_blowjob_1", "hg_pf_blowjob_2", "hg_pf_hidden_blowjob", "hg_hidden_blowjob_snape", "hg_hidden_blowjob_tonks", "hg_hidden_blowjob_luna", "hg_hidden_blowjob_cumming"]) default her_ev_blowjob_t5_e2 = Event(id="blowjob_t5_e2", label="hg_pf_blowjob_T5_intro_E2", priority=6, req="states.her.tier == 5", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False, repeat=False, ignore_labels=["hg_pf_blowjob_1", "hg_pf_blowjob_2", "hg_pf_hidden_blowjob", "hg_hidden_blowjob_snape", "hg_hidden_blowjob_tonks", "hg_hidden_blowjob_luna", "hg_hidden_blowjob_cumming"]) default her_ev_blowjob_t5_e3 = Event(id="blowjob_t5_e3", label="hg_pf_blowjob_T5_repeat", priority=7, req="states.her.tier == 5", queue="her_eventqueue_blowjob", autoenqueue=True, autodequeue=False, ignore_labels=["hg_pf_blowjob_1", "hg_pf_blowjob_2", "hg_pf_hidden_blowjob", "hg_hidden_blowjob_snape", "hg_hidden_blowjob_tonks", "hg_hidden_blowjob_luna", "hg_hidden_blowjob_cumming"]) @@ -96,4 +96,4 @@ define hermione_favors = [ "her_eventqueue_titjob", "her_eventqueue_blowjob", "her_eventqueue_sex", - ] \ No newline at end of file + ] diff --git a/game/scripts/characters/hermione/vars.rpy b/game/scripts/characters/hermione/vars.rpy index 649227f6..c09ff24a 100644 --- a/game/scripts/characters/hermione/vars.rpy +++ b/game/scripts/characters/hermione/vars.rpy @@ -147,7 +147,7 @@ init python early: elif states.her.status.public_handjob: return 4 - elif states.her.status.public_kissing or states.her.status.public_voyer: + elif states.her.status.public_kissing or states.her.status.public_stripping: return 3 elif states.her.status.public_groping: