From 669bf3bd06dbd4703fbf4a16fe0fcc8e6a88b117 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sat, 11 Mar 2023 17:41:07 +0000 Subject: [PATCH] Bug fixes * Fixed breasts potion intro label typo * Fixed menus page calculation (PY2 -> PY3) * Fixed menu page arrow rotation in Twins Shop * Fixed ball dress being able to be given out before getting the actual item in a parcel * Fixed Hermione vibrator event CG wetness layering --- game/scripts/cg/hermione.rpy | 2 +- .../characters/hermione/events/potions/breast_expand.rpy | 2 +- game/scripts/characters/hermione/talk.rpy | 2 +- game/scripts/interface/achievements.rpy | 4 ++-- game/scripts/interface/inventory.rpy | 4 ++-- game/scripts/shops/dress/chitchats.rpy | 2 -- game/scripts/shops/item/menu.rpy | 8 ++++---- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/game/scripts/cg/hermione.rpy b/game/scripts/cg/hermione.rpy index 151f4411..211af383 100644 --- a/game/scripts/cg/hermione.rpy +++ b/game/scripts/cg/hermione.rpy @@ -71,7 +71,7 @@ layeredimage her_vibrators_public: attribute neutral default attribute hair default if_not "no_hermione" - group wetness auto prefix "wetness" if_not "no_hermione" + group wetness multiple auto prefix "wetness" if_not "no_hermione" group vibrator_upper variant "vibrator_upper" multiple if_not "no_hermione": attribute base default diff --git a/game/scripts/characters/hermione/events/potions/breast_expand.rpy b/game/scripts/characters/hermione/events/potions/breast_expand.rpy index 1f0adf0f..b58d8ebf 100644 --- a/game/scripts/characters/hermione/events/potions/breast_expand.rpy +++ b/game/scripts/characters/hermione/events/potions/breast_expand.rpy @@ -5,7 +5,7 @@ default her_breast_expand_groped = False default her_breast_expand_pub_low_reputation_done = False default her_breast_expand_pub_high_reputation_done = False -label potion_breast_make: +label potion_breasts_make: call give_reward("You have successfully created a new potion!", breast_potion_ITEM) diff --git a/game/scripts/characters/hermione/talk.rpy b/game/scripts/characters/hermione/talk.rpy index 882be0bf..91cf3b1d 100644 --- a/game/scripts/characters/hermione/talk.rpy +++ b/game/scripts/characters/hermione/talk.rpy @@ -44,7 +44,7 @@ label hermione_talk: jump job_5 "-Work by advertising the card game-" (style="disabled") if game.daytime and cardgame_work and not her_outfit_poker.unlocked: - gen "(I'll need an outfit for hermione if I want her to work.)" ("base", xpos="far_left", ypos="head") + gen "(I'll need an outfit for Hermione if I want her to work.)" ("base", xpos="far_left", ypos="head") gen "(Maybe the twins have something fitting for her in their stock.)" ("base", xpos="far_left", ypos="head") jump working_menu diff --git a/game/scripts/interface/achievements.rpy b/game/scripts/interface/achievements.rpy index 1cad09bb..809fa665 100644 --- a/game/scripts/interface/achievements.rpy +++ b/game/scripts/interface/achievements.rpy @@ -318,7 +318,7 @@ screen achievement_menuitem(xx, yy): pos (540, 24) spacing 5 add "interface/page.webp" yanchor 0.5 ypos 53 - text str(current_page+1)+"/"+str(int(math.ceil(menu_items_length/items_shown))+1) ypos 44 size 16 + text str(current_page+1)+"/"+str(int(math.ceil(menu_items_length/items_shown))) ypos 44 size 16 vbox: pos (570, 186) spacing 10 @@ -331,7 +331,7 @@ screen achievement_menuitem(xx, yy): imagebutton: idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), yzoom = -1.0) - if current_page < math.ceil((menu_items_length-1)/items_shown): + if current_page < math.ceil((menu_items_length-1)/items_shown)-1: hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), yzoom = -1.0) action Return("inc") diff --git a/game/scripts/interface/inventory.rpy b/game/scripts/interface/inventory.rpy index 8b7b8158..265e1123 100644 --- a/game/scripts/interface/inventory.rpy +++ b/game/scripts/interface/inventory.rpy @@ -308,7 +308,7 @@ screen inventory_menuitem(xx, yy): pos (540, 24) spacing 5 add "interface/page.webp" yanchor 0.5 ypos 53 - text str(current_page+1)+"/"+str(int(math.ceil(menu_items_length/items_shown))+1) ypos 44 size 16 + text str(current_page+1)+"/"+str(int(math.ceil(menu_items_length/items_shown))) ypos 44 size 16 vbox: pos (570, 186) spacing 10 @@ -321,7 +321,7 @@ screen inventory_menuitem(xx, yy): imagebutton: idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), yzoom=-1) - if current_page < math.ceil((menu_items_length-1)/items_shown): + if current_page < math.ceil((menu_items_length-1)/items_shown)-1: hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), yzoom=-1) action Return("inc") diff --git a/game/scripts/shops/dress/chitchats.rpy b/game/scripts/shops/dress/chitchats.rpy index ff859834..1c94585c 100644 --- a/game/scripts/shops/dress/chitchats.rpy +++ b/game/scripts/shops/dress/chitchats.rpy @@ -34,8 +34,6 @@ label purchase_outfit(item): maf "As you wish sweetie, it should be ready shortly." gen "Thank you." ("base", xpos="far_left", ypos="head") elif item == her_outfit_ball: - $ ball_outfit_ITEM.owned = 1 - if not ball_quest.E4_complete: gen "Could you make a dress for me?" ("base", xpos="far_left", ypos="head") maf "A dress? Do you mean something like a ball dress, or more burlesque?" diff --git a/game/scripts/shops/item/menu.rpy b/game/scripts/shops/item/menu.rpy index 4f5f2ecc..70e1d6b5 100644 --- a/game/scripts/shops/item/menu.rpy +++ b/game/scripts/shops/item/menu.rpy @@ -175,7 +175,7 @@ screen shop_item_menuitem(xx, yy): pos (540, 24) spacing 5 add "interface/page.webp" yanchor 0.5 ypos 53 - text str(current_page+1)+"/"+str(int(math.ceil(menu_items_length/items_shown))+1) ypos 44 size 16 + text str(current_page+1)+"/"+str(int(math.ceil(menu_items_length/items_shown))) ypos 44 size 16 vbox: pos (570, 186) spacing 10 @@ -187,9 +187,9 @@ screen shop_item_menuitem(xx, yy): action Return("dec") imagebutton: - idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), xzoom=-1) - if current_page < math.ceil((menu_items_length-1)/items_shown): - hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), xzoom=-1) + idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), yzoom=-1) + if current_page < math.ceil((menu_items_length-1)/items_shown)-1: + hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), yzoom=-1) action Return("inc") # Add items