From 3ad9042702ac55da78ccf5fb23a9562867da7e6f Mon Sep 17 00:00:00 2001
From: BOT Alex <44818698+MagicBOTAlex@users.noreply.github.com>
Date: Sat, 3 Feb 2024 21:35:06 +0100
Subject: [PATCH] Seperated keyboard movement

---
 .../Scripts/Player/PlayerAnimationHandler.cs  |  2 +-
 Assets/Scripts/Player/PlayerInput.cs          | 16 ++++--
 Assets/Scripts/Player/PlayerMovement.cs       |  5 ++
 ProjectSettings/EditorBuildSettings.asset     |  3 +-
 ProjectSettings/InputManager.asset            | 53 +++++++++++++++----
 5 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/Assets/Scripts/Player/PlayerAnimationHandler.cs b/Assets/Scripts/Player/PlayerAnimationHandler.cs
index ef54b41..f26e30f 100644
--- a/Assets/Scripts/Player/PlayerAnimationHandler.cs
+++ b/Assets/Scripts/Player/PlayerAnimationHandler.cs
@@ -27,7 +27,7 @@ public class PlayerAnimationHandler : MonoBehaviour
         }
 
         prevPos = transform.position;
-    }
+    }   
 
     public void Idle()
     {
diff --git a/Assets/Scripts/Player/PlayerInput.cs b/Assets/Scripts/Player/PlayerInput.cs
index 3497fea..7721fc9 100644
--- a/Assets/Scripts/Player/PlayerInput.cs
+++ b/Assets/Scripts/Player/PlayerInput.cs
@@ -17,6 +17,8 @@ public class PlayerInput : MonoBehaviour
     public event Action<int> ropeLengthShrinken;
     public event Action<int> ropeLengthExtend;
 
+    public bool useArrowKeys = false;
+
     public int PlayerNum => playerNumber;
 
     private void Start()
@@ -45,11 +47,19 @@ public class PlayerInput : MonoBehaviour
         }
         else
         {
-            movement.x = Input.GetAxisRaw("Horizontal");
-            movement.y = Input.GetAxisRaw("Vertical");
+            if (!useArrowKeys)
+            {
+                movement.x = Input.GetAxisRaw("bruh");
+                movement.y = Input.GetAxisRaw("bruh_v");
+            }
+            else
+            {
+                movement.x = Input.GetAxisRaw("bruh2");
+                movement.y = Input.GetAxisRaw("bruh2_v");
 
+            }
             whipAttack = Input.GetKey(KeyCode.B);
+            //Debug.Log($"player {playerNumber}: move {movement}");
         }
-        //Debug.Log($"player {playerNumber}: move {movement}");
     }
 }
diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs
index ff91a14..91247a5 100644
--- a/Assets/Scripts/Player/PlayerMovement.cs
+++ b/Assets/Scripts/Player/PlayerMovement.cs
@@ -35,6 +35,11 @@ public class PlayerMovement : MonoBehaviour
         rb = GetComponent<Rigidbody2D>();
         playerInput = GetComponent<PlayerInput>();
 
+        if (gameObject.name == "Player2")
+        {
+            playerInput.useArrowKeys = true;
+        }
+
         StartCoroutine(ToggleWithDelay());
     }
 
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index a020a0d..63fa704 100644
--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@@ -11,4 +11,5 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/GameScene.unity
     guid: 0400e5e5779425c40ba3164b1e0b5b59
-  m_configObjects: {}
+  m_configObjects:
+    com.unity.input.settings: {fileID: 11400000, guid: de04e34f85a966e4da851d9b3d804fa1, type: 2}
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
index b16147e..8d07924 100644
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@@ -150,11 +150,11 @@ InputManager:
     axis: 2
     joyNum: 0
   - serializedVersion: 3
-    m_Name: Horizontal
+    m_Name: bruh
     descriptiveName: 
     descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: 
+    negativeButton: a
+    positiveButton: d
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
@@ -162,11 +162,11 @@ InputManager:
     sensitivity: 1
     snap: 0
     invert: 0
-    type: 2
-    axis: 0
-    joyNum: 0
+    type: 0
+    axis: 15
+    joyNum: 6
   - serializedVersion: 3
-    m_Name: Vertical
+    m_Name: bruh_v
     descriptiveName: 
     descriptiveNegativeName: 
     negativeButton: 
@@ -178,9 +178,9 @@ InputManager:
     sensitivity: 1
     snap: 0
     invert: 1
-    type: 2
-    axis: 1
-    joyNum: 0
+    type: 0
+    axis: 15
+    joyNum: 8
   - serializedVersion: 3
     m_Name: Fire1
     descriptiveName: 
@@ -485,3 +485,36 @@ InputManager:
     type: 2
     axis: 5
     joyNum: 0
+  - serializedVersion: 3
+    m_Name: bruh2
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: left
+    positiveButton: right
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 27
+    joyNum: 10
+  - serializedVersion: 3
+    m_Name: bruh2_v
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: down
+    positiveButton: up
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 1000
+    dead: 0.001
+    sensitivity: 1000
+    snap: 0
+    invert: 0
+    type: 0
+    axis: 5
+    joyNum: 8
+  m_UsePhysicalKeys: 1