From ac85848ce5f49f33efdd8e2ad478316febd1c96e Mon Sep 17 00:00:00 2001 From: Johnny28 Date: Tue, 4 Jul 2023 18:04:06 +0200 Subject: [PATCH] Public end dialogue check * Added additional checks for public end dialogue writing. --- .../hermione/events/requests/flash_your_tits.rpy | 8 +++++--- .../hermione/events/requests/flirt_with_students.rpy | 2 +- .../hermione/events/requests/give_a_handjob.rpy | 2 +- .../characters/hermione/events/requests/kiss_a_girl.rpy | 2 +- .../hermione/events/requests/let_them_grope_you.rpy | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) 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 decfcd03..54bffbac 100644 --- a/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy +++ b/game/scripts/characters/hermione/events/requests/flash_your_tits.rpy @@ -129,13 +129,13 @@ label end_hg_pr_flash: pause.2 # Inner monologue - if not _events_completed_any: + if states.her.tier <= 3 and not _events_completed_any: 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 states.her.ev.admire_breasts.monologue: - $ states.her.ev.admire_breasts.monologue = True + if states.her.ev.admire_breasts.monologue: + $ states.her.ev.admire_breasts.monologue = False 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") @@ -444,6 +444,8 @@ label hg_pr_flash_T4_E3: gen "*Hmm*..." ("base", xpos="far_left", ypos="head") gen "Well, alright... In that case, I suppose it counts..." ("base", xpos="far_left", ypos="head") + $ states.her.ev.admire_breasts.monologue = True + jump end_hg_pr_flash ### Tier 5 ### diff --git a/game/scripts/characters/hermione/events/requests/flirt_with_students.rpy b/game/scripts/characters/hermione/events/requests/flirt_with_students.rpy index 051729cd..afaea36a 100644 --- a/game/scripts/characters/hermione/events/requests/flirt_with_students.rpy +++ b/game/scripts/characters/hermione/events/requests/flirt_with_students.rpy @@ -99,7 +99,7 @@ label end_hg_pr_flirt: pause.2 # Inner monologue - if not _events_completed_any: + if states.her.tier <= 1 and not _events_completed_any: her "(........)" ("disgust", "base", "worried", "down", ypos="base", xpos="base", flip=True, trans=d3) her "(I'll need to read about this whole \"flirting\" thing...)" ("annoyed", "base", "angry", "L") 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 c12ad54c..bef4b78a 100644 --- a/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy +++ b/game/scripts/characters/hermione/events/requests/give_a_handjob.rpy @@ -132,7 +132,7 @@ label end_hg_pr_handjob: pause.2 # Inner monologue - if not _events_completed_any: + if states.her.tier <= 4 and 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") 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 ed90e0ed..d8becaac 100644 --- a/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy +++ b/game/scripts/characters/hermione/events/requests/kiss_a_girl.rpy @@ -104,7 +104,7 @@ label end_hg_pr_kiss: pause.2 # Inner monologue - if not _events_completed_any: + if states.her.tier <= 3 and not _events_completed_any: her "(*Tsk*)" ("mad", "base", "angry", "R", ypos="base", xpos="base", flip=True, trans=d3) 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 4800c511..618686c6 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 @@ -123,7 +123,7 @@ label end_hg_pr_grope: pause.2 # Inner monologue - if not _events_completed_any: + if states.her.tier <= 2 and not _events_completed_any: her "(Why did I agree to this...)" ("disgust", "base", "worried", "down", ypos="base", xpos="base", flip=True, trans=d3)