From 4505d4e73d32f4574d1407901be8d77622d6b3f9 Mon Sep 17 00:00:00 2001
From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com>
Date: Sun, 4 Feb 2024 23:18:40 +0100
Subject: [PATCH] Solved merge conflics

---
 Assets/Scenes/GameScene.unity  |  8 ++++++++
 Assets/Scripts/UI/PauseMenu.cs | 17 ++++++++++++++++-
 Assets/Scripts/Upgrader.cs     |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity
index 6783f1a..4575dc7 100644
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@@ -4148,6 +4148,10 @@ PrefabInstance:
       propertyPath: player2
       value: 
       objectReference: {fileID: 1579580564}
+    - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
+      propertyPath: upgradeCost
+      value: 15000
+      objectReference: {fileID: 0}
     - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
       propertyPath: bloodManager
       value: 
@@ -4236,6 +4240,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6303512888481769756, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 300
+      objectReference: {fileID: 0}
     - target: {fileID: 6486619975880161691, guid: 48e0e53445d42474895d37a321c39d1c, type: 3}
       propertyPath: m_IsActive
       value: 0
diff --git a/Assets/Scripts/UI/PauseMenu.cs b/Assets/Scripts/UI/PauseMenu.cs
index 51c606e..843578d 100644
--- a/Assets/Scripts/UI/PauseMenu.cs
+++ b/Assets/Scripts/UI/PauseMenu.cs
@@ -52,6 +52,21 @@ public class PauseMenu : MonoBehaviour
                     MainMenu();
                 }
             }
+            if (!isPaused)
+                break;
+
+            if (controller.crossButton.IsPressed())
+            {
+                ResumeGame();
+            }
+            if (controller.circleButton.IsPressed())
+            {
+                QuitGame();
+            }
+            if (controller.squareButton.IsPressed())
+            {
+                MainMenu();
+            }
         }
 
         // Check if the Escape key is pressed
@@ -96,7 +111,7 @@ public class PauseMenu : MonoBehaviour
 
     public void MainMenu()
     {
-        SceneManager.LoadScene("MainMenu");
+        SceneManager.LoadScene(0);
     }
     public void QuitGame()
     {
diff --git a/Assets/Scripts/Upgrader.cs b/Assets/Scripts/Upgrader.cs
index be7330f..946ec36 100644
--- a/Assets/Scripts/Upgrader.cs
+++ b/Assets/Scripts/Upgrader.cs
@@ -165,6 +165,7 @@ public class Upgrader : MonoBehaviour
 
                     // Subtract blood
                     bloodManager.score -= upgradeCost;
+                    upgradeCost = (int)(upgradeCost * 1.2f);
                     acceptTime = 0f;
                 }
                 else