merged "master" into "combining

Assets/Scripts/PlayerController.cs

@@ -29,6 +29,10 @@ public class PlayerMovement : MonoBehaviour
     public float LastOnWallTime { get; private set; }
     public float LastOnWallRightTime { get; private set; }
     public float LastOnWallLeftTime { get; private set; }
+    
+    private bool trumpet = false;
+    public bool in_range = false;
+    public GameObject enemy;
 
     //Jump
     private bool _isJumpCut;
@@ -100,6 +104,7 @@ public class PlayerMovement : MonoBehaviour
             if (Physics2D.OverlapBox(this.transform.position, _groundCheckSize, 0, _groundLayer) && !IsJumping) //checks if set box overlaps with ground
             {
                 LastOnGroundTime = Data.coyoteTime; //if so sets the lastGrounded to coyoteTime
+                trumpet = true;
             }
 
             //Right Wall Check
@@ -114,7 +119,6 @@ public class PlayerMovement : MonoBehaviour
 
             //Two checks needed for both left and right walls since whenever the play turns the wall checkPoints swap sides
             LastOnWallTime = Mathf.Max(LastOnWallLeftTime, LastOnWallRightTime);
-        }
         #endregion
 
         #region JUMP CHECKS