From f036e508e12af804b2fd629b7afa7a406ec3b20b Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Mon, 27 Feb 2023 15:52:42 +0100 Subject: [PATCH] Hermione Scene + mix fixes * Replaced old calls in added clothing choice. * Added clothing state check for strip so it won't play the sound if she's already naked. * Minor writing tweaks. --- .../hermione/events/favors/lets_have_sex.rpy | 82 ++++++++++--------- .../characters/hermione/events/intro.rpy | 6 +- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy index f2abb0dd..d74342fa 100644 --- a/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy +++ b/game/scripts/characters/hermione/events/favors/lets_have_sex.rpy @@ -115,13 +115,13 @@ label hg_pf_sex_T6_intro_E1: gen "Great!" ("base", xpos="far_left", ypos="head") gen "Get over here then!" ("base", xpos="far_left", ypos="head") - call her_main("*Ehm*...{w=0.4} How do you...{w=0.4} How do you want me [genie_name]?", "angry", "narrow", "base", "down", cheeks="blush") + her "*Ehm*...{w=0.4} How do you...{w=0.4} How do you want me [genie_name]?" ("angry", "narrow", "base", "down", cheeks="blush") menu: "\"I want you in your school uniform, just how I met you!\"": $ _temp_outfit_choice = "uniform" - call her_main("Okay then.", "open", "narrow", "base", "down") - hide screen hermione_main + her "Okay then." ("open", "narrow", "base", "down") + call hide_characters with fade $ her_outfit_last.save() @@ -130,13 +130,14 @@ label hg_pf_sex_T6_intro_E1: "\"Naked, of course!\"": $ _temp_outfit_choice = "naked" - call her_main("Alright...", "angry", "base", "base", "mid", cheeks="blush") - hide screen hermione_main + her "Alright..." ("angry", "base", "base", "mid", cheeks="blush") + call hide_characters with fade - $ renpy.sound.play("sounds/cloth_sound3.mp3") - $ hermione.strip("all") - pause .8 + if hermione.is_any_worn("clothes"): + $ renpy.sound.play("sounds/cloth_sound3.ogg") + $ hermione.strip("clothes") + pause .8 her "I'm ready..." ("open", "narrow", "base", "down") @@ -177,29 +178,32 @@ label hg_pf_sex_T6_intro_E2: $ renpy.sound.play("sounds/cloth_sound3.ogg") $ hermione.strip("robe", "accessory") - call her_main("So, how are we doing this?", "disgust", "narrow", "base", "down") + her "So, how are we doing this?" ("disgust", "narrow", "base", "down") menu: gen "We're doing it..." - "\"... with clothes on!\"": + "\"... With clothes on!\"": $ _temp_outfit_choice = "uniform" - call her_main("As you wish.", "open", "narrow", "base", "down") - hide screen hermione_main + her "You want me to wear my school uniform, I presume?" ("open", "narrow", "base", "mid") + gen "Yes, please." ("grin", xpos="far_left", ypos="head") + her "As you wish." ("open", "narrow", "base", "down") + call hide_characters with fade $ her_outfit_last.save() $ hermione.equip(her_outfit_default) pause .8 - "\"... naked all the way!\"": + "\"... Naked all the way!\"": $ _temp_outfit_choice = "naked" - call her_main("Fine...", "angry", "base", "base", "mid", cheeks="blush") - hide screen hermione_main + her "Fine..." ("angry", "base", "base", "mid", cheeks="blush") + call hide_characters with fade - $ renpy.sound.play("sounds/cloth_sound3.mp3") - $ hermione.strip("all") - pause .8 + if hermione.is_any_worn("clothes"): + $ renpy.sound.play("sounds/cloth_sound3.ogg") + $ hermione.strip("clothes") + pause .8 her "I'm done changing..." ("open", "narrow", "base", "down") @@ -239,14 +243,14 @@ label hg_pf_sex_T6_intro_E3: gen "Great, then you can probably guess what favour I'll be buying from you today..." ("base", xpos="far_left", ypos="head") her "..." ("annoyed", "narrow", "base", "down") - call her_main("How do you want me?", "soft", "narrow", "base", "R") + her "How do you want me?" ("soft", "narrow", "base", "R") menu: - gen "Hmm..." - "\"I want you in your uniform!\"": + gen "*Hmm*..." + "\"I want you in your school uniform!\"": $ _temp_outfit_choice = "uniform" - call her_main("Sure!", "open", "narrow", "base", "down") - hide screen hermione_main + her "Sure!" ("open", "narrow", "base", "down") + call hide_characters with fade $ her_outfit_last.save() @@ -255,13 +259,14 @@ label hg_pf_sex_T6_intro_E3: "\"I want you naked!\"": $ _temp_outfit_choice = "naked" - call her_main("That works for me...", "angry", "base", "base", "mid", cheeks="blush") - hide screen hermione_main + her "That works for me..." ("angry", "base", "base", "mid", cheeks="blush") + call hide_characters with fade - $ renpy.sound.play("sounds/cloth_sound3.mp3") - $ hermione.strip("all") - pause .8 + if hermione.is_any_worn("clothes"): + $ renpy.sound.play("sounds/cloth_sound3.ogg") + $ hermione.strip("clothes") + pause .8 her "I'm all finished..." ("open", "narrow", "base", "down") @@ -310,14 +315,14 @@ label hg_pf_sex_T6_E3: # repeats gen "Great, then you know what's coming..." ("base", xpos="far_left", ypos="head") her "..." ("annoyed", "narrow", "base", "down") - call her_main("How would you want me, [genie_name]?", "soft", "narrow", "base", "R") + her "How would you want me, [genie_name]?" ("soft", "narrow", "base", "R") menu: - gen "Hmm..." - "\"In your uniform!\"": + gen "*Hmm*..." + "\"In your school uniform!\"": $ _temp_outfit_choice = "uniform" - call her_main("Sure!", "open", "narrow", "base", "down") - hide screen hermione_main + her "Sure!" ("open", "narrow", "base", "down") + call hide_characters with fade $ her_outfit_last.save() @@ -326,13 +331,14 @@ label hg_pf_sex_T6_E3: # repeats "\"Naked!\"": $ _temp_outfit_choice = "naked" - call her_main("That works for me...", "angry", "base", "base", "mid", cheeks="blush") - hide screen hermione_main + her "That works for me..." ("angry", "base", "base", "mid", cheeks="blush") + call hide_characters with fade - $ renpy.sound.play("sounds/cloth_sound3.mp3") - $ hermione.strip("all") - pause .8 + if hermione.is_any_worn("clothes"): + $ renpy.sound.play("sounds/cloth_sound3.ogg") + $ hermione.strip("clothes") + pause .8 her "All done..." ("open", "narrow", "base", "down") diff --git a/game/scripts/characters/hermione/events/intro.rpy b/game/scripts/characters/hermione/events/intro.rpy index 368a4f7f..9bdb9ea9 100644 --- a/game/scripts/characters/hermione/events/intro.rpy +++ b/game/scripts/characters/hermione/events/intro.rpy @@ -1001,9 +1001,9 @@ label hermione_intro_E5: her "But that's not all..." ("normal", "squint", "angry", "mid") her "The \"MRM\" shall investigate our education system much closer now..." her "I think some sort of foul play might be taking place..." - gen "*exagerrated gasp* No way!" ("base", xpos="far_left", ypos="head") + gen "*Exaggerated gasp* No way!" ("base", xpos="far_left", ypos="head") her "I have a list of suspects already but I will get back to you on this later..." - gen "*Ehm*... alright..." ("base", xpos="far_left", ypos="head") + gen "*Ehm*... Alright..." ("base", xpos="far_left", ypos="head") her "Oh, my classes are about to start. I'd better go..." ("open", "base", "worried", "R") her "Good day to you, sir." ("base", "happyCl", "base", "mid") @@ -1230,7 +1230,7 @@ label hermione_intro_E6: her "(Wow. That's quite a lot for such simple request...)" ("base", "base", "base", "mid") $ current_payout = 20 - her "Em, alright..." (xpos="mid", ypos="base", trans=fade) + her "*Ehm*, alright..." (xpos="mid", ypos="base", trans=fade) if current_favor == "show_tongue": her "M-my... tongue, sir?" ("grin", "happyCl", "worried", "mid", emote="sweat")