From 6b3a20bd2db58b13ed467274dc0293cccb0267b1 Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Mon, 3 Apr 2023 19:40:11 +0200 Subject: [PATCH] Eventchecks and fix * Added check for if you've asked Hermione to strip during Tier 2 dancing, for writing variation once she agrees on Tier 3. * Added writing variant for Hermione Tier 3 show breasts ending, if you came on her. * Adjusted event name var. --- .../hermione/events/favors/dance_for_me.rpy | 22 ++++++++++++------- .../events/favors/show_me_your_tits.rpy | 13 +++++++---- .../favors/show_me_your_tits_branches.rpy | 3 ++- game/scripts/characters/hermione/vars.rpy | 7 +++--- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy index cf1a1aac..b40417b2 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy @@ -63,6 +63,7 @@ label hg_pf_strip: ### Fail Events ### label hg_pf_strip_fail: + $ states.her.ev.dance_for_me.strip_asked = True gen "[name_hermione_genie], I need you to dance for me a little." ("base", xpos="far_left", ypos="head") her "You want me to..." ("soft", "wide", "base", "stare") @@ -177,13 +178,18 @@ label hg_pf_strip_T3_intro_E1: her "{size=-5}(...........................................){/size}" ("annoyed", "narrow", "angry", "R", cheeks="blush") gen "Alright, you can start undressing now." ("base", xpos="far_left", ypos="head") - call her_chibi("stand","mid","base") #Hermione stands still. - with hpunch + if not states.her.ev.dance_for_me.strip_asked: + call her_chibi("stand","mid","base") #Hermione stands still. + with hpunch - her "??!" ("mad", "wide", "base", "stare", cheeks="blush") - her "I thought all I had to do was dance?" ("angry", "base", "angry", "mid") - play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed # SEX THEME. - gen "Really? That's adorable." ("base", xpos="far_left", ypos="head") + her "??!" ("mad", "wide", "base", "stare", cheeks="blush") + her "I thought all I had to do was dance?" ("angry", "base", "angry", "mid") + play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed # SEX THEME. + gen "Really? That's adorable." ("base", xpos="far_left", ypos="head") + else: + her "..." ("disgust", "base", "angry", "mid") + play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed # SEX THEME. + gen "Go on... You knew this was coming..." ("base", xpos="far_left", ypos="head") if hermione.is_any_worn("top", "bottom", "robe", "accessory"): gen "Now start taking off those clothes." ("base", xpos="far_left", ypos="head") @@ -337,13 +343,13 @@ label hg_pf_strip_T3_intro_E1: with d3 nar "Hermione looks extremely embarrassed..." - nar "Her fingers shakes as she fumbles somewhat..." + nar "Her fingers tremble as she fumbles somewhat..." "\"Take off your panties!\"" if not hermione.is_worn("bottom"): hide hermione_main with d3 nar "Hermione looks at your pleadingly..." - nar "Her fingers shakes slightly as she begins moving them towards her panties..." + nar "Her fingers tremble slightly as she begins moving them towards her panties..." gen "That's it..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy b/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy index 08e9bb57..8ab9e843 100644 --- a/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy +++ b/game/scripts/characters/hermione/events/favors/show_me_your_tits.rpy @@ -72,10 +72,15 @@ label hg_pf_admire_breasts: elif states.her.tier <= 2: her "........................" ("disgust", "narrow", "base", "down", cheeks="blush", xpos="far_right", flip=True, trans=d3) elif states.her.tier <= 3 and hg_pf_admire_breasts.points == 1: - her "{size=-5}(That was so humiliating...){/size}" ("base", "narrow", "base", "up", cheeks="blush", xpos="far_right", flip=True, trans=d3) - her "{size=-5}(No, Hermione, you silly girl!){/size}" ("angry", "base", "angry", "mid", cheeks="blush") - her "{size=-5}(We are doing this to protect the honour of our house!){/size}" ("angry", "base", "angry", "mid", cheeks="blush") - her "................................." ("base", "narrow", "base", "up", cheeks="blush") + if not _cumming: + her "{size=-5}(That was so humiliating...){/size}" ("base", "narrow", "base", "up", cheeks="blush", xpos="far_right", flip=True, trans=d3) + her "{size=-5}(No, Hermione, you silly girl!){/size}" ("angry", "base", "angry", "mid", cheeks="blush") + her "{size=-5}(We are doing this to protect the honour of our house!){/size}" ("angry", "base", "angry", "mid", cheeks="blush") + her "................................." ("base", "narrow", "base", "up", cheeks="blush") + else: + her "{size=-5}(To think that I have to humiliate myself like this, just to have a chance at winning the cup...){/size}" ("angry", "narrow", "angry", "down", cheeks="blush") + her "{size=-5}(Maybe this is going too far...){/size}" ("disgust", "narrow", "worried", "down", cheeks="blush") + her "{size=-5}(No, Hermione, you must protect the honour of our house!){/size}" ("angry", "base", "angry", "mid", cheeks="blush") call her_chibi("leave") 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 18bfc421..521ebce7 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 @@ -403,7 +403,7 @@ label hg_pf_admire_breasts_T3_masturbate: her "................" ("angry", "happyCl", "worried", "mid", cheeks="blush") gen "*Ngh*--" ("angry", xpos="far_left", ypos="head") - + $ _cumming = False menu: "-Hold it as promised-": gen "Oh, alright..." ("base", xpos="far_left", ypos="head") @@ -419,6 +419,7 @@ label hg_pf_admire_breasts_T3_masturbate: return "-Just start cumming-": + $ _cumming = True gen "*Argh*! You whore!" ("angry", xpos="far_left", ypos="head") her "Proff--?" ("scream", "wide", "base", "stare", cheeks="blush") call cum_block diff --git a/game/scripts/characters/hermione/vars.rpy b/game/scripts/characters/hermione/vars.rpy index c5253096..4828be94 100644 --- a/game/scripts/characters/hermione/vars.rpy +++ b/game/scripts/characters/hermione/vars.rpy @@ -47,11 +47,12 @@ default states.her.ev.sealed_scroll.examined = False default states.her.ev.cardgame.known = False default states.her.ev.cardgame.has_cards = False default states.her.ev.cardgame.stage = 0 -default states.her.ev.sell_cards.offered = True -default states.her.ev.sell_cards.first_time = True -default states.her.ev.sell_cards.helped = False +default states.her.ev.promote_cardgame.offered = True +default states.her.ev.promote_cardgame.first_time = True +default states.her.ev.promote_cardgame.helped = False default states.her.ev.buttplugs.magic_known = False default states.her.ev.buttplugs.medium_question = False +default states.her.ev.dance_for_me.strip_asked = False # Asked hermione to strip during dancing. default states.her.ev.dance_for_me.snape_invited = False default states.her.ev.suck_it.snape_encounter = False default states.her.ev.suck_it.tonks_encounter = False