✨ actions tab for downloads ✨

buildnumber.txt

@@ -1 +1 @@
-2239
+2246

source/funkin/game/StrumLine.hx

@@ -27,7 +27,7 @@ class StrumLine extends FlxTypedGroup<Strum> {
     /**
      * Whenever Ghost Tapping is enabled.
      */
-    @:isVar public var ghostTapping(get, set):Null<Bool> = false;
+    @:isVar public var ghostTapping(get, set):Null<Bool> = null;
 
     private function get_ghostTapping() {
         if (this.ghostTapping != null) return this.ghostTapping;

source/funkin/macros/ScriptsMacro.hx

@@ -13,7 +13,7 @@ class ScriptsMacro {
         Compiler.include("flixel");
         Compiler.include("away3d");
         Compiler.include("flx3d");
-        #if sys
+        #if (sys && !web)
         Compiler.include("sys");
         #end
 
@@ -24,7 +24,9 @@ class ScriptsMacro {
         Compiler.include("haxe.crypto");
         Compiler.include("haxe.display");
         Compiler.include("haxe.exceptions");
+        #if !web
         Compiler.include("haxe.extern");
+        #end
         
         Compiler.include("scripting");
 

source/funkin/options/Options.hx

@@ -27,6 +27,7 @@ class Options
 	public static var week6PixelPerfect:Bool = true;
 	public static var betaUpdates:Bool = false;
 	public static var hitWindow:Float = 250;
+	public static var framerate:Int = 1000;
 
 	public static var lastLoadedMod:String = null;
 
@@ -104,6 +105,7 @@ class Options
 		applyKeybinds();
 		FlxG.game.stage.quality = (FlxG.forceNoAntialiasing = !antialiasing) ? LOW : BEST;
 		FlxG.autoPause = autoPause;
+		FlxG.drawFramerate = FlxG.updateFramerate = framerate;
 	}
 
 	public static function applyKeybinds() {

source/funkin/scripting/MultiThreadedScript.hx

@@ -2,10 +2,10 @@ package funkin.scripting;
 
 #if ALLOW_MULTITHREADING
 import sys.thread.Thread;
-import flixel.util.FlxDestroyUtil;
 #end
 
 import hscript.IHScriptCustomBehaviour;
+import flixel.util.FlxDestroyUtil;
 
 class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBehaviour {
     var thread:#if ALLOW_MULTITHREADING Thread #else Dynamic #end;
@@ -47,10 +47,12 @@ class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBe
 
         script.load();
 
+        #if ALLOW_MULTITHREADING
         thread = Thread.createWithEventLoop(function() {
             // Prevent the thread from being auto deleted
             Thread.current().events.promise();
         });
+        #end
 
         __variables = Type.getInstanceFields(Type.getClass(this));
     }
@@ -67,11 +69,16 @@ class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBe
     }
 
     public function call(func:String, args:Array<Dynamic>) {
+        #if ALLOW_MULTITHREADING
         thread.events.run(function() {
             callEnded = false;
             returnValue = script.call(func, args);
             callEnded = true;
         });
+        #else
+        returnValue = script.call(func, args);
+        callEnded = true;
+        #end
     }
 
     public function destroy() {
@@ -80,10 +87,12 @@ class MultiThreadedScript implements IFlxDestroyable implements IHScriptCustomBe
             script.destroy();
         }
 
+        #if ALLOW_MULTITHREADING
         if (thread != null) {
             thread.events.runPromised(function() {
                 // close the thing
             });
         }
+        #end
     }
 }

source/funkin/scripting/Script.hx

@@ -84,7 +84,7 @@ class Script extends FlxBasic implements IFlxDestroyable {
             "CoolUtil"          => funkin.utils.CoolUtil,
             "IniUtil"           => funkin.utils.IniUtil,
             "XMLUtil"           => funkin.utils.XMLUtil,
-            "ZipUtil"           => funkin.utils.ZipUtil,
+            #if sys "ZipUtil"   => funkin.utils.ZipUtil, #end
             "MarkdownUtil"      => funkin.utils.MarkdownUtil,
             "EngineUtil"        => funkin.utils.EngineUtil,
         ];

source/funkin/utils/DiscordUtil.hx

@@ -3,12 +3,12 @@ package funkin.utils;
 import funkin.scripting.events.DiscordPresenceUpdateEvent;
 import haxe.Json;
 import openfl.utils.Assets;
+import flixel.system.FlxSound;
 #if DISCORD_RPC
 import discord_rpc.DiscordRpc;
 import sys.thread.Thread;
 import Sys;
 import lime.app.Application;
-import flixel.system.FlxSound;
 #end
 
 class DiscordUtil {

source/funkin/utils/ZipUtil.hx

@@ -1,5 +1,6 @@
 package funkin.utils;
 
+#if sys
 #if (!macro && sys)
 import openfl.display.BitmapData;
 #end
@@ -263,4 +264,5 @@ class StrNameLabel {
         this.name = name;
         this.label = label;
     }
-}
+}
+#end