From 639ee02bed0c0fa79f6063058728c93c3ae9dc42 Mon Sep 17 00:00:00 2001
From: Johnny28 <johnny281028@gmail.com>
Date: Thu, 29 Jun 2023 13:09:17 +0200
Subject: [PATCH] Hermione Admire breasts fix and improvements.

* Changed "hg_pf_admire_breasts_T2_touch" fail label to regular label as it should not mark event as failed.
* Improved Chibi usage.
---
 .../favors/show_me_your_tits_branches.rpy     | 53 ++++++++++++++-----
 1 file changed, 41 insertions(+), 12 deletions(-)

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 de235662..20241b4d 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
@@ -82,15 +82,15 @@ label hg_pf_admire_breasts_T2:
     call hg_pf_admire_breasts_transition
 
     menu:
-        "-Break your promise. Grab the tits!-":     # Event will fail.
-            jump hg_pf_admire_breasts_T2_touch_fail
+        "-Break your promise. Grab the tits!-":     # Hermione gets mad.
+            jump hg_pf_admire_breasts_T2_touch
 
         "-Keep promise. Admire visually-":
             call hg_pf_admire_breasts_T2_promise
 
             jump end_hg_pf_admire_breasts
 
-        "-Start jerking off-":                      # 2/3 branches will fail.
+        "-Start jerking off-":                      # 2/3 branches Hermione gets mad.
             jump hg_pf_admire_breasts_T2_masturbate
 
 label hg_pf_admire_breasts_T2_promise: # Call label
@@ -115,7 +115,7 @@ label hg_pf_admire_breasts_T2_promise: # Call label
 
             return
 
-label hg_pf_admire_breasts_T2_touch_fail: # Not a Call label
+label hg_pf_admire_breasts_T2_touch: # Not a Call label
 
     #Event Fails
     # if states.her.level >= 6 and states.her.level <= 8:
@@ -181,7 +181,7 @@ label hg_pf_admire_breasts_T2_masturbate: # Not a Call label
 
     play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed # HERMIONE'S THEME.
     her "[name_genie_hermione]?!!" ("angry", "wide", "base", "stare")
-    gen "Just stand still, [name_hermione_genie]..." ("base", xpos="far_left", ypos="head")
+    gen "Just stand still, [name_hermione_genie]..."
 
     # Start Jerking Off.
     hide screen blktone
@@ -209,7 +209,7 @@ label hg_pf_admire_breasts_T2_masturbate: # Not a Call label
             $ states.her.mood += 30
 
             her @ cheeks blush "After {size=+5}this{/size}? Are you kidding me, [name_genie_hermione]?" ("scream", "wide", "base", "stare")
-            her @ cheeks blush "I showed you my..." ("scream", "wide", "base", "stare")
+            her @ cheeks blush "I showed you my--" ("scream", "wide", "base", "stare")
             her @ cheeks blush ".........." ("annoyed", "narrow", "angry", "R")
             her @ cheeks blush "I am not going to sell you a single favour anymore, [name_genie_hermione]!" ("angry", "base", "angry", "mid")
             show screen blkfade
@@ -217,21 +217,34 @@ label hg_pf_admire_breasts_T2_masturbate: # Not a Call label
 
             play sound "sounds/cloth_sound3.ogg"
             nar "Hermione pulls away from you and covers up..."
-            gen "Don't you dare to leave me in this state, [name_hermione_genie]!" ("angry", xpos="far_left", ypos="head")
+            gen "Don't you dare to leave me in this state, [name_hermione_genie]!"
 
             $ hermione.wear("all")
-            call her_chibi_scene("reset","desk","base", trans=fade)
+            call gen_chibi("jerk_off", 225, "base", flip=True)
+            call her_chibi("stand","desk","base", flip=False)
             pause .5
 
+            hide screen blkfade
+            with d3
+
             her @ cheeks blush "I am not setting a foot into your office ever again, [name_genie_hermione]!" ("angry", "squint", "base", "mid", xpos="mid", ypos="base")
 
             gen "Come on now... Just say something dirty! I'm almost there!" ("angry", xpos="far_left", ypos="head")
             her @ cheeks blush tears messy "You are a horrible person, [name_genie_hermione]..." ("angry", "squint", "base", "mid")
 
             call her_walk(action="run", xpos="door", speed=2, reduce=True)
-            with hpunch
-            call her_walk(action="leave")
+            call her_chibi(action="leave")
 
+            call gen_chibi("dick_out_shocked", 225, "base", flip=True)
+            gen "... Balls." ("base", xpos="far_left", ypos="head")
+
+            show screen blkfade
+            with d5
+
+            call gen_chibi("sit_behind_desk")
+
+            hide screen blkfade
+            with d3
             jump end_hermione_event
 
         "\"Alright, alright. That's enough for now.\"":
@@ -255,12 +268,28 @@ label hg_pf_admire_breasts_T2_masturbate: # Not a Call label
             nar "Hermione pulls away from you and covers up..."
 
             $ hermione.wear("all")
-            call her_chibi_scene("reset","desk","base", trans=fade)
+            call her_chibi("stand","desk","base", flip=False)
+            call gen_chibi("dick_out_shocked", 225, "base", flip=True)
             pause .5
 
-            her @ cheeks blush "I'm leaving!" ("angry", "squint", "base", "mid")
+            her @ cheeks blush "I'm leaving!"
+
+            hide screen blkfade
+            with d3
+
             call her_walk(action="leave")
 
+            gen "... Balls." ("base", xpos="far_left", ypos="head")
+
+            show screen blkfade
+            with d5
+
+            call gen_chibi("sit_behind_desk")
+
+            hide screen blkfade
+            with d3
+            jump end_hermione_event
+
             jump end_hermione_event
 
 label hg_pf_admire_breasts_T3: