tunti1411

Author: prestonpiggy

Assets/Patterns/1. Command/Rebind keys/Scripts/AudioManager.cs

@@ -20,7 +20,7 @@ private void Awake()
         {
             Debug.Log("instance exists");
             Destroy(this);
-            //Destroy(gameObject);
+            Destroy(gameObject);
         }
     }
     // Start is called before the first frame update

Assets/Patterns/1. Command/Rebind keys/Scripts/GameController.cs

@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace CommandPattern.RebindKeys
 {
@@ -61,22 +62,22 @@ void Update()
             //If we were moving with speed * Time.deltaTime, the undo system would be more comlicated to implement.
             //When we undo, the Time.deltaTime may be different so we end up at another position than we previously had
             //You could solve this by saving the Time.deltaTime somewhere
-            if (Input.GetKeyDown(KeyCode.W))
-            {
-                ExecuteNewCommand(buttonW);
-            }
-            else if (Input.GetKeyDown(KeyCode.A))
-            {
-                ExecuteNewCommand(buttonA);
-            }
-            else if (Input.GetKeyDown(KeyCode.S))
-            {
-                ExecuteNewCommand(buttonS);
-            }
-            else if (Input.GetKeyDown(KeyCode.D))
-            {
-                ExecuteNewCommand(buttonD);
-            }
+            //if (Input.GetKeyDown(KeyCode.W))
+            //{
+            //    ExecuteNewCommand(buttonW);
+            //}
+            //else if (Input.GetKeyDown(KeyCode.A))
+            //{
+            //    ExecuteNewCommand(buttonA);
+            //}
+            //else if (Input.GetKeyDown(KeyCode.S))
+            //{
+            //    ExecuteNewCommand(buttonS);
+            //}
+            //else if (Input.GetKeyDown(KeyCode.D))
+            //{
+            //    ExecuteNewCommand(buttonD);
+            //}
             //Undo with u (ctrl + z is sometimes interfering with the editor's undo system)
             else if (Input.GetKeyDown(KeyCode.U))
             {
@@ -128,6 +129,34 @@ void Update()
 
                 isReplaying = true;
             }
+            
+            //check gamestate example
+            switch (GameManager.gamestate)
+            {
+                case GameState.REPLAYING:
+                    break;
+                case GameState.PLAYING:
+                    //check inputs for player movement INSERT MOVEMENT HERE!!
+                    HandlePlayInput();
+                    break;
+                case GameState.PAUSE:
+                    //check input for the pause key
+                    
+                    //if (Input.GetKeyDown(KeyCode.P))
+                    //{
+                    //    Time.timeScale = 1;
+                    //    GameManager.gamestate = GameState.PAUSE;
+                    //    Debug.Log("unpaused");
+                    //}
+                    HandlePauseInput();
+                    break;
+                case GameState.GAME_OVER:
+                    //check if game over
+                    break;
+
+
+            }
+            
         }
 
 
@@ -182,5 +211,48 @@ private void SwapKeys(ref Command key1, ref Command key2)
 
             key2 = temp;
         }
+        void HandlePlayInput() {
+            if (Input.GetKeyDown(KeyCode.W))
+            {
+                ExecuteNewCommand(buttonW);
+            }
+            else if (Input.GetKeyDown(KeyCode.A))
+            {
+                ExecuteNewCommand(buttonA);
+            }
+            else if (Input.GetKeyDown(KeyCode.S))
+            {
+                ExecuteNewCommand(buttonS);
+            }
+            else if (Input.GetKeyDown(KeyCode.D))
+            {
+                ExecuteNewCommand(buttonD);
+            }
+            //movement here
+            if (Input.GetKeyDown(KeyCode.P))
+            {
+                Time.timeScale = 0;
+                Debug.Log("paused");
+                GameManager.gamestate = GameState.PAUSE;
+
+            }
+        }
+        void HandlePauseInput() {
+
+            if (Input.GetKeyDown(KeyCode.P))
+            {
+
+                Time.timeScale = 1;
+                GameManager.gamestate = GameState.PLAYING;
+                Debug.Log("unpaused");
+            }
+            if (Input.GetKeyDown(KeyCode.Escape))
+            {
+                Time.timeScale = 1;
+                GameManager.gamestate = GameState.MENU;
+                SceneManager.LoadScene(0);
+
+            }
+        }
     }
 }

Assets/Patterns/1. Command/Rebind keys/Scripts/GameManager.cs

@@ -3,11 +3,25 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
+
+
+public enum GameState
+{
+    MENU = 100,
+    PLAYING = 101,
+    PAUSE = 102,
+    GAME_OVER = 103,
+    REPLAYING = 104
+
+}
 public class GameManager : MonoBehaviour
 {
     public static GameManager Instance { get; private set; }
     // Start is called before the first frame update
 
+    
+
+    public static GameState gamestate = GameState.MENU;
 
     public AudioSource baseMusic;
     public AudioSource battleMusic;
@@ -29,6 +43,8 @@ private void Awake()
     }
     public static void Startgame()
     {
+        //Switching state menu->play
+        GameManager.gamestate = GameState.PLAYING;
         //SceneManager.LoadScene(1);
         SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex +1);
     }

Assets/Patterns/1. Command/Rebind keys/Scripts/Player.cs

@@ -33,10 +33,12 @@ public void KillEnemy()
     // Update is called once per frame
     void Update()
     {
-        if (Input.GetKeyDown(KeyCode.Escape))
-        {
-            SceneManager.LoadScene(0);
+        
+        //if (Input.GetKeyDown(KeyCode.Escape))
+        //{
+        //    GameManager.gamestate = GameState.MENU;
+        //    SceneManager.LoadScene(0);
 
-        }
+        //}
     }
 }