From 9f5c99d4d8fb0e974936a523c5f3d9da7d01a06a Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 28 Mar 2023 22:06:48 +0100 Subject: [PATCH] Bug fixes * Fixed double fade effect when give_reward label was called * Fixed Susan's face cum layers not displaying due to wrong file structure * Fixed card game tutorial highlight placement * Fixed wardrobe vertical scrollbar styling not adhering to time of day * Fixed card game tutorial being covered by narrator fade --- .../cum/face/{heavy.webp => heavy/cum.webp} | 0 .../cum/face/{heavy_skin.webp => heavy/skin.webp} | 0 .../cum/face/{light.webp => light/cum.webp} | 0 .../cum/face/{light_skin.webp => light/skin.webp} | 0 game/scripts/interface/popup.rpy | 2 -- .../scripts/minigames/cardgame/_deck_builder_.rpy | 4 ++-- game/scripts/wardrobe/wardrobe.rpy | 15 +++++++++++++++ 7 files changed, 17 insertions(+), 4 deletions(-) rename game/characters/susan/poses/default/cum/face/{heavy.webp => heavy/cum.webp} (100%) rename game/characters/susan/poses/default/cum/face/{heavy_skin.webp => heavy/skin.webp} (100%) rename game/characters/susan/poses/default/cum/face/{light.webp => light/cum.webp} (100%) rename game/characters/susan/poses/default/cum/face/{light_skin.webp => light/skin.webp} (100%) diff --git a/game/characters/susan/poses/default/cum/face/heavy.webp b/game/characters/susan/poses/default/cum/face/heavy/cum.webp similarity index 100% rename from game/characters/susan/poses/default/cum/face/heavy.webp rename to game/characters/susan/poses/default/cum/face/heavy/cum.webp diff --git a/game/characters/susan/poses/default/cum/face/heavy_skin.webp b/game/characters/susan/poses/default/cum/face/heavy/skin.webp similarity index 100% rename from game/characters/susan/poses/default/cum/face/heavy_skin.webp rename to game/characters/susan/poses/default/cum/face/heavy/skin.webp diff --git a/game/characters/susan/poses/default/cum/face/light.webp b/game/characters/susan/poses/default/cum/face/light/cum.webp similarity index 100% rename from game/characters/susan/poses/default/cum/face/light.webp rename to game/characters/susan/poses/default/cum/face/light/cum.webp diff --git a/game/characters/susan/poses/default/cum/face/light_skin.webp b/game/characters/susan/poses/default/cum/face/light/skin.webp similarity index 100% rename from game/characters/susan/poses/default/cum/face/light_skin.webp rename to game/characters/susan/poses/default/cum/face/light/skin.webp diff --git a/game/scripts/interface/popup.rpy b/game/scripts/interface/popup.rpy index c2b3a52d..087f1317 100644 --- a/game/scripts/interface/popup.rpy +++ b/game/scripts/interface/popup.rpy @@ -25,7 +25,6 @@ label give_reward(text="You found something!", gift="interface/icons/box_blue_2. play sound "sounds/win2.ogg" show screen gift(gift) - show screen blktone show screen notes with d3 @@ -33,7 +32,6 @@ label give_reward(text="You found something!", gift="interface/icons/box_blue_2. $ renpy.say(None, text) hide screen gift - hide screen blktone hide screen notes with d3 diff --git a/game/scripts/minigames/cardgame/_deck_builder_.rpy b/game/scripts/minigames/cardgame/_deck_builder_.rpy index 50a29e92..cf2acca5 100644 --- a/game/scripts/minigames/cardgame/_deck_builder_.rpy +++ b/game/scripts/minigames/cardgame/_deck_builder_.rpy @@ -265,7 +265,7 @@ label deck_builder_guide: jump deck_builder screen deck_builder_tutorial(): - zorder 4 + zorder 18 #imagebutton idle "interface/desk/_bg_.webp" action None add "images/cardgame/guide/[deck_guide_page].webp" @@ -280,7 +280,7 @@ screen deck_builder_tutorial(): add "images/cardgame/guide/[deck_guide_helper].webp" xpos 540 ypos 300 xalign 0.5 yalign 0.5 if deck_guide_helper == "tier_guide": - add "images/cardgame/guide/[deck_guide_helper].webp" xpos 500 ypos 200 xalign 0.5 + add "images/cardgame/guide/[deck_guide_helper].webp" xpos 500 ypos 200 xanchor 0.5 if deck_guide_helper == "cho_stage2": add "images/cardgame/guide/[deck_guide_helper].webp" xpos 540 ypos 300 xalign 0.5 yalign 0.5 diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index 442b40f1..9e363fd9 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -725,6 +725,8 @@ screen wardrobe_menuitem(xx, yy): mousewheel True scrollbars "vertical" + style_prefix gui.theme("wardrobe") + for item, icon in zip(menu_items, icon_items): $ is_seen = item.seen $ is_equipped = char_active.is_equipped_item(item) @@ -841,6 +843,7 @@ screen wardrobe_outfit_menuitem(xx, yy): # else: mousewheel True scrollbars "vertical" + style_prefix gui.theme("wardrobe") # Add empty slot if current_subcategory == "save": @@ -966,3 +969,15 @@ style wardrobe_item_caption: color "#fff" size 14 outlines [ (1, "#000", 0, 0) ] + +style dark_wardrobe_window is wardrobe_window +style dark_wardrobe_button is wardrobe_button +style darK_wardrobe_button_text is wardrobe_button_text +style dark_wardrobe_item_caption is wardrobe_item_caption +style dark_wardrobe_vscrollbar is dark_vscrollbar + +style light_wardrobe_window is wardrobe_window +style light_wardrobe_button is wardrobe_button +style light_wardrobe_button_text is wardrobe_button_text +style light_wardrobe_item_caption is wardrobe_item_caption +style light_wardrobe_vscrollbar is light_vscrollbar