mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2025-04-11 14:54:52 +00:00
Added more pico results + charts
This commit is contained in:
parent
7fbc765403
commit
a9aa142b8d
|
@ -2,7 +2,7 @@
|
||||||
<project xmlns="http://lime.openfl.org/project/1.0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://lime.openfl.org/project/1.0.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/xsd/project-1.0.4.xsd">
|
xsi:schemaLocation="http://lime.openfl.org/project/1.0.4 http://lime.openfl.org/xsd/project-1.0.4.xsd">
|
||||||
<!-- _________________________ Application Settings _________________________ -->
|
<!-- _________________________ Application Settings _________________________ -->
|
||||||
<app title="Friday Night Funkin'" file="Funkin" packageName="com.funkin.fnf" package="com.funkin.fnf" main="Main" version="0.4.1" company="ninjamuffin99" />
|
<app title="Friday Night Funkin'" file="Funkin" packageName="com.funkin.fnf" package="com.funkin.fnf" main="Main" version="0.5.0" company="ninjamuffin99" />
|
||||||
<!--Switch Export with Unique ApplicationID and Icon-->
|
<!--Switch Export with Unique ApplicationID and Icon-->
|
||||||
<set name="APP_ID" value="0x0100f6c013bbc000" />
|
<set name="APP_ID" value="0x0100f6c013bbc000" />
|
||||||
|
|
||||||
|
|
2
assets
2
assets
|
@ -1 +1 @@
|
||||||
Subproject commit 859186eea46c8b70deb3530c25304ba875b7b34a
|
Subproject commit 94db49cd4a2acacd5089628619104830a4f1ffce
|
|
@ -239,8 +239,13 @@ class InitState extends FlxState
|
||||||
combo: 69,
|
combo: 69,
|
||||||
maxCombo: 69,
|
maxCombo: 69,
|
||||||
totalNotesHit: 140,
|
totalNotesHit: 140,
|
||||||
totalNotes: 240 // 0,
|
totalNotes: 190
|
||||||
}
|
}
|
||||||
|
// 2000 = loss
|
||||||
|
// 240 = good
|
||||||
|
// 230 = great
|
||||||
|
// 210 = excellent
|
||||||
|
// 190 = perfect
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
#elseif ANIMDEBUG
|
#elseif ANIMDEBUG
|
||||||
|
|
|
@ -223,6 +223,10 @@ typedef PlayerResultsAnimationData =
|
||||||
@:default('')
|
@:default('')
|
||||||
var startFrameLabel:Null<String>;
|
var startFrameLabel:Null<String>;
|
||||||
|
|
||||||
|
@:optional
|
||||||
|
@:default(true)
|
||||||
|
var looped:Bool;
|
||||||
|
|
||||||
@:optional
|
@:optional
|
||||||
var loopFrame:Null<Int>;
|
var loopFrame:Null<Int>;
|
||||||
|
|
||||||
|
|
|
@ -158,6 +158,10 @@ class FlxAtlasSprite extends FlxAnimate
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
anim.onComplete = function() {
|
||||||
|
onAnimationFinish.dispatch(id);
|
||||||
|
};
|
||||||
|
|
||||||
// Prevent other animations from playing if `ignoreOther` is true.
|
// Prevent other animations from playing if `ignoreOther` is true.
|
||||||
if (ignoreOther) canPlayOtherAnims = false;
|
if (ignoreOther) canPlayOtherAnims = false;
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,8 @@ class ResultState extends MusicBeatSubState
|
||||||
var characterAtlasAnimations:Array<
|
var characterAtlasAnimations:Array<
|
||||||
{
|
{
|
||||||
sprite:FlxAtlasSprite,
|
sprite:FlxAtlasSprite,
|
||||||
delay:Float
|
delay:Float,
|
||||||
|
forceLoop:Bool
|
||||||
}> = [];
|
}> = [];
|
||||||
var characterSparrowAnimations:Array<
|
var characterSparrowAnimations:Array<
|
||||||
{
|
{
|
||||||
|
@ -185,7 +186,17 @@ class ResultState extends MusicBeatSubState
|
||||||
|
|
||||||
animation.scale.set(animData.scale ?? 1.0, animData.scale ?? 1.0);
|
animation.scale.set(animData.scale ?? 1.0, animData.scale ?? 1.0);
|
||||||
|
|
||||||
if (animData.loopFrameLabel != null)
|
if (!(animData.looped ?? true))
|
||||||
|
{
|
||||||
|
// Animation is not looped.
|
||||||
|
animation.onAnimationFinish.add((_name:String) -> {
|
||||||
|
if (animation != null)
|
||||||
|
{
|
||||||
|
animation.anim.pause();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else if (animData.loopFrameLabel != null)
|
||||||
{
|
{
|
||||||
animation.onAnimationFinish.add((_name:String) -> {
|
animation.onAnimationFinish.add((_name:String) -> {
|
||||||
if (animation != null)
|
if (animation != null)
|
||||||
|
@ -211,7 +222,8 @@ class ResultState extends MusicBeatSubState
|
||||||
characterAtlasAnimations.push(
|
characterAtlasAnimations.push(
|
||||||
{
|
{
|
||||||
sprite: animation,
|
sprite: animation,
|
||||||
delay: animData.delay ?? 0.0
|
delay: animData.delay ?? 0.0,
|
||||||
|
forceLoop: (animData.loopFrame ?? -1) == 0
|
||||||
});
|
});
|
||||||
// Add to the scene.
|
// Add to the scene.
|
||||||
add(animation);
|
add(animation);
|
||||||
|
|
Loading…
Reference in a new issue