diff --git a/game/scripts/gui/_gui_.rpy b/game/scripts/gui/_gui_.rpy index 39dc679f..53c41d10 100644 --- a/game/scripts/gui/_gui_.rpy +++ b/game/scripts/gui/_gui_.rpy @@ -61,7 +61,6 @@ init python in gui: renpy.store.disable_game_menu() renpy.choice_for_skipping() - renpy.pause(0.001) # Give renderer the chance to catch up with transitions renpy.store.screenshot.capture() renpy.call_in_new_context("gui_init_context", label, *args, **kwargs) diff --git a/game/scripts/gui/help.rpy b/game/scripts/gui/help.rpy index e6329c87..4bae64a4 100644 --- a/game/scripts/gui/help.rpy +++ b/game/scripts/gui/help.rpy @@ -1,8 +1,11 @@ - init offset = -1 -screen help(page='tutorials'): - tag menu +screen help(): + + frame style "navigation_page_left": + pass + frame style "navigation_page_right": + pass # use game_menu(_("Help"), scroll="viewport"): @@ -33,136 +36,225 @@ screen help(page='tutorials'): # textbutton _("Gamepad") action [SelectedIf(page == 'gamepad'), Show("help", config.intra_transition, "gamepad")] # textbutton _("About") action [SelectedIf(page == 'about'), Show("help", config.intra_transition, "about")] -screen tutorials_help(): - for entry, tutorial in tutorial_dict.items(): - $ title = tutorial[0] +screen help_tutorials(): + frame style "navigation_page_left": + vbox: + label _("Tutorials") - textbutton "[title]": - action Function(renpy.call_in_new_context, 'tutorials_help', entry) - # action ShowTransient('tutorial', None, entry) - # sensitive tutorial_is_done(entry) + viewport: + style_prefix "help" + yinitial 1.0 + scrollbars "vertical" + mousewheel not renpy.android -label tutorials_help(entry): - show screen help('tutorials') - play sound "sounds/pop01.ogg" - $ renpy.music.set_volume(0.5, 3.0) - call screen tutorial(entry) - $ renpy.music.set_volume(1.0, 3.0) - return + has vbox -screen controls_help(): + for entry, tutorial in tutorial_dict.items(): - hbox: - label _("Interaction") - text _("Space, Enter or Left Mouse Button") + textbutton "[tutorial[0]]": + style "navigation_checkbox_button" + action Function(gui.in_context, "tutorial", entry, force=True) + selected tutorial[2] - hbox: - label _("Navigate Interface") - text _("Arrow keys or mouse") + frame style "navigation_page_right": + pass - hbox: - label _("Cancel/Menu") - text _("Escape or Right Mouse Button") +screen help_controls(): + frame style "navigation_page_left": + vbox: + label _("Controls") - hbox: - label _("Skipping") - text _("Ctrl") + viewport: + style_prefix "help" + scrollbars "vertical" + mousewheel not renpy.android - hbox: - label _("Toggle Skipping") - text _("Tab") + has vbox - hbox: - label _("Roll Back") - text _("Page Up or Mouse Wheel Up") + label _("General") xalign 0.5 - hbox: - label _("Roll Forward") - text _("Page Down or Mouse Wheel Down") + vbox: + label _("Interact") + text _("Space, Enter or Left Mouse Button") - hbox: - label "Hide Interface" - text _("H or Middle Mouse Button") + vbox: + label _("Navigate") + text _("Arrow keys or mouse") - hbox: - label "Screenshot" - text _("Print Screen") + vbox: + label _("Cancel/Menu") + text _("Escape or Right Mouse Button") - hbox: - label "Sleep" - text _("s") + vbox: + label _("Skip Dialogue") + text _("Ctrl or Tab") - hbox: - label "Map" - text _("m") + vbox: + label _("RollBack Dialogue") + text _("Page up or Mouse Wheel Up") - hbox: - label "Stats" - text _("c") + vbox: + label _("Rollforward Dialogue") + text _("Page down or Mouse Wheel Down") - hbox: - label "Inventory" - text _("i") + vbox: + label _("Hide Interface During Dialogue") + text _("H or Mouse Wheel Press") - hbox: - label "Fap-Fap-Fap" - text _("f") + vbox: + label _("Screenshot") + text _("Print Screen") - hbox: - label "Highlight Interactive Objects" - text _("Space") + label _("Gameplay") xalign 0.5 -screen gamepad_help(): + vbox: + label _("Skip Time") + text _("S") - hbox: - label _("Right Trigger\nA/Bottom Button") - text _("Advances dialogue and activates the interface.") + vbox: + label _("Inventory") + text _("I") - hbox: - label _("Left Trigger\nLeft Shoulder") - text _("Rolls back to earlier dialogue.") + vbox: + label _("Pay Respects") + text _("F") - hbox: - label _("Right Shoulder") - text _("Rolls forward to later dialogue.") + vbox: + label _("Highlight Interactive Objects") + text _("Space") + + frame style "navigation_page_right": + pass + +style help_viewport: + xmaximum 300 + ymaximum 400 + +style help_vscrollbar is navigation_vscrollbar +style help_button is navigation_button +style help_button_text is navigation_button_text +style help_label is empty +style help_label_text is navigation_text: + hinting "auto" + font gui.bold_font + size 16 +style help_text is navigation_text: + size 16 + first_indent 10 + +# screen controls_help(): + +# hbox: +# label _("Interaction") +# text _("Space, Enter or Left Mouse Button") + +# hbox: +# label _("Navigate Interface") +# text _("Arrow keys or mouse") + +# hbox: +# label _("Cancel/Menu") +# text _("Escape or Right Mouse Button") + +# hbox: +# label _("Skipping") +# text _("Ctrl") + +# hbox: +# label _("Toggle Skipping") +# text _("Tab") + +# hbox: +# label _("Roll Back") +# text _("Page Up or Mouse Wheel Up") + +# hbox: +# label _("Roll Forward") +# text _("Page Down or Mouse Wheel Down") + +# hbox: +# label "Hide Interface" +# text _("H or Middle Mouse Button") + +# hbox: +# label "Screenshot" +# text _("Print Screen") + +# hbox: +# label "Sleep" +# text _("s") + +# hbox: +# label "Map" +# text _("m") + +# hbox: +# label "Stats" +# text _("c") + +# hbox: +# label "Inventory" +# text _("i") + +# hbox: +# label "Fap-Fap-Fap" +# text _("f") + +# hbox: +# label "Highlight Interactive Objects" +# text _("Space") + +# screen gamepad_help(): + +# hbox: +# label _("Right Trigger\nA/Bottom Button") +# text _("Advances dialogue and activates the interface.") + +# hbox: +# label _("Left Trigger\nLeft Shoulder") +# text _("Rolls back to earlier dialogue.") + +# hbox: +# label _("Right Shoulder") +# text _("Rolls forward to later dialogue.") - hbox: - label _("D-Pad, Sticks") - text _("Navigate the interface.") +# hbox: +# label _("D-Pad, Sticks") +# text _("Navigate the interface.") - hbox: - label _("Start, Guide") - text _("Accesses the game menu.") +# hbox: +# label _("Start, Guide") +# text _("Accesses the game menu.") - hbox: - label _("Y/Top Button") - text _("Hides the user interface.") +# hbox: +# label _("Y/Top Button") +# text _("Hides the user interface.") - textbutton _("Calibrate") action GamepadCalibrate() +# textbutton _("Calibrate") action GamepadCalibrate() -screen about_help(): - vbox: - spacing gui.pref_spacing +# screen about_help(): +# vbox: +# spacing gui.pref_spacing - if gui.about: - text "[gui.about!t]\n" +# if gui.about: +# text "[gui.about!t]\n" - text _("Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]") size 12 +# text _("Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]") size 12 -style help_button is gui_button: - background None - xmargin 7 +# style help_button is gui_button: +# background None +# xmargin 7 -style help_button_text is gui_button_text +# style help_button_text is gui_button_text -style help_label is gui_label: - xsize 209 - right_padding 17 +# style help_label is gui_label: +# xsize 209 +# right_padding 17 -style help_label_text is gui_label_text: - xalign 1.0 - text_align 1.0 - outlines [(2, "#000", 0, 0)] +# style help_label_text is gui_label_text: +# xalign 1.0 +# text_align 1.0 +# outlines [(2, "#000", 0, 0)] -style help_text is gui_text +# style help_text is gui_text diff --git a/game/scripts/gui/history.rpy b/game/scripts/gui/history.rpy index c7dcbc0f..5a913c2f 100644 --- a/game/scripts/gui/history.rpy +++ b/game/scripts/gui/history.rpy @@ -62,16 +62,11 @@ style history_entry: hover_background Fixed("#C69D65", Frame(Image("gui/creamy_pumpkin_pie/book/book_select.png", oversample=4), 20, 8, 20, 8, tile=False)) style history_text_what is navigation_text: - # color "#fff" - # outlines [(1, "#000000", 1, 1)] - # hinting "bytecode" - size 10 + size 16 style history_text_who is navigation_text: - # color "#EA8E61" - # outlines [(1, "#000000", 1, 1)] hinting "auto" font gui.bold_font - size 12 + size 16 define gui.history_allow_tags = ("number", "unicode", "color") diff --git a/game/scripts/gui/navigation.rpy b/game/scripts/gui/navigation.rpy index dfeafa78..8f2cad8b 100644 --- a/game/scripts/gui/navigation.rpy +++ b/game/scripts/gui/navigation.rpy @@ -194,11 +194,12 @@ screen navigation(): textbutton _("Save") action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "save")] selected (category=="save") at navigation_tabs textbutton _("Load") action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "load")] selected (category=="load") at navigation_tabs textbutton _("Settings") action [SetLocalVariable("subcategory", "general"), SetLocalVariable("category", "settings")] at navigation_tabs - textbutton _("Main Menu") action MainMenu() at navigation_tabs + textbutton _("History") action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "history")] selected (category=="history") at navigation_tabs + textbutton _("Help") action [SetLocalVariable("subcategory", "tutorials"), SetLocalVariable("category", "help")] selected (category=="help") at navigation_tabs null height 35 textbutton _("Return") action [SetScreenVariable("navigation_last_frame_atl", navigation_last_frame_hide), SetScreenVariable("navigation_atl", navigation_hide), SetScreenVariable("navigation_exit", True)] keysym "game_menu" activate_sound "sounds/bookclose.ogg" at navigation_tabs null height 35 - textbutton _("History") action [SetLocalVariable("subcategory", None), SetLocalVariable("category", "history")] selected (category=="history") at navigation_tabs + textbutton _("Main Menu") action MainMenu() at navigation_tabs textbutton _("Credits") action Show("credits") at navigation_tabs if category == "save": @@ -246,6 +247,17 @@ screen navigation(): use settings_general elif category == "history": use history + elif category == "help": + vbox: + style_prefix "navigation_subtabs" + + textbutton _("Tutorials") action SetLocalVariable("subcategory", "tutorials") at navigation_tabs + textbutton _("Controls") action SetLocalVariable("subcategory", "controls") at navigation_tabs + + if subcategory == "tutorials": + use help_tutorials + elif subcategory == "controls": + use help_controls transform navigation_tabs: subpixel True diff --git a/game/scripts/interface/tutorials.rpy b/game/scripts/interface/tutorials.rpy index e21bc171..7c68d465 100644 --- a/game/scripts/interface/tutorials.rpy +++ b/game/scripts/interface/tutorials.rpy @@ -19,12 +19,12 @@ init python: return True return tutorial_dict[entry][2] -label tutorial(entry): - if not tutorial_is_done(entry): +label tutorial(entry, force=False): + if not tutorial_is_done(entry) or force: $ tutorial_dict[entry][2] = True play sound "sounds/pop01.ogg" $ renpy.music.set_volume(0.5, 3.0) call screen modal_popup(tutorial_dict[entry][0], tutorial_dict[entry][1], f"interface/tutorials/{entry}.webp", "Okay") $ renpy.music.set_volume(1.0, 3.0) $ enable_game_menu() - return \ No newline at end of file + return