Merge branch 'main' of https://github.com/poec987/FNF-V3

poec987 · Jun 26, 2024 · 8b06418 · 8b06418
2 parents a0f6ae7 + 49f7763
commit 8b06418
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/assets/shared/images/noteTypes/Play Animation.png b/assets/shared/images/noteTypes/Play Animation.png
diff --git a/source/ChartingState.hx b/source/ChartingState.hx
@@ -342,8 +342,8 @@ class ChartingState extends MusicBeatState
 
 	var noteTypes:Array<String> = [
 		"Normal",
-		// "Test",
 		"No Animation",
+		"Play Animation",
 		"Laugh",
 		"Kill Santa",
 		"Kill"

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -1178,6 +1178,7 @@ class PlayState extends MusicBeatState
 				var daStrumTime:Float = songNotes[0];
 				var daNoteData:Int = Std.int(songNotes[1] % 4);
 				var noteType = songNotes[3];
+				var noteTypeParam = songNotes[4];
 
 				var gottaHitNote:Bool = section.mustHitSection;
 
@@ -1192,7 +1193,7 @@ class PlayState extends MusicBeatState
 				else
 					oldNote = null;
 
-				var swagNote:Note = new Note(daStrumTime, daNoteData, oldNote, false, noteType);
+				var swagNote:Note = new Note(daStrumTime, daNoteData, oldNote, false, noteType, noteTypeParam);
 				swagNote.sustainLength = songNotes[2];
 				swagNote.scrollFactor.set(0, 0);
 
@@ -1205,7 +1206,7 @@ class PlayState extends MusicBeatState
 				{
 					oldNote = unspawnNotes[Std.int(unspawnNotes.length - 1)];
 
-					var sustainNote:Note = new Note(daStrumTime + (Conductor.stepCrochet * susNote) + Conductor.stepCrochet, daNoteData, oldNote, true, noteType);
+					var sustainNote:Note = new Note(daStrumTime + (Conductor.stepCrochet * susNote) + Conductor.stepCrochet, daNoteData, oldNote, true, noteType, noteTypeParam);
 					sustainNote.scrollFactor.set();
 					unspawnNotes.push(sustainNote);
 
@@ -1785,7 +1786,7 @@ class PlayState extends MusicBeatState
 
 						noteTypeCheck(daNote, true, true);
 
-						if (daNote.noteType != "No Animation" && daNote.noteType != "Laugh") {
+						if (daNote.noteType != "No Animation" && daNote.noteType != "Laugh" && daNote.noteType != "Play Animation") {
 							switch (Math.abs(daNote.noteData))
 							{
 								case 2:
@@ -2452,7 +2453,7 @@ class PlayState extends MusicBeatState
 					else
 						health += 0.004;
 
-					if (note.noteType != "No Animation") {
+					if (note.noteType != "No Animation" && note.noteType != "Play Animation") {
 						switch (note.noteData)
 						{
 							case 2:
@@ -2491,6 +2492,8 @@ class PlayState extends MusicBeatState
 		var zeNoteType:String = notezzz.noteType;
 		var noteTypeParam:String = notezzz.noteTypeParam; // Funny little silly parameter in chart editor :P
 
+		//trace("NTParam: "+noteTypeParam);
+
 		if (zeNoteType == null)
 			zeNoteType = "Normal";
 
@@ -2516,6 +2519,11 @@ class PlayState extends MusicBeatState
 					// trace("Test Note POST HIT");
 				case "Laugh":
 					dad.animation.play('laugh', true);
+				case "Play Animation":
+					if (dadHit)
+						dad.animation.play(noteTypeParam, true);
+					else
+						boyfriend.animation.play(noteTypeParam, true);
 				case "Kill Santa":
 					santa.animation.play('DIE', true);
 				case "Kill":