minimata/MovementTests
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

revamped the dash, fixed an infinite jump issue and fixed buffered inputs
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 20s
Details
Create tag and build when new code gets to main / Export (push) Successful in 10m15s
Details

Browse Source
This commit is contained in:
Alexandre Serex
2026-01-13 11:18:56 +01:00
parent 80e533d98e
commit 2fa4ce68e7
2 changed files with 81 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
player_controller/Scripts/PlayerController.cs
View File

@@ -118,8 +118,10 @@ public partial class PlayerController : CharacterBody3D
public int MaxNumberOfEmpoweredActions { get; set; } = 1;
// Simple dash
[ExportSubgroup("Simple")]
[Export(PropertyHint.Range, "0,50,0.1")]
[Export(PropertyHint.Range, "0,50,0.1,or_greater")]
public float SimpleDashStrength { get; set; } = 10f;
[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
public float SimpleDashTime { get; set; } = 0.5f;
// Aimed Dash
[ExportSubgroup("Special")]
[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
@@ -491,6 +493,7 @@ public partial class PlayerController : CharacterBody3D
///////////////////////////
// Grounded management //
///////////////////////////
public void OnGrounded()
{
_isWallJumpAvailable = true;
@@ -499,28 +502,36 @@ public partial class PlayerController : CharacterBody3D
if (_simpleDashCooldownTimer.IsStopped())
_simpleDashCooldownTimer.Start();
if (_bufferedAction == BufferedActions.Jump && _currentInputBufferFrames > 0)
{
_currentInputBufferFrames = 0;
PerformJump();
}
if (_bufferedAction == BufferedActions.Dash && _currentInputBufferFrames > 0)
{
_currentInputBufferFrames = 0;
SimpleDash();
}
if (_bufferedAction == BufferedActions.MantleJump)
{
SimpleDash();
OnJumpStarted(MantleJumpStartVelocity);
_playerState.SendEvent("jump");
}
if (_bufferedAction == BufferedActions.MantleDash)
{
SimpleDash(MantleDashStrength);
if (GetMoveInput().Length() < Mathf.Epsilon)
{
_bufferedAction = BufferedActions.None;
return;
}
_playerState.SendEvent("dash");
}
if (_bufferedAction == BufferedActions.Jump && _currentInputBufferFrames > 0)
{
_currentInputBufferFrames = 0;
_playerState.SendEvent("jump");
}
if (_bufferedAction == BufferedActions.Dash && _currentInputBufferFrames > 0)
{
if (GetMoveInput().Length() < Mathf.Epsilon)
{
_bufferedAction = BufferedActions.None;
return;
}
_currentInputBufferFrames = 0;
_playerState.SendEvent("dash");
}
_bufferedAction = BufferedActions.None;
}
public bool IsGroundLike()
@@ -852,22 +863,28 @@ public partial class PlayerController : CharacterBody3D
_playerState.SendEvent("cancel_aim");
return;
}
if (GetMoveInput().Length() < Mathf.Epsilon) return;
// Buffer dash in case of mantle or inputting dash airborne before touching the ground without air dash available
_currentInputBufferFrames = InputBufferFrames;
_bufferedAction = _mantling.Active ? BufferedActions.MantleDash : BufferedActions.Dash;
if (_airborne.Active)
{
if (!_canDashAirborne)
return;
_canDashAirborne = false;
}
_currentInputBufferFrames = InputBufferFrames;
_bufferedAction = _mantling.Active ? BufferedActions.MantleDash : BufferedActions.Dash;
_playerState.SendEvent("dash");
}
public void SimpleDashInDirection(Vector3 direction, float strength = -1)
{
if (strength < 0) strength = SimpleDashStrength;
SetVelocity(direction * strength);
GetTree().CreateTimer(SimpleDashTime).Timeout += SimpleDashFinished;
}
public void SimpleDash(float strength = -1)
{
@@ -876,12 +893,32 @@ public partial class PlayerController : CharacterBody3D
public void OnSimpleDashStarted()
{
if (!_canDash)
if (_bufferedAction == BufferedActions.MantleDash)
{
SimpleDash(MantleDashStrength);
_bufferedAction = BufferedActions.None;
return;
}
if (!_canDash)
{
_playerState.SendEvent("dash_finished");
return;
}
_canDash = false;
SimpleDash();
_bufferedAction = BufferedActions.None;
}
public void HandleSimpleDash(float delta)
{
if (MantleSystem.IsMantlePossible && IsPlayerInputtingForward())
{
_bufferedAction = BufferedActions.MantleDash;
_playerState.SendEvent("mantle");
}
}
public void SimpleDashFinished()
{
_playerState.SendEvent("dash_finished");
}
@@ -996,7 +1033,9 @@ public partial class PlayerController : CharacterBody3D
public void OnInputJumpStarted()
{
_currentInputBufferFrames = InputBufferFrames;
_bufferedAction = _mantling.Active ? BufferedActions.MantleJump : BufferedActions.Jump;
if (_mantling.Active) _bufferedAction = BufferedActions.MantleJump;
// Don't overwrite mantle jump buffered action
else if (_bufferedAction == BufferedActions.None) _bufferedAction = BufferedActions.Jump;
_isJumpInputPressed = true;
PerformJump();
@@ -1012,12 +1051,16 @@ public partial class PlayerController : CharacterBody3D
public void PerformJump()
{
if (MantleSystem.IsMantlePossible)
if (MantleSystem.IsMantlePossible && !_mantling.Active)
{
_playerState.SendEvent("mantle");
return;
}
if (WallHugSystem.IsWallHugging())
{
_playerState.SendEvent("wall_jump");
}
_playerState.SendEvent("jump");
}
@@ -1028,13 +1071,22 @@ public partial class PlayerController : CharacterBody3D
}
public void OnSimpleJumpStarted()
{
if (_bufferedAction == BufferedActions.MantleJump)
{
SetVelocity(GetInputGlobalHDirection()*SimpleDashStrength);
OnJumpStarted(MantleJumpStartVelocity);
_bufferedAction = BufferedActions.None;
return;
}
OnJumpStarted(SimpleJumpStartVelocity);
_bufferedAction = BufferedActions.None;
}
public void OnDoubleJumpStarted()
{
_canDash = true;
// _canDashAirborne = true;
OnJumpStarted(DoubleJumpStartVelocity);
_bufferedAction = BufferedActions.None;
}
public void HandleJump(float delta, float gravityFactor, int hangFrames)