Merge branch 'main' into translations-system

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

@@ -123,6 +123,13 @@ final class NoteHitEvent extends CancellableEvent {
 	@:dox(hide)
 	public function cancelDeletion() {preventDeletion();}
 
+	/**
+	 * Forces the note to be deleted.
+	**/
+	public function forceDeletion() {
+		deleteNote = true;
+	}
+
 	/**
 	 * Prevents the vocals volume from being set to 1 after pressing the note.
 	 */

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

@@ -1,5 +1,7 @@
 package funkin.backend.system.framerate;
 
+import funkin.backend.scripting.ModState;
+
 class FlixelInfo extends FramerateCategory {
 	public function new() {
 		super("Flixel Info");
@@ -14,7 +16,12 @@ class FlixelInfo extends FramerateCategory {
 			for(_ in FlxG.bitmap._cache.keys())
 				c++;
 
-			_text = 'State: ${Type.getClassName(Type.getClass(FlxG.state))}';
+			if((FlxG.state is ModState)) {
+				var state:ModState = cast FlxG.state;
+				_text = "Mod State: " + state.scriptName;
+			} else {
+				_text = 'State: ${Type.getClassName(Type.getClass(FlxG.state))}';
+			}
 			_text += '\nObject Count: ${FlxG.state.members.length}';
 			_text += '\nCamera Count: ${FlxG.cameras.list.length}';
 			_text += '\nBitmaps Count: ${c}';
@@ -22,9 +29,9 @@ class FlixelInfo extends FramerateCategory {
 			_text += '\nFlxG.game Childs Count: ${FlxG.game.numChildren}';
 			// _text += '\nCached objects count: ${cachedObjects}';
 			#if FLX_POINT_POOL
-			var points = flixel.math.FlxPoint.FlxBasePoint.pool;
+			//var points = flixel.math.FlxPoint.FlxBasePoint.pool;
 			//_text += '\nPoint Count: ${points._count} | +${points.made} | -${points.gotten} | ${points.balance} | >${points.putted}';
-			_text += '\nPoint Count: ${points._count}';
+			//_text += '\nPoint Count: ${points._count}';
 			#end
 		}
 

source/funkin/backend/system/github/GitHub.hx

@@ -4,6 +4,7 @@ import haxe.Exception;
 #if GITHUB_API
 import haxe.Json;
 #end
+import haxe.Exception;
 
 // TODO: Document further and perhaps make this a Haxelib.
 class GitHub {

source/funkin/backend/system/updating/AsyncUpdater.hx

@@ -99,7 +99,7 @@ class AsyncUpdater {
 		progress.files = files.length;
 		progress.step = DOWNLOADING_ASSETS;
 		trace('starting assets download');
-		doFile([for(e in files) e], fileNames.copy(), function() {
+		doFile(files.copy(), fileNames.copy(), function() {
 			progress.curFile = -1;
 			progress.curFileName = null;
 			progress.files = 1;

source/funkin/backend/utils/DiscordUtil.hx

@@ -525,7 +525,7 @@ typedef DPresence =
 	var ?button1Url:String; /* max 512 bytes */
 	var ?button2Label:String; /* max 32 bytes */
 	var ?button2Url:String; /* max 512 bytes */
-	var ?activityType:ActivityType;
+	var ?activityType:#if DISCORD_RPC ActivityType #else Dynamic #end;
 	var ?streamUrl:String; /* max 512 bytes */
 }
 

source/funkin/editors/charter/Charter.hx

@@ -1672,7 +1672,7 @@ class Charter extends UIState {
 		changeNoteSustain(-1);
 
 	function _note_selectall(_) {
-		selection = [for (note in notesGroup.members) note];
+		selection = cast notesGroup.members.copy();
 	}
 
 	function _note_selectmeasure(_) {

source/funkin/game/PlayState.hx

@@ -1661,9 +1661,11 @@ class PlayState extends MusicBeatState
 
 		var event:NoteHitEvent;
 		if (strumLine != null && !strumLine.cpu)
-			event = scripts.event("onPlayerHit", EventManager.get(NoteHitEvent).recycle(false, !note.isSustainNote, !note.isSustainNote, note, strumLine.characters, true, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, score, note.isSustainNote ? null : accuracy, 0.023, daRating, Options.splashesEnabled && !note.isSustainNote && daRating == "sick"));
+			event = EventManager.get(NoteHitEvent).recycle(false, !note.isSustainNote, !note.isSustainNote, note, strumLine.characters, true, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, score, note.isSustainNote ? null : accuracy, 0.023, daRating, Options.splashesEnabled && !note.isSustainNote && daRating == "sick");
 		else
-			event = scripts.event("onDadHit", EventManager.get(NoteHitEvent).recycle(false, false, false, note, strumLine.characters, false, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, 0, null, 0, daRating, false));
+			event = EventManager.get(NoteHitEvent).recycle(false, false, false, note, strumLine.characters, false, note.noteType, note.animSuffix.getDefault(note.strumID < strumLine.members.length ? strumLine.members[note.strumID].animSuffix : strumLine.animSuffix), "game/score/", "", note.strumID, 0, null, 0, daRating, false);
+		event.deleteNote = !note.isSustainNote; // work around, to allow sustain notes to be deleted
+		event = scripts.event(strumLine != null && !strumLine.cpu ? "onPlayerHit" : "onDadHit", event);
 		strumLine.onHit.dispatch(event);
 		scripts.event("onNoteHit", event);
 
@@ -1710,7 +1712,7 @@ class PlayState extends MusicBeatState
 			}
 		}
 
-		if (event.deleteNote && !note.isSustainNote) strumLine.deleteNote(note);
+		if (event.deleteNote) strumLine.deleteNote(note);
 	}
 
 	public function displayRating(myRating:String, ?evt:NoteHitEvent = null):Void {