Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OPTIMIZATION] Optimize FreeplayDJ's onFinishAnim #4254

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 30 additions & 62 deletions source/funkin/ui/freeplay/FreeplayDJ.hx
Original file line number Diff line number Diff line change
Expand Up @@ -236,71 +236,39 @@ class FreeplayDJ extends FlxAtlasSprite

function onFinishAnim(name:String):Void
{
// var name = anim.curSymbol.name;

if (name == playableCharData.getAnimationPrefix('intro'))
switch (currentState)
{
if (PlayerRegistry.instance.hasNewCharacter())
{
currentState = NewUnlock;
}
else
{
case Intro:
if (PlayerRegistry.instance.hasNewCharacter())
{
currentState = NewUnlock;
}
else
{
currentState = Idle;
}
onIntroDone.dispatch();
case FistPump:
currentState = Idle;
}
onIntroDone.dispatch();
}
else if (name == playableCharData.getAnimationPrefix('idle'))
{
// trace('Finished idle');
}
else if (name == playableCharData.getAnimationPrefix('confirm'))
{
// trace('Finished confirm');
}
else if (name == playableCharData.getAnimationPrefix('fistPump'))
{
// trace('Finished fist pump');
currentState = Idle;
}
else if (name == playableCharData.getAnimationPrefix('idleEasterEgg'))
{
// trace('Finished spook');
currentState = Idle;
}
else if (name == playableCharData.getAnimationPrefix('loss'))
{
// trace('Finished loss reaction');
currentState = Idle;
}
else if (name == playableCharData.getAnimationPrefix('cartoon'))
{
// trace('Finished cartoon');

var frame:Int = FlxG.random.bool(33) ? playableCharData.getCartoonLoopBlinkFrame() : playableCharData.getCartoonLoopFrame();
case IdleEasterEgg:
currentState = Idle;
case Cartoon:
var frame:Int = FlxG.random.bool(33) ? playableCharData.getCartoonLoopBlinkFrame() : playableCharData.getCartoonLoopFrame();
var cartoonAnim:String = playableCharData.getAnimationPrefix('cartoon');

// Character switches channels when the video ends, or at a 10% chance each time his idle loops.
if (FlxG.random.bool(5))
{
frame = playableCharData.getCartoonChannelChangeFrame();
// boyfriend switches channel code?
// runTvLogic();
}
trace('Replay idle: ${frame}');
playFlashAnimation(playableCharData.getAnimationPrefix('cartoon'), true, false, false, frame);
// trace('Finished confirm');
}
else if (name == playableCharData.getAnimationPrefix('newUnlock'))
{
// Animation should loop.
}
else if (name == playableCharData.getAnimationPrefix('charSelect'))
{
onCharSelectComplete();
}
else
{
trace('Finished ${name}');
// Character switches channels when the video ends, or at a 10% chance each time his idle loops.
if (FlxG.random.bool(5))
{
frame = playableCharData.getCartoonChannelChangeFrame();
// boyfriend switches channel code?
// runTvLogic();
}
trace('Replay idle: ${frame}');
playFlashAnimation(cartoonAnim, true, false, false, frame);
case CharSelect:
onCharSelectComplete();
default:
// Nothing!
}
}

Expand Down
Loading