game/scripts/interface/door.rpy

@@ -28,23 +28,27 @@ label summon_menu(xx=723, yy=90):
 
     $ current_sorting = summon_show_busy
 
-    call screen summon(xx, yy)
+    label .after_init:
 
-    return
+    show screen summon(xx, yy)
 
-label .summon(char):
-    $ enable_game_menu()
-    $ renpy.jump_out_of_context("summon_"+char.lower())
+    $ renpy.dynamic(__choice = ui.interact())
 
-    return
-
-label .summon_busy(char):
-    if game.daytime or char in ["Tonks", "Snape"]:
-        nar "[char] is currently busy. Try again later."
+    if __choice[0] == "summon":
+        hide screen summon
+        if not __choice[2]:
+            $ enable_game_menu()
+            $ renpy.jump_out_of_context("summon_"+__choice[1].lower())
+        else:
+            if game.daytime or __choice[1] in ["Tonks", "Snape"]:
+                nar "[__choice[1]] is currently busy. Try again later."
+            else:
+                nar "[__choice[1]] is currently asleep. Try again tomorrow."
     else:
-        nar "[char] is currently asleep. Try again tomorrow."
+        hide screen summon
+        return
 
-    return
+    jump .after_init
 
 screen summon(xx, yy):
     tag summon
@@ -58,18 +62,18 @@ screen summon(xx, yy):
     use close_button(key=["summon", "game_menu"])
 
     fixed:
-        pos (xx, yy)
         if settings.get("animations"):
             at gui_animation
-        use summon_menu
+        use summon_menu(xx, yy)
 
-screen summon_menu():
+screen summon_menu(xx, yy):
     tag summon_menu
     modal True
     zorder 15
 
     window:
         style "empty"
+        pos (xx, yy)
         xysize (207, 454)
 
         use invisible_button()
@@ -111,10 +115,10 @@ screen summon_menu():
                                     text_xanchor 0.5
                                     text_size 20
                                     if not summon_dict[char]["busy"]:
-                                        action Call("summon_menu.summon", char, from_current=True)
+                                        action Return(["summon", char, False])
                                     else:
                                         text_color "#8C8C70"
-                                        action Call("summon_menu.summon_busy", char, from_current=True)
+                                        action Return(["summon", char, True])
 
                                 add gui.format("interface/achievements/{}/spacer_left.webp")