added variable jump

Author: Joshalexjacobs

.idea/.idea.Unity-Platformer-Template/.idea/.gitignore

@@ -666,7 +666,7 @@ MonoBehaviour:
   _playerState: 0
   _rigidbody2D: {fileID: 1986650177}
   _movementSpeed: 6
-  _jumpStrength: 12
+  _jumpStrength: 6.5
   _groundMask:
     serializedVersion: 2
     m_Bits: 64

.idea/.idea.Unity-Platformer-Template/.idea/encodings.xml

@@ -0,0 +1,26 @@
+using UnityEngine.InputSystem;
+using UnityEngine.InputSystem.Controls;
+using UnityEngine.InputSystem.Utilities;
+
+public static class ControllerUtils {
+  
+  public static ButtonControl[] InitializeButtonControls(ReadOnlyArray<InputControl> controls) {
+    ButtonControl[] buttonControls = new ButtonControl[controls.Count];
+    
+    for (int i = 0; i < controls.Count; i++) {
+      buttonControls[i] = (ButtonControl) controls[i];      
+    }
+
+    return buttonControls;
+  }
+  
+  public static bool IsButtonDown(ButtonControl[] buttonControls) {
+    foreach (ButtonControl buttonControl in buttonControls) {
+      if (buttonControl != null && buttonControl.isPressed)
+        return true;
+    }
+
+    return false;
+  }
+  
+}

.idea/.idea.Unity-Platformer-Template/.idea/indexLayout.xml

@@ -1,5 +1,6 @@
 using System;
 using UnityEngine;
+using UnityEngine.InputSystem.Controls;
 
 public class PlayerController : MonoBehaviour {
 
@@ -13,16 +14,22 @@ enum PlayerState {
   [SerializeField] private PlayerState _playerState = PlayerState.Idle;
 
   private PlayerInputActions _playerActions;
+  
+  private ButtonControl[] _jumpButtonControls;
 
   [SerializeField] private Rigidbody2D _rigidbody2D;
 
   [SerializeField] private float _movementSpeed = 4;
 
   [SerializeField] private float _jumpStrength = 15;
 
-  private float _jumpTimer = 0f;
+  private float _jumpTimer = 0f; // time before you can be considered on the ground again
+
+  private float _jumpLength = 0f; // how high you can jump depending on how long you hold down jump 
+
+  private bool _canTriggerNewJump = true; // forces the player to let go of the jump button in order to jump again
 
-  private float _graceJumpPeriod = 0f;
+  private float _graceJumpPeriod = 0f; // grace period for jumping after walking off a ledge
 
   [SerializeField] private LayerMask _groundMask;
 
@@ -34,57 +41,65 @@ private void Awake() {
     _playerActions.Player.Move.performed += context => {
       _movementInput = context.ReadValue<Vector2>();
     };
+
+    _jumpButtonControls = ControllerUtils.InitializeButtonControls(_playerActions.Player.Jump.controls);
+  }
+
+  private void TriggerJump() {
+    _canTriggerNewJump = false;
 
-    // replace this with the "mario jump", player has a bigger jump the longer they hold down the jump button
-    
-    // -- jump -- from https://github.com/Joshalexjacobs/Fantastic-Guac-Endless-Demo/blob/master/player.lua
-    // if (love.keyboard.isDown('n') and player.isJumping == false and player.isGrounded and player.jumpLock == false) or (pressX() and player.isJumping == false and player.isGrounded and player.jumpLock == false) then -- when the player hits jump
-      // player.isJumping = true
-      // player.jumpLock = true
-      // player.isGrounded = false
-      // player.dy = -player.initVel -- 6 is our current initial velocity
-      // jumpTimer = jumpTimerMax // this is like a "jump hold" timer
-    // elseif (love.keyboard.isDown('n') and jumpTimer > 0 and player.isJumping) or (pressX() and jumpTimer > 0 and player.isJumping) then
-      // player.dy = player.dy + (-0.5) // I think this is a double jump
-    // elseif (love.keyboard.isDown('n') == false and player.isJumping) or (pressX() == false and player.isJumping) then -- if the player releases the jump button mid-jump...
-      // if player.dy < player.termVel then -- and if the player's velocity has reached the minimum velocity (minimum jump height)...
-        // player.dy = player.termVel -- terminate the jump
-      // end
-      // player.isJumping = false
-    // end
-    
-    _playerActions.Player.Jump.performed += _ => {
-      if (_playerState != PlayerState.Jumping && _playerState != PlayerState.Falling) {
-        _playerState = PlayerState.Jumping;
+    _playerState = PlayerState.Jumping;
 
-        _rigidbody2D.AddForce(new Vector2(0f, 40f) * _jumpStrength);
+    _jumpTimer = 0.2f;
+    
+    _jumpLength = 0.3f;
+  }
 
-        _jumpTimer = 0.2f;
-      } else if (_playerState == PlayerState.Falling && _graceJumpPeriod > 0f) {
-        _playerState = PlayerState.Jumping;
-        
-        _rigidbody2D.AddForce(new Vector2(0f, 40f) * _jumpStrength);
+  private float HandleJump() {
+    if (ControllerUtils.IsButtonDown(_jumpButtonControls)) {
+      if (_canTriggerNewJump && _playerState != PlayerState.Jumping && _playerState != PlayerState.Falling) {
+        TriggerJump();
 
-        _jumpTimer = 0.2f;
+        return _jumpStrength;
+      } else if (_playerState == PlayerState.Jumping && _jumpLength > 0f) {
+        return _jumpStrength;
+      } else if (_canTriggerNewJump && _playerState == PlayerState.Falling && _graceJumpPeriod > 0f) {
+        TriggerJump();
+        
+        return _jumpStrength;
       }
-    };
-  }
+    } else if (_playerState == PlayerState.Jumping) {
+      _jumpLength = 0f;
+    } else if (_canTriggerNewJump == false && (_playerState == PlayerState.Idle || _playerState == PlayerState.Walking)) {
+      _canTriggerNewJump = true;
+    }
 
+    return _rigidbody2D.linearVelocity.y;
+  }
+  
   private Vector2 HandleControllerMovement() {
     float x = _movementInput.x * _movementSpeed;
 
     if (_playerState == PlayerState.Idle && (x > 0.01 || x < -0.01)) {
       _playerState = PlayerState.Walking;
-    }  else if (_playerState == PlayerState.Walking && x < 0.01 && x > -0.01) {
+    } else if (_playerState == PlayerState.Walking && x < 0.01 && x > -0.01) {
       _playerState = PlayerState.Idle;
     }
 
-    return new Vector2(x, _rigidbody2D.linearVelocity.y);
+    return new Vector2(x, HandleJump());
   }
 
   private void Update() {
     if (_jumpTimer > 0f)
       _jumpTimer -= Time.deltaTime;
+
+    if (_jumpLength > 0f) {
+      _jumpLength -= Time.deltaTime;
+
+      if (_jumpLength <= 0f && _playerState == PlayerState.Jumping) {
+        _playerState = PlayerState.Falling;
+      }
+    }
 
     if (_graceJumpPeriod > 0f)
       _graceJumpPeriod -= Time.deltaTime;
@@ -110,8 +125,8 @@ private void FixedUpdate() {
 
   // collision detection
 
-  private const float GroundRayCastRadius = 0.25f;
-  private const float GroundRayCastDistance = 0.25f;
+  private const float GroundRayCastRadius = 0.3f;
+  private const float GroundRayCastDistance = 0.3f;
 
   // gizmos