gabry/Funkin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix easter egg idle and cartoon to play as intended

Browse Source
This commit is contained in:
CheemsAndFriends
2024-11-23 15:21:28 -05:00
committed by Cameron Taylor
parent 1ac91b35ca
commit a1cf76e89c
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/ui/freeplay/FreeplayDJ.hx
+9 -12
View File
@@ -100,18 +100,6 @@ class FreeplayDJ extends FlxAtlasSprite
{
playFlashAnimation(animPrefix, true, false, true);
}
if (getCurrentAnimation() == animPrefix && this.isLoopComplete())
{
if (timeIdling >= IDLE_EGG_PERIOD && !seenIdleEasterEgg)
{
currentState = IdleEasterEgg;
}
else if (timeIdling >= IDLE_CARTOON_PERIOD)
{
currentState = Cartoon;
}
}
timeIdling += elapsed;
case NewUnlock:
var animPrefix = playableCharData.getAnimationPrefix('newUnlock');
@@ -253,6 +241,15 @@ class FreeplayDJ extends FlxAtlasSprite
else if (name == playableCharData.getAnimationPrefix('idle'))
{
// trace('Finished idle');
if (timeIdling >= IDLE_EGG_PERIOD && !seenIdleEasterEgg)
{
currentState = IdleEasterEgg;
}
else if (timeIdling >= IDLE_CARTOON_PERIOD)
{
currentState = Cartoon;
}
}
else if (name == playableCharData.getAnimationPrefix('confirm'))
{