From e1feea93d4c5ffeed706e589e93dbc6589debdb9 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 14 Mar 2023 23:25:54 +0000 Subject: [PATCH] Bug fixes * Fixed Hermione's card game job opportunity logic * Fixed keysym lacking an action in save ui. * Fixed missing image definitions * Fixed outfit randomizer affecting bodypart layers * Fixed a typo --- game/scripts/characters/hermione/talk.rpy | 12 ++++++------ game/scripts/gui/_images_.rpy | 2 ++ game/scripts/gui/save_files.rpy | 2 +- game/scripts/wardrobe/wardrobe.rpy | 2 ++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/game/scripts/characters/hermione/talk.rpy b/game/scripts/characters/hermione/talk.rpy index 91cf3b1d..12825f4d 100644 --- a/game/scripts/characters/hermione/talk.rpy +++ b/game/scripts/characters/hermione/talk.rpy @@ -36,22 +36,22 @@ label hermione_talk: #"This job is only available during the day." #jump working_menu - "-Hidden-" (style="disabled") if game.daytime and not cardgame_work and not her_outfit_poker.unlocked: + "-Hidden-" (style="disabled") if not cardgame_work or not poker_outfit_ITEM.unlocked: "You haven't unlocked this job opportunity yet." jump working_menu - "-Work by advertising the card game-" if game.daytime and cardgame_work and her_outfit_poker.unlocked: - jump job_5 - - "-Work by advertising the card game-" (style="disabled") if game.daytime and cardgame_work and not her_outfit_poker.unlocked: + "-Work by advertising the card game-" (style="disabled") if cardgame_work and poker_outfit_ITEM.unlocked 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 "(Maybe the twins have something fitting for her in their stock.)" ("base", xpos="far_left", ypos="head") jump working_menu - "-Work by advertising the card game-" (style="disabled") if not game.daytime and cardgame_work: + "-Work by advertising the card game-" (style="disabled") if not game.daytime and cardgame_work and her_outfit_poker.unlocked: "This job is only available during the day." jump working_menu + "-Work by advertising the card game-" if game.daytime and cardgame_work and her_outfit_poker.unlocked: + jump job_5 + "-Never mind-": jump hermione_talk diff --git a/game/scripts/gui/_images_.rpy b/game/scripts/gui/_images_.rpy index caf38132..40f2e515 100644 --- a/game/scripts/gui/_images_.rpy +++ b/game/scripts/gui/_images_.rpy @@ -230,6 +230,8 @@ image scrollbar_vertical_idle_bar = Solid("#726363") image scrollbar_vertical_selected_idle_bar = "scrollbar_vertical_idle_bar" image scrollbar_vertical_hover_bar = Solid("#726363") image scrollbar_vertical_selected_hover_bar = "scrollbar_vertical_hover_bar" +image scrollbar_vertical_insensitive_bar = "scrollbar_vertical_idle_bar" +image scrollbar_vertical_selected_insensitive_bar = "scrollbar_horizontal_idle_bar" diff --git a/game/scripts/gui/save_files.rpy b/game/scripts/gui/save_files.rpy index c37965e4..7055f610 100644 --- a/game/scripts/gui/save_files.rpy +++ b/game/scripts/gui/save_files.rpy @@ -118,7 +118,7 @@ screen file_slots(title): textbutton _("{#auto_page}A") action FilePage("auto") keysym "K_a" if config.has_quicksave: - textbutton _("{#quick_page}Q") action FilePage("quick") keysym + textbutton _("{#quick_page}Q") action FilePage("quick") keysym "K_q" $ page_modifier = max(0, int(FilePageName(str(page_modifier+9), str(page_modifier+9)))-9) diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index c307339b..3063432a 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -348,6 +348,8 @@ label wardrobe_menu(): valid_choices += [None] elif k == "hair": pass + elif k in char_active.body_layers: + pass else: valid_choices += [None]