Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-26 17:46:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Implement placeholder GREAT animation

Browse source
This commit is contained in:
EliteMasterEric 2024-05-24 00:06:26 -04:00
parent f17f639304
commit 44880fa569
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/InitState.hx
View file

@ -227,7 +227,7 @@ class InitState extends FlxState
tallies: tallies:
{ {
sick: 130, sick: 130,
good: 70, good: 25,
bad: 69, bad: 69,
shit: 69, shit: 69,
missed: 69, missed: 69,

29
source/funkin/play/ResultState.hx
View file

@ -53,6 +53,7 @@ class ResultState extends MusicBeatSubState
var bfPerfect:Null<FlxAtlasSprite> = null; var bfPerfect:Null<FlxAtlasSprite> = null;
var bfExcellent:Null<FlxAtlasSprite> = null; var bfExcellent:Null<FlxAtlasSprite> = null;
var bfGreat:Null<FlxAtlasSprite> = null;
var bfGood:Null<FlxSprite> = null; var bfGood:Null<FlxSprite> = null;
var gfGood:Null<FlxSprite> = null; var gfGood:Null<FlxSprite> = null;
var bfShit:Null<FlxAtlasSprite> = null; var bfShit:Null<FlxAtlasSprite> = null;
@ -151,7 +152,20 @@ class ResultState extends MusicBeatSubState
} }
}); });
case GOOD | GREAT: case GREAT:
bfGreat = new FlxAtlasSprite(640, 200, Paths.animateAtlas("resultScreen/results-bf/resultsGREAT", "shared"));
bfGreat.visible = false;
bfGreat.zIndex = 500;
add(bfGreat);
bfGreat.onAnimationFinish.add((animName) -> {
if (bfGreat != null)
{
bfGreat.playAnimation('Loop Start');
}
});
case GOOD:
gfGood = FunkinSprite.createSparrow(625, 325, 'resultScreen/results-bf/resultsGOOD/resultGirlfriendGOOD'); gfGood = FunkinSprite.createSparrow(625, 325, 'resultScreen/results-bf/resultsGOOD/resultGirlfriendGOOD');
gfGood.animation.addByPrefix("clap", "Girlfriend Good Anim", 24, false); gfGood.animation.addByPrefix("clap", "Girlfriend Good Anim", 24, false);
gfGood.visible = false; gfGood.visible = false;
@ -476,6 +490,17 @@ class ResultState extends MusicBeatSubState
bfExcellent.playAnimation('Intro'); bfExcellent.playAnimation('Intro');
} }
case GREAT:
if (bfGreat == null)
{
trace("Could not build GREAT animation!");
}
else
{
bfGreat.visible = true;
bfGreat.playAnimation('Intro');
}
case SHIT: case SHIT:
if (bfShit == null) if (bfShit == null)
{ {
@ -487,7 +512,7 @@ class ResultState extends MusicBeatSubState
bfShit.playAnimation('Intro'); bfShit.playAnimation('Intro');
} }
case GREAT | GOOD: case GOOD:
if (bfGood == null) if (bfGood == null)
{ {
trace("Could not build GOOD animation!"); trace("Could not build GOOD animation!");