From d911c46d2fd15b54dc8abde12268376125e361b9 Mon Sep 17 00:00:00 2001
From: EliteMasterEric <ericmyllyoja@gmail.com>
Date: Wed, 3 Apr 2024 06:24:20 -0400
Subject: [PATCH] Better scoring numbers and improved anims.

---
 assets                            |   2 +-
 source/funkin/play/ResultScore.hx | 140 ++++++++++++++++++++++++++++++
 source/funkin/play/ResultState.hx |   9 +-
 3 files changed, 148 insertions(+), 3 deletions(-)
 create mode 100644 source/funkin/play/ResultScore.hx

diff --git a/assets b/assets
index 3ccfe33ac..4ee903339 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 3ccfe33acef6e62c40317af583af764838544a24
+Subproject commit 4ee903339e3a34ae8d612125b0bf9c17fbb667b2
diff --git a/source/funkin/play/ResultScore.hx b/source/funkin/play/ResultScore.hx
new file mode 100644
index 000000000..d5d5a6567
--- /dev/null
+++ b/source/funkin/play/ResultScore.hx
@@ -0,0 +1,140 @@
+package funkin.play;
+
+import flixel.FlxSprite;
+import flixel.group.FlxSpriteGroup.FlxTypedSpriteGroup;
+
+class ResultScore extends FlxTypedSpriteGroup<ScoreNum>
+{
+  public var scoreShit(default, set):Int = 0;
+
+  function set_scoreShit(val):Int
+  {
+    if (group == null || group.members == null) return val;
+    var loopNum:Int = group.members.length - 1;
+    var dumbNumb = Std.parseInt(Std.string(val));
+    var prevNum:ScoreNum;
+
+    while (dumbNumb > 0)
+    {
+      group.members[loopNum].digit = dumbNumb % 10;
+
+      // var funnyNum = group.members[loopNum];
+      // prevNum = group.members[loopNum + 1];
+
+      // if (prevNum != null)
+      // {
+      // funnyNum.x = prevNum.x - (funnyNum.width * 0.7);
+      // }
+
+      // funnyNum.y = (funnyNum.baseY - (funnyNum.height / 2)) + 73;
+      // funnyNum.x = (funnyNum.baseX - (funnyNum.width / 2)) + 450; // this plus value is hand picked lol!
+
+      dumbNumb = Math.floor(dumbNumb / 10);
+      loopNum--;
+    }
+
+    while (loopNum > 0)
+    {
+      group.members[loopNum].digit = 10;
+      loopNum--;
+    }
+
+    return val;
+  }
+
+  public function animateNumbers():Void
+  {
+    for (i in group.members)
+    {
+      i.playAnim();
+    }
+  }
+
+  public function new(x:Float, y:Float, digitCount:Int, scoreShit:Int = 100)
+  {
+    super(x, y);
+
+    for (i in 0...digitCount)
+    {
+      add(new ScoreNum(x + (65 * i), y));
+    }
+
+    this.scoreShit = scoreShit;
+  }
+
+  public function updateScore(scoreNew:Int)
+  {
+    scoreShit = scoreNew;
+  }
+}
+
+class ScoreNum extends FlxSprite
+{
+  public var digit(default, set):Int = 10;
+
+  function set_digit(val):Int
+  {
+    if (val >= 0 && animation.curAnim != null && animation.curAnim.name != numToString[val])
+    {
+      animation.play(numToString[val], true, false, 0);
+      updateHitbox();
+
+      switch (val)
+      {
+        case 1:
+        // offset.x -= 15;
+        case 5:
+        // set offsets
+        // offset.x += 0;
+        // offset.y += 10;
+
+        case 7:
+        // offset.y += 6;
+        case 4:
+        // offset.y += 5;
+        case 9:
+        // offset.y += 5;
+        default:
+          centerOffsets(false);
+      }
+    }
+
+    return digit = val;
+  }
+
+  public function playAnim():Void
+  {
+    animation.play(numToString[digit], true, false, 0);
+  }
+
+  public var baseY:Float = 0;
+  public var baseX:Float = 0;
+
+  var numToString:Array<String> = [
+    "ZERO", "ONE", "TWO", "THREE", "FOUR", "FIVE", "SIX", "SEVEN", "EIGHT", "NINE", "DISABLED"
+  ];
+
+  public function new(x:Float, y:Float)
+  {
+    super(x, y);
+
+    baseY = y;
+    baseX = x;
+
+    frames = Paths.getSparrowAtlas('resultScreen/score-digital-numbers');
+
+    for (i in 0...10)
+    {
+      var stringNum:String = numToString[i];
+      animation.addByPrefix(stringNum, '$stringNum DIGITAL', 24, false);
+    }
+
+    animation.addByPrefix('DISABLED', 'DISABLED', 24, false);
+
+    this.digit = 10;
+
+    animation.play(numToString[digit], true);
+
+    updateHitbox();
+  }
+}
diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx
index 1dfc09114..c05257338 100644
--- a/source/funkin/play/ResultState.hx
+++ b/source/funkin/play/ResultState.hx
@@ -229,7 +229,8 @@ class ResultState extends MusicBeatSubState
     var tallyMissed:TallyCounter = new TallyCounter(260, (hStuf * 9) + extraYOffset, params.scoreData.tallies.missed, 0xFFC68AE6);
     ratingGrp.add(tallyMissed);
 
-    var score:FreeplayScore = new FreeplayScore(825, 630, 10, params.scoreData.score);
+    var score:ResultScore = new ResultScore(35, 305, 10, params.scoreData.score);
+    score.visible = false;
     add(score);
 
     for (ind => rating in ratingGrp.members)
@@ -247,9 +248,13 @@ class ResultState extends MusicBeatSubState
 
       ratingsPopin.animation.finishCallback = anim -> {
         scorePopin.animation.play("score");
+        scorePopin.animation.finishCallback = anim -> {
+          score.visible = true;
+          score.animateNumbers();
+        };
         scorePopin.visible = true;
 
-        if (params.isNewHighscore || true)
+        if (params.isNewHighscore)
         {
           highscoreNew.visible = true;
           highscoreNew.animation.play("new");