Merge branch 'main' into new-editors

source/funkin/backend/FunkinSprite.hx

@@ -112,7 +112,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);
 		}
 	}
 
@@ -290,11 +290,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 @@ final 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 @@ final 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 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 @@ final 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 @@ final 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

@@ -22,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);
 		}
 	}
@@ -37,4 +38,4 @@ class FramerateCounter extends Sprite {
 		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

@@ -982,6 +982,19 @@ final 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;
+	}
 }
 
 /**
@@ -994,4 +1007,4 @@ enum abstract CoolSfx(Int) from Int {
 	var CHECKED = 3;
 	var UNCHECKED = 4;
 	var WARNING = 5;
-}
+}

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;
@@ -175,8 +176,7 @@ final 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]
 				});
 			}
 		}
@@ -202,8 +202,7 @@ final class XMLUtil {
 			animType: animType,
 			x: 0,
 			y: 0,
-			indices: [],
-			forced: false,
+			indices: []
 		};
 
 		if (anim.has.name) animData.name = anim.att.name;
@@ -259,24 +258,28 @@ final 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/game/Character.hx

@@ -291,7 +291,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]);
@@ -308,7 +308,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;
@@ -380,6 +380,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

@@ -1928,7 +1928,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,8 +152,10 @@ 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;
-		var limit = FlxG.height / 0.45;
-		notes.limit = limit / scrollSpeed;
+
+		// TODOD: Make this work by accounting zoom and scrollspeed changes  - Nex
+		/*var limit = FlxG.height / 0.45;
+		notes.limit = limit / scrollSpeed;*/
 	}
 
 	public override function update(elapsed:Float) {

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

@@ -94,7 +94,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

@@ -61,7 +61,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;