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

timing stuff all nice XD

Browse source
This commit is contained in:
Cameron Taylor 2022-09-22 16:21:31 -04:00
parent becef12c9f
commit 1a1ac2a866
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/funkin/play/PlayState.hx
View file

@ -1449,6 +1449,8 @@ class PlayState extends MusicBeatState implements IHook
FlxG.camera.follow(PlayState.instance.currentStage.getGirlfriend(), null, 0.05); FlxG.camera.follow(PlayState.instance.currentStage.getGirlfriend(), null, 0.05);
FlxG.camera.targetOffset.y -= 370; FlxG.camera.targetOffset.y -= 370;
FlxTween.tween(camHUD, {alpha: 0}, 0.6);
new FlxTimer().start(0.8, _ -> new FlxTimer().start(0.8, _ ->
{ {
FlxTween.tween(FlxG.camera, {zoom: 1200}, 1.1, { FlxTween.tween(FlxG.camera, {zoom: 1200}, 1.1, {
@ -1457,7 +1459,7 @@ class PlayState extends MusicBeatState implements IHook
{ {
persistentUpdate = false; persistentUpdate = false;
vocals.stop(); vocals.stop();
camHUD.alpha = 1;
var res:ResultState = new ResultState(); var res:ResultState = new ResultState();
res.camera = camHUD; res.camera = camHUD;
openSubState(res); openSubState(res);

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

@ -3,6 +3,7 @@ package funkin.play;
import flixel.FlxBasic; import flixel.FlxBasic;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames; import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.text.FlxText; import flixel.text.FlxText;
import flixel.tweens.FlxEase; import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween; import flixel.tweens.FlxTween;
@ -89,28 +90,41 @@ class ResultState extends MusicBeatSubstate
var hStuf:Int = 50; var hStuf:Int = 50;
var ratingGrp:FlxTypedGroup<TallyCounter> = new FlxTypedGroup<TallyCounter>();
add(ratingGrp);
var totalHit:TallyCounter = new TallyCounter(375, hStuf * 3, Highscore.tallies.totalNotes); var totalHit:TallyCounter = new TallyCounter(375, hStuf * 3, Highscore.tallies.totalNotes);
add(totalHit); ratingGrp.add(totalHit);
var maxCombo:TallyCounter = new TallyCounter(375, hStuf * 4, Highscore.tallies.maxCombo); var maxCombo:TallyCounter = new TallyCounter(375, hStuf * 4, Highscore.tallies.maxCombo);
add(maxCombo); ratingGrp.add(maxCombo);
hStuf += 2; hStuf += 2;
var extraYOffset:Float = 5; var extraYOffset:Float = 5;
var tallySick:TallyCounter = new TallyCounter(230, (hStuf * 5) + extraYOffset, Highscore.tallies.sick, 0xFF89E59E); var tallySick:TallyCounter = new TallyCounter(230, (hStuf * 5) + extraYOffset, Highscore.tallies.sick, 0xFF89E59E);
add(tallySick); ratingGrp.add(tallySick);
var tallyGood:TallyCounter = new TallyCounter(210, (hStuf * 6) + extraYOffset, Highscore.tallies.good, 0xFF89C9E5); var tallyGood:TallyCounter = new TallyCounter(210, (hStuf * 6) + extraYOffset, Highscore.tallies.good, 0xFF89C9E5);
add(tallyGood); ratingGrp.add(tallyGood);
var tallyBad:TallyCounter = new TallyCounter(190, (hStuf * 7) + extraYOffset, Highscore.tallies.bad, 0xffE6CF8A); var tallyBad:TallyCounter = new TallyCounter(190, (hStuf * 7) + extraYOffset, Highscore.tallies.bad, 0xffE6CF8A);
add(tallyBad); ratingGrp.add(tallyBad);
var tallyShit:TallyCounter = new TallyCounter(220, (hStuf * 8) + extraYOffset, Highscore.tallies.shit, 0xFFE68C8A); var tallyShit:TallyCounter = new TallyCounter(220, (hStuf * 8) + extraYOffset, Highscore.tallies.shit, 0xFFE68C8A);
add(tallyShit); ratingGrp.add(tallyShit);
var tallyMissed:TallyCounter = new TallyCounter(260, (hStuf * 9) + extraYOffset, Highscore.tallies.missed, 0xFFC68AE6); var tallyMissed:TallyCounter = new TallyCounter(260, (hStuf * 9) + extraYOffset, Highscore.tallies.missed, 0xFFC68AE6);
add(tallyMissed); ratingGrp.add(tallyMissed);
for (ind => rating in ratingGrp.members)
{
rating.visible = false;
new FlxTimer().start((0.3 * ind) + 0.55, _ ->
{
rating.visible = true;
FlxTween.tween(rating, {curNumber: rating.neededNumber}, 0.5, {ease: FlxEase.quartOut});
});
}
new FlxTimer().start(0.5, _ -> new FlxTimer().start(0.5, _ ->
{ {

3
source/funkin/ui/TallyCounter.hx
View file

@ -12,7 +12,7 @@ import flixel.tweens.FlxTween;
*/ */
class TallyCounter extends FlxTypedSpriteGroup<FlxSprite> class TallyCounter extends FlxTypedSpriteGroup<FlxSprite>
{ {
var curNumber:Float = 0; public var curNumber:Float = 0;
public var neededNumber:Int = 0; public var neededNumber:Int = 0;
public var flavour:Int = 0xFFFFFFFF; public var flavour:Int = 0xFFFFFFFF;
@ -24,7 +24,6 @@ class TallyCounter extends FlxTypedSpriteGroup<FlxSprite>
this.flavour = flavour; this.flavour = flavour;
this.neededNumber = neededNumber; this.neededNumber = neededNumber;
FlxTween.tween(this, {curNumber: neededNumber}, 4, {ease: FlxEase.quartOut});
drawNumbers(); drawNumbers();
} }