Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2025-04-09 05:24:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'result-percentage' into rewrite/master

Browse source
This commit is contained in:
Cameron Taylor 2024-06-05 17:11:47 -04:00
commit e01fa2c85e
2 changed files with 5 additions and 8 deletions
source/funkin/play
ResultState.hx
components
ClearPercentCounter.hx

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

@ -691,13 +691,13 @@ class ResultState extends MusicBeatSubState
{
clearPercentSmall.x = (difficulty.x + difficulty.width) + 60;
clearPercentSmall.y = -clearPercentSmall.height;
FlxTween.tween(clearPercentSmall, {y: 122 - 5}, 0.5, {ease: FlxEase.expoOut, startDelay: 0.8});
FlxTween.tween(clearPercentSmall, {y: 122 - 5}, 0.5, {ease: FlxEase.expoOut, startDelay: 0.85});
}
songName.y = -songName.height;
var fuckedupnumber = (10) * (songName.text.length / 15);
FlxTween.tween(songName, {y: diffYTween - 25 - fuckedupnumber}, 0.5, {ease: FlxEase.expoOut, startDelay: 0.9});
songName.x = clearPercentSmall.x + clearPercentSmall.width - 30;
songName.x = clearPercentSmall.x + 94;
new FlxTimer().start(timerLength, _ -> {
var tempSpeed = FlxPoint.get(speedOfTween.x, speedOfTween.y);

9
source/funkin/play/components/ClearPercentCounter.hx
View file

@ -59,14 +59,14 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
var tmr:Float = 0;
override function update(elapsed:Float)
override function update(elapsed:Float):Void
{
super.update(elapsed);
if (numberChanged) drawNumbers();
}
function drawNumbers()
function drawNumbers():Void
{
var seperatedScore:Array<Int> = [];
var tempCombo:Int = Math.round(curNumber);
@ -83,7 +83,7 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
for (ind => num in seperatedScore)
{
var digitIndex = ind + 1;
var digitIndex:Int = ind + 1;
// If there's only one digit, move it to the right
// If there's three digits, move them all to the left
var digitOffset = (seperatedScore.length == 1) ? 1 : (seperatedScore.length == 3) ? -1 : 0;
@ -95,7 +95,6 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
var yPos = (digitIndex - 1 + digitOffset) * (digitHeightOffset * this.scale.y);
yPos += small ? 0 : 72;
trace('[COUNTER] Drawing digit ${num}');
if (digitIndex >= members.length)
{
// Three digits = LLR because the 1 and 0 won't be the same anyway.
@ -116,10 +115,8 @@ class ClearPercentCounter extends FlxTypedSpriteGroup<FlxSprite>
members[digitIndex].visible = true;
}
}
trace('[COUNTER] Members: ${members.length}, expected members: ${seperatedScore.length + 1}');
for (ind in (seperatedScore.length + 1)...(members.length))
{
trace('Hiding digit ${ind}');
members[ind].visible = false;
}
}