From a39b8644c9ed665c8a7540861456a0206067b23b Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Wed, 15 Mar 2023 01:24:10 +0100 Subject: [PATCH] stuff --- assets/sounds/menu/checkboxChecked.mp3 | Bin 0 -> 3480 bytes assets/sounds/menu/checkboxChecked.ogg | Bin 0 -> 6585 bytes assets/sounds/menu/checkboxUnchecked.mp3 | Bin 0 -> 3312 bytes assets/sounds/menu/checkboxUnchecked.ogg | Bin 0 -> 6684 bytes buildnumber.txt | 2 +- source/funkin/editors/DebugOptions.hx | 27 +++++++++++++++++- source/funkin/editors/EditorPicker.hx | 1 - source/funkin/editors/UIDebugState.hx | 2 +- source/funkin/editors/ui/UICheckbox.hx | 9 ++++-- source/funkin/game/PlayState.hx | 1 - source/funkin/game/Stage.hx | 1 - source/funkin/game/Strum.hx | 1 - source/funkin/import.hx | 1 + source/funkin/menus/MainMenuState.hx | 3 +- source/funkin/mods/ModsFolder.hx | 1 - source/funkin/options/Options.hx | 6 ++++ .../funkin/options/categories/DebugOptions.hx | 17 ----------- .../options/keybinds/ChangeKeybindSubState.hx | 1 - .../funkin/options/keybinds/KeybindSetting.hx | 1 - .../options/keybinds/KeybindsOptions.hx | 1 - source/funkin/system/Controls.hx | 1 - source/funkin/system/Main.hx | 1 - source/funkin/updating/UpdateUtil.hx | 1 - source/funkin/utils/CoolUtil.hx | 4 +++ 24 files changed, 46 insertions(+), 36 deletions(-) create mode 100644 assets/sounds/menu/checkboxChecked.mp3 create mode 100644 assets/sounds/menu/checkboxChecked.ogg create mode 100644 assets/sounds/menu/checkboxUnchecked.mp3 create mode 100644 assets/sounds/menu/checkboxUnchecked.ogg delete mode 100644 source/funkin/options/categories/DebugOptions.hx diff --git a/assets/sounds/menu/checkboxChecked.mp3 b/assets/sounds/menu/checkboxChecked.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..4d81b62ceb6abe32af06fb972223372481c1aba1 GIT binary patch literal 3480 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 literal 0 HcmV?d00001 diff --git a/assets/sounds/menu/checkboxChecked.ogg b/assets/sounds/menu/checkboxChecked.ogg new file mode 100644 index 0000000000000000000000000000000000000000..014efd8093028d82404fea9e636ddd8789bf56bc GIT binary patch literal 6585 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 literal 0 HcmV?d00001 diff --git a/assets/sounds/menu/checkboxUnchecked.ogg b/assets/sounds/menu/checkboxUnchecked.ogg new file mode 100644 index 0000000000000000000000000000000000000000..59a78de6d0733a2a06207ec35c924fce99e01e6d GIT binary patch literal 6684 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 literal 0 HcmV?d00001 diff --git a/buildnumber.txt b/buildnumber.txt index b2ae9591..ac037cdb 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2498 \ No newline at end of file +2508 \ No newline at end of file diff --git a/source/funkin/editors/DebugOptions.hx b/source/funkin/editors/DebugOptions.hx index 29c3ae0e..ad784031 100644 --- a/source/funkin/editors/DebugOptions.hx +++ b/source/funkin/editors/DebugOptions.hx @@ -1,6 +1,9 @@ package funkin.editors; +import funkin.options.type.*; +import funkin.options.OptionsScreen; import funkin.options.TreeMenu; +import funkin.windows.WindowsAPI; class DebugOptions extends TreeMenu { public override function create() { @@ -18,6 +21,28 @@ class DebugOptions extends TreeMenu { bg.antialiasing = true; add(bg); - main = new funkin.options.categories.DebugOptions(); + main = new DebugOptionsScreen(); + } +} + +class DebugOptionsScreen extends OptionsScreen { + public override function new() { + super("Debug Options", "Use this menu to change debug options."); + #if windows + add(new TextOption( + "Show Console", + "Select this to show the debug console, which contains log information about the game.", + function() { + WindowsAPI.allocConsole(); + })); + add(new Checkbox( + "Enable Editor SFXs", + "If checked, will play sound effects when working on editors (ex: will play sfxs when checking checkboxes...)", + "editorSFX")); + add(new Checkbox( + "Resizable Editors", + "If checked, editors will be resizable and extensible like other programs instead of zooming in upon maximization.", + "resizableEditors")); + #end } } \ No newline at end of file diff --git a/source/funkin/editors/EditorPicker.hx b/source/funkin/editors/EditorPicker.hx index 883ac0d5..f128f4bf 100644 --- a/source/funkin/editors/EditorPicker.hx +++ b/source/funkin/editors/EditorPicker.hx @@ -1,7 +1,6 @@ package funkin.editors; import flixel.addons.transition.FlxTransitionableState; -import funkin.options.Options; import flixel.math.FlxPoint; import flixel.effects.FlxFlicker; diff --git a/source/funkin/editors/UIDebugState.hx b/source/funkin/editors/UIDebugState.hx index 08dbcf60..9aba4f09 100644 --- a/source/funkin/editors/UIDebugState.hx +++ b/source/funkin/editors/UIDebugState.hx @@ -5,7 +5,7 @@ import funkin.editors.ui.*; class UIDebugState extends UIState { public override function create() { super.create(); - var bg = new FlxSprite().makeGraphic(0xFF888888); + var bg = new FlxSprite().makeGraphic(1, 1, 0xFF888888); bg.scale.set(FlxG.width, FlxG.height); bg.updateHitbox(); bg.scrollFactor.set(); diff --git a/source/funkin/editors/ui/UICheckbox.hx b/source/funkin/editors/ui/UICheckbox.hx index a2c6d597..894450b5 100644 --- a/source/funkin/editors/ui/UICheckbox.hx +++ b/source/funkin/editors/ui/UICheckbox.hx @@ -18,7 +18,7 @@ class UICheckbox extends UISprite { this.checked = checked; - field = new FunkinText(x, y, text, w); + field = new FunkinText(x, y, w, text, 14, false); check = new FlxSprite().loadGraphicFromSprite(this); check.animation.play("checkmark"); @@ -45,8 +45,8 @@ class UICheckbox extends UISprite { public inline function updatePositions() { check.cameras = field.cameras = cameras; - - field.setPosition(x + 30, y); + + field.setPosition(x + 25, y); check.setPosition(x, y); } @@ -63,6 +63,9 @@ class UICheckbox extends UISprite { // clicked checked = !checked; check.scale.set(1.25, 1.25); + + if (Options.editorSFX) + CoolUtil.playMenuSFX(checked ? CHECKED : UNCHECKED, 0.5); } } diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 447bcbce..d874f951 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -7,7 +7,6 @@ import funkin.scripting.DummyScript; import funkin.menus.StoryMenuState.WeekData; import funkin.ui.FunkinText; import flixel.group.FlxSpriteGroup; -import funkin.options.Options; import funkin.scripting.Script; import flixel.util.FlxDestroyUtil; import funkin.scripting.ScriptPack; diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx index 63f8d07a..822ca199 100644 --- a/source/funkin/game/Stage.hx +++ b/source/funkin/game/Stage.hx @@ -1,6 +1,5 @@ package funkin.game; -import funkin.options.Options; import flixel.FlxState; import haxe.xml.Access; import funkin.interfaces.IBeatReceiver; diff --git a/source/funkin/game/Strum.hx b/source/funkin/game/Strum.hx index 0c95b755..a1c7fcdc 100644 --- a/source/funkin/game/Strum.hx +++ b/source/funkin/game/Strum.hx @@ -1,7 +1,6 @@ package funkin.game; import flixel.math.FlxPoint; -import funkin.options.Options; import funkin.system.Conductor; class Strum extends FlxSprite { diff --git a/source/funkin/import.hx b/source/funkin/import.hx index 093733b3..233ef4f3 100644 --- a/source/funkin/import.hx +++ b/source/funkin/import.hx @@ -6,6 +6,7 @@ import funkin.system.MusicBeatGroup; import funkin.system.FunkinSprite; import funkin.utils.*; import funkin.system.Logs; +import funkin.options.Options; import funkin.game.PlayState; import funkin.scripting.EventManager; diff --git a/source/funkin/menus/MainMenuState.hx b/source/funkin/menus/MainMenuState.hx index 68f2a9ec..5072107a 100644 --- a/source/funkin/menus/MainMenuState.hx +++ b/source/funkin/menus/MainMenuState.hx @@ -2,7 +2,6 @@ package funkin.menus; import haxe.Json; import funkin.ui.FunkinText; -import funkin.options.Options; // import funkin.menus.credits.CreditsMain; import flixel.FlxState; import flixel.addons.transition.FlxTransitionableState; @@ -77,7 +76,7 @@ class MainMenuState extends MusicBeatState FlxG.camera.follow(camFollow, null, 0.06); - var versionShit:FunkinText = new FunkinText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\nBeta: Build ${funkin.macros.BuildCounterMacro.getBuildNumber()}\n'); + var versionShit:FunkinText = new FunkinText(5, FlxG.height - 2, 0, 'Codename Engine v${Application.current.meta.get('version')}\nBeta: Build ${funkin.macros.BuildCounterMacro.getBuildNumber()}\n[TAB] Open Mods menu\n'); versionShit.scrollFactor.set(); versionShit.y -= versionShit.height; add(versionShit); diff --git a/source/funkin/mods/ModsFolder.hx b/source/funkin/mods/ModsFolder.hx index b554291e..43bf1218 100644 --- a/source/funkin/mods/ModsFolder.hx +++ b/source/funkin/mods/ModsFolder.hx @@ -1,6 +1,5 @@ package funkin.mods; -import funkin.options.Options; import funkin.menus.TitleState; import funkin.system.Main; import openfl.utils.AssetCache; diff --git a/source/funkin/options/Options.hx b/source/funkin/options/Options.hx index 2907dd14..acace74f 100644 --- a/source/funkin/options/Options.hx +++ b/source/funkin/options/Options.hx @@ -32,6 +32,12 @@ class Options public static var lastLoadedMod:String = null; + /** + * EDITORS SETTINGS + */ + public static var editorSFX:Bool = true; + public static var resizableEditors:Bool = true; + /** * PLAYER 1 CONTROLS */ diff --git a/source/funkin/options/categories/DebugOptions.hx b/source/funkin/options/categories/DebugOptions.hx deleted file mode 100644 index 7f98bddc..00000000 --- a/source/funkin/options/categories/DebugOptions.hx +++ /dev/null @@ -1,17 +0,0 @@ -package funkin.options.categories; - -import funkin.windows.WindowsAPI; - -class DebugOptions extends OptionsScreen { - public override function new() { - super("Debug Options", "Use this menu to change debug options."); - #if windows - add(new TextOption( - "Show Console", - "Select this to show the debug console, which contains log information about the game.", - function() { - WindowsAPI.allocConsole(); - })); - #end - } -} \ No newline at end of file diff --git a/source/funkin/options/keybinds/ChangeKeybindSubState.hx b/source/funkin/options/keybinds/ChangeKeybindSubState.hx index 934078a5..766ee444 100644 --- a/source/funkin/options/keybinds/ChangeKeybindSubState.hx +++ b/source/funkin/options/keybinds/ChangeKeybindSubState.hx @@ -2,7 +2,6 @@ package funkin.options.keybinds; import flixel.effects.FlxFlicker; import funkin.system.Controls; -import funkin.options.Options; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; diff --git a/source/funkin/options/keybinds/KeybindSetting.hx b/source/funkin/options/keybinds/KeybindSetting.hx index dedc225b..3cbad799 100644 --- a/source/funkin/options/keybinds/KeybindSetting.hx +++ b/source/funkin/options/keybinds/KeybindSetting.hx @@ -2,7 +2,6 @@ package funkin.options.keybinds; import flixel.effects.FlxFlicker; import funkin.system.Controls; -import funkin.options.Options; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; diff --git a/source/funkin/options/keybinds/KeybindsOptions.hx b/source/funkin/options/keybinds/KeybindsOptions.hx index 281dddb3..01ae3eaa 100644 --- a/source/funkin/options/keybinds/KeybindsOptions.hx +++ b/source/funkin/options/keybinds/KeybindsOptions.hx @@ -1,7 +1,6 @@ package funkin.options.keybinds; import funkin.system.Controls; -import funkin.options.Options; import flixel.addons.transition.FlxTransitionableState; import flixel.util.FlxColor; import flixel.input.keyboard.FlxKey; diff --git a/source/funkin/system/Controls.hx b/source/funkin/system/Controls.hx index 04caee4c..5ca81129 100644 --- a/source/funkin/system/Controls.hx +++ b/source/funkin/system/Controls.hx @@ -1,6 +1,5 @@ package funkin.system; -import funkin.options.Options; import flixel.input.FlxInput; import flixel.input.actions.FlxAction; import flixel.input.actions.FlxActionInput; diff --git a/source/funkin/system/Main.hx b/source/funkin/system/Main.hx index bcc35918..d1e105f8 100644 --- a/source/funkin/system/Main.hx +++ b/source/funkin/system/Main.hx @@ -8,7 +8,6 @@ import funkin.windows.WindowsAPI; import funkin.menus.BetaWarningState; import funkin.menus.TitleState; import funkin.game.Highscore; -import funkin.options.Options; import flixel.FlxGame; import flixel.FlxState; import openfl.Assets; diff --git a/source/funkin/updating/UpdateUtil.hx b/source/funkin/updating/UpdateUtil.hx index c7606995..b6c7a9d3 100644 --- a/source/funkin/updating/UpdateUtil.hx +++ b/source/funkin/updating/UpdateUtil.hx @@ -1,6 +1,5 @@ package funkin.updating; -import funkin.options.Options; import sys.FileSystem; import haxe.io.Path; import funkin.github.GitHubRelease; diff --git a/source/funkin/utils/CoolUtil.hx b/source/funkin/utils/CoolUtil.hx index 150dd7d3..a6966533 100644 --- a/source/funkin/utils/CoolUtil.hx +++ b/source/funkin/utils/CoolUtil.hx @@ -193,6 +193,8 @@ class CoolUtil case CONFIRM: 'menu/confirm'; case CANCEL: 'menu/cancel'; case SCROLL: 'menu/scroll'; + case CHECKED: 'menu/checkboxChecked'; + case UNCHECKED: 'menu/checkboxUnchecked'; default: 'menu/scroll'; }), volume); } @@ -413,4 +415,6 @@ enum abstract CoolSfx(Int) from Int { var SCROLL = 0; var CONFIRM = 1; var CANCEL = 2; + var CHECKED = 3; + var UNCHECKED = 4; } \ No newline at end of file