stuff

2023-03-15 01:24:10 +01:00
parent 8b595cf7b4
commit a39b8644c9
24 changed files with 46 additions and 36 deletions
@@ -1 +1 @@
-2498
+2508
@@ -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
    }
 }
@@ -1,7 +1,6 @@
 package funkin.editors;

 import flixel.addons.transition.FlxTransitionableState;
-import funkin.options.Options;
 import flixel.math.FlxPoint;
 import flixel.effects.FlxFlicker;

@@ -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();
@@ -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);
        }
    }

@@ -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;
@@ -1,6 +1,5 @@
 package funkin.game;

-import funkin.options.Options;
 import flixel.FlxState;
 import haxe.xml.Access;
 import funkin.interfaces.IBeatReceiver;
@@ -1,7 +1,6 @@
 package funkin.game;

 import flixel.math.FlxPoint;
-import funkin.options.Options;
 import funkin.system.Conductor;

 class Strum extends FlxSprite {
@@ -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;

@@ -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);
@@ -1,6 +1,5 @@
 package funkin.mods;

-import funkin.options.Options;
 import funkin.menus.TitleState;
 import funkin.system.Main;
 import openfl.utils.AssetCache;
@@ -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
 	 */
@@ -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
-    }
-}
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -1,6 +1,5 @@
 package funkin.updating;

-import funkin.options.Options;
 import sys.FileSystem;
 import haxe.io.Path;
 import funkin.github.GitHubRelease;
@@ -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;
 }