Merge branch 'choreo' of git.snootgame.xyz:Bowie/SnootGame into choreo

This commit is contained in:
Bowie 2021-10-07 20:48:49 +01:00
commit e61f3fdf73
2 changed files with 19 additions and 18 deletions

View File

@ -47,7 +47,7 @@ define build.name = "SnootGame"
define config.has_sound = True
define config.has_music = True
define config.has_voice = True
define config.has_voice = False
define config.play_channel = "uisounds"
@ -133,8 +133,8 @@ default preferences.text_cps = 50
default preferences.afm_time = 15
##Default Audio is not ear rape
define config.default_music_volume = 0.075
define config.default_sfx_volume = 0.075
define config.default_music_volume = 0.55
define config.default_sfx_volume = 0.90
## Save directory ##############################################################
##

View File

@ -943,39 +943,40 @@ screen preferences():
if config.has_music:
label _("Music Volume")
hbox:
bar value Preference("music volume")
if config.has_music:
label _("UI Sounds Volume")
hbox:
bar value Preference("ui volume")
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("sound volume")
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")
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 or config.has_ui:
null height gui.pref_spacing
textbutton _("Mute All"):
action Preference("all mute", "toggle")
style "mute_all_button"