diff --git a/game/gui.rpy b/game/gui.rpy index 41c1468..73fd5bf 100644 --- a/game/gui.rpy +++ b/game/gui.rpy @@ -450,12 +450,12 @@ init python: if renpy.variant("small"): ## Font sizes. - gui.text_size = 44 + gui.text_size = 40 gui.name_text_size = 46 gui.notify_text_size = 38 - gui.interface_text_size = 45 - gui.button_text_size = 45 - gui.label_text_size = 51 + gui.interface_text_size = 40 + gui.button_text_size = 40 + gui.label_text_size = 45 ## Namebox gui.name_xpos = 395 @@ -472,7 +472,7 @@ init python: gui.choice_button_width = 1860 - gui.navigation_spacing = 30 + gui.navigation_spacing = 20 gui.pref_button_spacing = 15 gui.history_height = 285 diff --git a/game/gui/phone/bar/bottom.png b/game/gui/phone/bar/bottom.png index baf5d42..377bac4 100644 Binary files a/game/gui/phone/bar/bottom.png and b/game/gui/phone/bar/bottom.png differ diff --git a/game/gui/phone/bar/left.png b/game/gui/phone/bar/left.png index 7997ccb..7c9c1cf 100644 Binary files a/game/gui/phone/bar/left.png and b/game/gui/phone/bar/left.png differ diff --git a/game/gui/phone/bar/right.png b/game/gui/phone/bar/right.png index 279b9fb..597eae1 100644 Binary files a/game/gui/phone/bar/right.png and b/game/gui/phone/bar/right.png differ diff --git a/game/gui/phone/bar/top.png b/game/gui/phone/bar/top.png index f2854a3..2c53689 100644 Binary files a/game/gui/phone/bar/top.png and b/game/gui/phone/bar/top.png differ diff --git a/game/gui/phone/button/check_foreground.png b/game/gui/phone/button/check_foreground.png index c334a43..4113f1a 100644 Binary files a/game/gui/phone/button/check_foreground.png and b/game/gui/phone/button/check_foreground.png differ diff --git a/game/gui/phone/button/check_selected_foreground.png b/game/gui/phone/button/check_selected_foreground.png index cd1aa50..1976a85 100644 Binary files a/game/gui/phone/button/check_selected_foreground.png and b/game/gui/phone/button/check_selected_foreground.png differ diff --git a/game/gui/phone/button/choice_hover_background.png b/game/gui/phone/button/choice_hover_background.png index 63e03b9..4c5ef5e 100644 Binary files a/game/gui/phone/button/choice_hover_background.png and b/game/gui/phone/button/choice_hover_background.png differ diff --git a/game/gui/phone/button/hover_background.png b/game/gui/phone/button/hover_background.png index 6264b8b..266d53b 100644 Binary files a/game/gui/phone/button/hover_background.png and b/game/gui/phone/button/hover_background.png differ diff --git a/game/gui/phone/button/idle_background.png b/game/gui/phone/button/idle_background.png index 6264b8b..266d53b 100644 Binary files a/game/gui/phone/button/idle_background.png and b/game/gui/phone/button/idle_background.png differ diff --git a/game/gui/phone/button/quick_hover_background.png b/game/gui/phone/button/quick_hover_background.png new file mode 100644 index 0000000..0ecc7c9 Binary files /dev/null and b/game/gui/phone/button/quick_hover_background.png differ diff --git a/game/gui/phone/button/quick_idle_background.png b/game/gui/phone/button/quick_idle_background.png new file mode 100644 index 0000000..0ecc7c9 Binary files /dev/null and b/game/gui/phone/button/quick_idle_background.png differ diff --git a/game/gui/phone/button/radio_foreground.png b/game/gui/phone/button/radio_foreground.png index c334a43..4113f1a 100644 Binary files a/game/gui/phone/button/radio_foreground.png and b/game/gui/phone/button/radio_foreground.png differ diff --git a/game/gui/phone/button/radio_selected_foreground.png b/game/gui/phone/button/radio_selected_foreground.png index cd1aa50..27a3696 100644 Binary files a/game/gui/phone/button/radio_selected_foreground.png and b/game/gui/phone/button/radio_selected_foreground.png differ diff --git a/game/gui/phone/button/slot_hover_background.png b/game/gui/phone/button/slot_hover_background.png index a8207d9..6ecbc25 100644 Binary files a/game/gui/phone/button/slot_hover_background.png and b/game/gui/phone/button/slot_hover_background.png differ diff --git a/game/gui/phone/button/slot_idle_background.png b/game/gui/phone/button/slot_idle_background.png index 6cd3fd7..89e8310 100644 Binary files a/game/gui/phone/button/slot_idle_background.png and b/game/gui/phone/button/slot_idle_background.png differ diff --git a/game/gui/phone/scrollbar/horizontal_hover_bar.png b/game/gui/phone/scrollbar/horizontal_hover_bar.png index 812a4b8..4b44f48 100644 Binary files a/game/gui/phone/scrollbar/horizontal_hover_bar.png and b/game/gui/phone/scrollbar/horizontal_hover_bar.png differ diff --git a/game/gui/phone/scrollbar/horizontal_hover_thumb.png b/game/gui/phone/scrollbar/horizontal_hover_thumb.png index a74702e..3d615c9 100644 Binary files a/game/gui/phone/scrollbar/horizontal_hover_thumb.png and b/game/gui/phone/scrollbar/horizontal_hover_thumb.png differ diff --git a/game/gui/phone/scrollbar/horizontal_idle_bar.png b/game/gui/phone/scrollbar/horizontal_idle_bar.png index ba18acd..8be5b53 100644 Binary files a/game/gui/phone/scrollbar/horizontal_idle_bar.png and b/game/gui/phone/scrollbar/horizontal_idle_bar.png differ diff --git a/game/gui/phone/scrollbar/horizontal_idle_thumb.png b/game/gui/phone/scrollbar/horizontal_idle_thumb.png index 4a951e4..0a8723c 100644 Binary files a/game/gui/phone/scrollbar/horizontal_idle_thumb.png and b/game/gui/phone/scrollbar/horizontal_idle_thumb.png differ diff --git a/game/gui/phone/scrollbar/vertical_hover_bar.png b/game/gui/phone/scrollbar/vertical_hover_bar.png index 69b93db..ddeabc0 100644 Binary files a/game/gui/phone/scrollbar/vertical_hover_bar.png and b/game/gui/phone/scrollbar/vertical_hover_bar.png differ diff --git a/game/gui/phone/scrollbar/vertical_hover_thumb.png b/game/gui/phone/scrollbar/vertical_hover_thumb.png index d3d0eee..550212a 100644 Binary files a/game/gui/phone/scrollbar/vertical_hover_thumb.png and b/game/gui/phone/scrollbar/vertical_hover_thumb.png differ diff --git a/game/gui/phone/scrollbar/vertical_idle_bar.png b/game/gui/phone/scrollbar/vertical_idle_bar.png index bc69cdb..01df57b 100644 Binary files a/game/gui/phone/scrollbar/vertical_idle_bar.png and b/game/gui/phone/scrollbar/vertical_idle_bar.png differ diff --git a/game/gui/phone/scrollbar/vertical_idle_thumb.png b/game/gui/phone/scrollbar/vertical_idle_thumb.png index ad4ac99..edf6a01 100644 Binary files a/game/gui/phone/scrollbar/vertical_idle_thumb.png and b/game/gui/phone/scrollbar/vertical_idle_thumb.png differ diff --git a/game/screens.rpy b/game/screens.rpy index ff8cfb8..ced31a4 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -678,7 +678,7 @@ style game_menu_label is gui_label style game_menu_label_text is gui_label_text style game_menu_label_text: - xpos 40 + xpos 0 style return_button is navigation_button style return_button_text is navigation_button_text @@ -1701,10 +1701,7 @@ style nvl_button_text: ## Mobile Variants ################################################################################ -style pref_vbox: - variant "medium" - xsize 675 - +# Why would a mouse be present ## Since a mouse may not be present, we replace the quick menu with a version ## that uses fewer and bigger buttons that are easier to touch. @@ -1738,21 +1735,13 @@ screen quick_menu(): screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py) variant "mobile" - 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 - use main_menu_buttons("gui/button/menubuttons/template_idle.png", + hbox: + xalign 0.5 + spacing 2 + ypos 30 + use main_menu_buttons("gui/button/menubuttons/title_button.png", [ - [ _("Help"), ShowMenu("help") ], + #[ _("Help"), ShowMenu("help") ], You just press the screen, not mamy instructions needed [ _("About"), ShowMenu("about") ], #["Gallery", ShowMenu("cg_gallery") ], [ _("Mods"), ShowMenu("mod_menu") ], @@ -1773,7 +1762,7 @@ style nvl_window: style game_menu_outer_frame: variant "mobile" - background "gui/phone/overlay/game_menu.png" + #background "gui/phone/overlay/game_menu.png" style game_menu_navigation_frame: variant "mobile" @@ -1781,7 +1770,9 @@ style game_menu_navigation_frame: style game_menu_content_frame: variant "mobile" - top_margin 0 + left_margin -20 + right_margin 0 + top_margin 15 style pref_vbox: variant "mobile" @@ -1830,3 +1821,104 @@ style slider_pref_vbox: style slider_pref_slider: variant "mobile" xsize 900 + + +screen preferences(): + variant "mobile" + tag menu + use game_menu(_("Options"), scroll="viewport"): + vbox: + spacing 20 + hbox: + + vbox: + style_prefix "radio" + label _("Rollback Side") + textbutton _("Disable") activate_sound "audio/ui/snd_ui_option_on.wav" action Preference("rollback side", "disable") + textbutton _("Left") activate_sound "audio/ui/snd_ui_option_on.wav" action Preference("rollback side", "left") + textbutton _("Right") activate_sound "audio/ui/snd_ui_option_on.wav" action Preference("rollback side", "right") + vbox: + style_prefix "check" + label _("Naughty Stuff") + textbutton _("Enable Saucy Images") action [Function(onclick_audio, persistent.lewd), ToggleVariable("persistent.lewd", True, False)] + hbox: + vbox: + style_prefix "check" + label _("Language") + vpgrid: + rows len(languages) + cols 1 + mousewheel True + draggable True + xsize 300 + ysize 250 + if len(languages)>4: + scrollbars "vertical" + for lang in languages: + fixed: + xsize 300 + ysize 60 + use lang_button(lang) + vbox: + style_prefix "check" + label _("Skip") + textbutton _("Unseen Text") action [Function(onclick_audio, preferences.skip_unseen), ToggleVariable("preferences.skip_unseen", True, False)] + textbutton _("After Choices") action [Function(onclick_audio, preferences.skip_after_choices), ToggleVariable("preferences.skip_after_choices", True, False)] + textbutton _("Transitions") action [Function(onclick_audio, preferences.transitions, True), ToggleVariable("preferences.transitions", 0, 2)] + + + hbox: + style_prefix "slider" + + + vbox: + + label _("Text Speed") + + bar value Preference("text speed") + + label _("Auto-Forward Time") + + bar value Preference("auto-forward time") + + vbox: + + if config.has_music: + label _("Music Volume") + hbox: + bar value Preference("music volume") #yalign 0.5 + textbutton _("Reset"): + action Function(preferences.set_volume, 'music', config.default_music_volume) + + if config.has_sound: + + label _("Sound Volume") + hbox: + bar value Preference("sfx volume") #yalign 0.5 + textbutton _("Reset"): + action Function(preferences.set_volume, 'sfx', config.default_sfx_volume) + if config.sample_sound: + textbutton _("Test") action Play("sound", config.sample_sound) + + label _("UI Sounds Volume") + hbox: + bar value Preference("ui volume") #yalign 0.5 + textbutton _("Reset"): + yalign 0.5 + action Function(preferences.set_volume, 'ui', config.default_sfx_volume) + + if config.has_voice: + label _("Voice Volume") + hbox: + bar value Preference("voice volume") #yalign 0.5 + textbutton _("Reset"): + yalign 0.5 + action Function(preferences.set_volume, 'voice', config.default_sfx_volume) + if config.sample_voice: + textbutton _("Test") action Play("voice", config.sample_voice) + + if config.has_music or config.has_sound or config.has_voice: + null height gui.pref_spacing + textbutton _("Mute All"): + action Preference("all mute", "toggle") + style "mute_all_button"