Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-02-19 13:14:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

wombo combo

Browse source
This commit is contained in:
Cameron Taylor 2021-07-15 18:22:15 -04:00
parent 98a77811be
commit f314fe3a4b
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/ComboCounter.hx
View file

@ -34,8 +34,16 @@ class ComboCounter extends FlxTypedSpriteGroup<FlxSprite>
// add(grpNumbers); // add(grpNumbers);
} }
public function forceFinish():Void
{
effectStuff.animation.play('funny', true, false, 18);
}
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
if (effectStuff.animation.curAnim.curFrame == 17)
effectStuff.animation.pause();
if (effectStuff.animation.curAnim.curFrame == 2 && !wasComboSetup) if (effectStuff.animation.curAnim.curFrame == 2 && !wasComboSetup)
{ {
setupCombo(daCombo); setupCombo(daCombo);

9
source/PlayState.hx
View file

@ -3014,7 +3014,16 @@ class PlayState extends MusicBeatState
&& !SONG.notes[Math.floor(curStep / 16) + 1].mustHitSection) && !SONG.notes[Math.floor(curStep / 16) + 1].mustHitSection)
{ {
var animShit:ComboCounter = new ComboCounter(-100, 300, combo); var animShit:ComboCounter = new ComboCounter(-100, 300, combo);
animShit.scrollFactor.set(0.6, 0.6);
add(animShit); add(animShit);
var frameShit:Float = (1 / 24) * 2; // equals 2 frames in the animation
new FlxTimer().start(((Conductor.crochet / 1000) * 1.25) - frameShit, function(tmr)
{
animShit.forceFinish();
});
} }
if (curBeat % gfSpeed == 0) if (curBeat % gfSpeed == 0)