From 07b555bbc6f3222e7db8febf0ea0c1cdd7717a15 Mon Sep 17 00:00:00 2001
From: Lncvrt <lncvrtreal@gmail.com>
Date: Sat, 11 Oct 2025 12:33:47 -0700
Subject: [PATCH] Make it so you can press escape in any place in berrydash
 (almost any)

---
 Assets/Scripts/AccountMenu/AccountHandler.cs         | 12 ++++++++++++
 Assets/Scripts/ChatroomMenu.cs                       | 11 ++++++++++-
 .../IconMarketplace/IconMarketplaceManager.cs        | 11 +++++++++++
 Assets/Scripts/IconsMenu.cs                          |  7 +++++++
 Assets/Scripts/LeaderboardsMenu.cs                   | 10 ++++++++++
 Assets/Scripts/PlayMenu.cs                           | 10 ++++++++++
 Assets/Scripts/ProfileMenu.cs                        |  6 ++++++
 Assets/Scripts/SettingsMenu.cs                       | 11 +++++++++++
 Assets/Scripts/StatsMenu.cs                          |  7 +++++++
 9 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/Assets/Scripts/AccountMenu/AccountHandler.cs b/Assets/Scripts/AccountMenu/AccountHandler.cs
index 0a228be..458226c 100644
--- a/Assets/Scripts/AccountMenu/AccountHandler.cs
+++ b/Assets/Scripts/AccountMenu/AccountHandler.cs
@@ -1,4 +1,6 @@
 using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
 
 public class AccountHandler : MonoBehaviour
 {
@@ -98,4 +100,14 @@ public class AccountHandler : MonoBehaviour
         }
         foreach (CustomColorObject customColorObject in FindObjectsByType<CustomColorObject>(FindObjectsSortMode.None)) customColorObject.SetColor();
     }
+
+    async void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame)
+        {
+            if (accountChangePassword.gameObject.activeSelf || accountChangeUsername.gameObject.activeSelf || accountRefreshLogin.gameObject.activeSelf) SwitchPanel(0);
+            else if (accountLogin.gameObject.activeSelf || accountRegister.gameObject.activeSelf) SwitchPanel(1);
+            else await SceneManager.LoadSceneAsync("MainMenu");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ChatroomMenu.cs b/Assets/Scripts/ChatroomMenu.cs
index 31757c1..a20c989 100644
--- a/Assets/Scripts/ChatroomMenu.cs
+++ b/Assets/Scripts/ChatroomMenu.cs
@@ -8,7 +8,9 @@ using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
 using UnityEngine.Networking;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class ChatroomMenu : MonoBehaviour
@@ -301,11 +303,18 @@ public class ChatroomMenu : MonoBehaviour
         statusRoutine = StartCoroutine(StatusRoutine());
     }
 
-    void Update()
+    async void Update()
     {
         var max = content.GetComponent<RectTransform>().sizeDelta.y;
         var current = content.transform.localPosition.y;
         downButton.gameObject.SetActive(Mathf.Abs(max - current) > 0.1f * max);
+        if (Keyboard.current.escapeKey.wasPressedThisFrame && FindFirstObjectByType<ProfileMenu>() == null)
+        {
+            if (optionsPanel.activeSelf) optionsPanelExitButton.onClick.Invoke();
+            else if (reportMessagePanel.activeSelf) reportMessagePanelExitButton.onClick.Invoke();
+            else if (editMessagePanelCurrent != null) editMessagePanelCurrent.transform.GetChild(0).GetChild(0).GetComponent<Button>().onClick.Invoke();
+            else await SceneManager.LoadSceneAsync("MainMenu");
+        }
     }
 
     IEnumerator StatusRoutine()
diff --git a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs
index 72cd78f..a33bdb0 100644
--- a/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs
+++ b/Assets/Scripts/IconMarketplace/IconMarketplaceManager.cs
@@ -1,5 +1,7 @@
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class IconMarketplaceManager : MonoBehaviour
@@ -68,4 +70,13 @@ public class IconMarketplaceManager : MonoBehaviour
                 break;
         }
     }
+
+    async void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame)
+        {
+            if (downloadPanel.activeSelf || uploadPanel.activeSelf) SwitchPanel(0);
+            else await SceneManager.LoadSceneAsync("MainMenu");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/IconsMenu.cs b/Assets/Scripts/IconsMenu.cs
index 3086227..7a003c9 100644
--- a/Assets/Scripts/IconsMenu.cs
+++ b/Assets/Scripts/IconsMenu.cs
@@ -2,6 +2,8 @@ using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class Iconsmenu : MonoBehaviour
@@ -281,4 +283,9 @@ public class Iconsmenu : MonoBehaviour
             customIcons[loopIcon.UUID].interactable = loopIcon.UUID != icon.UUID;
         }
     }
+
+    async void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame) await SceneManager.LoadSceneAsync("MainMenu");
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/LeaderboardsMenu.cs b/Assets/Scripts/LeaderboardsMenu.cs
index f392ba5..e16e87e 100644
--- a/Assets/Scripts/LeaderboardsMenu.cs
+++ b/Assets/Scripts/LeaderboardsMenu.cs
@@ -4,6 +4,7 @@ using System.Numerics;
 using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
 using UnityEngine.Networking;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
@@ -868,4 +869,13 @@ public class LeaderboardsMenu : MonoBehaviour
         statusText.gameObject.SetActive(enabled);
         statusText.text = message;
     }
+
+    async void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame && FindFirstObjectByType<ProfileMenu>() == null)
+        {
+            if (!selectionPanel.activeSelf) SwitchMenu(0);
+            else await SceneManager.LoadSceneAsync("MainMenu");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/PlayMenu.cs b/Assets/Scripts/PlayMenu.cs
index 8d42521..dbb724a 100644
--- a/Assets/Scripts/PlayMenu.cs
+++ b/Assets/Scripts/PlayMenu.cs
@@ -1,6 +1,7 @@
 using System;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
@@ -272,4 +273,13 @@ public class PlayMenu : MonoBehaviour
             inputField.stringPosition = inputField.text.Length;
         }
     }
+
+    async void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame)
+        {
+            if (customMenu.activeSelf) customBackButton.onClick.Invoke();
+            else await SceneManager.LoadSceneAsync("MainMenu");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/ProfileMenu.cs b/Assets/Scripts/ProfileMenu.cs
index 295af3a..af0b199 100644
--- a/Assets/Scripts/ProfileMenu.cs
+++ b/Assets/Scripts/ProfileMenu.cs
@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
 using UnityEngine.Networking;
 using UnityEngine.UI;
 
@@ -393,4 +394,9 @@ public class ProfileMenu : MonoBehaviour
             Debug.LogError("Failed to upload post");
         }
     }
+
+    void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame) Destroy(gameObject);
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/SettingsMenu.cs b/Assets/Scripts/SettingsMenu.cs
index 55a03c1..290096f 100644
--- a/Assets/Scripts/SettingsMenu.cs
+++ b/Assets/Scripts/SettingsMenu.cs
@@ -1,6 +1,8 @@
 using Newtonsoft.Json.Linq;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
 public class SettingsMenu : MonoBehaviour
@@ -134,4 +136,13 @@ public class SettingsMenu : MonoBehaviour
         colorMenu.SetColor(new Color((int)colorToSet[0] / 255f, (int)colorToSet[1] / 255f, (int)colorToSet[2] / 255f));
         colorCanSave = true;
     }
+
+    async void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame)
+        {
+            if (colorMenu.gameObject.activeSelf) toggleButton.onClick.Invoke();
+            else await SceneManager.LoadSceneAsync("MainMenu");
+        }
+    }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/StatsMenu.cs b/Assets/Scripts/StatsMenu.cs
index e7218e9..a22bf72 100644
--- a/Assets/Scripts/StatsMenu.cs
+++ b/Assets/Scripts/StatsMenu.cs
@@ -1,6 +1,8 @@
 using System.Text;
 using TMPro;
 using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.SceneManagement;
 
 public class StatsMenu : MonoBehaviour
 {
@@ -22,4 +24,9 @@ public class StatsMenu : MonoBehaviour
         text.AppendLine("Total Attempts: " + Tools.FormatWithCommas(BazookaManager.Instance.GetGameStoreTotalAttepts()));
         statText.text = text.ToString();
     }
+
+    async void Update()
+    {
+        if (Keyboard.current.escapeKey.wasPressedThisFrame) await SceneManager.LoadSceneAsync("MainMenu");
+    }
 }