From 79046463598a712af9f28e7b88721750d9d1f069 Mon Sep 17 00:00:00 2001 From: Map Date: Sat, 5 Oct 2024 09:14:16 -0500 Subject: [PATCH] Bring fast skipping to the skip button (fucking finally) --- game/screens.rpy | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/game/screens.rpy b/game/screens.rpy index bc3deaa..dcf19df 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -259,11 +259,12 @@ style choice_button_text is default: ## The quick menu is displayed in-game to provide easy access to the out-of-game ## menus. -screen quick_button(filename, label, function): +screen quick_button(filename, label, function=NullAction(), function2=NullAction()): button: xsize 71 ysize 71 action function + alternate function2 if 'Return' in label or 'Back' in label or 'Menu' in label: activate_sound "audio/ui/uiBack.wav" else: @@ -276,7 +277,7 @@ screen quick_button(filename, label, function): # Reuse the same image string and keep things 'neat'. screen quick_buttons(filename, label_functions): for l_f in label_functions: - use quick_button(filename, l_f[0], l_f[1]) + use quick_button(filename, l_f[0], l_f[1], l_f[2]) screen quick_menu(): @@ -292,10 +293,10 @@ screen quick_menu(): use quick_buttons("gui/button/uioptionbuttons/template_idle.png", [ - [ _("Skip"), Skip() ], - [ _("Save"), ShowMenu('save') ], - [ _("Auto"), Preference("auto-forward", "toggle") ], - [ _("Load"), ShowMenu('load') ] + [ _("Skip"), Skip(), Skip(fast=True, confirm=True) ], + [ _("Save"), ShowMenu('save'), NullAction() ], + [ _("Auto"), Preference("auto-forward", "toggle"), NullAction() ], + [ _("Load"), ShowMenu('load'), NullAction() ] ] ) screen score_menu(): @@ -1788,10 +1789,10 @@ screen quick_menu(): yalign 0.975 use quick_buttons("gui/button/uioptionbuttons/template_idle.png", \ [ \ - [ _("Back"), Rollback() ], \ - [ _("Skip"), Skip() ], \ - [ _("Auto"), Preference("auto-forward", "toggle") ], \ - [ _("Menu"), ShowMenu() ] \ + [ _("Back"), Rollback(), NullAction()], \ + [ _("Skip"), Skip(), Skip(fast=True, confirm=True) ], \ + [ _("Auto"), Preference("auto-forward", "toggle"), NullAction() ], \ + [ _("Menu"), ShowMenu(), NullAction() ] \ ] ) screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py)