From 5c96a89d9e099d179efb28f75fc703a4af60d3a2 Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Fri, 15 Jul 2022 23:03:14 +0100
Subject: [PATCH] Bug Fixes

* Fixed overlapping menu during Quidditch Training
* Fixed some text issues
* Make sure to fit images before blitting
---
 game/scripts/characters/cho/events/quidditch/training.rpy       | 2 +-
 .../scripts/characters/hermione/events/favors/grope_her_ass.rpy | 2 +-
 .../hermione/events/favors/show_me_your_tits_branches.rpy       | 2 +-
 game/scripts/doll/face.rpy                                      | 2 +-
 game/scripts/shops/item/room.rpy                                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/game/scripts/characters/cho/events/quidditch/training.rpy b/game/scripts/characters/cho/events/quidditch/training.rpy
index c873014a..74b3ac90 100644
--- a/game/scripts/characters/cho/events/quidditch/training.rpy
+++ b/game/scripts/characters/cho/events/quidditch/training.rpy
@@ -399,7 +399,7 @@ label cho_tactics:
     call hide_characters
     call bld
 
-    $ menu_y = 0.8
+    $ menu_y = 0.74
 
     menu:
         gen "(What directions should I give her?)" ("base", xpos="far_left", ypos="head")
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 45fbd243..35f61a26 100644
--- a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy
+++ b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy
@@ -295,7 +295,7 @@ label hg_pf_grope_ass_T3_front:
         "\"Open your eyes, or you'll lose the points!\"":
             $ her_mood += 10
 
-            her "*Tsk*! {size=-5}(You wretched old--{/size})" ("angry", "happyCl", "worried", "mid", cheeks="blush", ypos="head", flip=False)
+            her "*Tsk*! {size=-5}(You wretched old--){/size}" ("angry", "happyCl", "worried", "mid", cheeks="blush", ypos="head", flip=False)
             gen "Did you say something, [hermione_name]?" ("base", xpos="far_left", ypos="head")
             her "It's nothing, [genie_name]." ("angry", "base", "angry", "mid")
 
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 8d97fb96..d1974d07 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
@@ -159,7 +159,7 @@ label hg_pf_admire_breasts_T2_touch: # Not a Call label
     her "And I am getting nothing in return?" ("scream", "base", "angry", "mid", cheeks="blush",emote="angry")
     gen "You are dismissed, [hermione_name]..." ("base", xpos="far_left", ypos="head")
     her "*Grr*.........." ("angry", "happyCl", "worried", "mid", cheeks="blush")
-    her "{size=-5}(Burn in hell, you wretched old--{/size})" ("angry", "happyCl", "worried", "mid", cheeks="blush")
+    her "{size=-5}(Burn in hell, you wretched old--){/size}" ("angry", "happyCl", "worried", "mid", cheeks="blush")
 
     call her_walk(action="leave")
 
diff --git a/game/scripts/doll/face.rpy b/game/scripts/doll/face.rpy
index 194e3219..9df454df 100644
--- a/game/scripts/doll/face.rpy
+++ b/game/scripts/doll/face.rpy
@@ -29,7 +29,7 @@ init python:
 
                 if pupils:
                     if renpy.loadable(blink_path):
-                        normal = Fixed(eyes_path, AlphaMask(pupils_path, mask_path))
+                        normal = Fixed(eyes_path, AlphaMask(pupils_path, mask_path), fit_first=True)
                         sprites.append( (doll_blink(normal, blink_path), self.face["eyes"][1]) )
                     else:
                         sprites.append((eyes_path, self.face["eyes"][1]))
diff --git a/game/scripts/shops/item/room.rpy b/game/scripts/shops/item/room.rpy
index 9b14988d..af9ce03f 100644
--- a/game/scripts/shops/item/room.rpy
+++ b/game/scripts/shops/item/room.rpy
@@ -99,7 +99,7 @@ label item_store:
         gen "So, do you have such a book in stock?" ("base", xpos="far_left", ypos="head")
         fre "Of course!"
         ger "We do?"
-        fre "Yes George... We've got our own guidebook book, since we're on the Gryffindor team."
+        fre "Yes George... We've got our own guidebook, since we're on the Gryffindor team."
         ger "Oh yeah!"
         gen "You are?" ("base", xpos="far_left", ypos="head")
         fre "Yep!"