From 25278a488d282b82e47ec48b4ed6eee617e4d551 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sun, 2 Jul 2023 21:54:12 +0100 Subject: [PATCH] Hermione additions * Added timer check for masturbate section of the 'dance for me' event * Added additional flags required for snape section of the 'dance for me' event --- .../events/favors/dance_for_me_masturbate.rpy | 44 ++++++----- .../events/favors/dance_for_me_snape.rpy | 79 +++++++++++-------- 2 files changed, 71 insertions(+), 52 deletions(-) diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy index 877611ac..b0ccc899 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me_masturbate.rpy @@ -517,6 +517,8 @@ label hg_pf_strip_T6_fingering: her "*Hmm*... I suppose that's not too bad of an idea..." ("soft", "narrow", "base", "down") gen "Great! Timer starts... Now!" ("grin", xpos="far_left", ypos="head") + $ _start_time = datetime.datetime.now() + her "..." ("base", "narrow", "base", "down") if hermione.is_worn("panties"): nar "Hermione hastily takes off her panties." @@ -809,27 +811,29 @@ label hg_pf_strip_T6_fingering: call her_chibi_scene("behind_desk_front") - #if more than an hour - #gen "I'm not exactly sure how this happened..." - #gen "But you were masturbating for over an hour..." - #her "*Ah*... But... How is that even possible?" - #gen "I'm not sure... Maybe they just left for a bit..." - #her "Who's they, [name_genie_hermione]?" - #gen "Don't worry about it..." - #elif more than 12 minutes - #gen "Although... it appears you didn't beat your average time..." - #her "Oh..." - #gen "No worries... There's always next time." - #elif between 6 and 12 minutes - #gen "Looks like you finished under your average time... Congratulations" - #her "Oh... *Ehm*... Thank you..." - #elif between 1 and 6 minutes - #gen "You finished in under six minutes... Very impresive." - #elif less than a minute - #gen "I'm not sure how you did it, but you finished in less than a minute." - #her "Whoa... Really?" - #gen "Yes... If I didn't see it happen myself, I would've thought you cheated somehow..." + $ _end_time = datetime.datetime.now() + $ _time_difference = (_end_time - _start_time).total_seconds() + if _time_difference < 60: + gen "I'm not sure how you did it, but you finished in less than a minute." ("grin", xpos="far_left", ypos="head") + her "Whoa... Really?" + gen "Yes... If I didn't see it happen myself, I would've thought you cheated somehow..." ("base", xpos="far_left", ypos="head") + elif _time_difference < 360: + gen "You finished in under six minutes... Very impresive." ("base", xpos="far_left", ypos="head") + elif _time_difference <= 720: + gen "Looks like you finished under your average time... Congratulations" ("base", xpos="far_left", ypos="head") + her "Oh... *Ehm*... Thank you..." + elif _time_difference < 3600: + gen "Although... it appears you didn't beat your average time..." ("base", xpos="far_left", ypos="head") + her "Oh..." + gen "No worries... There's always next time." ("base", xpos="far_left", ypos="head") + else: + gen "I'm not exactly sure how this happened..." ("base", xpos="far_left", ypos="head") + gen "But you were masturbating for over an hour..." ("base", xpos="far_left", ypos="head") + her "*Ah*... But... How is that even possible?" + gen "I'm not sure... Maybe they just left for a bit..." ("base", xpos="far_left", ypos="head") + her "Who's they, [name_genie_hermione]?" + gen "Don't worry about it..." ("base", xpos="far_left", ypos="head") gen "Alright then, [name_hermione_genie]... If you're finished..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy index c560c9aa..e5772586 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy @@ -40,6 +40,11 @@ label hg_pf_strip_T4_snape: $ _wearing_clothes = False #Check if she has to put clothing back on at the end + $ _flogging_known = False + $ _potter_known = False + $ _weasley_known = False + $ _butt_known = False + if not states.her.ev.dance_for_me.snape_invited: $ states.her.ev.dance_for_me.snape_invited = True @@ -231,6 +236,8 @@ label hg_pf_strip_T4_snape: sna "..........." ("snape_13") "\"Severus, you started this.\"": #Flogging + $ _flogging_known = True + sna "What? Me?!" ("snape_10") her "Thank you sir." ("grin", "closed", "base", "mid") sna "Albus, you are spoiling the girl! She must be taught a lesson!" ("snape_08") @@ -323,6 +330,7 @@ label hg_pf_strip_T4_snape: menu: gen "..." ("base", xpos="far_left", ypos="head") "\"Severus, let's talk about that Potter boy.\"": #Potter + $ _potter_known = True her "(.....?)" ("soft", "base", "base", "mid") sna "What about him?" ("snape_09") gen "Is he still causing you grief?" ("base", xpos="far_left", ypos="head") @@ -334,6 +342,8 @@ label hg_pf_strip_T4_snape: her "..................." ("disgust", "squint", "base", "R") "\"Severus, anything you'd like to get off your chest?\"": #Weasley + $ _weasley_known = True + sna "Is this really the best time to ask such questions?" ("snape_05") gen "I don't see why not..." ("base", xpos="far_left", ypos="head") gen "Now tell me... Anyone been causing you trouble lately?" ("base", xpos="far_left", ypos="head") @@ -355,6 +365,8 @@ label hg_pf_strip_T4_snape: gen "Alright, alright..." ("base", xpos="far_left", ypos="head") "\"Severus, tell me what grade you'd give Miss Granger's butt.\"": #Butt + $ _butt_known = True + sna "What grade?" ("snape_05") her @ cheeks blush "............" ("disgust", "squint", "worried", "stare") gen "Yes! How do you normally grade her papers?" ("base", xpos="far_left", ypos="head") @@ -830,38 +842,41 @@ label hg_pf_strip_T4_snape_results: #TODO These are he results of menu options earlier in the event, and should only show the first time. If you replay the same option, it will skip it in this section (search for "#flogging", "#weasley", "#potter", "#butt") - #flogging: - #her "Well, I've learned that he doesn't seem to have any problems with hitting his students..." ("open", "closed", "base", "mid") - #gen "*Hmm*... I'd say that his statement isn't exactly conclusive enough to make that assumption." ("base", xpos="far_left", ypos="head") - #her "*Hmph*... Perhaps..." ("annoyed", "narrow", "base", "R") - #gen "Anything else?" ("base", xpos="far_left", ypos="head") - #potter: - #her "I've learned that he finally stopped targeting Harry..." ("open", "closed", "base", "mid") - #her "Probably due to being busy with all the favour trading..." ("annoyed", "narrow", "base", "R") - #her "So I suppose there's at least one positive thing about those Slytherin girls whoring themselves out..." ("base", "narrow", "base", "R") - #gen "Anything else?" ("base", xpos="far_left", ypos="head") - #weasley: - #her "I've learned that he's been eyeing up a student outside of Slytherin..." ("annoyed", "base", "base", "R") - #gen "Really? What gave you that idea?" ("base", xpos="far_left", ypos="head") - #her "From what he said about the Weasley twins..." ("annoyed", "narrow", "base", "mid") - #her "Unless they've got some friend in Slytherin... Which I highly doubt..." ("open", "closed", "base", "mid") - #her "He must've been talking about--" ("angry", "narrow", "base", "R") - #gen "Yes?" ("base", xpos="far_left", ypos="head") - #her "*Hmm*... Nevermind..." ("annoyed", "base", "base", "R") - #gen "Anything else?" ("base", xpos="far_left", ypos="head") - #butt: - #her "I've learned that he's got absolutely zero depth perception..." ("annoyed", "narrow", "angry", "R") - #gen "Really? What makes you say that?" ("base", xpos="far_left", ypos="head") - #her "He called my butt dreadful!" ("open", "mid", "angry", "mid") - #her @ cheeks blush "And that it's like that of a boy's!" ("disgust", "closed", "angry", "mid") - #if _watch: - #gen "He did mention that your breasts exceeded his expectations." ("base", xpos="far_left", ypos="head") - #her "He never commented on their size." ("annoyed", "base", "base", "mid") - #gen "That is true..." ("base", xpos="far_left", ypos="head") - #else: - #gen "Yes, how could he say such things... That just isn't true." ("base", xpos="far_left", ypos="head") - #her "Thank you [name_genie_hermione]... Although I was trying to get validated..." ("open", "base", "base", "R") - #gen "Anything else?" ("base", xpos="far_left", ypos="head") + if _flogging_known: + her "Well, I've learned that he doesn't seem to have any problems with hitting his students..." ("open", "closed", "base", "mid") + gen "*Hmm*... I'd say that his statement isn't exactly conclusive enough to make that assumption." ("base", xpos="far_left", ypos="head") + her "*Hmph*... Perhaps..." ("annoyed", "narrow", "base", "R") + gen "Anything else?" ("base", xpos="far_left", ypos="head") + + if _potter_known: + her "I've learned that he finally stopped targeting Harry..." ("open", "closed", "base", "mid") + her "Probably due to being busy with all the favour trading..." ("annoyed", "narrow", "base", "R") + her "So I suppose there's at least one positive thing about those Slytherin girls whoring themselves out..." ("base", "narrow", "base", "R") + gen "Anything else?" ("base", xpos="far_left", ypos="head") + + if _weasley_known: + her "I've learned that he's been eyeing up a student outside of Slytherin..." ("annoyed", "base", "base", "R") + gen "Really? What gave you that idea?" ("base", xpos="far_left", ypos="head") + her "From what he said about the Weasley twins..." ("annoyed", "narrow", "base", "mid") + her "Unless they've got some friend in Slytherin... Which I highly doubt..." ("open", "closed", "base", "mid") + her "He must've been talking about--" ("angry", "narrow", "base", "R") + gen "Yes?" ("base", xpos="far_left", ypos="head") + her "*Hmm*... Nevermind..." ("annoyed", "base", "base", "R") + gen "Anything else?" ("base", xpos="far_left", ypos="head") + + if _butt_known: + her "I've learned that he's got absolutely zero depth perception..." ("annoyed", "narrow", "angry", "R") + gen "Really? What makes you say that?" ("base", xpos="far_left", ypos="head") + her "He called my butt dreadful!" ("open", "mid", "angry", "mid") + her @ cheeks blush "And that it's like that of a boy's!" ("disgust", "closed", "angry", "mid") + if _watch: + gen "He did mention that your breasts exceeded his expectations." ("base", xpos="far_left", ypos="head") + her "He never commented on their size." ("annoyed", "base", "base", "mid") + gen "That is true..." ("base", xpos="far_left", ypos="head") + else: + gen "Yes, how could he say such things... That just isn't true." ("base", xpos="far_left", ypos="head") + her "Thank you [name_genie_hermione]... Although I was trying to get validated..." ("open", "base", "base", "R") + gen "Anything else?" ("base", xpos="far_left", ypos="head") her "*Hmm*... Let me think..." ("open", "base", "base", "R")