Cavemanon
/
SnootGame
25
0
Fork 16
Code Issues 2 Pull Requests 3 Projects Releases 4 Wiki Activity

Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6

This commit is contained in:
Nutbuster 2021-08-03 11:37:43 +10:00
parent 9bed598168 c723cb19f3
commit b1cdf38707
6 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
game/audio/ui/uiBack.wav Normal file
View File

Binary file not shown.

BIN
game/audio/ui/uiClick.wav Normal file
View File

Binary file not shown.

BIN
game/audio/ui/uiNotification.wav Normal file
View File

Binary file not shown.

BIN
game/audio/ui/uiRollover.wav Normal file
View File

Binary file not shown.

8
game/options.rpy
View File

@ -47,7 +47,13 @@ define build.name = "SnootGame"
define config.has_sound = True
define config.has_music = True
define config.has_voice = False
define config.has_voice = True
define config.play_channel = "uisounds"
##Custom Channels?
init -1 python:
renpy.music.register_channel("uisounds", "ui", loop=False, stop_on_mute=True)
## To allow the user to play a test sound on the sound or voice channel,

15
game/screens.rpy
View File

@ -48,6 +48,7 @@ style gui_text:
style button:
properties gui.button_properties("button")
activate_sound "audio/ui/uiClick.wav"
style button_text is gui_text:
properties gui.text_properties("button")
@ -681,6 +682,7 @@ screen updates():
label _("Updater:")
label _("{color=#FFFFFF}{size=32}Server URL (click to edit):{/size}{/color}")
default input_on = False
button:
key_events True
@ -695,10 +697,9 @@ screen updates():
action ToggleScreenVariable('input_on')
style_prefix "quick"
if persistent.updateresult != "No new version is available":
textbutton _("{size=36}Update Now!\n{/size}") action updater.Update(persistent.updateWebServer, force=False)
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}") action Notify("Nothing to update to!")
textbutton _("{size=36}Update Now!\n{/size}") activate_sound "audio/ui/uiBack.wav" action [Notify("Nothing to update to!")]
use extrasnavigation
## Load and Save screens #######################################################
@ -917,6 +918,12 @@ screen preferences():
hbox:
bar value Preference("music volume")
if config.has_music:
label _("UI Sounds Volume")
hbox:
bar value Preference("ui volume")
if config.has_sound:
label _("Sound Volume")
@ -937,7 +944,7 @@ screen preferences():
if config.sample_voice:
textbutton _("Test") action Play("voice", config.sample_voice)
if config.has_music or config.has_sound or config.has_voice:
if config.has_music or config.has_sound or config.has_voice or config.has_ui:
null height gui.pref_spacing
textbutton _("Mute All"):