Skip to content

Commit 6534266

Browse files
committed
COMPLETELY FIXED ANIMATION BUGS FINALLY
time for release
1 parent 89106d7 commit 6534266

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

source/PlayState.hx

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1933,16 +1933,16 @@ class PlayState extends MusicBeatState
19331933
{
19341934
case 0:
19351935
boyfriend.playAnim('singLEFT', true);
1936-
// goodNoteHit(daNote);
1936+
goodNoteHit(daNote);
19371937
case 1:
19381938
boyfriend.playAnim('singDOWN', true);
1939-
// goodNoteHit(daNote);
1939+
goodNoteHit(daNote);
19401940
case 2:
19411941
boyfriend.playAnim('singUP', true);
1942-
// goodNoteHit(daNote);
1942+
goodNoteHit(daNote);
19431943
case 3:
19441944
boyfriend.playAnim('singRIGHT', true);
1945-
// goodNoteHit(daNote);
1945+
goodNoteHit(daNote);
19461946
}
19471947

19481948
boyfriend.holdTimer = 0;
@@ -1953,10 +1953,8 @@ class PlayState extends MusicBeatState
19531953
daNote.kill();
19541954
notes.remove(daNote, true);
19551955
daNote.destroy();
1956-
if (!daNote.isSustainNote)
1957-
popUpScore(daNote.strumTime);
19581956

1959-
idleShit();
1957+
// idleShit();
19601958
}
19611959

19621960
// WIP interpolation shit? Need to fix the pause issue
@@ -2647,13 +2645,16 @@ class PlayState extends MusicBeatState
26472645
boyfriend.playAnim('singRIGHT', true);
26482646
}
26492647

2650-
playerStrums.forEach(function(spr:FlxSprite)
2648+
if (!autoMode)
26512649
{
2652-
if (Math.abs(note.noteData) == spr.ID)
2650+
playerStrums.forEach(function(spr:FlxSprite)
26532651
{
2654-
spr.animation.play('confirm', true);
2655-
}
2656-
});
2652+
if (Math.abs(note.noteData) == spr.ID)
2653+
{
2654+
spr.animation.play('confirm', true);
2655+
}
2656+
});
2657+
}
26572658

26582659
note.wasGoodHit = true;
26592660
vocals.volume = 1;
@@ -2796,6 +2797,8 @@ class PlayState extends MusicBeatState
27962797
// Dad doesnt interupt his own notes
27972798
if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
27982799
dad.dance();
2800+
if (SONG.notes[Math.floor(curStep / 16)] != null)
2801+
boyfriend.playAnim('idle');
27992802
}
28002803
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
28012804
wiggleShit.update(Conductor.crochet);

0 commit comments

Comments
 (0)