Merge branch 'main' of https://gitea.deprived.dev/Sveskejuice/fgm24

Assets/Scripts/Player/PlayerAnimationHandler.cs

@@ -5,28 +5,10 @@ using UnityEngine;
 public class PlayerAnimationHandler : MonoBehaviour
 {
     Animator animator;
-    SpriteRenderer sp;
-
-    Vector3 prevPos;
 
     void Start()
     {
         animator = GetComponentInChildren<Animator>();
-        sp = GetComponentInChildren<SpriteRenderer>();
-    }
-
-    private void Update()
-    {
-        if ((transform.position - prevPos).x > 0.1f)
-        {
-            sp.flipX = false;
-        }
-        else if ((transform.position - prevPos).x < -0.1f)
-        {
-            sp.flipX = true;
-        }
-
-        prevPos = transform.position;
     }
 
     public void Idle()

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");
+            if (!useArrowKeys)
-            movement.y = Input.GetAxisRaw("Vertical");
+            {
-
+                movement.x = Input.GetAxisRaw("bruh");
-            whipAttack = Input.GetKey(KeyCode.B);
+                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}");
         }
     }
+}

Assets/Scripts/Player/PlayerMovement.cs

@@ -7,6 +7,7 @@ using System.Linq;
 [RequireComponent(typeof(PlayerInput))]
 public class PlayerMovement : MonoBehaviour
 {
+    public PlayerAnimationHandler animationHandler;
     public float moveSpeed = 5f;
     private Rigidbody2D rb;
 
@@ -35,6 +36,11 @@ public class PlayerMovement : MonoBehaviour
         rb = GetComponent<Rigidbody2D>();
         playerInput = GetComponent<PlayerInput>();
 
+        if (gameObject.name == "Player2")
+        {
+            playerInput.useArrowKeys = true;
+        }
+
         StartCoroutine(ToggleWithDelay());
     }
 
@@ -43,7 +49,7 @@ public class PlayerMovement : MonoBehaviour
         if (playerInput.movement != Vector2.zero)
         {
             RumbleWalk();
-            GetComponent<PlayerAnimationHandler>().Run();
+            animationHandler.Run();
         }
     }
     private void FixedUpdate()

Assets/Scripts/Player/SpriteMovementFlipper.cs

@@ -0,0 +1,27 @@
+using UnityEngine;
+
+public class SpriteMovementFlipper : MonoBehaviour
+{
+    SpriteRenderer sp;
+
+    Vector3 prevPos;
+
+    void Start()
+    {
+        sp = GetComponentInChildren<SpriteRenderer>();
+    }
+
+    private void Update()
+    {
+        if ((transform.position - prevPos).x > 0.1f)
+        {
+            sp.flipX = false;
+        }
+        else if ((transform.position - prevPos).x < -0.1f)
+        {
+            sp.flipX = true;
+        }
+
+        prevPos = transform.position;
+    }
+}

Assets/Scripts/Player/SpriteMovementFlipper.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c66441ada081b6c4c841000e83cc2b7a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Rope/RopeSimulator.cs

@@ -263,7 +263,10 @@ public class RopeSimulator : MonoBehaviour
         // Handle squeze kills
         foreach (var collider in colliderToSquezeForce)
         {
-            ISquezeDamageReceiver squezeDamageReceiver = collider.Key.GetComponent<ISquezeDamageReceiver>();
+            ISquezeDamageReceiver squezeDamageReceiver = collider.Key.transform.root.GetComponent<ISquezeDamageReceiver>();
+            if (squezeDamageReceiver == null)
+                squezeDamageReceiver = collider.Key.GetComponent<ISquezeDamageReceiver>();
+
             if (squezeDamageReceiver == null) continue;
 
             squezeDamageReceiver.TakeSquezeDamage(collider.Value * squezeDamage);

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}

ProjectSettings/InputManager.asset

@@ -150,11 +150,11 @@ InputManager:
     axis: 2
     joyNum: 0
   - serializedVersion: 3
-    m_Name: Horizontal
+    m_Name: bruh
     descriptiveName: 
     descriptiveNegativeName: 
-    negativeButton: 
+    negativeButton: a
-    positiveButton: 
+    positiveButton: d
     altNegativeButton: 
     altPositiveButton: 
     gravity: 0
@@ -162,11 +162,11 @@ InputManager:
     sensitivity: 1
     snap: 0
     invert: 0
-    type: 2
+    type: 0
-    axis: 0
+    axis: 15
-    joyNum: 0
+    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
+    type: 0
-    axis: 1
+    axis: 15
-    joyNum: 0
+    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