From 360c253ed67c4532f383b55ca4290281c38c85e0 Mon Sep 17 00:00:00 2001
From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:39:57 +0100
Subject: [PATCH] !!

---
 buildnumber.txt                        | 2 +-
 source/funkin/options/OptionsMenu.hx   | 8 ++++++--
 source/funkin/options/OptionsScreen.hx | 4 +++-
 source/funkin/scripting/Script.hx      | 4 ++--
 source/funkin/ui/Alphabet.hx           | 2 ++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/buildnumber.txt b/buildnumber.txt
index 3af922be..b5089da9 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-1315
\ No newline at end of file
+1323
\ No newline at end of file
diff --git a/source/funkin/options/OptionsMenu.hx b/source/funkin/options/OptionsMenu.hx
index d79dae40..099b9ff9 100644
--- a/source/funkin/options/OptionsMenu.hx
+++ b/source/funkin/options/OptionsMenu.hx
@@ -1,5 +1,6 @@
 package funkin.options;
 
+import flixel.util.typeLimit.OneOfTwo;
 import flixel.FlxState;
 import flixel.addons.transition.FlxTransitionableState;
 import flixel.group.FlxGroup.FlxTypedGroup;
@@ -15,7 +16,7 @@ import funkin.options.categories.*;
 typedef OptionCategory = {
     var name:String;
     var desc:String;
-    var state:Class<FlxState>;
+    var state:OneOfTwo<Class<FlxState>, FlxState>;
 }
 class OptionsMenu extends MusicBeatState {
     public static var fromPlayState:Bool = false;
@@ -85,7 +86,10 @@ class OptionsMenu extends MusicBeatState {
             FlxFlicker.flicker(alphabets.members[curSelected], 1, Options.flashingMenu ? 0.06 : 0.15, false, false, function(flick:FlxFlicker)
             {
                 FlxTransitionableState.skipNextTransOut = true;
-                FlxG.switchState(Type.createInstance(options[curSelected].state, []));
+                if (options[curSelected].state is FlxState)
+                    FlxG.switchState(options[curSelected].state);
+                else 
+                    FlxG.switchState(Type.createInstance(options[curSelected].state, []));
             });
         } else if (controls.BACK) {
             if (fromPlayState)
diff --git a/source/funkin/options/OptionsScreen.hx b/source/funkin/options/OptionsScreen.hx
index 07323b4a..0372fdf9 100644
--- a/source/funkin/options/OptionsScreen.hx
+++ b/source/funkin/options/OptionsScreen.hx
@@ -64,6 +64,8 @@ class OptionsScreen extends MusicBeatState {
         descDrop.scrollFactor.set();
         add(descDrop);
 
+        descText.antialiasing = descDrop.antialiasing = true;
+
         for(k=>option in options) {
             option.setPosition(k * 20, 10 + (k * optionHeight));
             add(option);
@@ -116,7 +118,7 @@ class OptionsScreen extends MusicBeatState {
     }
 
     public function updateDesc() {
-        descText.text = '/ ${options[curSelected].desc} /';
+        descText.text = '/    ${options[curSelected].desc}    /';
         @:privateAccess descText.regenGraphic(); //updates the thing
 
         descDrop.loadFrame(descText.frame);
diff --git a/source/funkin/scripting/Script.hx b/source/funkin/scripting/Script.hx
index f9eeca46..d21f9fab 100644
--- a/source/funkin/scripting/Script.hx
+++ b/source/funkin/scripting/Script.hx
@@ -76,7 +76,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
      * All available script extensions
      */
     public static var scriptExtensions:Array<String> = [
-        "hx", "hscript", "hsc"
+        "hx", "hscript", "hsc", "hxs", "lua" /** ACTUALLY NOT SUPPORTED, ONLY FOR THE MESSAGE **/
     ];
 
     /**
@@ -101,7 +101,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
     public static function create(path:String):Script {
         if (Assets.exists(path)) {
             return switch(Path.extension(path).toLowerCase()) {
-                case "hx" | "hscript" | "hsc":
+                case "hx" | "hscript" | "hsc" | "hxs":
                     new HScript(path);
                 case "lua":
                     Logs.trace("Lua is not supported in this engine. Use HScript instead.", ERROR);
diff --git a/source/funkin/ui/Alphabet.hx b/source/funkin/ui/Alphabet.hx
index 0cd1364c..b52376a9 100644
--- a/source/funkin/ui/Alphabet.hx
+++ b/source/funkin/ui/Alphabet.hx
@@ -251,6 +251,7 @@ class AlphaCharacter extends FlxSprite
 		letter = letter.toUpperCase();
 		if (boldAnims[letter] == null) {
 			visible = false;
+			scale.set();
 			width = 40;
 			return;
 		}
@@ -264,6 +265,7 @@ class AlphaCharacter extends FlxSprite
 	{
 		if (letterAnims[letter] == null) {
 			visible = false;
+			scale.set();
 			width = 40;
 			return;
 		}