From acfb09516ce125451a3ba87c1fad2e3b4013c897 Mon Sep 17 00:00:00 2001 From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com> Date: Fri, 17 Nov 2023 03:16:28 +0100 Subject: [PATCH] Improve and fix last --- game/scripts/interface/door.rpy | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/game/scripts/interface/door.rpy b/game/scripts/interface/door.rpy index d645ac4c..b2b13211 100644 --- a/game/scripts/interface/door.rpy +++ b/game/scripts/interface/door.rpy @@ -32,15 +32,17 @@ label summon_menu(xx=723, yy=90): return -label .summon(char, busy): - if not busy: - $ enable_game_menu() - $ renpy.jump_out_of_context("summon_"+char.lower()) +label .summon(char): + $ enable_game_menu() + $ renpy.jump_out_of_context("summon_"+char.lower()) + + return + +label .summon_busy(char): + if game.daytime or char in ["Tonks", "Snape"]: + nar "[char] is currently busy. Try again later." else: - if game.daytime or char in ["Tonks", "Snape"]: - nar "[char] is currently busy. Try again later." - else: - nar "[char] is currently asleep. Try again tomorrow." + nar "[char] is currently asleep. Try again tomorrow." return @@ -109,10 +111,10 @@ screen summon_menu(): text_xanchor 0.5 text_size 20 if not summon_dict[char]["busy"]: - action Call("summon_menu.summon", char, False) + action Call("summon_menu.summon", char, from_current=True) else: text_color "#8C8C70" - action Call("summon_menu.summon", char, True) + action Call("summon_menu.summon_busy", char, from_current=True) add gui.format("interface/achievements/{}/spacer_left.webp")