From 8b8bc2c2a23cd265c78b55a874463af04c74f52a Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Thu, 29 Jun 2023 18:41:45 +0200 Subject: [PATCH] Public event flags * Added event flags into public events. * Fixed minor writing inconsistency. --- .../hermione/events/favors/grope_her.rpy | 2 +- .../hermione/events/favors/grope_her_ass.rpy | 4 ++-- .../hermione/events/favors/grope_her_breasts.rpy | 2 +- .../hermione/events/requests/flash_your_tits.rpy | 8 +++++++- .../events/requests/flirt_with_teachers.rpy | 8 ++++---- .../hermione/events/requests/give_a_blowjob.rpy | 15 +++++++++++---- .../hermione/events/requests/give_a_handjob.rpy | 6 +++++- .../hermione/events/requests/have_sex.rpy | 1 + .../hermione/events/requests/kiss_a_girl.rpy | 12 +++++++++--- .../events/requests/let_them_grope_you.rpy | 3 ++- 10 files changed, 43 insertions(+), 18 deletions(-) diff --git a/game/scripts/characters/hermione/events/favors/grope_her.rpy b/game/scripts/characters/hermione/events/favors/grope_her.rpy index fe1452b5..24e2dabf 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her.rpy @@ -132,7 +132,7 @@ label hg_pf_grope_T1_E1: label hg_pf_grope_T2_intro_E1: stop music fadeout 2.0 gen "Come closer [name_hermione_genie]... Hop around my desk..." ("base", xpos="far_left", ypos="head") - her "*Ehm*... very well, [name_genie_hermione]." ("disgust", "narrow", "base", "down") + her "*Ehm*... Very well, [name_genie_hermione]." ("disgust", "narrow", "base", "down") call her_walk("desk", "base", reduce=0.8) call blkfade 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 af3b9c34..8978be2a 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy @@ -44,7 +44,7 @@ label hg_pf_grope_ass_T2_front: her @ cheeks blush "I'm sorry, [name_genie_hermione]. But I can't do this!" ("soft", "narrow", "base", "down") call her_chibi_scene("behind_desk_front", trans=d7) - gen "Can't do what [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") + gen "Can't do what, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") her @ cheeks blush "I can't do it when I can see you looking at me..." ("mad", "happyCl", "worried", "mid") gen "That's the whole point [name_hermione_genie], I want to look at you..." ("base", xpos="far_left", ypos="head") @@ -140,7 +140,7 @@ label hg_pf_grope_ass_T2_back: call her_chibi_scene("reset", "desk", "base", trans=fade) - # Event Fails + # Hermione gets mad menu: gen "*Tsk*..." ("angry", xpos="far_left", ypos="head") "\"I... I apologise...\"": 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 683dc621..583dd1db 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy @@ -80,7 +80,7 @@ label hg_pf_grope_breasts_T2: ### Tier 3 ### -label hg_pf_grope_breasts_T3: # Favour fails if you slap them. +label hg_pf_grope_breasts_T3: # Hermione gets mad if you slap them. call her_chibi_scene("behind_desk_front", trans=d7) $ hermione.strip("robe", "accessory") 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 6f849401..baac7925 100644 --- a/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy +++ b/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy @@ -115,7 +115,6 @@ label hg_pr_flash_fail: label end_hg_pr_flash: $ gryffindor += current_payout - $ states.her.status.public_stripping = True gen "The Gryffindor house gets {number=current_payout} points!" ("base", xpos="far_left", ypos="head") her "Thank you, [name_genie_hermione]." @@ -151,6 +150,7 @@ label end_hg_pr_flash: if not _events_filtered_completed_all: $ states.her.public_level += 1 + $ states.her.status.public_stripping = True jump end_hermione_event label hg_pr_flash_intro: @@ -295,6 +295,8 @@ label hg_pr_flash_T3_E2: gen "I wouldn't expect you to perform perfectly this early in your training anyway..." ("base", xpos="far_left", ypos="head") her "(My training?)" ("angry", "base", "base", "mid") + $ states.her.status.public_show_tits = True + jump end_hg_pr_flash label hg_pr_flash_T3_E3: @@ -363,6 +365,8 @@ label hg_pr_flash_T4_E1: gen "Oh, whatever. Just take your points and go." ("base", xpos="far_left", ypos="head") her "" ("annoyed", "closed", "base", "mid") + $ states.her.status.public_show_tits = True + jump end_hg_pr_flash label hg_pr_flash_T4_E2: @@ -466,6 +470,8 @@ label hg_pr_flash_T5_E1: her "I think the school librarian may have seen me too..." gen "*Hmm*... Well, I'd say that's a job well done." ("base", xpos="far_left", ypos="head") + $ states.her.status.public_show_tits = True + jump end_hg_pr_flash label hg_pr_flash_T5_E2: 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 259cb360..4c8ce97a 100644 --- a/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy +++ b/game/scripts/characters/hermione/events/requests/flirt_with_teachers.rpy @@ -27,7 +27,7 @@ label hg_pr_flirt_teacher: her "Now I understand why you asked me to flirt with these pesky Slytherin boys." ("open", "closed", "angry", "mid") her "I am glad you finally decided to act, [name_genie_hermione]!" ("open", "base", "base", "mid") else: - her "*huh*?!" ("open", "base", "angry", "mid") + her "*Huh*?!" ("open", "base", "angry", "mid") her "Why would I want to flirt with the teach--" ("angry", "base", "angry", "mid") her "O-oh... I see..." ("grin", "base", "base", "R") gen "*Huh*?" ("base", xpos="far_left", ypos="head") @@ -260,7 +260,7 @@ label hg_pr_flirt_teacher_T1_E3: # Filch gen "I see. {size=-5}(No idea who that is.){/size}" ("base", xpos="far_left", ypos="head") play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME. her "Yes, I know that technically mister Filch is not a teacher..." ("open", "base", "worried", "mid") - gen "*huh*?" ("base", xpos="far_left", ypos="head") + gen "*Huh*?" ("base", xpos="far_left", ypos="head") her "But he is part of the school's staff..." ("base", "base", "base", "mid") her "And we did hit it off quite well too!" her "He was surprisingly sweet." @@ -505,7 +505,7 @@ label hg_pr_flirt_teacher_T3_E1: # Filch gen "Well, your noble sacrifice shall not go unnoticed, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head") gen "{number=current_payout} points to Gryf--" ("base", xpos="far_left", ypos="head") her @ tears soft "Professor, please wait." ("soft", "base", "base", "mid") - gen "*huh*?" ("base", xpos="far_left", ypos="head") + gen "*Huh*?" ("base", xpos="far_left", ypos="head") her "Well, aren't you going to do something about this?" ("open", "base", "base", "mid") gen "Err..." ("base", xpos="far_left", ypos="head") her "What if I am not the first victim...?" ("angry", "base", "angry", "mid") @@ -572,7 +572,7 @@ label hg_pr_flirt_teacher_T3_E3: # Lockhart play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed # SEX THEME. gen "{size=-4}(*Argh*! The suspense is killing me!){/size}" ("base", xpos="far_left", ypos="head") gen "What was it, [name_hermione_genie]? Speak up!" ("angry", xpos="far_left", ypos="head") - her "*huh*?" ("open", "base", "base", "mid") + her "*Huh*?" ("open", "base", "base", "mid") gen "What did Professor Lockhart do to you?" ("base", xpos="far_left", ypos="head") her "*Ehm*... Nothing, [name_genie_hermione]..." ("soft", "base", "base", "R") gen "Nothing?!" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/hermione/events/requests/give_a_blowjob.rpy b/game/scripts/characters/hermione/events/requests/give_a_blowjob.rpy index b5b1c77b..774923ec 100644 --- a/game/scripts/characters/hermione/events/requests/give_a_blowjob.rpy +++ b/game/scripts/characters/hermione/events/requests/give_a_blowjob.rpy @@ -65,7 +65,7 @@ label hg_pr_blowjob: gen "Then there is the door." ("base", xpos="far_left", ypos="head") her "But I need the points, [name_genie_hermione]... You know that." ("upset", "closed", "base", "mid") gen "It's as the saying goes, [name_hermione_genie]..." ("base", xpos="far_left", ypos="head") - gen "\"If you won't suck a dick for it - you don't need it\"." ("base", xpos="far_left", ypos="head") + gen "\"If you won't suck a dick for it - You don't need it\"." ("base", xpos="far_left", ypos="head") her @ cheeks blush "*Tch*..." ("angry", "base", "angry", "mid") her "............................" gen ".........................................." ("base", xpos="far_left", ypos="head") @@ -121,6 +121,7 @@ label end_hg_pr_blowjob: # Inner monologue if not _events_completed_any: + $ states.her.status.public_blowjob = True her "(I did it...)" ("base", "narrow", "base", "dead", xpos="base", ypos="base", flip=True, trans=d3) her "(I sucked off one of my classmates...)" ("angry", "narrow", "base", "dead") @@ -182,7 +183,7 @@ label hg_pr_blowjob_T5_E1: gen "Did you swallow?" ("base", xpos="far_left", ypos="head") her "..........................." ("annoyed", "narrow", "annoyed", "mid") gen "[name_hermione_genie], did you swallow the load properly?" ("base", xpos="far_left", ypos="head") - her "Yes I did, [name_genie_hermione]." ("angry", "base", "angry", "mid") + her "I... I didn't... [name_genie_hermione]." ("angry", "base", "angry", "mid") gen "Well, I suppose that will do for now..." ("base", xpos="far_left", ypos="head") jump end_hg_pr_blowjob @@ -238,6 +239,8 @@ label hg_pr_blowjob_T5_E3: her "I told you -- I gave the boy a {b}proper{/b} blowjob." ("upset", "closed", "base", "mid") her "It's the least I could do for someone who treated me with respect for a change..." ("angry", "narrow", "base", "down") gen "Well, in that case." ("base", xpos="far_left", ypos="head") + + $ states.her.status.public_gokkun = True else: her "Oh... *Ehm*..." ("angry", "base", "base", "R") gen "Did you not say that you gave him a {b}proper{/b} blowjob?" ("base", xpos="far_left", ypos="head") @@ -257,7 +260,7 @@ label hg_pr_blowjob_T6_intro_E1: call hg_pr_blowjob_intro - her "Splendid, [name_genie_hermione]... Simply splendid." ("base", "happyCl", "base", "mid") + her "Splendid, [name_genie_hermione]...{w=0.4} Simply splendid." ("base", "happyCl", "base", "mid") gen "Really? Do tell." ("base", xpos="far_left", ypos="head") play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed # Music her "Today I did something I have wanted to do for a long time..." ("base", "narrow", "base", "up") @@ -286,6 +289,8 @@ label hg_pr_blowjob_T6_intro_E1: her "Could I get paid now, please?" gen "Sure..." ("base", xpos="far_left", ypos="head") + $ states.her.status.public_gokkun = True + jump end_hg_pr_blowjob label hg_pr_blowjob_T6_E2: @@ -336,6 +341,8 @@ label hg_pr_blowjob_T6_E2: her "Can I get my payment now, please?" ("angry", "base", "base", "mid") gen "Of course..." ("base", xpos="far_left", ypos="head") + $ states.her.status.public_cumshot = True + jump end_hg_pr_blowjob label hg_pr_blowjob_T6_E3: @@ -354,7 +361,7 @@ label hg_pr_blowjob_T6_E3: gen "What happened to you?" ("angry", xpos="far_left", ypos="head") gen "All I asked you to do was to give a blowjob to one of your classmates." ("angry", xpos="far_left", ypos="head") play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # Music - her "That... That was exactly what I did, [name_genie_hermione]." ("grin", "narrow", "base", "up") + her "That...{w=0.4} That was exactly what I did, [name_genie_hermione]." ("grin", "narrow", "base", "up") gen "[name_hermione_genie], you are covered head to toe in cum..." ("base", xpos="far_left", ypos="head") her "I am?" ("angry", "narrow", "worried", "dead") her "Oh... Did I forget to clean myself up?" ("soft", "narrow", "worried", "down") 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 dc46b0ff..4d4ac550 100644 --- a/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy +++ b/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy @@ -129,11 +129,11 @@ label end_hg_pr_handjob: # Inner monologue if not _events_completed_any: - her ".........." ("upset", "narrow", "angry", "R", ypos="base", xpos="base", flip=True, trans=d3) her "(Do I really have to do this?)" ("upset", "closed", "angry", "mid") her "*Sigh*" ("soft", "closed", "angry", "mid") + $ states.her.status.public_handjob = True call her_chibi("leave") @@ -299,6 +299,8 @@ label hg_pr_handjob_T4_E3: gen "I say, job well done, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head") her "Oh... I see." ("normal", "base", "worried", "mid") + $ states.her.status.public_cumshot = True + jump end_hg_pr_handjob ### Tier 5 ### @@ -533,6 +535,8 @@ label hg_pr_handjob_T6_intro_E1: her "Will I get paid for this, [name_genie_hermione]?" ("base", "base", "base", "mid") gen "Of course." ("base", xpos="far_left", ypos="head") + $ states.her.status.public_blowjob = True + jump end_hg_pr_handjob label hg_pr_handjob_T6_E2: diff --git a/game/scripts/characters/hermione/events/requests/have_sex.rpy b/game/scripts/characters/hermione/events/requests/have_sex.rpy index 9383c86c..34c8dbad 100644 --- a/game/scripts/characters/hermione/events/requests/have_sex.rpy +++ b/game/scripts/characters/hermione/events/requests/have_sex.rpy @@ -103,6 +103,7 @@ label end_hg_pr_sex: if not _events_filtered_completed_all: $ states.her.public_level += 1 + $ states.her.status.public_sex = True jump end_hermione_event label hg_pr_sex_intro: 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 967b6801..67bfc92d 100644 --- a/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy +++ b/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy @@ -24,14 +24,14 @@ label hg_pr_kiss: #Intro. if not _events_completed_any: - gen "Have You ever kissed another girl, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") + gen "Have you ever kissed another girl, [name_hermione_genie]?" ("base", xpos="far_left", ypos="head") if states.her.public_level < 9: $_event.cancel() jump too_much_public her "?!" ("normal", "squint", "angry", "mid") - her "I am not a... Lesbian, [name_genie_hermione]." ("open", "base", "base", "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") her "..............." ("angry", "base", "angry", "mid") @@ -188,7 +188,7 @@ label hg_pr_kiss_T3_E2: gen "Seeing how it went last time, I presume it was embarrassing for you, girl?" ("base", xpos="far_left", ypos="head") her "Very much so, [name_genie_hermione]." ("annoyed", "narrow", "angry", "R") gen "Did you enjoy it at least?" ("base", xpos="far_left", ypos="head") - her "*Humph*!..." ("annoyed", "narrow", "annoyed", "mid") + her "*Hmph*!..." ("annoyed", "narrow", "annoyed", "mid") gen "So, you kissed a girl and you liked it?" ("base", xpos="far_left", ypos="head") her "Yes..." ("disgust", "narrow", "base", "mid_soft") gen "Did your tongues touch?" ("base", xpos="far_left", ypos="head") @@ -198,6 +198,8 @@ label hg_pr_kiss_T3_E2: her "Please, [name_genie_hermione]..." ("annoyed", "narrow", "angry", "R") gen "Well, alright..." ("base", xpos="far_left", ypos="head") + $ states.her.status.public_kissing = True + jump end_hg_pr_kiss label hg_pr_kiss_T3_E3: @@ -288,6 +290,8 @@ label hg_pr_kiss_T4_E1: gen "Oh... Well, in that case..." ("base", xpos="far_left", ypos="head") her "" ("soft", "base", "base", "R") + $ states.her.status.public_kissing = True + jump end_hg_pr_kiss label hg_pr_kiss_T4_E2: @@ -514,6 +518,8 @@ label hg_pr_kiss_T5_E1: gen "Well done, [name_hermione_genie]." ("base", xpos="far_left", ypos="head") her "...{w=0.4} Thanks." ("annoyed", "base", "base", "R") + $ states.her.status.public_kissing = True + jump end_hg_pr_kiss label hg_pr_kiss_T5_E2: 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 c4e3e46a..e439b214 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 @@ -133,6 +133,7 @@ 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: @@ -234,7 +235,7 @@ label hg_pr_grope_T2_E3: gen "There, there..." ("base", xpos="far_left", ypos="head") her @ tears soft "*Sob*!" ("normal", "base", "base", "R") gen "Will ten extra points make you feel better?" ("base", xpos="far_left", ypos="head") - her @ tears soft "*huh*? That would be very sweet of you [name_genie_hermione]." ("soft", "base", "base", "mid") + her @ tears soft "*Huh*? That would be very sweet of you [name_genie_hermione]." ("soft", "base", "base", "mid") gen "Of course... Don't mention it." ("base", xpos="far_left", ypos="head") her @ cheeks blush tears soft "Thank you [name_genie_hermione]..." ("base", "base", "worried", "mid")