diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index a9bf72ac1..b1a33d1a4 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -84,6 +84,9 @@ class Options public static var P1_PAUSE:Array = [ENTER]; public static var P1_RESET:Array = [R]; public static var P1_SWITCHMOD:Array = [TAB]; + public static var P1_VOLUME_UP:Array = [PLUS]; + public static var P1_VOLUME_DOWN:Array = [MINUS]; + public static var P1_VOLUME_MUTE:Array = [ZERO]; /** * PLAYER 2 CONTROLS (ALT) @@ -101,6 +104,9 @@ class Options public static var P2_PAUSE:Array = [ESCAPE]; 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]; /** * SOLO GETTERS @@ -118,6 +124,9 @@ class Options public static var SOLO_PAUSE(get, null):Array; 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; public static function load() { if (__save == null) __save = new FlxSave(); @@ -146,6 +155,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 e4e7d26cd..b05e4c4a5 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: [ @@ -162,6 +179,10 @@ class KeybindsOptions extends MusicBeatSubstate { } add(alphabets); add(camFollow); + + FlxG.sound.volumeUpKeys = []; + FlxG.sound.volumeDownKeys = []; + FlxG.sound.muteKeys = []; } public override function destroy() {