diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index a191c2ada..f01e4f100 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -71,7 +71,7 @@ class Options /** * PLAYER 1 CONTROLS */ - + // Notes public static var P1_NOTE_LEFT:Array = [A]; public static var P1_NOTE_DOWN:Array = [S]; @@ -90,7 +90,10 @@ class Options // Misc public static var P1_RESET:Array = [R]; public static var P1_SWITCHMOD:Array = [TAB]; - + public static var P1_VOLUME_UP:Array = []; + public static var P1_VOLUME_DOWN:Array = []; + public static var P1_VOLUME_MUTE:Array = []; + // Debugs public static var P1_DEBUG_RELOAD:Array = [F5]; @@ -116,14 +119,17 @@ class Options // Misc public static var P2_RESET:Array = []; public static var P2_SWITCHMOD:Array = []; - + public static var P2_VOLUME_UP:Array = [NUMPADPLUS]; + public static var P2_VOLUME_DOWN:Array = [NUMPADMINUS]; + public static var P2_VOLUME_MUTE:Array = [NUMPADZERO]; + // Debugs public static var P2_DEBUG_RELOAD:Array = []; /** * SOLO GETTERS */ - + // Notes public static var SOLO_NOTE_LEFT(get, null):Array; public static var SOLO_NOTE_DOWN(get, null):Array; @@ -142,6 +148,9 @@ class Options // Misc public static var SOLO_RESET(get, null):Array; public static var SOLO_SWITCHMOD(get, null):Array; + public static var SOLO_VOLUME_UP(get, null):Array; + public static var SOLO_VOLUME_DOWN(get, null):Array; + public static var SOLO_VOLUME_MUTE(get, null):Array; // Debugs public static var SOLO_DEBUG_RELOAD(get, null):Array; @@ -173,6 +182,10 @@ class Options PlayerSettings.solo.setKeyboardScheme(Solo); PlayerSettings.player1.setKeyboardScheme(Duo(true)); PlayerSettings.player2.setKeyboardScheme(Duo(false)); + + FlxG.sound.volumeUpKeys = SOLO_VOLUME_UP; + FlxG.sound.volumeDownKeys = SOLO_VOLUME_DOWN; + FlxG.sound.muteKeys = SOLO_VOLUME_MUTE; } public static function save() { diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index b7cb6bbb5..621143d4d 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -66,6 +66,23 @@ class KeybindsOptions extends MusicBeatSubstate { }, ] }, + { + name: 'Volume', + settings: [ + { + name: 'Up', + control: 'VOLUME_UP' + }, + { + name: 'Down', + control: 'VOLUME_DOWN' + }, + { + name: 'Mute', + control: 'VOLUME_MUTE' + }, + ] + }, { name: 'Engine', settings: [ @@ -171,6 +188,10 @@ class KeybindsOptions extends MusicBeatSubstate { } add(alphabets); add(camFollow); + + FlxG.sound.volumeUpKeys = []; + FlxG.sound.volumeDownKeys = []; + FlxG.sound.muteKeys = []; } public override function destroy() {