From a69f4cc73dd36692676668a191af713c3dd4344a Mon Sep 17 00:00:00 2001
From: Lncvrt <lncvrtreal@gmail.com>
Date: Thu, 5 Jun 2025 21:31:48 -0700
Subject: [PATCH] Optimize arrow finding code & add commas to scores

---
 Assets/Scripts/AccountMenu.cs         |  2 +-
 Assets/Scripts/ButtonToScene.cs       |  3 +-
 Assets/Scripts/GamePlayer.cs          | 43 +++++++++++++--------------
 Assets/Scripts/GamePlayerPauseMenu.cs |  2 +-
 Assets/Scripts/IconsMenu.cs           |  2 +-
 Assets/Scripts/LatestVersionText.cs   |  2 +-
 Assets/Scripts/LeaderboardsMenu.cs    |  5 ++--
 Assets/Scripts/LoadingMenu.cs         |  2 +-
 Assets/Scripts/MainMenu.cs            |  2 +-
 Assets/Scripts/Tools.cs               | 24 +++++++++++++--
 10 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/Assets/Scripts/AccountMenu.cs b/Assets/Scripts/AccountMenu.cs
index 42933a3..f834e5b 100644
--- a/Assets/Scripts/AccountMenu.cs
+++ b/Assets/Scripts/AccountMenu.cs
@@ -480,4 +480,4 @@ public class AccountMenu : MonoBehaviour
         statusText.text = message;
         statusText.color = color;
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/ButtonToScene.cs b/Assets/Scripts/ButtonToScene.cs
index a85b761..eb39c60 100644
--- a/Assets/Scripts/ButtonToScene.cs
+++ b/Assets/Scripts/ButtonToScene.cs
@@ -8,7 +8,8 @@ public class ButtonToScene : MonoBehaviour
 
     void Awake()
     {
-        gameObject.GetComponent<Button>().onClick.AddListener(async () => {
+        gameObject.GetComponent<Button>().onClick.AddListener(async () =>
+        {
             await SceneManager.LoadSceneAsync(sceneName);
         });
     }
diff --git a/Assets/Scripts/GamePlayer.cs b/Assets/Scripts/GamePlayer.cs
index 51485d6..845b252 100644
--- a/Assets/Scripts/GamePlayer.cs
+++ b/Assets/Scripts/GamePlayer.cs
@@ -25,6 +25,11 @@ public class GamePlayer : MonoBehaviour
     private float nextUpdate;
     private float fps;
     public SpriteRenderer overlayRender;
+    public GameObject leftArrow;
+    public GameObject rightArrow;
+    public GameObject jumpArrow;
+    public GameObject restartButton;
+    public GameObject backButton;
 
     void Awake()
     {
@@ -81,14 +86,14 @@ public class GamePlayer : MonoBehaviour
         PlayerPrefs.Save();
         backgroundMusic.volume = PlayerPrefs.GetFloat("musicVolume", 1f);
         screenWidth = Camera.main.orthographicSize * 2f * Camera.main.aspect;
-        highScoreText.text = $"High Score: {highscore}";
+        highScoreText.text = $"High Score: {Tools.FormatWithCommas(highscore)}";
         if (Application.isMobilePlatform)
         {
-            GameObject leftArrow = new("LeftArrow");
-            GameObject rightArrow = new("RightArrow");
-            GameObject jumpArrow = new("JumpArrow");
-            GameObject restartButton = new("RestartButton");
-            GameObject backButton = new("BackButton");
+            leftArrow = new("LeftArrow");
+            rightArrow = new("RightArrow");
+            jumpArrow = new("JumpArrow");
+            restartButton = new("RestartButton");
+            backButton = new("BackButton");
             leftArrow.AddComponent<SpriteRenderer>();
             rightArrow.AddComponent<SpriteRenderer>();
             jumpArrow.AddComponent<SpriteRenderer>();
@@ -96,10 +101,15 @@ public class GamePlayer : MonoBehaviour
             backButton.AddComponent<SpriteRenderer>();
 
             leftArrow.GetComponent<SpriteRenderer>().sprite = Resources.Load<Sprite>("Arrows/Arrow");
+            leftArrow.GetComponent<SpriteRenderer>().sortingOrder = 1000;
             rightArrow.GetComponent<SpriteRenderer>().sprite = Resources.Load<Sprite>("Arrows/Arrow");
+            rightArrow.GetComponent<SpriteRenderer>().sortingOrder = 1000;
             jumpArrow.GetComponent<SpriteRenderer>().sprite = Resources.Load<Sprite>("Arrows/Arrow");
+            jumpArrow.GetComponent<SpriteRenderer>().sortingOrder = 1000;
             restartButton.GetComponent<SpriteRenderer>().sprite = Resources.Load<Sprite>("Arrows/Restart");
+            restartButton.GetComponent<SpriteRenderer>().sortingOrder = 1000;
             backButton.GetComponent<SpriteRenderer>().sprite = Resources.Load<Sprite>("Arrows/Back");
+            backButton.GetComponent<SpriteRenderer>().sortingOrder = 1000;
 
             leftArrow.transform.rotation = UnityEngine.Quaternion.Euler(0f, 0f, 90f);
             rightArrow.transform.rotation = UnityEngine.Quaternion.Euler(0f, 0f, -90f);
@@ -161,11 +171,6 @@ public class GamePlayer : MonoBehaviour
         }
         if (Application.isMobilePlatform)
         {
-            GameObject leftArrow = GameObject.Find("LeftArrow");
-            GameObject rightArrow = GameObject.Find("RightArrow");
-            GameObject jumpArrow = GameObject.Find("JumpArrow");
-            GameObject restartButton = GameObject.Find("RestartButton");
-            GameObject backButton = GameObject.Find("BackButton");
             if (!Application.isMobilePlatform)
             {
                 if (Mouse.current.leftButton.isPressed)
@@ -197,7 +202,8 @@ public class GamePlayer : MonoBehaviour
             else
             {
                 var touches = UnityEngine.InputSystem.EnhancedTouch.Touch.activeTouches;
-                for (int i = 0; i < touches.Count; i++) {
+                for (int i = 0; i < touches.Count; i++)
+                {
                     var pos = touches[i].screenPosition;
                     UnityEngine.Vector3 clickPosition = Camera.main.ScreenToWorldPoint(new UnityEngine.Vector3(pos.x, pos.y, 0f));
                     clickPosition.z = 0f;
@@ -358,12 +364,6 @@ public class GamePlayer : MonoBehaviour
             ClampPosition(screenWidth, bird);
             if (Application.isMobilePlatform)
             {
-                GameObject leftArrow = GameObject.Find("LeftArrow");
-                GameObject rightArrow = GameObject.Find("RightArrow");
-                GameObject jumpArrow = GameObject.Find("JumpArrow");
-                GameObject restartButton = GameObject.Find("RestartButton");
-                GameObject backButton = GameObject.Find("BackButton");
-
                 leftArrow.transform.position = new UnityEngine.Vector3(-screenWidth / 2.5f, -4f, 0f);
                 rightArrow.transform.position = new UnityEngine.Vector3(screenWidth / 2.5f, -4f, 0f);
                 restartButton.transform.position = new UnityEngine.Vector3(screenWidth / 2.3f, Camera.main.orthographicSize - 1.2f, 0f);
@@ -534,13 +534,12 @@ public class GamePlayer : MonoBehaviour
         }
         PlayerPrefs.SetString("HighScoreV2", highscore.ToString());
         PlayerPrefs.Save();
-        scoreText.text = "Score: " + score;
-        highScoreText.text = "High Score: " + highscore;
+        scoreText.text = "Score: " + Tools.FormatWithCommas(score);
+        highScoreText.text = "High Score: " + Tools.FormatWithCommas(highscore);
     }
 
     void CheckIfGrounded()
     {
-        GameObject jumpArrow = GameObject.Find("JumpArrow");
         isGrounded = bird.transform.position.y <= -4.1299996f;
 
         rb.gravityScale = isGrounded ? 0f : 1.5f;
@@ -594,4 +593,4 @@ public class GamePlayer : MonoBehaviour
         Cursor.visible = true;
         Cursor.lockState = CursorLockMode.None;
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/GamePlayerPauseMenu.cs b/Assets/Scripts/GamePlayerPauseMenu.cs
index 0b9ae7f..56a80c6 100644
--- a/Assets/Scripts/GamePlayerPauseMenu.cs
+++ b/Assets/Scripts/GamePlayerPauseMenu.cs
@@ -30,4 +30,4 @@ public class GamePlayerPauseMenu : MonoBehaviour
             PlayerPrefs.Save();
         });
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/IconsMenu.cs b/Assets/Scripts/IconsMenu.cs
index ba28fe4..a5a971f 100644
--- a/Assets/Scripts/IconsMenu.cs
+++ b/Assets/Scripts/IconsMenu.cs
@@ -214,4 +214,4 @@ public class Iconsmenu : MonoBehaviour
             previewOverlay.sprite = Resources.Load<Sprite>("Icons/Overlays/overlay_" + overlayID);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/LatestVersionText.cs b/Assets/Scripts/LatestVersionText.cs
index 3cdcde6..5fe476f 100644
--- a/Assets/Scripts/LatestVersionText.cs
+++ b/Assets/Scripts/LatestVersionText.cs
@@ -72,4 +72,4 @@ public class LatestVersionText : MonoBehaviour
         else
             text.text = "Latest: v" + latest;
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/LeaderboardsMenu.cs b/Assets/Scripts/LeaderboardsMenu.cs
index 1b2babb..2ff31b8 100644
--- a/Assets/Scripts/LeaderboardsMenu.cs
+++ b/Assets/Scripts/LeaderboardsMenu.cs
@@ -54,7 +54,8 @@ public class LeaderboardsMenu : MonoBehaviour
             UpdateStatus(false);
             string response = request.downloadHandler.text;
             var splitResponse = response.Split(';');
-            for (int i = 0; i < splitResponse.Length; i++) {
+            for (int i = 0; i < splitResponse.Length; i++)
+            {
                 var entry = splitResponse[i];
                 var split = entry.Split(":");
                 var username = Encoding.UTF8.GetString(Convert.FromBase64String(split[0]));
@@ -70,7 +71,7 @@ public class LeaderboardsMenu : MonoBehaviour
                 var highScoreText = entryInfo.transform.GetChild(1).GetComponent<TMP_Text>();
 
                 usernameText.text = $"{username} (#{i + 1})";
-                highScoreText.text += highScore;
+                highScoreText.text += Tools.FormatWithCommas(highScore);
                 playerIcon.sprite = Resources.Load<Sprite>("Icons/Icons/bird_" + icon);
                 if (icon == "1")
                 {
diff --git a/Assets/Scripts/LoadingMenu.cs b/Assets/Scripts/LoadingMenu.cs
index 3f20f3a..e68725c 100644
--- a/Assets/Scripts/LoadingMenu.cs
+++ b/Assets/Scripts/LoadingMenu.cs
@@ -100,4 +100,4 @@ public class LoadingMenu : MonoBehaviour
             PlayerPrefs.SetInt(key, value);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs
index e3ac682..bcec399 100644
--- a/Assets/Scripts/MainMenu.cs
+++ b/Assets/Scripts/MainMenu.cs
@@ -26,4 +26,4 @@ public class MenuScript : MonoBehaviour
             });
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Tools.cs b/Assets/Scripts/Tools.cs
index 32d2e77..e9a4b80 100644
--- a/Assets/Scripts/Tools.cs
+++ b/Assets/Scripts/Tools.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using System.Numerics;
+using UnityEngine;
 
 public static class Tools
 {
@@ -15,9 +16,28 @@ public static class Tools
         else if (user == 4)
         {
             return Resources.Load<Sprite>("Icons/Icons/bird_-3");
-        } else
+        }
+        else
         {
             return Resources.Load<Sprite>("Icons/Icons/bird_1");
         }
     }
+
+    public static string FormatWithCommas(string number)
+    {
+        try
+        {
+            BigInteger bigInt = BigInteger.Parse(number);
+            return FormatWithCommas(bigInt);
+        }
+        catch
+        {
+            return number;
+        }
+    }
+
+    public static string FormatWithCommas(BigInteger number)
+    {
+        return string.Format("{0:N0}", number);
+    }
 }
\ No newline at end of file