diff --git a/game/gui/button/menubuttons/aboutbutton_idle.png b/game/gui/button/menubuttons/aboutbutton_idle.png new file mode 100644 index 0000000..51303ce Binary files /dev/null and b/game/gui/button/menubuttons/aboutbutton_idle.png differ diff --git a/game/gui/button/menubuttons/helpbutton_idle.png b/game/gui/button/menubuttons/helpbutton_idle.png index 0d5b1d7..6d994cb 100644 Binary files a/game/gui/button/menubuttons/helpbutton_idle.png and b/game/gui/button/menubuttons/helpbutton_idle.png differ diff --git a/game/gui/button/menubuttons/returnbutton_idle.png b/game/gui/button/menubuttons/returnbutton_idle.png new file mode 100644 index 0000000..3db0bdc Binary files /dev/null and b/game/gui/button/menubuttons/returnbutton_idle.png differ diff --git a/game/gui/button/menubuttons/updatesbutton_idle.png b/game/gui/button/menubuttons/updatesbutton_idle.png index 62ec66f..185961a 100644 Binary files a/game/gui/button/menubuttons/updatesbutton_idle.png and b/game/gui/button/menubuttons/updatesbutton_idle.png differ diff --git a/game/gui/overlay/extras_submenu_panel.png b/game/gui/overlay/extras_submenu_panel.png index c6d82ce..46b1642 100644 Binary files a/game/gui/overlay/extras_submenu_panel.png and b/game/gui/overlay/extras_submenu_panel.png differ diff --git a/game/screens.rpy b/game/screens.rpy index 97a46ad..b2a1b18 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -596,11 +596,11 @@ screen about(): spacing 25 xpos 1885 yalign 0.9 - textbutton _("Help") action ShowMenu("help") - textbutton _("About") action ShowMenu("about") - textbutton _("Updates") action ShowMenu("updates") + 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") - textbutton _("Return") action ShowMenu("main_menu") + imagebutton auto "gui/button/menubuttons/returnbutton_%s.png" action ShowMenu("main_menu") style main_menu_frame is empty style main_menu_vbox is vbox @@ -635,29 +635,87 @@ style main_menu_title: screen gallery(): tag menu - ## This use statement includes the game_menu screen inside this one. The ## vbox child is then included inside the viewport inside the game_menu ## screen. - use game_menu(_("Gallery"), scroll="viewport"): + style_prefix "main_menu" - style_prefix "gallery" + add gui.main_menu_background + add gui.extras_submenu_panel + + frame: + pass + + vbox: + xpos 500 + yalign 0.2 + textbutton "Back to Extras" action ShowMenu("extras") - vbox: + vbox: + viewport id "gallery": + xpos 300 + yalign 0.3 + style_prefix "gallery" + use images + text _("") ## Not sure why, but this keeps the vbox below working ... Renpy quirk? Does it kill scrolling in the viewport? Tune in when we have the gallery populated in the images screen. - label "[config.name!t]" - text _("Version [config.version!t]\n") + + + 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") - text _("Placeholder for gallery.") - textbutton "Back to Extras" action ShowMenu("extras") +style main_menu_frame is empty +style main_menu_vbox is vbox +style main_menu_text is gui_text +style main_menu_title is main_menu_text +style main_menu_version is main_menu_text + +style main_menu_frame: + xsize 420 + yfill True + + background "gui/overlay/main_menu.png" + +style main_menu_vbox: + xalign 1.0 + xoffset -30 + xmaximum 1200 + yalign 1.0 + yoffset -30 + +style main_menu_text: + properties gui.text_properties("main_menu", accent=True) + +style main_menu_title: + properties gui.text_properties("title") -style about_label is gui_label -style about_label_text is gui_label_text -style about_text is gui_text +## Images Screen ################################################################ +## +## This is the screen that actually houses the images of the gallery +screen images(): + tag menu + style_prefix "main_menu" + + frame: + pass + vbox: + text _("Placeholder for gallery.") -style about_label_text: - size gui.label_text_size ## Updates screen ################################################################ @@ -708,11 +766,11 @@ screen updates(): spacing 25 xpos 1885 yalign 0.9 - textbutton _("Help") action ShowMenu("help") - textbutton _("About") action ShowMenu("about") - textbutton _("Updates") action ShowMenu("updates") + 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") - textbutton _("Return") action ShowMenu("main_menu") + imagebutton auto "gui/button/menubuttons/returnbutton_%s.png" action ShowMenu("main_menu") style main_menu_frame is empty style main_menu_vbox is vbox @@ -1159,11 +1217,12 @@ screen extras(): spacing 25 xpos 1885 yalign 0.9 - textbutton _("Help") action ShowMenu("help") - textbutton _("About") action ShowMenu("about") - textbutton _("Updates") action ShowMenu("updates") - imagebutton auto "gui/button/menubuttons/gallerybutton_%s.png" action ShowMenu("gallery") - textbutton _("Return") action ShowMenu("main_menu") + 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: @@ -1210,33 +1269,67 @@ screen help(): tag menu + style_prefix "main_menu" + + add gui.main_menu_background + add gui.extras_submenu_panel + + ## This empty frame darkens the main menu. + frame: + pass + default device = "keyboard" - use game_menu(_("Help"), scroll="viewport"): + # vbox: + # xpos 1100 + # ## ypos 1000 + # 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") - vbox: - spacing 23 - - hbox: - - textbutton _("Keyboard") action SetScreenVariable("device", "keyboard") - textbutton _("Mouse") action SetScreenVariable("device", "mouse") - textbutton "Back to Extras" action ShowMenu("extras") - if GamepadExists(): - textbutton _("Gamepad") action SetScreenVariable("device", "gamepad") - - if device == "keyboard": - use keyboard_help - elif device == "mouse": - use mouse_help - elif device == "gamepad": - use gamepad_help + 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: + 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") + screen keyboard_help(): - + style_prefix "help" hbox: label _("Enter") text _("Advances dialogue and activates the interface.") @@ -1283,7 +1376,7 @@ screen keyboard_help(): screen mouse_help(): - + style_prefix "help" hbox: label _("Left Click") text _("Advances dialogue and activates the interface.") @@ -1305,8 +1398,8 @@ screen mouse_help(): text _("Rolls forward to later dialogue.") -screen gamepad_help(): - +screen gamepad_help(): + style_prefix "help" hbox: label _("Right Trigger\nA/Bottom Button") text _("Advances dialogue and activates the interface.") @@ -1334,7 +1427,7 @@ screen gamepad_help(): textbutton _("Calibrate") action GamepadCalibrate() - +#this bit is might need trimming or rework style help_button is gui_button style help_button_text is gui_button_text style help_label is gui_label @@ -1358,6 +1451,30 @@ style help_label_text: text_align 1.0 +style main_menu_frame is empty +# style main_menu_vbox is vbox +# style main_menu_text is gui_text +# style main_menu_title is main_menu_text +# style main_menu_version is main_menu_text + +style main_menu_frame: + xsize 420 + yfill True + + background "gui/overlay/main_menu.png" + +style main_menu_vbox: + xalign 1.0 + xoffset -30 + xmaximum 1200 + yalign 1.0 + yoffset -30 + +style main_menu_text: + properties gui.text_properties("main_menu", accent=True) + +style main_menu_title: + properties gui.text_properties("title") ################################################################################ ## Additional screens