diff --git a/game/screens.rpy b/game/screens.rpy index 88474d2..10d0458 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -613,9 +613,10 @@ screen about(): ## contents of the main menu are in the navigation screen. vbox: - xpos 1240 - ## yalign 0.03 - ypos 800 + yalign 0.00 + yoffset 100 + xoffset 80 + xmaximum 1100 label "[config.name!t]" text _("Version [config.version!t]\n") @@ -623,13 +624,10 @@ screen about(): if gui.about: text "[gui.about!t]\n" - text _("{size=24}Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]\nTo find more information about the game (and its source code) please visit {a=https://www.snootgame.xyz/}our website{/a}.{/size}") - textbutton "Back to Extras" action ShowMenu("extras") + style_prefix "quick" + text _("{size=30}Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]\nTo find more information about the game (and its source code) please visit {a=https://www.snootgame.xyz/}our website{/a}.{/size}") text_align 0 use extrasnavigation - - - ## Updates screen ################################################################ ## ## This screen houses the updates option using the built-in updates capabilities of Ren'Py. @@ -642,7 +640,7 @@ screen updates(): style_prefix "main_menu" add gui.main_menu_background - add gui.extras_submenu_background + add gui.extras_submenu_panel ## This empty frame darkens the main menu. frame: @@ -654,9 +652,8 @@ screen updates(): ##todo add size ##add gui.game_menu_background vbox: - xpos 1040 - # yalign 0.03 - ypos 800 + xalign 0.10 + ypos 1000 text _("UPDATES") label "[config.name!t]" text _("Your Version is [config.version!t]\n") @@ -666,7 +663,6 @@ screen updates(): textbutton _("Update Now!") ##action ("persistent.autoup", True, False) This should also set the value of updateresults label _("Update Result:\n") text _("[persistent.updateresult!t]\n") - textbutton "Back to Extras" action ShowMenu("extras") use extrasnavigation ## Load and Save screens ####################################################### @@ -1084,38 +1080,10 @@ screen extras(): add gui.main_menu_background - ## This empty frame darkens the main menu. frame: pass - ## The use statement includes another screen inside this one. The actual - ## contents of the main menu are in the navigation screen. - # vbox: -# xpos 1940 -# yalign 0.03 -# if persistent.splashtype == 1: -# add "gui/sneedgame.png" -# else: -# add "gui/snootgame.png" -# vbox: -# spacing 25 -# xpos 1885 -# yalign 0.9 -# imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("help") -# imagebutton auto "gui/button/menubuttons/aboutbutton_%s.png" action ShowMenu("about") -# imagebutton auto "gui/button/menubuttons/updatesbutton_%s.png" action ShowMenu("updates") -# imagebutton auto "gui/button/menubuttons/gallerybutton_%s.png" action ShowMenu("gallery") -# imagebutton auto "gui/button/menubuttons/returnbutton_%s.png" action ShowMenu("main_menu") - - - -# # if gui.show_name: -# # -# # vbox: -# # text "[config.version]": - -# # style "main_menu_version" use extrasnavigation ##Extras Navigation Screen ##################################################### @@ -1143,7 +1111,6 @@ screen extrasnavigation(): [ "Return", ShowMenu("main_menu") ] ] ) - ## Help screen ################################################################# ## ## A screen that gives information about key and mouse bindings. It uses other @@ -1171,29 +1138,26 @@ screen help(): # yalign 0.4 # spacing 23 - hbox: - xpos 200 - ## ypos 1000 - yalign 0.3 - spacing 23 - style_prefix "help" - textbutton _("Keyboard") action SetScreenVariable("device", "keyboard") - textbutton _("Mouse") action SetScreenVariable("device", "mouse") - if GamepadExists(): - textbutton _("Gamepad") action SetScreenVariable("device", "gamepad") - textbutton "Back to Extras" action ShowMenu("extras") + fixed: + hbox: + xpos 200 + spacing 23 + style_prefix "help" + textbutton _("Keyboard") action SetScreenVariable("device", "keyboard") + textbutton _("Mouse") action SetScreenVariable("device", "mouse") + if GamepadExists(): + textbutton _("Gamepad") action SetScreenVariable("device", "gamepad") - vbox: - xpos 1100 - ypos 1000 - # yalign 0.4 - if device == "keyboard": - use keyboard_help - elif device == "mouse": - use mouse_help - elif device == "gamepad": - use gamepad_help - text _("") ## again in here to keep vbox in check + vbox: + yalign 0.5 + xpos 1100 + if device == "keyboard": + use keyboard_help + elif device == "mouse": + use mouse_help + elif device == "gamepad": + use gamepad_help + text _("") ## again in here to keep vbox in check use extrasnavigation