Merge branch 'main' into Dylan

Persistent block needs to be implemented

Assets/Prefabs/Block.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 896bcaa1220cb294480528aa82dbc0e7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Block.cs

@@ -0,0 +1,68 @@
+using UnityEngine;
+using UnityEngine.InputSystem;
+
+[RequireComponent(typeof(PlayerInput))]
+[RequireComponent(typeof(Animation))]
+public class Block : MonoBehaviour
+{
+    //public bool cancelable = true;
+    [SerializeField] private BoxCollider2D blockArea;
+
+    private InputActionAsset actions;
+    private Animation animationComponent;
+
+    public bool blocking = false;
+
+    private void Start()
+    {
+        actions = GetComponent<PlayerInput>().actions;
+        animationComponent = GetComponent<Animation>();
+    }
+
+    private void Update()
+    {
+        var blockAction = actions.FindAction("Block");
+
+        if (blockAction.ReadValue<float>() == 1f)
+        {
+            Debug.Log("Block action triggered!");
+
+            //if (!cancelable) return;
+
+            //animationComponent.Play("Block");
+            GetComponent<AnimationPlayer>().Block();
+
+            DisableCancellation();
+            ActivateBlockArea();
+        }
+        else
+        {
+            DeactivateBlockArea();
+        }
+    }
+
+    public void ActivateBlockArea()
+    {
+        blockArea.enabled = true;
+    }
+
+    public void DeactivateBlockArea()
+    {
+        blockArea.enabled = false;
+    }
+
+    public void DisableCancellation()
+    {
+        //cancelable = false;
+    }
+
+    public void EnableCancellation()
+    {
+        //cancelable = true;
+    }
+
+    public bool IsBlocking()
+    {
+        return blockArea.enabled;
+    }
+}

Assets/Scripts/Block.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: c8c9288561905664eade3f6b2634fc6d

Assets/Scripts/Player/AnimationPlayer.cs

@@ -32,4 +32,9 @@ public class AnimationPlayer : MonoBehaviour
     {
         animator.SetTrigger("punch");
     }
+
+    public void Block()
+    {
+        animator.SetTrigger("Block");
+    }
 }