From 9df361fe5d514c5a02a7ad88cc92654c70650a38 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sun, 2 Jul 2023 20:34:04 +0100 Subject: [PATCH] Bug fixes * Fixed monologue in 'show me your tits' event * Fixed ambiguous event flag name --- .../events/favors/show_me_your_tits.rpy | 4 ++-- .../events/requests/flash_your_tits.rpy | 20 +++++++++---------- game/scripts/characters/hermione/vars.rpy | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) 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 22c8933f..b8f26ae5 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 @@ -323,7 +323,7 @@ label hg_pf_admire_breasts_T2_intro_E1: gen "How much will it cost me to see your tits?" ("base", xpos="far_left", ypos="head") stop music fadeout 1.0 - if not states.her.ev.admire_breasts_T2_intro_E1.failed: + if not states.her.ev.admire_breasts.T2_intro_E1_failed: her "How much will it cost you to...?" ("open", "base", "base", "mid") play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME. @@ -403,7 +403,7 @@ label hg_pf_admire_breasts_T2_intro_E1: gen "Maybe I have pushed her a bit too hard." ("base", xpos="far_left", ypos="head") $ states.her.mood += 12 - $ states.her.ev.admire_breasts_T2_intro_E1.failed = True #repeat writing + $ states.her.ev.admire_breasts.T2_intro_E1_failed = True #repeat writing # Event resets. (No progress) $ _event.cancel() 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 baac7925..b1f85a21 100644 --- a/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy +++ b/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy @@ -130,17 +130,17 @@ label end_hg_pr_flash: her "(Stupid Slytherins...)" ("angry", "narrow", "angry", "mid", xpos="far_right", flip=True, trans=d3) her "(I {b}HATE{/b} them!)" ("angry", "closed", "worried", "mid") - #elif not hg_pr_flash.monologue_glass and hg_pr_flash.is_event_complete(5, 1): # Event specific - #$ hg_pr_flash.monologue_glass = True + 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 "(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") - #her "(I would probably just die of embarrassment right there on the spot...)" ("angry", "narrow", "base", "down") - #her "(No. Protecting the honour of the Gryffindor house is my number one priority.)" ("upset", "closed", "base", "mid") - #her "(We must get the cup this year, no matter the cost...)" ("upset", "closed", "base", "mid") - #her "(........)" ("angry", "narrow", "base", "down") + her "(I can't believe I did that today...)" ("upset", "closed", "base", "mid", ypos="head", flip=False, 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") + her "(I would probably just die of embarrassment right there on the spot...)" ("angry", "narrow", "base", "down") + her "(No. Protecting the honour of the Gryffindor house is my number one priority.)" ("upset", "closed", "base", "mid") + her "(We must get the cup this year, no matter the cost...)" ("upset", "closed", "base", "mid") + her "(........)" ("angry", "narrow", "base", "down") call her_chibi("leave") diff --git a/game/scripts/characters/hermione/vars.rpy b/game/scripts/characters/hermione/vars.rpy index b5d1a0eb..407315dd 100644 --- a/game/scripts/characters/hermione/vars.rpy +++ b/game/scripts/characters/hermione/vars.rpy @@ -70,7 +70,8 @@ default states.her.ev.intro.e4_complete = False # 4th visit, she's crying. Faile default states.her.ev.intro.e5_complete = False # 5th visit, asks to be tutored, summon unlocked. default states.her.ev.intro.convinced = False # Tonks convinces Hermione to sell favours. default states.her.ev.intro.e6_complete = False # 6th visit, asks to buy favours, favours unlocked. -default states.her.ev.admire_breasts_T2_intro_E1.failed = False +default states.her.ev.admire_breasts.T2_intro_E1_failed = False +default states.her.ev.admire_breasts.monologue = False default states.her.ev.panty_thief.soaked = False # Temp var, genie procures Hermione's panties and cums on them, resets once returned. default states.her.ev.panty_thief.acquired = False default states.her.ev.forest_bj.stage = 1