From c94239a53019c03f5dab2c33c30b94932cb3bc05 Mon Sep 17 00:00:00 2001 From: poec987 Date: Wed, 26 Jun 2024 12:24:31 -0500 Subject: [PATCH 1/3] Play Animation Note --- .../shared/images/noteTypes/Play Animation.png | Bin 0 -> 1197 bytes source/ChartingState.hx | 2 +- source/PlayState.hx | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 assets/shared/images/noteTypes/Play Animation.png diff --git a/assets/shared/images/noteTypes/Play Animation.png b/assets/shared/images/noteTypes/Play Animation.png new file mode 100644 index 0000000000000000000000000000000000000000..1f5ac76514a7b694e8910061d34df70e3e3af42d GIT binary patch literal 1197 zcmeAS@N?(olHy`uVBq!ia0vp^(?FPm8Ax*9Z@d7c7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1M1^9%xGEDgoWX3^q(M`^7%lZ@u+6HR|ujsI|-YZrk$giEvBQm#O!bsWz+Z|5seLwQl==FGZD-^ zaAil=iP$%?6*E=$*Di=YCE{^bbZ7V8v$s1!xo&aZO|lS8Y1^Bu`+&VxSG-@yrTgd}H)naca;L;!et97G%z9Fexp({*uz z7kc>t&mQ`oyt-5C+5wlIcc0jvx>W?_Rq{{K`q6hW_T2)FE8LGyJ=?o?-KF;Z%;iC1 zr)Hnbk-hUbVt!`mhmEUS4|3hzzBbfYd28{+@5f*4n6I(PEzFiYLYnL@8;|CZNY ztg5T^V}(w>+8Vnnha_%XIF!JAch}0Lk<;uiefk-~-7IUgm;2G~mHl6rh_OY-tTNS~ zJ#S}!>C$O`6z-^Gmad$(WXA&EYp=p|KY2ypT^+i@t#bA4tuMNt?ug~yV{j)u`B8Ya zeM;?yDBE{i_pp1dznm5S>f`yX7T0UzmS3%(|Fvs9@9gQBi66c^=jtyMUuxPNmm`}y zoA31Qr9aZ6Btmr7W`|lFeD{gujyXx zzIKMzcERn@OejLp^961m#w;gq$8 zr?y^|NHWk^IWIJHmdP`6^Y2@KaGXBJEan!OBk_eP zKSOc;jAI`I>moKO%;Q@8ravKdX)7axzGiA_T8Zh5173co|An9MD7?hn+7p($%`D2Y zZJiz)*DpT*jzzg!cP(1o-RKm?y}0wJXlyKx$iLpOmgS=FPRJ+(Me&(u#2&nOs$h%J no)GP4cyco|kH7u=_b;>S(qQ&xsXGsVMF@kZtDnm{r-UW|Zu2>T literal 0 HcmV?d00001 diff --git a/source/ChartingState.hx b/source/ChartingState.hx index d4b8230..922e90c 100644 --- a/source/ChartingState.hx +++ b/source/ChartingState.hx @@ -342,8 +342,8 @@ class ChartingState extends MusicBeatState var noteTypes:Array = [ "Normal", - // "Test", "No Animation", + "Play Animation", "Laugh", "Kill Santa", "Kill" diff --git a/source/PlayState.hx b/source/PlayState.hx index 6064a2d..333470e 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2505,6 +2505,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": From a7048d3625e7c13eb165aebb60b4938553108090 Mon Sep 17 00:00:00 2001 From: poec987 Date: Wed, 26 Jun 2024 12:36:26 -0500 Subject: [PATCH 2/3] I forgor --- source/PlayState.hx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index d97b500..2bb1bdd 100644 --- 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); @@ -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"; From 49f77630a5cfcedd54b9d7b09b859ba33bbb84b3 Mon Sep 17 00:00:00 2001 From: poec987 Date: Wed, 26 Jun 2024 12:42:25 -0500 Subject: [PATCH 3/3] More fixes --- source/PlayState.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 2bb1bdd..c853f7e 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1786,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: @@ -2453,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: @@ -2492,7 +2492,7 @@ 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); + //trace("NTParam: "+noteTypeParam); if (zeNoteType == null) zeNoteType = "Normal";