diff --git a/game/audio/ui/uiBack.wav b/game/audio/ui/uiBack.wav index 65cca24..c550a2d 100644 Binary files a/game/audio/ui/uiBack.wav and b/game/audio/ui/uiBack.wav differ diff --git a/game/audio/ui/uiClick.wav b/game/audio/ui/uiClick.wav index 8784fcb..a75de0c 100644 Binary files a/game/audio/ui/uiClick.wav and b/game/audio/ui/uiClick.wav differ diff --git a/game/audio/ui/uiFail.wav b/game/audio/ui/uiFail.wav new file mode 100644 index 0000000..d5b52a4 Binary files /dev/null and b/game/audio/ui/uiFail.wav differ diff --git a/game/audio/ui/uiOptionOff.wav b/game/audio/ui/uiOptionOff.wav new file mode 100644 index 0000000..33349da Binary files /dev/null and b/game/audio/ui/uiOptionOff.wav differ diff --git a/game/audio/ui/uiOptionOn.wav b/game/audio/ui/uiOptionOn.wav new file mode 100644 index 0000000..3dc767e Binary files /dev/null and b/game/audio/ui/uiOptionOn.wav differ diff --git a/game/screens.rpy b/game/screens.rpy index 253ebf7..1b7eccf 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -1,4 +1,4 @@ -###Updater Python stuff### +###Updater Python stuff### init python: if renpy.variant("pc"): #Don't run this on mobile, not supported if persistent.updateresult is None: @@ -17,8 +17,64 @@ init python: else: persistent.updateresult = pendingVersion +#idk non-functional dummies for uisounds hackery +#coming soon + def ToggleAutoUpdate(): - persistent.autoup = not persistent.autoup + if persistent.autoup == True: + renpy.play("audio/ui/uiOptionOff.wav") + else: + renpy.play("audio/ui/uiOptionOn.wav") + persistent.autoup = not persistent.autoup + + def ToggleLewd(): + if persistent.lewd == True: + renpy.play("audio/ui/uiOptionOff.wav") + else: + renpy.play("audio/ui/uiOptionOn.wav") + persistent.lewd = not persistent.lewd + + def ToggleScroll(): + if persistent.scroll == True: + renpy.play("audio/ui/uiOptionOff.wav") + else: + renpy.play("audio/ui/uiOptionOn.wav") + persistent.scroll = not persistent.scroll + + def ToggleSkip(): + if preferences.skip_unseen == True: + renpy.play("audio/ui/uiOptionOff.wav") + else: + renpy.play("audio/ui/uiOptionOn.wav") + preferences.skip_unseen = not preferences.skip_unseen + + def ToggleAfterChoices(): + if preferences.skip_after_choices == True: + renpy.play("audio/ui/uiOptionOff.wav") + else: + renpy.play("audio/ui/uiOptionOn.wav") + preferences.skip_after_choices = not preferences.skip_after_choices + + def ToggleTransitions(): + if preferences.transitions == True: + renpy.play("audio/ui/uiOptionOff.wav") + else: + renpy.play("audio/ui/uiOptionOn.wav") + preferences.transitions = not preferences.transitions + +# def ToggleMuteAll(): +# if preferences.all_mute == True: +# renpy.play("audio/ui/uiOptionOff.wav") +# else: +# renpy.play("audio/ui/uiOptionOn.wav") +# preferences.all_mute = not preferences.all_mute + + def ToggleAutoForwardMove(): + if preferences.afm_enable == True: + renpy.play("audio/ui/uiOptionOff.wav") + else: + renpy.play("audio/ui/uiOptionOn.wav") + preferences.afm_enable = not preferences.afm_enable ################################################################################ ## Initialization @@ -48,7 +104,7 @@ style gui_text: style button: properties gui.button_properties("button") - activate_sound "audio/ui/uiClick.wav" + # activate_sound "audio/ui/uiClick.wav" style button_text is gui_text: properties gui.text_properties("button") @@ -266,6 +322,10 @@ screen quick_button(filename, label, function): xmaximum 80 ymaximum 72 action function + if 'Return' in label or 'Back' in label or 'Menu' in label: + activate_sound "audio/ui/uiBack.wav" + else: + activate_sound "audio/ui/uiClick.wav" fixed: add filename xalign 0.5 yalign 0.5 zoom 1 text label xalign 0.5 yalign 0.5 xanchor 0.5 size 22 style "quick_button_text" @@ -351,22 +411,22 @@ screen navigation(): spacing gui.navigation_spacing - textbutton _("History") action ShowMenu("history") - textbutton _("Save") action ShowMenu("save") - textbutton _("Load") action ShowMenu("load") - textbutton _("Delete") action ShowMenu("delete") - textbutton _("Options") action ShowMenu("preferences") + textbutton _("History") activate_sound "audio/ui/uiClick.wav" action ShowMenu("history") + textbutton _("Save") activate_sound "audio/ui/uiClick.wav" action ShowMenu("save") + textbutton _("Load") activate_sound "audio/ui/uiClick.wav" action ShowMenu("load") + textbutton _("Delete") activate_sound "audio/ui/uiClick.wav" action ShowMenu("delete") + textbutton _("Options") activate_sound "audio/ui/uiClick.wav" action ShowMenu("preferences") #textbutton _("Extras") action ShowMenu("extras") - textbutton _("Return") action Return() + textbutton _("Return") activate_sound "audio/ui/uiBack.wav" action Return() if _in_replay: - textbutton _("End Replay") action EndReplay(confirm=True) + textbutton _("End Replay") activate_sound "audio/ui/uiBack.wav" action EndReplay(confirm=True) elif not main_menu: - textbutton _("Main Menu") action MainMenu() + textbutton _("Main Menu") activate_sound "audio/ui/uiBack.wav" action MainMenu() #textbutton _("Debug Score Card") action ShowMenu("score_menu") #if renpy.variant("pc"): @@ -399,6 +459,10 @@ screen main_menu_button(filename, label, function): xmaximum 500 ymaximum 129 action function + if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label: + activate_sound "audio/ui/uiBack.wav" + else: + activate_sound "audio/ui/uiClick.wav" fixed: add filename xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 text label xalign 0.5 yalign 0.5 xanchor 0.5 @@ -678,7 +742,7 @@ screen updates(): label _("Update Checker:") label _("{color=#FFFFFF}{size=32}[persistent.updateresult!t]{/size}{/color}") - textbutton _("{size=36}Check for Update\n{/size}") action [Notify("Checking for update..."), Function(UpdateCheck)] + textbutton _("{size=36}Check for Update\n{/size}") activate_sound "audio/ui/uiClick.wav" action [Notify("Checking for update..."), Function(UpdateCheck)] label _("Updater:") label _("{color=#FFFFFF}{size=32}Server URL (click to edit):{/size}{/color}") @@ -699,7 +763,7 @@ screen updates(): if persistent.updateresult != "No new version is available": textbutton _("{size=36}Update Now!\n{/size}") activate_sound "audio/ui/uiNotification.wav" action [updater.Update(persistent.updateWebServer, force=False)] else: - textbutton _("{size=36}Update Now!\n{/size}") activate_sound "audio/ui/uiBack.wav" action [Notify("Nothing to update to!")] + textbutton _("{size=36}Update Now!\n{/size}") activate_sound "audio/ui/uiFail.wav" action [Notify("Nothing to update to!")] use extrasnavigation ## Load and Save screens ####################################################### @@ -794,19 +858,19 @@ screen file_slots(title, flag=False): spacing gui.page_spacing - textbutton _("<") action FilePagePrevious() + textbutton _("<") activate_sound "audio/ui/uiRollover.wav" action FilePagePrevious() if config.has_autosave: - textbutton _("{#auto_page}A") action FilePage("auto") + textbutton _("{#auto_page}A") activate_sound "audio/ui/uiClick.wav" action FilePage("auto") if config.has_quicksave: - textbutton _("{#quick_page}Q") action FilePage("quick") + textbutton _("{#quick_page}Q") activate_sound "audio/ui/uiClick.wav" action FilePage("quick") ## range(1, 10) gives the numbers from 1 to 9. for page in range(1, 10): - textbutton "[page]" action FilePage(page) + textbutton "[page]" activate_sound "audio/ui/uiClick.wav" action FilePage(page) - textbutton _(">") action FilePageNext() + textbutton _(">") activate_sound "audio/ui/uiRollover.wav" action FilePageNext() style page_label is gui_label @@ -864,32 +928,32 @@ screen preferences(): vbox: style_prefix "radio" label _("Display") - textbutton _("Window") action Preference("display", "any window") - textbutton _("Fullscreen") action Preference("display", "fullscreen") + textbutton _("Window") activate_sound "audio/ui/uiOptionOn.wav" action Preference("display", "any window") + textbutton _("Fullscreen") activate_sound "audio/ui/uiOptionOn.wav" action Preference("display", "fullscreen") vbox: style_prefix "radio" label _("Rollback Side") - textbutton _("Disable") action Preference("rollback side", "disable") - textbutton _("Left") action Preference("rollback side", "left") - textbutton _("Right") action Preference("rollback side", "right") + textbutton _("Disable") activate_sound "audio/ui/uiOptionOn.wav" action Preference("rollback side", "disable") + textbutton _("Left") activate_sound "audio/ui/uiOptionOn.wav" action Preference("rollback side", "left") + textbutton _("Right") activate_sound "audio/ui/uiOptionOn.wav" action Preference("rollback side", "right") vbox: style_prefix "check" label _("Naughty Stuff") - textbutton _("Enable Lewd Images") action ToggleVariable("persistent.lewd", True, False) + textbutton _("Enable Lewd Images") action [ToggleVariable("persistent.dummylewd", True, False), Function(ToggleLewd)] vbox: style_prefix "check" label _("Requires Restart") - textbutton _("Enable Forward-Scroll Movement") action ToggleVariable("persistent.scroll", True, False) + textbutton _("Enable Forward-Scroll Movement") action [ToggleVariable("persistent.dummyscroll", True, False), Function(ToggleScroll)] vbox: style_prefix "check" label _("Skip") - textbutton _("Unseen Text") action Preference("skip", "toggle") - textbutton _("After Choices") action Preference("after choices", "toggle") - textbutton _("Transitions") action InvertSelected(Preference("transitions", "toggle")) + textbutton _("Unseen Text") action [ToggleVariable("persistent.dummyunseentext", True, False), Function(ToggleSkip)] + textbutton _("After Choices") action [ToggleVariable("persistent.dummyafterchoices", True, False), Function(ToggleAfterChoices)] + textbutton _("Transitions") action [ToggleVariable("persistent.dummytransitions", True, False), InvertSelected(Function(ToggleTransitions))] ## Additional vboxes of type "radio_pref" or "check_pref" can be ## added here, to add additional creator-defined preferences. @@ -1148,10 +1212,10 @@ screen extrasnavigation(): use main_menu_buttons("gui/button/menubuttons/template_idle.png", [ [ "Help", ShowMenu("help") ], - [ "About", ShowMenu("about") ], - [ "Updates", ShowMenu("updates") ], + [ "About", ShowMenu("about") ], + [ "Updates", ShowMenu("updates") ], [ "Gallery", ShowMenu("cg_gallery_0") ], - [ "Return", ShowMenu("main_menu") ] + [ "Return", ShowMenu("main_menu") ] ] ) ## Help screen ################################################################# @@ -1666,9 +1730,9 @@ screen extrasnavigation(): #Updates are removed (not even supported by Ren'Py) use main_menu_buttons("gui/button/menubuttons/template_idle.png", [ [ "Help", ShowMenu("help") ], - [ "About", ShowMenu("about") ], + [ "About", ShowMenu("about") ], [ "Gallery", ShowMenu("cg_gallery_0") ], - [ "Return", ShowMenu("main_menu") ] + [ "Return", ShowMenu("main_menu") ] ] ) style radio_button: diff --git a/game/src/cg_gallery.rpy b/game/src/cg_gallery.rpy index aec52ca..c2f3a6f 100644 --- a/game/src/cg_gallery.rpy +++ b/game/src/cg_gallery.rpy @@ -158,17 +158,17 @@ screen cg_gallery(flag, __yoffset = 0, origin = 'CG'): textbutton _(cp['name']) text_color gui.selected_color text_xalign 0.5 else: if cp['eval'] is None: - textbutton _(cp['name']) action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5 + textbutton _(cp['name']) activate_sound "audio/ui/uiClick.wav" action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5 elif eval(cp['eval']): - textbutton _(cp['name']) action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5 + textbutton _(cp['name']) activate_sound "audio/ui/uiClick.wav" action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5 else: textbutton _(cp['name']) text_xalign 0.5 - textbutton _("Return") action ShowMenu('main_menu') text_xalign 0.5 + textbutton _("Return") activate_sound "audio/ui/uiBack.wav" action ShowMenu('main_menu') text_xalign 0.5 if _in_replay: - textbutton _("End Replay") action EndReplay(confirm=True) + textbutton _("End Replay") activate_sound "audio/ui/uiBack.wav" action EndReplay(confirm=True) elif not main_menu: - textbutton _("Main Menu") action MainMenu() + textbutton _("Main Menu") activate_sound "audio/ui/uiBack.wav" action MainMenu() transform: zoom 0.95 diff --git a/game/src/mod_menu.rpy b/game/src/mod_menu.rpy index a068e04..6085dc6 100644 --- a/game/src/mod_menu.rpy +++ b/game/src/mod_menu.rpy @@ -10,6 +10,10 @@ screen mod_menu_button(filename, label, function): xmaximum 600 ymaximum 129 action function + if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label: + activate_sound "audio/ui/uiBack.wav" + else: + activate_sound "audio/ui/uiClick.wav" fixed: add filename xalign 0.5 yalign 0.5 zoom 0.9 text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34