revamped the dash, fixed an infinite jump issue and fixed buffered inputs

player_controller/PlayerController.tscn

@@ -24,7 +24,7 @@
 [ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="13_nob5r"]
 [ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="13_r7i3q"]
 [ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"]
-[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide.tres" id="17_6lejt"]
+[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_released.tres" id="17_6lejt"]
 [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="17_h6vvl"]
 [ext_resource type="PackedScene" uid="uid://cqduhd4opgwvm" path="res://systems/dash/dash_system.tscn" id="18_q5h8a"]
 [ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="18_q14ux"]
@@ -84,12 +84,17 @@ DoubleJumpHangTimeInFrames = 3
 DoubleJumpGravityLesseningFactor = 1.5
 WallJumpStartVelocity = 8.0
 MaxNumberOfEmpoweredActions = 3
-SimpleDashStrength = 15.0
+SimpleDashStrength = 18.0
+SimpleDashTime = 0.2
 AimedDashTime = 0.2
 PostDashSpeed = 30.0
+SlamSpeed = 80.0
+AccelerationGroundSlide = 0.2
+AirGlideVSpeed = 4.0
+AccelerationAirGlide = 0.2
 WallHugGravityLesseningFactor = 15.0
-WallHugDownwardMaxSpeed = 8.0
-WallHugHorizontalDeceleration = 0.5
+WallHugDownwardMaxSpeed = 4.0
+WallHugHorizontalDeceleration = 1.0
 
 [node name="WallRunSnapper" type="RayCast3D" parent="."]
 unique_name_in_owner = true
@@ -112,8 +117,8 @@ aim_pressed = ExtResource("9_nob5r")
 aim_released = ExtResource("8_lhb11")
 jump = ExtResource("10_4u7i3")
 jump_pressed = ExtResource("13_nob5r")
-slide = ExtResource("17_6lejt")
 slide_pressed = ExtResource("18_q14ux")
+slide_released = ExtResource("17_6lejt")
 hit = ExtResource("11_cresl")
 parry = ExtResource("18_ruloh")
 dash = ExtResource("12_34snm")
@@ -480,6 +485,33 @@ to = NodePath("../OnWall/Hanging")
 event = &"to_planted"
 delay_in_seconds = "0.0"
 
+[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("27_34snm")
+
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Dashing/Dash")
+event = &"dash"
+delay_in_seconds = "0.0"
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Jump/SimpleJump")
+event = &"jump"
+delay_in_seconds = "0.0"
+
+[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Airborne/CoyoteEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
+[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Sliding/GroundSlide")
+event = &"slide"
+delay_in_seconds = "0.0"
+
 [node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("27_34snm")
 
@@ -495,10 +527,25 @@ to = NodePath("../../OnWall/Hugging")
 event = &"on_wall"
 delay_in_seconds = "0.0"
 
+[node name="Slamming" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("27_34snm")
+
+[node name="OnSlamEnded" type="Node" parent="StateChart/Root/Movement/Slamming"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Grounded")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
 [node name="Jump" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("SimpleJump")
 
+[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Sliding/AirGlide")
+event = &"slide"
+delay_in_seconds = "0.0"
+
 [node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Jump"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Mantling")
@@ -514,12 +561,6 @@ to = NodePath("../../../Airborne/DoubleJumpEnabled")
 event = &"jump_ended"
 delay_in_seconds = "0.0"
 
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../MegaJump")
-event = &"megajump"
-delay_in_seconds = "0.0"
-
 [node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
 script = ExtResource("27_34snm")
 
@@ -529,15 +570,6 @@ to = NodePath("../../../Airborne/Falling")
 event = &"jump_ended"
 delay_in_seconds = "0.0"
 
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../MegaJump")
-event = &"megajump"
-delay_in_seconds = "0.0"
-
-[node name="MegaJump" type="Node" parent="StateChart/Root/Movement/Jump"]
-script = ExtResource("27_34snm")
-
 [node name="Dashing" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("Dash")
@@ -566,33 +598,46 @@ script = ExtResource("27_34snm")
 [node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
 script = ExtResource("27_34snm")
 
-[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
+[node name="Sliding" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("GroundSlide")
+
+[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Sliding"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Mantling")
+event = &"mantle"
+delay_in_seconds = "0.0"
+
+[node name="GroundSlide" type="Node" parent="StateChart/Root/Movement/Sliding"]
 script = ExtResource("27_34snm")
 
-[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Dashing/Dash")
-event = &"dash"
+to = NodePath("../../../Grounded")
+event = &"slide_released"
 delay_in_seconds = "0.0"
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Jump/SimpleJump")
-event = &"jump"
-delay_in_seconds = "0.0"
-
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Grounded"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Jump/MegaJump")
-event = &"megajump"
-delay_in_seconds = "0.0"
-
-[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/CoyoteEnabled")
+to = NodePath("../../AirGlide")
 event = &"start_falling"
 delay_in_seconds = "0.0"
 
+[node name="AirGlide" type="Node" parent="StateChart/Root/Movement/Sliding"]
+script = ExtResource("27_34snm")
+
+[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlide"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/Reset")
+event = &"slide_released"
+delay_in_seconds = "0.0"
+
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlide"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../GroundSlide")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
 [node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("CoyoteEnabled")
@@ -619,15 +664,21 @@ to = NodePath("../../Grounded")
 event = &"grounded"
 delay_in_seconds = "0.0"
 
+[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Airborne"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Sliding/AirGlide")
+event = &"slide"
+delay_in_seconds = "0.0"
+
+[node name="OnSlam" type="Node" parent="StateChart/Root/Movement/Airborne"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Slamming")
+event = &"slam"
+delay_in_seconds = "0.0"
+
 [node name="CoyoteEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("27_34snm")
 
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../../Jump/MegaJump")
-event = &"megajump"
-delay_in_seconds = "0.0"
-
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../../Jump/SimpleJump")
@@ -645,15 +696,10 @@ script = ExtResource("27_34snm")
 
 [node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
 script = ExtResource("28_n7qhm")
+to = NodePath("../../../OnWall/Hugging")
 event = &"wall_hug"
 delay_in_seconds = "0.0"
 
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../../Jump/MegaJump")
-event = &"megajump"
-delay_in_seconds = "0.0"
-
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../../Jump/DoubleJump")
@@ -675,6 +721,12 @@ to = NodePath("../../DoubleJumpEnabled")
 event = &"enable_double_jump"
 delay_in_seconds = "0.0"
 
+[node name="OnWallJump" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Jump/DoubleJump")
+event = &"wall_jump"
+delay_in_seconds = "0.0"
+
 [node name="OnWall" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("Hugging")
@@ -685,12 +737,6 @@ to = NodePath("../../Grounded")
 event = &"grounded"
 delay_in_seconds = "0.0"
 
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/OnWall"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Jump/MegaJump")
-event = &"megajump"
-delay_in_seconds = "0.0"
-
 [node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Airborne/Reset")
@@ -705,7 +751,7 @@ delay_in_seconds = "0.0"
 
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Jump/DoubleJump")
+to = NodePath("../../Jump/SimpleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
@@ -752,6 +798,5 @@ delay_in_seconds = "0.0"
 [connection signal="input_rotate_y" from="InputController" to="." method="OnInputRotateY"]
 [connection signal="input_slam" from="InputController" to="." method="OnInputSlamPressed"]
 [connection signal="input_slide_ended" from="InputController" to="." method="OnInputSlideEnded"]
-[connection signal="input_slide_ongoing" from="InputController" to="." method="OnInputSlideOngoing"]
 [connection signal="input_slide_started" from="InputController" to="." method="OnInputSlideStarted"]
 [connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]

systems/inputs/base_mode/base_mode.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=157 format=3 uid="uid://bl5crtu1gkrtr"]
+[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=161 format=3 uid="uid://bl5crtu1gkrtr"]
 
 [ext_resource type="Script" uid="uid://cpplm41b5bt6m" path="res://addons/guide/guide_action_mapping.gd" id="1_qmhk6"]
 [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="2_g6bbx"]
@@ -28,7 +28,7 @@
 [ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="23_g6bbx"]
 [ext_resource type="Script" uid="uid://dsa1dnifd6w32" path="res://addons/guide/guide_mapping_context.gd" id="23_llfhp"]
 [ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="23_rvpjj"]
-[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide.tres" id="25_s8kjn"]
+[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_released.tres" id="25_rvpjj"]
 [ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="25_si4d4"]
 [ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="29_q86qg"]
 [ext_resource type="Script" uid="uid://cw71o87tvdx3q" path="res://addons/guide/inputs/guide_input_key.gd" id="30_cvxqo"]
@@ -234,7 +234,7 @@ script = ExtResource("10_cvxqo")
 axis = 5
 
 [sub_resource type="Resource" id="Resource_st2ej"]
-script = ExtResource("15_fykw6")
+script = ExtResource("15_g6bbx")
 
 [sub_resource type="Resource" id="Resource_s8kjn"]
 script = ExtResource("3_yp12v")
@@ -246,10 +246,13 @@ metadata/_guide_triggers_collapsed = false
 script = ExtResource("30_cvxqo")
 key = 4194326
 
+[sub_resource type="Resource" id="Resource_8ifoc"]
+script = ExtResource("15_g6bbx")
+
 [sub_resource type="Resource" id="Resource_imjft"]
 script = ExtResource("3_yp12v")
 input = SubResource("Resource_wcvib")
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_st2ej")])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_8ifoc")])
 metadata/_guide_triggers_collapsed = false
 
 [sub_resource type="Resource" id="Resource_vibkn"]
@@ -261,21 +264,29 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn"), S
 script = ExtResource("10_cvxqo")
 axis = 5
 
+[sub_resource type="Resource" id="Resource_rvpjj"]
+script = ExtResource("17_s8kjn")
+
 [sub_resource type="Resource" id="Resource_818lq"]
 script = ExtResource("3_yp12v")
 input = SubResource("Resource_f3pn5")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rvpjj")])
 
 [sub_resource type="Resource" id="Resource_qksfw"]
 script = ExtResource("30_cvxqo")
 key = 4194326
 
+[sub_resource type="Resource" id="Resource_bhf7o"]
+script = ExtResource("17_s8kjn")
+
 [sub_resource type="Resource" id="Resource_woy8j"]
 script = ExtResource("3_yp12v")
 input = SubResource("Resource_qksfw")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_bhf7o")])
 
 [sub_resource type="Resource" id="Resource_2hs2y"]
 script = ExtResource("1_qmhk6")
-action = ExtResource("25_s8kjn")
+action = ExtResource("25_rvpjj")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq"), SubResource("Resource_woy8j")])
 
 [sub_resource type="Resource" id="Resource_1fkas"]
@@ -419,21 +430,25 @@ metadata/_guide_input_mappings_collapsed = false
 script = ExtResource("19_qkgmj")
 button = 2
 
-[sub_resource type="Resource" id="Resource_kxb2c"]
-script = ExtResource("15_fykw6")
+[sub_resource type="Resource" id="Resource_06f1o"]
+script = ExtResource("15_g6bbx")
 
 [sub_resource type="Resource" id="Resource_v2ywt"]
 script = ExtResource("3_yp12v")
 input = SubResource("Resource_o5yys")
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_06f1o")])
 
 [sub_resource type="Resource" id="Resource_qpgnj"]
 script = ExtResource("30_cvxqo")
 key = 69
 
+[sub_resource type="Resource" id="Resource_g5tel"]
+script = ExtResource("15_g6bbx")
+
 [sub_resource type="Resource" id="Resource_s6d3g"]
 script = ExtResource("3_yp12v")
 input = SubResource("Resource_qpgnj")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_g5tel")])
 
 [sub_resource type="Resource" id="Resource_vtk18"]
 script = ExtResource("1_qmhk6")

systems/inputs/input_system.gd

@@ -22,8 +22,8 @@ class_name InputController
 @export var jump:GUIDEAction
 @export var jump_pressed:GUIDEAction
 @export_subgroup("Slide")
-@export var slide:GUIDEAction
 @export var slide_pressed:GUIDEAction
+@export var slide_released:GUIDEAction
 @export_subgroup("Other")
 @export var hit:GUIDEAction
 @export var parry:GUIDEAction
@@ -48,7 +48,6 @@ signal input_aim_down
 signal input_aim_released
 
 signal input_slide_started
-signal input_slide_ongoing
 signal input_slide_ended
 
 signal input_hit
@@ -68,8 +67,7 @@ func _ready() -> void:
 	jump.completed.connect(on_input_jump_ended)
 	
 	slide_pressed.triggered.connect(on_input_slide_started)
-	slide.triggered.connect(on_input_slide_ongoing)
-	slide.completed.connect(on_input_slide_ended)
+	slide_released.triggered.connect(on_input_slide_ended)
 	
 	hit.triggered.connect(on_input_hit)
 	parry.triggered.connect(on_input_parry)
@@ -102,8 +100,6 @@ func on_input_aim_released():
 	
 func on_input_slide_started():
 	input_slide_started.emit()
-func on_input_slide_ongoing():
-	input_slide_ongoing.emit()
 func on_input_slide_ended():
 	input_slide_ended.emit()
 

systems/mantle/MantleSystem.cs

@@ -81,19 +81,6 @@ public partial class MantleSystem: Node3D
             // Got to the other side of the wall, we stop there
             if (!wallProfileShapecast.IsColliding())
             {
-                /*EndedOnOtherSideOfWall = true;
-                
-                var origin = globalTargetPosition;
-                var end = origin + Vector3.Down*0.51f;  // We check for the ground a bit below our target
-                var groundQuery = PhysicsRayQueryParameters3D.Create(origin, end, wallProfileShapecast.CollisionMask);
-                var groundResult = spaceState.IntersectRay(groundQuery);
-                if (groundResult.Count > 0) 
-                {
-                    // We found the ground, this is our final location
-                    FoundGround = true;
-                    Vector3 position = (Vector3) groundResult["position"];
-                    MantleCurve.AddPoint(ToLocal(position));
-                }*/
                 break;
             }