From a1d601b1a5c8778118dfb139fc86cc6b11cc4c3b Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Tue, 4 Jul 2023 13:47:07 +0200 Subject: [PATCH] Fixes * Minor posing and writing fixes. * Renamed a couple of labels to avoid confusion. --- .../characters/hermione/events/favors/dance_for_me.rpy | 4 ++-- .../characters/hermione/events/favors/grope_her.rpy | 6 +++--- .../characters/hermione/events/favors/grope_her_ass.rpy | 8 ++++---- .../hermione/events/favors/grope_her_breasts.rpy | 3 +-- .../events/favors/show_me_your_tits_branches.rpy | 2 +- .../characters/hermione/events/favors/suck_it.rpy | 9 +++------ .../characters/hermione/events/odd_jobs/panty_thief.rpy | 7 ++++--- .../hermione/events/requests/flash_your_tits.rpy | 5 +++-- .../hermione/events/requests/flirt_with_teachers.rpy | 4 ++-- .../hermione/events/requests/give_a_handjob.rpy | 2 +- .../characters/hermione/events/requests/kiss_a_girl.rpy | 4 ++-- .../hermione/events/requests/let_them_grope_you.rpy | 3 +-- game/scripts/characters/hermione/summon.rpy | 2 +- 13 files changed, 28 insertions(+), 31 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 0353f39b..17d4bd1c 100644 --- a/game/scripts/characters/hermione/events/favors/dance_for_me.rpy +++ b/game/scripts/characters/hermione/events/favors/dance_for_me.rpy @@ -846,8 +846,8 @@ label hg_pf_strip_T3_E2: "{size=-3}\"Your father would disown you!\"{/size}": her "You are probably right, [name_genie_hermione]..." ("angry", "happyCl", "worried", "mid", emote="sweat") - her @ tears soft "(Oh father, I am so sorry...)" ("angry", "base", "base", "mid") - her @ tears soft "he must never find out..." ("angry", "base", "base", "mid") + her "(Oh father, I am so sorry...)" ("angry", "base", "base", "mid") + her "he must never find out..." ("angry", "base", "base", "mid") "{size=-3}\"Your father would love to watch you strip!\"{/size}": her "He would not! He would be ashamed of me!" ("normal", "happyCl", "worried", "mid") diff --git a/game/scripts/characters/hermione/events/favors/grope_her.rpy b/game/scripts/characters/hermione/events/favors/grope_her.rpy index 24e2dabf..3fe3b0c8 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her.rpy @@ -244,11 +244,11 @@ label hg_pf_grope_T3_intro_E1: menu: "\"I'm gonna play with your tits now.\"": if hermione.is_worn("top"): - nar "You reach out swiftly and grab both of her tits through her clothes..." + nar "You reach out swiftly to grab both of her tits through her clothes..." elif hermione.is_worn("bra"): - nar "You reach out swiftly and grab both of her tits through her bra..." + nar "You reach out swiftly to grab both of her tits through her bra..." else: - nar "You reach out swiftly and grab both of her tits..." #Fallback, she'd usually wear a bra on this level. + nar "You reach out swiftly to grab both of her tits..." #Fallback, she'd usually wear a bra on this level. jump hg_pf_grope_breasts_T3 diff --git a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy index 8978be2a..67a1a73b 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy @@ -240,7 +240,7 @@ label hg_pf_grope_ass_T3: jump hg_pf_grope_ass_T3_back "\"No. Just stand still, [name_hermione_genie].\"": - her @ cheeks blush "As you say, [name_genie_hermione]..." ("annoyed", "narrow", "angry", "R", ypos="head", flip=False) + her @ cheeks blush "As you say, [name_genie_hermione]..." ("annoyed", "narrow", "angry", "R") jump hg_pf_grope_ass_T3_front @@ -455,7 +455,7 @@ label hg_pf_grope_ass_T3_continue: nar "It's very tight and warm..." nar "It is also relatively dry... Doesn't look like Hermione's taking much pleasure in this..." - jump hg_pf_grope_ass_T3_fail + jump hg_pf_grope_ass_T3_mad "-Let the girl go...-": jump end_hg_pf_grope @@ -472,7 +472,7 @@ label hg_pf_grope_ass_T3_continue: her "!!?" ("angry", "wide", "base", "stare") nar "It's very tight and warm inside..." - jump hg_pf_grope_ass_T3_fail + jump hg_pf_grope_ass_T3_mad "-Let the girl go...-": jump end_hg_pf_grope @@ -480,7 +480,7 @@ label hg_pf_grope_ass_T3_continue: "-Stop pushing your luck. Dismiss the girl-": jump end_hg_pf_grope -label hg_pf_grope_ass_T3_fail: +label hg_pf_grope_ass_T3_mad: her @ cheeks blush "Stop that at once!" ("angry", "happyCl", "worried", "mid", ypos="head") nar "Hermione gives you an unexpectedly strong shove..." diff --git a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy index 583dd1db..8b5be7c8 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy @@ -86,7 +86,7 @@ label hg_pf_grope_breasts_T3: # Hermione gets mad if you slap them. if states.her.status.stripping: menu: - "\"First, lift up your top\"" if hermione.is_worn("top"): + "\"First, lift up your top!\"" if hermione.is_worn("top"): her "[name_genie_hermione]?!" ("clench", "base", "base", "mid") gen "What? It's not like I haven't seen them before..." ("base", xpos="far_left", ypos="head") her "But!" ("clench", "narrow", "base", "down") @@ -193,7 +193,6 @@ label hg_pf_grope_breasts_T3_continue: gen "You are starting to sound like a broken record." ("base", xpos="far_left", ypos="head") her "...." ("annoyed", "narrow", "annoyed", "mid") - jump end_hg_pf_grope ### Tier 4 ### 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 51f05506..2f3f5fed 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 @@ -316,7 +316,7 @@ label hg_pf_admire_breasts_T3_promise: call ctc menu: - "\"A Nice set of tits you got there.\"": + "\"A nice set of tits you got there.\"": her "" ("annoyed", "closed", "base", "mid") pause .5 diff --git a/game/scripts/characters/hermione/events/favors/suck_it.rpy b/game/scripts/characters/hermione/events/favors/suck_it.rpy index 187a55c9..f046ee80 100644 --- a/game/scripts/characters/hermione/events/favors/suck_it.rpy +++ b/game/scripts/characters/hermione/events/favors/suck_it.rpy @@ -89,10 +89,7 @@ label hg_pf_blowjob_T1_E1: #Fail gen "We're done playing games..." ("base", xpos="far_left", ypos="head") gen "Get over here, and suck my cock!" ("base", xpos="far_left", ypos="head") her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare",xpos="mid",trans=fade) - if not _event_completed_failed: - her "How could you ask for such a thing!?" - else: - her "Why would you ask me of such a thing again?" + her "How could you ask for such a thing!?" her "I think I better leave." ("angry", "happyCl", "worried", "mid",emote="sweat") call her_walk(action="leave") @@ -112,7 +109,7 @@ label hg_pf_blowjob_T2_E1: #Fail her "Yes, [name_genie_hermione]?" ("base", "base", "base", "mid") gen "Why don't you open that pretty little mouth of yours... And then put it around my cock?" ("base", xpos="far_left", ypos="head") her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare",xpos="mid",trans=fade) - her "Why would you ask me of such a thing again?" + her "How could you ask for such a thing!?" her "I think I better leave." ("angry", "happyCl", "worried", "mid",emote="sweat") call her_walk(action="leave") @@ -135,7 +132,7 @@ label hg_pf_blowjob_T3_E1: #Fail gen "Great!" ("grin", xpos="far_left", ypos="head") gen "Then get over here, and suck my cock!" ("grin", xpos="far_left", ypos="head") her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare",xpos="mid",trans=fade) - her "Why would you ask me of such a thing again?" + her "How could you ask for such a thing!?" her "I think I better leave." ("angry", "happyCl", "worried", "mid",emote="sweat") call her_walk(action="leave") diff --git a/game/scripts/characters/hermione/events/odd_jobs/panty_thief.rpy b/game/scripts/characters/hermione/events/odd_jobs/panty_thief.rpy index 295e59e7..ba73fa96 100644 --- a/game/scripts/characters/hermione/events/odd_jobs/panty_thief.rpy +++ b/game/scripts/characters/hermione/events/odd_jobs/panty_thief.rpy @@ -11,8 +11,9 @@ label hg_pr_panty_thief_e1: $ _event.cancel() jump hermione_favor_menu + her "" (xpos="mid", ypos="base", trans=fade) gen "[name_hermione_genie]?" ("base", xpos="far_left", ypos="head") - her "I am listening, [name_genie_hermione]." (xpos="right",ypos="base") + her "I am listening, [name_genie_hermione]." ("open", "base", "base", "mid") gen "I will need your panties..." ("base", xpos="far_left", ypos="head") if not states.her.status.stripping: @@ -32,7 +33,7 @@ label hg_pr_panty_thief_e1: play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed - her "... Panties, [name_genie_hermione]?" ("angry", "base", "angry", "mid") + her "... Panties, [name_genie_hermione]?" ("angry", "base", "base", "mid") gen "Yes I do..." ("base", xpos="far_left", ypos="head") her "May I ask what you are planning to do with them...?" ("disgust", "narrow", "base", "mid_soft") gen "*Ehm*... I'm conducting research..." ("base", xpos="far_left", ypos="head") @@ -111,7 +112,7 @@ label hg_pr_panty_thief_e1: her "Here..." - if states.her.level >= 12: + if states.her.tier > 4: hide hermione_main with d3 diff --git a/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy b/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy index 0509e14d..decfcd03 100644 --- a/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy +++ b/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy @@ -137,7 +137,7 @@ label end_hg_pr_flash: elif not states.her.ev.admire_breasts.monologue: $ states.her.ev.admire_breasts.monologue = True - her "(I can't believe I did that today...)" ("upset", "closed", "base", "mid", ypos="head", flip=False, trans=d3) + her "(I can't believe I did that today...)" ("upset", "closed", "base", "mid", xpos="far_right", flip=True, trans=d3) her "(What if Harry or Ron saw me like that?)" ("angry", "wide", "base", "stare") her "(Standing there...)" ("angry", "wide", "base", "stare") her "(Pressing my breasts against that window...)" ("angry", "wide", "base", "stare") @@ -287,10 +287,11 @@ label hg_pr_flash_T3_E2: hide cg with fade + her "" ("annoyed", "base", "worried", "R", xpos="mid", ypos="base") gen "*Hmm*..." ("base", xpos="far_left", ypos="head") gen "You've got one tit out at least. As a wise man once said--" ("base", xpos="far_left", ypos="head") gen "{i}A tit in the hand is worth two in the bush.{/i}" ("base", xpos="far_left", ypos="head") - her "I suppose... although I don't know if he ever realised I was trying to do something for his benefit." + her "I suppose... although I don't know if he ever realised I was trying to do something for his benefit." ("open", "narrow", "worried", "down") her "......................" ("annoyed", "base", "worried", "R") her "I'm sorry, [name_genie_hermione]..." ("open", "base", "base", "mid") gen "That's alright..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy b/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy index 2bf5175d..f4afee2c 100644 --- a/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy +++ b/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy @@ -409,7 +409,7 @@ label hg_pr_flirt_teacher_T2_E2: her @ cheeks blush "" ("angry", "narrow", "annoyed", "mid", emote="angry") call ctc - gen "Well then, this {i}Goldenheart{/i} surely is \"dirty\"!" ("base", xpos="far_left", ypos="head") + gen "Well then, this {i}Goldenheart{/i} is most certainly \"dirty\"!" ("base", xpos="far_left", ypos="head") label .angry: @@ -428,7 +428,7 @@ label hg_pr_flirt_teacher_T2_E2: her "Thank you for understanding, [name_genie_hermione]." ("base", "happyCl", "base", "mid") $ hermione.wear("all") - call unlock_clothing(text="A New tattoo for Hermione has been unlocked!", item=her_tattoo_lockhart) + call unlock_clothing(text="A new tattoo for Hermione has been unlocked!", item=her_tattoo_lockhart) jump end_hg_pr_flirt_teacher diff --git a/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy b/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy index 95de7df9..c12ad54c 100644 --- a/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy +++ b/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy @@ -223,7 +223,7 @@ label hg_pr_handjob_T4_E1: $ current_payout = int(current_payout/2) her "Oh...?" ("open", "base", "base", "mid") - gen "Is that a Problem, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") + gen "Is that a problem, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") her "N-No [name_genie_hermione]... It's only fair, I suppose..." ("angry", "narrow", "base", "down") gen "Of course it is!" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy b/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy index 0acea16f..ed90e0ed 100644 --- a/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy +++ b/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy @@ -33,7 +33,7 @@ label hg_pr_kiss: her "?!" ("normal", "squint", "angry", "mid") her "I am not a... lesbian, [name_genie_hermione]." ("open", "base", "base", "mid") gen "Silly girl... You don't need to be a lesbian to kiss girls." ("base", xpos="far_left", ypos="head") - gen "I mean, I do it, and that doesn't make me a lesbian." ("base", xpos="far_left", ypos="head") + gen "I mean, I've done it, and that doesn't make me a lesbian." ("base", xpos="far_left", ypos="head") her "..............." ("angry", "base", "angry", "mid") her "[name_genie_hermione]--" gen "No, \"[name_genie_hermione]s\"! This is your task for today!" ("base", xpos="far_left", ypos="head") @@ -245,7 +245,7 @@ label hg_pr_kiss_T3_E3: gen "Dismissed." ("base", xpos="far_left", ypos="head") her "B-but--" ("open", "base", "worried", "R") her "[name_genie_hermione], please!" ("open", "base", "worried", "mid") - her "The girl was from Hufflepuff and--" + her "The girl was from Hufflepuff, and--" gen "It's far too late for that, [name_hermione_genie]." ("base", xpos="far_left", ypos="head") gen "You are dismissed." ("base", xpos="far_left", ypos="head") her @ tears soft "......" ("angry", "base", "base", "mid") diff --git a/game/scripts/characters/hermione/events/requests/let_them_grope_you.rpy b/game/scripts/characters/hermione/events/requests/let_them_grope_you.rpy index 26e114d1..4800c511 100644 --- a/game/scripts/characters/hermione/events/requests/let_them_grope_you.rpy +++ b/game/scripts/characters/hermione/events/requests/let_them_grope_you.rpy @@ -82,7 +82,7 @@ label hg_pr_grope: gen "Yes. Good luck." ("base", xpos="far_left", ypos="head") elif states.her.tier >= 3: gen "I need you to go out there, and make one of your classmates molest you a little." ("base", xpos="far_left", ypos="head") - her "I understand, [name_genie_hermione]..." ("base", "base", "base", "mid") + her "I understand, [name_genie_hermione]..." ("open", "base", "base", "mid") gen "Off you go then." ("base", xpos="far_left", ypos="head") her "..........." else: @@ -137,7 +137,6 @@ label end_hg_pr_grope: if not _events_filtered_completed_all: $ states.her.public_level += 1 - $ states.her.status.public_groping = True jump end_hermione_event label hg_pr_grope_intro: diff --git a/game/scripts/characters/hermione/summon.rpy b/game/scripts/characters/hermione/summon.rpy index 37a6c1c4..7e062092 100644 --- a/game/scripts/characters/hermione/summon.rpy +++ b/game/scripts/characters/hermione/summon.rpy @@ -187,7 +187,7 @@ label hermione_favor_menu: # Public whore ending choice $ renpy.choice_for_skipping() $ renpy.music.set_volume(0.5, 1.0) - nar "Attention!{w=1.0} If you continue tarnishing Hermione's reputation you will lock yourself towards certain game ending. (Public route)" + nar "Attention!{w=1.0} If you continue tarnishing Hermione's reputation, you will lock yourself towards a certain game ending. (Public route)" menu: nar "Do you wish to continue?\n{size=-4}(You won't be asked again){/size}" "Yes, I do.":