Merge branch 'main' into base-fnf-port-remake

source/funkin/backend/FunkinSprite.hx

@@ -103,7 +103,7 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 		if (!debugMode && isAnimFinished()) {
 			var name = getAnimName() + '-loop';
 			if (hasAnimation(name))
-				playAnim(name, false, lastAnimContext);
+				playAnim(name, null, lastAnimContext);
 		}
 	}
 
@@ -296,11 +296,16 @@ class FunkinSprite extends FlxSkewedSprite implements IBeatReceiver implements I
 	#if REGION
 	public var lastAnimContext:PlayAnimContext = DANCE;
 
-	public function playAnim(AnimName:String, Force:Bool = false, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0):Void
+	public function playAnim(AnimName:String, ?Force:Null<Bool>, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0):Void
 	{
 		if (AnimName == null)
 			return;
 
+		if (Force == null) {
+			var anim = animDatas.get(AnimName);
+			Force = anim != null && anim.forced;
+		}
+
 		if (animateAtlas != null)
 		{
 			@:privateAccess

source/funkin/backend/chart/EventsData.hx

@@ -69,7 +69,11 @@ class EventsData {
 		hscriptInterp.variables.set("String", TString);
 		hscriptInterp.variables.set("StrumLine", TStrumLine);
 		hscriptInterp.variables.set("ColorWheel", TColorWheel);
-		hscriptInterp.variables.set("DropDown", Reflect.makeVarArgs((args) -> {return args.length > 0 ? TDropDown([for (arg in args) Std.string(arg)]) : TDropDown(["null"]);}));
+		hscriptInterp.variables.set("DropDown", Reflect.makeVarArgs(function(args:Array<Dynamic>):EventParamType {
+			var flatArgs = CoolUtil.deepFlatten(args);
+			if(flatArgs.length == 0) return TDropDown(["null"]);
+			return TDropDown([for (arg in flatArgs) Std.string(arg)]);
+		}));
 		hscriptInterp.variables.set("Character", TCharacter);
 		hscriptInterp.variables.set("Stage", TStage);
 
@@ -77,11 +81,12 @@ class EventsData {
 		hscriptParser.allowJSON = hscriptParser.allowMetadata = false;
 
 		for (file in Paths.getFolderContent('data/events/', true, BOTH)) {
-			if (Path.extension(file) != "json" && Path.extension(file) != "pack") continue;
-			var eventName:String = Path.withoutExtension(Path.withoutDirectory(file));
+			var ext = Path.extension(file);
+			if (ext != "json" && ext != "pack") continue;
+			var eventName:String = CoolUtil.getFilename(file);
 			var fileTxt:String = Assets.getText(file);
 
-			if (Path.extension(file) == "pack") {
+			if (ext == "pack") {
 				var arr = fileTxt.split("________PACKSEP________");
 				eventName = Path.withoutExtension(arr[0]);
 				fileTxt = arr[2];
@@ -93,13 +98,17 @@ class EventsData {
 			eventsParams.set(eventName, []);
 
 			try {
-				var data:Dynamic = Json.parse(fileTxt);
+				var data:EventInfoFile = cast Json.parse(fileTxt);
 				if (data == null || data.params == null) continue;
 
 				var finalParams:Array<EventParamInfo> = [];
-				for (paramData in cast(data.params, Array<Dynamic>)) {
+				for (paramData in data.params) {
 					try {
-						finalParams.push({name: paramData.name, type: hscriptInterp.expr(hscriptParser.parseString(paramData.type)), defValue: paramData.defaultValue});
+						finalParams.push({
+							name: paramData.name,
+							type: hscriptInterp.expr(hscriptParser.parseString(paramData.type)),
+							defValue: paramData.defaultValue
+						});
 					} catch (e) {trace('Error parsing event param ${paramData.name} - ${eventName}: $e'); finalParams.push(null);}
 				}
 				eventsParams.set(eventName, finalParams);
@@ -110,6 +119,14 @@ class EventsData {
 	}
 }
 
+typedef EventInfoFile = {
+	var params:Array<{
+		var name:String;
+		var type:String;
+		var defaultValue:Dynamic;
+	}>;
+}
+
 typedef EventInfo = {
 	var params:Array<EventParamInfo>;
 	var paramValues:Array<Dynamic>;

source/funkin/backend/scripting/events/DirectionAnimEvent.hx

@@ -26,7 +26,7 @@ final class DirectionAnimEvent extends CancellableEvent {
 	**/
 	public var frame:Int;
 	/**
-		Force the animation to replay even if it's already playing.
+		Force the animation to replay even if it's already playing  (if it's null it will be forced based on the sprite's data xml, if it has one).
 	**/
-	public var force:Bool = true;
+	public var force:Null<Bool>;
 }

source/funkin/backend/scripting/events/NoteHitEvent.hx

@@ -100,9 +100,9 @@ final class NoteHitEvent extends CancellableEvent {
 	 */
 	public var ratingAntialiasing:Bool = true;
 	/**
-	 * Whenever the animation should be forced to play.
+	 * Whenever the animation should be forced to play (if it's null it will be forced based on the sprite's data xml, if it has one).
 	 */
-	public var forceAnim:Bool = true;
+	public var forceAnim:Null<Bool> = true;
 
 	/**
 	 * Prevents the default sing animation from being played.

source/funkin/backend/scripting/events/NoteMissEvent.hx

@@ -29,9 +29,9 @@ final class NoteMissEvent extends CancellableEvent {
 	public var gfSadAnim:String;
 	public var forceGfAnim:Bool;
 	/**
-	 * Whenever the animation should be forced to play.
+	 * Whenever the animation should be forced to play (if it's null it will be forced based on the sprite's data xml, if it has one).
 	 */
-	public var forceAnim:Bool;
+	public var forceAnim:Null<Bool>;
 	/**
 	 * Suffix of the animation. "miss" for miss notes, "-alt" for alt notes, "" for normal ones.
 	 */

source/funkin/backend/scripting/events/PlayAnimEvent.hx

@@ -7,9 +7,9 @@ final class PlayAnimEvent extends CancellableEvent {
 	public var animName:String;
 
 	/**
-		Whenever the animation will be forced or not.
+		Whenever the animation will be forced or not (if it's null it will be forced based on the sprite's data xml, if it has one).
 	**/
-	public var force:Bool;
+	public var force:Null<Bool>;
 
 	/**
 		Whenever the animation will play in reverse or not

source/funkin/backend/system/framerate/Framerate.hx

@@ -125,9 +125,16 @@ class Framerate extends Sprite {
 		bgSprite.scaleX = width;
 		bgSprite.scaleY = height;
 
-		var y:Float = height + 4;
+		var selectable = debugMode == 2;
+		{  // idk i tried to make it more lookable:sob:  - Nex
+			memoryCounter.memoryText.selectable = memoryCounter.memoryPeakText.selectable =
+			fpsCounter.fpsNum.selectable = fpsCounter.fpsLabel.selectable =
+			#if SHOW_BUILD_ON_FPS codenameBuildField.selectable = #end selectable;
+		}
 
+		var y:Float = height + 4;
 		for(c in categories) {
+			c.title.selectable = c.text.selectable = selectable;
 			c.alpha = debugAlpha;
 			c.x = FlxMath.lerp(-c.width - offset.x, 0, debugAlpha);
 			c.y = y;

source/funkin/backend/system/framerate/FramerateCategory.hx

@@ -29,6 +29,7 @@ class FramerateCategory extends Sprite {
 			label.x = 0;
 			label.y = 0;
 			label.defaultTextFormat = new TextFormat(Framerate.fontName, label == this.title ? 18 : 12, -1);
+			label.selectable = false;
 			addChild(label);
 		}
 		this.title.text = title;
@@ -51,4 +52,4 @@ class FramerateCategory extends Sprite {
 		bgSprite.scaleX = width;
 		bgSprite.scaleY = height;
 	}
-}
+}

source/funkin/backend/system/framerate/FramerateCounter.hx

@@ -1,28 +1,17 @@
 package funkin.backend.system.framerate;
 
-import haxe.ds.Vector;
 import openfl.display.Sprite;
 import openfl.text.TextField;
 import openfl.text.TextFormat;
 
-inline final FRAME_TIME_HISTORY = 20;
-
 class FramerateCounter extends Sprite {
 	public var fpsNum:TextField;
 	public var fpsLabel:TextField;
-
-	public var fpsHistoryIndex:Int = 0;
-	public var fpsHistory:Vector<Float>;
+	public var lastFPS:Float = 0;
 
 	public function new() {
 		super();
 
-		fpsHistory = new Vector(FRAME_TIME_HISTORY);
-		// Initialize to 60 FPS, so that the initial estimation until we get enough data is always reasonable.
-		for(i in 0...FRAME_TIME_HISTORY) {
-			fpsHistory[i] = 1000.0 / 60.0;
-		}
-
 		fpsNum = new TextField();
 		fpsLabel = new TextField();
 
@@ -33,6 +22,7 @@ class FramerateCounter extends Sprite {
 			label.text = "FPS";
 			label.multiline = label.wordWrap = false;
 			label.defaultTextFormat = new TextFormat(Framerate.fontName, label == fpsNum ? 18 : 12, -1);
+			label.selectable = false;
 			addChild(label);
 		}
 	}
@@ -43,21 +33,9 @@ class FramerateCounter extends Sprite {
 		if (alpha <= 0.05) return;
 		super.__enterFrame(t);
 
-		// todo use gpu time
-		fpsHistory[fpsHistoryIndex] = FlxG.elapsed * 1000;
-		fpsHistoryIndex = (fpsHistoryIndex + 1) % FRAME_TIME_HISTORY;
-
-		// Calculate average CPU time.
-		// Code based on Godot's FPS counter.
-		var cpuTime = 0.0;
-		for(i in 0...FRAME_TIME_HISTORY) {
-			cpuTime += fpsHistory[i];
-		}
-		cpuTime /= FRAME_TIME_HISTORY;
-		cpuTime = Math.max(0.01, cpuTime); // Prevent unrealistically low values.
-
-		fpsNum.text = Std.string(Math.floor(1000.0 / cpuTime));
+		lastFPS = CoolUtil.fpsLerp(lastFPS, FlxG.elapsed == 0 ? 0 : (1 / FlxG.elapsed), 0.25);
+		fpsNum.text = Std.string(Math.floor(lastFPS));
 		fpsLabel.x = fpsNum.x + fpsNum.width;
 		fpsLabel.y = (fpsNum.y + fpsNum.height) - fpsLabel.height;
 	}
-}
+}

source/funkin/backend/system/framerate/MemoryCounter.hx

@@ -24,6 +24,7 @@ class MemoryCounter extends Sprite {
 			label.text = "FPS";
 			label.multiline = label.wordWrap = false;
 			label.defaultTextFormat = new TextFormat(Framerate.fontName, 12, -1);
+			label.selectable = false;
 			addChild(label);
 		}
 		memoryPeakText.alpha = 0.5;
@@ -42,4 +43,4 @@ class MemoryCounter extends Sprite {
 
 		memoryPeakText.x = memoryText.x + memoryText.width;
 	}
-}
+}

source/funkin/backend/utils/CoolUtil.hx

@@ -721,7 +721,7 @@ class CoolUtil
 	 */
 	@:noUsing public static inline function openURL(url:String) {
 		#if linux
-		Sys.command('/usr/bin/xdg-open', [url, "&"]);
+		Sys.command('/usr/bin/xdg-open', [url]);
 		#else
 		FlxG.openURL(url);
 		#end
@@ -906,6 +906,19 @@ class CoolUtil
 
 		return result.join(seperator);
 	}
+
+	public static function deepFlatten(arr:Array<Dynamic>, ?result:Array<Dynamic>):Array<Dynamic> {
+		if(arr == null) return [];
+		if(result == null) result = [];
+		for (e in arr) {
+			if (Std.isOfType(e, Array)) {
+				deepFlatten(e, result);
+			} else {
+				result.push(e);
+			}
+		}
+		return result;
+	}
 }
 
 /**
@@ -918,4 +931,4 @@ enum abstract CoolSfx(Int) from Int {
 	var CHECKED = 3;
 	var UNCHECKED = 4;
 	var WARNING = 5;
-}
+}

source/funkin/backend/utils/FunkinParentDisabler.hx

@@ -32,8 +32,8 @@ class FunkinParentDisabler extends FlxBasic {
 			FlxTimer.globalManager._timers = [];
 
 			// cameras
-			__cameras = [for(c in FlxG.cameras.list) if (c.active) c];
-			for(c in __cameras) c.active = false;
+			__cameras = [for(c in FlxG.cameras.list) if (!c.paused) c];
+			for(c in __cameras) c.paused = true;
 
 			// sounds
 			__sounds = [for(s in FlxG.sound.list) if (s.playing) s];
@@ -41,9 +41,6 @@ class FunkinParentDisabler extends FlxBasic {
 		}
 	}
 
-	public override function update(elapsed:Float) {
-		@:privateAccess for(c in __cameras) c.updateFlashSpritePosition();
-	}
 	public override function draw() {}
 
 	public function reset() {
@@ -63,7 +60,7 @@ class FunkinParentDisabler extends FlxBasic {
 				for(t in __tweens) FlxTween.globalManager._tweens.push(t);
 				for(t in __timers) FlxTimer.globalManager._timers.push(t);
 			}
-			for(c in __cameras) c.active = true;
+			for(c in __cameras) c.paused = false;
 			for(s in __sounds) s.play();
 		}
 	}

source/funkin/backend/utils/XMLUtil.hx

@@ -4,6 +4,7 @@ import flixel.util.FlxColor;
 import flixel.util.typeLimit.OneOfTwo;
 import funkin.backend.FunkinSprite.XMLAnimType;
 import funkin.backend.FunkinSprite;
+import funkin.game.Character;
 import funkin.backend.system.ErrorCode;
 import funkin.backend.system.interfaces.IOffsetCompatible;
 import haxe.xml.Access;
@@ -172,8 +173,7 @@ class XMLUtil {
 					animType: spr.spriteAnimType,
 					x: 0,
 					y: 0,
-					indices: [for(i in 0...spr.frames.frames.length) i],
-					forced: (node.has.forced && node.att.forced == "true") || (!node.has.forced && spr.spriteAnimType == BEAT)
+					indices: [for(i in 0...spr.frames.frames.length) i]
 				});
 			}
 		}
@@ -199,8 +199,7 @@ class XMLUtil {
 			animType: animType,
 			x: 0,
 			y: 0,
-			indices: [],
-			forced: false,
+			indices: []
 		};
 
 		if (anim.has.name) animData.name = anim.att.name;
@@ -256,24 +255,28 @@ class XMLUtil {
 
 			if (sprite is FunkinSprite) {
 				var xmlSpr = cast(sprite, FunkinSprite);
+				var name = animData.name;
 				switch(animData.animType) {
 					case BEAT:
 						xmlSpr.beatAnims.push({
-							name: animData.name,
-							forced: animData.forced.getDefault(false)
+							name: name,
+							forced: animData.forced.getDefault(defaultForcedCheck(name, xmlSpr))
 						});
 					case LOOP:
-						xmlSpr.playAnim(animData.name, animData.forced.getDefault(false));
+						xmlSpr.playAnim(name, animData.forced.getDefault(defaultForcedCheck(name, xmlSpr)));
 					default:
 						// nothing
 				}
-				xmlSpr.animDatas.set(animData.name, animData);
+				xmlSpr.animDatas.set(name, animData);
 			}
 			return OK;
 		}
 		return MISSING_PROPERTY;
 	}
 
+	public static inline function defaultForcedCheck(animName:String, sprite:FunkinSprite):Bool
+		return sprite is Character && (animName.startsWith("idle") || animName.startsWith("danceLeft") || animName.startsWith("danceRight")) ? false : sprite.spriteAnimType == BEAT;
+
 	public static inline function fixXMLText(text:String) {
 		var v:String;
 		return [for(l in text.split("\n")) if ((v = l.trim()) != "") v].join("\n");

source/funkin/editors/charter/SongCreationScreen.hx

@@ -98,11 +98,7 @@ class SongCreationScreen extends UISubstateWindow {
 			voicesExplorer.uiElement = audioPlayer;
 		});
 		songDataGroup.add(voicesExplorer);
-
-		voicesUIText = addLabelOn(voicesExplorer, "Vocal Audio File");
-		voicesUIText.applyMarkup(
-			"Vocal Audio File $* Required$",
-			[new FlxTextFormatMarkerPair(new FlxTextFormat(0xFFAD1212), "$")]);
+		addLabelOn(voicesExplorer, "Vocal Audio File");
 
 		var menuTitle:UIText;
 		menuDataGroup.add(menuTitle = new UIText(windowSpr.x + 20, windowSpr.y + 30 + 16, 0, "Menus Data (Freeplay/Story)", 28));

source/funkin/game/Character.hx

@@ -235,7 +235,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 	/**
 	 * Like `playSingAnimUnsafe` but checks if the character has the animation with the suffix part, otherwise it plays the animation without the suffix part.
 	 */
-	public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, Force:Bool = true, Reversed:Bool = false, Frame:Int = 0)
+	public function playSingAnim(direction:Int, suffix:String = "", Context:PlayAnimContext = SING, ?Force:Null<Bool> = null, Reversed:Bool = false, Frame:Int = 0)
 	{
 		var event = EventManager.get(DirectionAnimEvent).recycle(getSingAnim(direction, suffix), direction, suffix, Context, Reversed, Frame, Force);
 		script.call("onPlaySingAnim", [event]);
@@ -252,7 +252,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 		playAnim(event.animName, event.force, event.context, event.reversed, event.frame);
 	}
 
-	public override function playAnim(AnimName:String, Force:Bool = false, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0) {
+	public override function playAnim(AnimName:String, ?Force:Bool, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0) {
 		var event = EventManager.get(PlayAnimEvent).recycle(AnimName, Force, Reversed, Frame, Context);
 		script.call("onPlayAnim", [event]);
 		if (event.cancelled) return;
@@ -323,6 +323,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
 	public inline function buildCharacter(xml:Access) {
 		this.xml = xml; // Modders wassup :D
 		sprite = curCharacter;
+		spriteAnimType = BEAT;
 
 		if (xml.x.exists("isPlayer")) playerOffsets = (xml.x.get("isPlayer") == "true");
 		if (xml.x.exists("x")) globalOffset.x = Std.parseFloat(xml.x.get("x"));

source/funkin/game/PlayState.hx

@@ -675,10 +675,12 @@ class PlayState extends MusicBeatState
 				chars.push(char);
 			}
 
-			var strOffset:Float = strumLine.strumLinePos == null ? (strumLine.type == 1 ? 0.75 : 0.25) : strumLine.strumLinePos;
-			var startingPos:FlxPoint = strumLine.strumPos == null ?
-				FlxPoint.get((FlxG.width * strOffset) - ((Note.swagWidth * (strumLine.strumScale == null ? 1 : strumLine.strumScale)) * 2), this.strumLine.y) :
-				FlxPoint.get(strumLine.strumPos[0] == 0 ? ((FlxG.width * strOffset) - ((Note.swagWidth * (strumLine.strumScale == null ? 1 : strumLine.strumScale)) * 2)) : strumLine.strumPos[0], strumLine.strumPos[1]);
+			var strOffset:Float = strumLine.strumLinePos != null ? strumLine.strumLinePos : (strumLine.type == 1 ? 0.75 : 0.25);
+			var strScale:Float = strumLine.strumScale != null ? strumLine.strumScale : 1;
+			var strXPos:Float = (FlxG.width * strOffset) - (Note.swagWidth * strScale * 2);
+			var startingPos:FlxPoint = strumLine.strumPos != null ?
+				FlxPoint.get(strumLine.strumPos[0] == 0 ? strXPos : strumLine.strumPos[0], strumLine.strumPos[1]) :
+				FlxPoint.get(strXPos, this.strumLine.y);
 			var strLine = new StrumLine(chars,
 				startingPos,
 				strumLine.strumScale == null ? 1 : strumLine.strumScale,
@@ -1954,7 +1956,7 @@ class PlayState extends MusicBeatState
 	}
 }
 
-class ComboRating {
+final class ComboRating {
 	public var percent:Float;
 	public var rating:String;
 	public var color:FlxColor;

source/funkin/game/StrumLine.hx

@@ -152,7 +152,12 @@ class StrumLine extends FlxTypedGroup<Strum> {
 		var scrollSpeed = strumLine.scrollSpeed;
 		if(scrollSpeed == null) if (PlayState.instance != null) scrollSpeed = PlayState.instance.scrollSpeed;
 		if(scrollSpeed == null) scrollSpeed = 1;
-		notes.limit = Constants.DEFAULT_NOTE_MS_LIMIT / scrollSpeed;
+
+		// TODO: Make this work by accounting zoom and scrollspeed changes  - Nex
+		/*var limit = FlxG.height / 0.45;
+		notes.limit = limit / scrollSpeed;
+			OR
+		notes.limit = Constants.DEFAULT_NOTE_MS_LIMIT / scrollSpeed;*/
 	}
 
 	public override function update(elapsed:Float) {

source/funkin/game/cutscenes/dialogue/DialogueBox.hx

@@ -97,7 +97,7 @@ class DialogueBox extends FunkinSprite {
 		dialogueBoxScript.call("postCreate");
 	}
 
-	public override function playAnim(AnimName:String, Force:Bool = false, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0) {
+	public override function playAnim(AnimName:String, ?Force:Bool, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0) {
 		var event = EventManager.get(PlayAnimEvent).recycle(AnimName, Force, Reversed, Frame, Context);
 		dialogueBoxScript.call("onPlayAnim", [event]);
 		if(event.cancelled) return;

source/funkin/game/cutscenes/dialogue/DialogueCharacter.hx

@@ -62,7 +62,7 @@ class DialogueCharacter extends FunkinSprite {
 		dialogueCharScript.call("postCreate");
 	}
 
-	public override function playAnim(AnimName:String, Force:Bool = false, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0) {
+	public override function playAnim(AnimName:String, ?Force:Bool, Context:PlayAnimContext = NONE, Reversed:Bool = false, Frame:Int = 0) {
 		var event = EventManager.get(PlayAnimEvent).recycle(AnimName, Force, Reversed, Frame, Context);
 		dialogueCharScript.call("playAnim", [event]);
 		if(event.cancelled) return;