small gravity and jump balancing, removed wall jumping coyote times

.gitea/workflows/main.yaml

@@ -54,27 +54,12 @@ jobs:
       - name: Import resources and build solution
         run: |
           godot --headless --editor --build-solutions --quit --import --path $PWD          
+          
       - name: Build Windows
         run: |
           mkdir -v -p build/windows
           godot --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
           zip -r Windows.zip build/windows
-      - name: Build Windows ARM
-        run: |
-          mkdir -v -p build/windowsArm
-          godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
-          zip -r WindowsArm.zip build/windowsArm
-#      - name: Linux Build
-#        run: |
-#          mkdir -v -p build/linux
-#          godot --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64
-#          zip -r Linux.zip build/linux
-      - name: Mac Build
-        run: |
-          mkdir -v -p build/mac
-          godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
-          zip -r Mac.zip build/mac     
-          
       - name: Upload to Itch
         uses: KikimoraGames/itch-publish@v0.0.3
         with:
@@ -84,6 +69,12 @@ jobs:
           buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
           gameData: Windows.zip
           buildChannel: windows
+          
+      - name: Build Windows ARM
+        run: |
+          mkdir -v -p build/windowsArm
+          godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
+          zip -r WindowsArm.zip build/windowsArm
       - name: Upload to Itch
         uses: KikimoraGames/itch-publish@v0.0.3
         with:
@@ -93,15 +84,27 @@ jobs:
           buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
           gameData: WindowsArm.zip
           buildChannel: windows-arm
-#      - name: Upload to Itch
-#        uses: KikimoraGames/itch-publish@v0.0.3
-#        with:
-#          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
-#          itchUsername: ${{ env.ITCHIO_USERNAME }}
-#          itchGameId: ${{ env.ITCHIO_GAMEID }}
-#          buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
-#          gameData: Linux.zip
-#          buildChannel: linux  
+          
+      - name: Linux Build
+        run: |
+          mkdir -v -p build/linux
+          godot --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64
+          zip -r Linux.zip build/linux
+      - name: Upload to Itch
+        uses: KikimoraGames/itch-publish@v0.0.3
+        with:
+          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
+          itchUsername: ${{ env.ITCHIO_USERNAME }}
+          itchGameId: ${{ env.ITCHIO_GAMEID }}
+          buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
+          gameData: Linux.zip
+          buildChannel: linux
+          
+      - name: Mac Build
+        run: |
+          mkdir -v -p build/mac
+          godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
+          zip -r Mac.zip build/mac     
       - name: Upload to Itch
         uses: KikimoraGames/itch-publish@v0.0.3
         with:

maps/city.tscn

@@ -102,6 +102,7 @@ player = NodePath("../Player")
 pause = ExtResource("10_0ari0")
 
 [node name="TutorialController" type="Control" parent="."]
+visible = false
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -374,9 +375,10 @@ shadow_opacity = 0.95
 shadow_blur = 2.435
 
 [node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
-transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, 0, -132.75, 118)
+transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -6, 75.5, -13.5)
 collision_layer = 17
 TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
+TutorialDone = true
 AccelerationAir = 1.5
 
 [node name="DebugLayer" type="CanvasLayer" parent="."]

player_controller/PlayerController.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=47 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=48 format=3 uid="uid://bei4nhkf8lwdo"]
 
 [ext_resource type="Script" uid="uid://bbbrf5ckydfna" path="res://player_controller/Scripts/PlayerController.cs" id="1_poq2x"]
+[ext_resource type="PackedScene" uid="uid://cf3rrgr1imvv4" path="res://scenes/path/path.tscn" id="2_6lejt"]
 [ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="3_cresl"]
 [ext_resource type="Resource" uid="uid://cpdaw41ah5gic" path="res://systems/inputs/base_mode/rotate_y.tres" id="4_rxwoh"]
 [ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="5_4u7i3"]
@@ -62,21 +63,21 @@ blend_mode = 1
 [node name="Player" type="CharacterBody3D"]
 script = ExtResource("1_poq2x")
 WalkSpeed = 7.5
-AccelerationAir = 2.0
-DecelerationAir = 0.1
-Weight = 5.0
-MantleTime = 0.2
+AccelerationAir = 0.8
+DecelerationAir = 0.02
+Weight = 4.0
+MantleTime = 0.3
+MantlePath = ExtResource("2_6lejt")
 CoyoteTime = 0.3
-SimpleJumpStartVelocity = 8.0
+SimpleJumpStartVelocity = 6.0
 SimpleJumpHangTimeInFrames = 1
-SimpleJumpGravityLesseningFactor = 2.5
-DoubleJumpStartVelocity = 15.0
+SimpleJumpGravityLesseningFactor = 2.0
 DoubleJumpHangTimeInFrames = 3
 DoubleJumpGravityLesseningFactor = 1.5
 MegaJumpStartVelocity = 30.0
 MegaJumpHangTimeInFrames = 12
 MegaJumpGravityLesseningFactor = 1.2
-WallJumpStartVelocity = 12.0
+WallJumpStartVelocity = 8.0
 MaxNumberOfEmpoweredActions = 3
 SimpleDashStrength = 15.0
 PoweredDashStrength = 30.0
@@ -234,6 +235,11 @@ transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 0
 mesh = SubResource("CylinderMesh_nodcl")
 
 [node name="DashCooldown" type="Timer" parent="."]
+wait_time = 0.8
+one_shot = true
+
+[node name="AirborneDashCooldown" type="Timer" parent="."]
+wait_time = 0.5
 one_shot = true
 
 [node name="PowerCooldown" type="Timer" parent="."]
@@ -607,7 +613,7 @@ default_state = NodePath("../CoyoteEnabled")
 
 [node name="OnWallRun" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../OnWall/RunningCoyoteEnabled")
+to = NodePath("../../OnWall/Running")
 event = &"wall_run"
 delay_in_seconds = "0.0"
 
@@ -670,7 +676,7 @@ script = ExtResource("27_34snm")
 
 [node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../OnWall/HuggingCoyoteEnabled")
+to = NodePath("../../../OnWall/Hugging")
 event = &"wall_hug"
 delay_in_seconds = "0.0"
 
@@ -734,7 +740,7 @@ script = ExtResource("27_34snm")
 
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../Jump/SimpleJump")
+to = NodePath("../../../Jump/DoubleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
@@ -743,7 +749,7 @@ script = ExtResource("27_34snm")
 
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall/Hanging"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../Jump/SimpleJump")
+to = NodePath("../../../Jump/DoubleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
@@ -762,6 +768,12 @@ to = NodePath("../../Running")
 event = &"coyote_expired"
 delay_in_seconds = "0.0"
 
+[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/CoyoteEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
 [node name="Running" type="Node" parent="StateChart/Root/Movement/OnWall"]
 script = ExtResource("27_34snm")
 
@@ -771,6 +783,12 @@ to = NodePath("../../../Jump/SimpleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
+[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/Running"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/CoyoteEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
 [connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"]
 [connection signal="input_aim_down" from="InputController" to="." method="OnInputAimDown"]
 [connection signal="input_aim_pressed" from="InputController" to="." method="OnInputAimPressed"]

player_controller/Scripts/PlayerController.cs

@@ -58,6 +58,7 @@ public partial class PlayerController : CharacterBody3D
 	// Timers
 	private Timer _timeScaleAimInAirTimer;
 	private Timer _simpleDashCooldownTimer;
+	private Timer _airborneDashCooldownTimer;
 	private Timer _powerCooldownTimer;
 
 	[Export] public Marker3D TutorialWeaponTarget;
@@ -82,7 +83,7 @@ public partial class PlayerController : CharacterBody3D
 	[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
 	public float MantleTime { get; set; } = 0.1f;
 	[Export]
-	public PackedScene MantlePath { get; set; } = GD.Load<PackedScene>("res://scenes/path/Path.tscn");
+	public PackedScene MantlePath { get; set; }
 	
 	// Jump
 	[ExportGroup("Jump")] 
@@ -225,10 +226,12 @@ public partial class PlayerController : CharacterBody3D
 	private Transition       _onJumpFromWall2;
 	private Transition       _onJumpFromWall3;
 	private Transition       _onMegajumpFromWall;
+	private Transition       _onLeaveWallFromRunCoyote;
+	private Transition       _onLeaveWallFromRun;
 
 	private float            _playerHeight;
 	private float            _playerRadius;
-	private bool _isJumpInputPressed = false;
+	private bool _isJumpInputPressed;
 	
 	private float _lookSensitivityMultiplier = 1.0f;
 	private float _mouseSensitivityMultiplier = 1.0f;
@@ -319,10 +322,13 @@ public partial class PlayerController : CharacterBody3D
 		_onWallHanging = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/Hanging"));
 		_onWallRunning = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/Running"));
 		_onWallRunningCoyoteEnabled = StateChartState.Of(GetNode("StateChart/Root/Movement/OnWall/RunningCoyoteEnabled"));
+		_onLeaveWallFromRun = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/Running/OnLeaveWall"));
+		_onLeaveWallFromRunCoyote = Transition.Of(GetNode("StateChart/Root/Movement/OnWall/RunningCoyoteEnabled/OnLeaveWall"));
 		// State timers
 		_powerCooldownTimer = GetNode<Timer>("PowerCooldown");
 		_timeScaleAimInAirTimer = GetNode<Timer>("TimeScaleAimInAir");
 		_simpleDashCooldownTimer = GetNode<Timer>("DashCooldown");
+		_airborneDashCooldownTimer = GetNode<Timer>("AirborneDashCooldown");
 		
 		///////////////////////////
 		// Initialize components //
@@ -394,6 +400,7 @@ public partial class PlayerController : CharacterBody3D
 		_aimedDash.StateExited += OnAimedDashFinished;
 
 		_simpleDashCooldownTimer.Timeout += DashCooldownTimeout;
+		_airborneDashCooldownTimer.Timeout += AirborneDashCooldownTimeout;
 		
 		_onWall.StateEntered += OnWallStarted;
 		_onWall.StateExited += OnWallStopped;
@@ -411,6 +418,8 @@ public partial class PlayerController : CharacterBody3D
 		_onJumpFromWall2.Taken += OnJumpFromWall;
 		_onJumpFromWall3.Taken += OnJumpFromWall;
 		_onMegajumpFromWall.Taken += OnMegajumpFromWall;
+		_onLeaveWallFromRun.Taken += OnLeaveWallFromRun;
+		_onLeaveWallFromRunCoyote.Taken += OnLeaveWallFromRun;
 	}
 
 	public void SetAllowedInputsAll()
@@ -463,10 +472,19 @@ public partial class PlayerController : CharacterBody3D
 	{
 		_canDash = true;
 	}
+	public void AirborneDashCooldownTimeout()
+	{
+		_canDashAirborne = true;
+	}
+
+	public bool IsPlayerInputtingForward()
+	{
+		return GetMoveInput().Z < -0.5f;
+	}
 
 	public bool IsTryingToMantle()
 	{
-		return MantleSystem.IsMantlePossible && GetMoveInput().Z < -0.5f && _isJumpInputPressed;
+		return MantleSystem.IsMantlePossible && IsPlayerInputtingForward() && _isJumpInputPressed;
 	}
 	
 	public void HandleGrounded(float delta)
@@ -479,15 +497,17 @@ public partial class PlayerController : CharacterBody3D
 	
 	public void HandleAirborne(float delta)
 	{
-		
 		MoveInAir(delta);
 		if (isOnFloorCustom())
 			_playerState.SendEvent("grounded");
 		
 		if (IsTryingToMantle()) _playerState.SendEvent("mantle");
-		
+
 		if (!WallHugSystem.IsWallHugging())
+		{
+			_isWallJumpAvailable = true; // reset wall jump if we left the wall 
 			return;
+		}
 		
 		// Going upwards, we stay simply airborne
 		if (Velocity.AngleTo(Vector3.Up) < Math.PI / 4)
@@ -538,6 +558,7 @@ public partial class PlayerController : CharacterBody3D
 			return;
 		
 		var newWallNormal = WallHugSystem.WallHugNormal.UnwrapOr(Vector3.Up);
+		if (newWallNormal.AngleTo(_wallHugStartNormal) > Mathf.Pi/4) return;
 		_wallHugStartNormal = newWallNormal;
 	}
 	
@@ -555,6 +576,11 @@ public partial class PlayerController : CharacterBody3D
 	public void OnWallStopped()
 	{
 	}
+
+	public void OnLeaveWallFromRun()
+	{
+		SimpleDashInDirection(Velocity.Normalized());
+	}
 	
 	public void HandleWallHugging(float delta)
 	{
@@ -626,13 +652,15 @@ public partial class PlayerController : CharacterBody3D
 			return;
 		}
 
-		if (_onWallHuggingCoyoteEnabled.Active || _onWallRunningCoyoteEnabled.Active)
-		{
-			if (!_isWallJumpAvailable) return;
-		}
+		if (_onWall.Active && !_isWallJumpAvailable && IsFacingWall()) return;
 		_playerState.SendEvent("jump");
 	}
 
+	public bool IsFacingWall()
+	{
+		return _wallHugStartNormal.Dot(GetGlobalForwardFacingVector()) < -0.5f;
+	}
+
 	public void OnInputJumpOngoing()
 	{
 	}
@@ -655,7 +683,7 @@ public partial class PlayerController : CharacterBody3D
 	public void OnDoubleJumpStarted()
 	{
 		_canDash = true;
-		_canDashAirborne = true;
+		// _canDashAirborne = true;
 		OnJumpStarted(DoubleJumpStartVelocity);
 	}
 	public void OnMegaJumpStarted()
@@ -687,7 +715,14 @@ public partial class PlayerController : CharacterBody3D
 	
 	public void OnJumpFromWall()
 	{
-		ComputeJumpFromWallHSpeed(WallJumpStartVelocity);
+		if (!IsFacingWall())
+		{
+			ComputeJumpFromWallHSpeed(WallJumpStartVelocity);
+		}
+		// Remove the ability to dash straight away so you cannot scale up the wall
+		_canDashAirborne = false;
+		_airborneDashCooldownTimer.Start();
+		_isWallJumpAvailable = false;
 	}
 	public void OnMegajumpFromWall()
 	{
@@ -746,6 +781,10 @@ public partial class PlayerController : CharacterBody3D
 	}
 
 	private Path _mantlePath; 
+	private bool _customMantle;
+	private Transform3D _customMantleStartTransform;
+	private Curve3D _customMantleCurve;
+	private Vector3 _mantleStartPosition;
 	public void OnMantleStarted()
 	{
 		HeadSystem.OnMantle();
@@ -755,10 +794,13 @@ public partial class PlayerController : CharacterBody3D
 		{
 			GD.PrintErr("Failed to instantiate MantlePath");
 			return;
-		};
-		
+		}
+
+		var transform = _customMantle ? _customMantleStartTransform : MantleSystem.GlobalTransform;
+		var curve = _customMantle ? _customMantleCurve : MantleSystem.MantleCurve;
 		GetTree().GetRoot().AddChild(_mantlePath);
-		_mantlePath.Setup(MantleSystem.GlobalTransform, MantleSystem.MantleCurve);
+		_mantlePath.Setup(transform, curve);
+		_mantleStartPosition = GlobalPosition;
 		
 		var tween = GetTree().CreateTween();
 		tween.SetTrans(Tween.TransitionType.Linear);
@@ -772,14 +814,29 @@ public partial class PlayerController : CharacterBody3D
 		GlobalPosition = _mantlePath.Target.GlobalPosition;
 	}
 	
+	public void SimpleDashInDirection(Vector3 direction)
+	{
+		SetVelocity(direction * SimpleDashStrength);
+	}
+
+	public void SimpleDash()
+	{
+		SimpleDashInDirection(GetInputGlobalHDirection());
+	}
+	
 	public void MantleFinished()
 	{
 		_mantlePath.Teardown();
-		var direction = GetInputGlobalHDirection();
-		if (direction.Length() > 0)
+		var isThereMovementInput = GetMoveInput().Length() > 0;
+		if (isThereMovementInput)
 		{
-			SetVelocity(direction * SimpleDashStrength);
+			// If there's a movement input on Mantle, we dash in the direction the mantle took place
+			var positionDifference = GlobalPosition - _mantleStartPosition;
+			var directionHorizontal = new Vector3(positionDifference.X, 0, positionDifference.Z);
+			SimpleDashInDirection(directionHorizontal.Normalized());
 		}
+
+		_customMantle = false;
 		_playerState.SendEvent("grounded");
 	}
 	
@@ -1034,7 +1091,6 @@ public partial class PlayerController : CharacterBody3D
 	}
 	
 	private Vector3 _preDashVelocity = Vector3.Zero;
-	
 	public void OnAimedDashStarted()
 	{
 		// Adjusting for player height, where the middle of the capsule should get to the dash location instead of the 
@@ -1048,9 +1104,10 @@ public partial class PlayerController : CharacterBody3D
 		var dashTween = CreatePositionTween(correctedLocation, AimedDashTime);
 		// dashTween.TweenMethod(Callable.From<float>(AimedDashTweenOngoing), 0.0f, 1.0f, AimedDashTime);
 		dashTween.Finished += AimedDashTweenEnded;
-
-		_shouldMantleOnDashEnded = DashSystem.ShouldMantle;
-		_mantleLocation = DashSystem.PlannedMantleLocation;
+		
+		_customMantle = DashSystem.ShouldMantle;
+		_customMantleCurve = DashSystem.MantleSystem.MantleCurve;
+		_customMantleStartTransform = DashSystem.MantleSystem.GlobalTransform;
 	}
 
 	Tween CreatePositionTween(Vector3 targetLocation, float tweenTime)
@@ -1069,6 +1126,13 @@ public partial class PlayerController : CharacterBody3D
 		_playerState.SendEvent("dash_finished");
 	}
 
+	public void OnAimedDashFinished()
+	{
+		var postDashVelocity = _preDashVelocity.Length() > PostDashSpeed ? PostDashSpeed : _preDashVelocity.Length();
+		Velocity = _dashDirection * postDashVelocity;
+		if (_customMantle) _playerState.SendEvent("mantle");
+	}
+
 	public void PlaceWeaponForTutorial()
 	{
 		if (TutorialDone)
@@ -1107,29 +1171,12 @@ public partial class PlayerController : CharacterBody3D
 			DashSystem.CollisionNormal);
 	}
 
-	public void OnAimedDashFinished()
-	{
-		var postDashVelocity = _preDashVelocity.Length() > PostDashSpeed ? PostDashSpeed : _preDashVelocity.Length();
-		Velocity = _dashDirection * postDashVelocity;
-
-		if (_shouldMantleOnDashEnded)
-		{
-			// TODO update post dash mantle
-			// MantleToLocation(_mantleLocation);
-			
-		}
-	}
-
 	public void OnSimpleDashStarted()
 	{
 		if (!_canDash)
 			return;
 		_canDash = false;
-		
-		var dashStrength = SimpleDashStrength;
-
-		var direction = GetInputGlobalHDirection();
-		SetVelocity(direction * dashStrength);
+		SimpleDash();
 	}
 
 	public void HandleSimpleDash(float delta)
@@ -1337,6 +1384,11 @@ public partial class PlayerController : CharacterBody3D
 	{
 		WeaponRoot.SetRotation(HeadSystem.Rotation);
 	}
+
+	public Vector3 GetGlobalForwardFacingVector()
+	{
+		return Transform.Basis * HeadSystem.Transform.Basis * Vector3.Forward;
+	}
 	
 	///////////////////////////
 	// Processes //////////////

systems/dash/DashSystem.cs

@@ -20,10 +20,10 @@ public partial class DashSystem: Node3D
     
     public bool ShouldMantle { get; set; }
     public Vector3 PlannedMantleLocation { get; set; }
+    public MantleSystem MantleSystem { get; set; }
         
     private Node3D _head;
     private ShapeCast3D _dashCast3D;
-    private ShapeCast3D _playerCast3D;
     private Camera3D _camera;
     private Vector3 _dashDirection = Vector3.Zero;
     
@@ -31,7 +31,6 @@ public partial class DashSystem: Node3D
     private MeshInstance3D _dashDropIndicator;
     private MeshInstance3D _dashDropLocationIndicator;
 
-    private MantleSystem _mantleSystem;
     private MeshInstance3D _dashTarget;
     private CpuParticles3D _dashIndicator;
     private AnimationPlayer _dashIndicatorAnim;
@@ -47,9 +46,6 @@ public partial class DashSystem: Node3D
     public delegate void DashProgressEventHandler(float progress);
     
     private Vector3 _globalDashPosition = Vector3.Zero;
-
-    private float _playerHeight;
-    private float _playerRadius;
     
     public float DashCastRadius { get; set; }
 
@@ -65,16 +61,11 @@ public partial class DashSystem: Node3D
         _dashDropLocationIndicator = GetNode<MeshInstance3D>("DashDropLocationIndicator");
         _dashDropLocationIndicator.Visible = false;
         
-        _playerCast3D = GetNode<ShapeCast3D>("PlayerShapeCast3D");
-        var playerShape = _playerCast3D.GetShape() as CapsuleShape3D;
-        _playerHeight = playerShape!.Height;
-        _playerRadius = playerShape!.Radius;
-        
         _head = head;
         _camera = camera;
         
-        _mantleSystem = GetNode<MantleSystem>("MantleSystem");
-        _mantleSystem.Init();
+        MantleSystem = GetNode<MantleSystem>("MantleSystem");
+        MantleSystem.Init();
         
         _dashTarget = GetNode<MeshInstance3D>("DashTarget");
         _dashTarget.SetVisible(false);
@@ -109,14 +100,15 @@ public partial class DashSystem: Node3D
 
         (HasHit, PlannedLocation, CollisionPoint, CollisionNormal) = ComputeDashLocation();
         
-        ShouldMantle = false;
-        var mantleLocation = Vector3.Zero;
-        if (HasHit && Mathf.Abs(CollisionNormal.Y) < 0.5f)
-        {
-            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(PlannedLocation, CollisionNormal);
-            ShouldMantle = mantleResult.IsSome(out mantleLocation);
-        }
-        PlannedMantleLocation = mantleLocation;
+        // TODO: Position mantle system to planned location, aligned with ground planned and facing the same way as the dash
+        // Then query it being careful when dashing underneath a platform and such
+        MantleSystem.SetGlobalPosition(PlannedLocation);
+        MantleSystem.SetRotation(new Vector3(
+            MantleSystem.Rotation.X,
+            _head.Rotation.Y,   
+            MantleSystem.Rotation.Z));
+        MantleSystem.ProcessMantle(false);
+        ShouldMantle = MantleSystem.IsMantlePossible;
         
         // Setup dash target
         var targetColor = HasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
@@ -124,7 +116,7 @@ public partial class DashSystem: Node3D
         var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
         targetMaterial.SetAlbedo(targetColor);
         _dashTarget.SetVisible(true);
-        var targetLocation = ShouldMantle ? PlannedMantleLocation : PlannedLocation;
+        var targetLocation = ShouldMantle ? MantleSystem.FirstMantleProfilePoint : PlannedLocation;
         _dashTarget.SetGlobalPosition(targetLocation);
         
         var shouldShowDropIndicator = !HasHit && !ShouldMantle;
@@ -160,6 +152,5 @@ public partial class DashSystem: Node3D
     public void StartPreparingDash()
     {
         _dashTarget.SetVisible(true);
-        
     }
 }

systems/dash/dash_system.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=10 format=3 uid="uid://cqduhd4opgwvm"]
+[gd_scene load_steps=9 format=3 uid="uid://cqduhd4opgwvm"]
 
 [ext_resource type="Script" uid="uid://dwoppk8j5fxeg" path="res://systems/dash/DashSystem.cs" id="1_hwig2"]
-[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="2_jngg2"]
 [ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="2_pff7b"]
 [ext_resource type="PackedScene" uid="uid://hd0868f4pb63" path="res://systems/dash/dash_indicator.tscn" id="2_tqt6i"]
 
@@ -24,16 +23,8 @@ outer_radius = 0.5
 script = ExtResource("1_hwig2")
 DashIndicatorScene = ExtResource("2_tqt6i")
 
-[node name="PlayerShapeCast3D" type="ShapeCast3D" parent="."]
-visible = false
-shape = ExtResource("2_jngg2")
-target_position = Vector3(0, 0, 0)
-collision_mask = 2
-debug_shape_custom_color = Color(0.863327, 0.636844, 0, 1)
-
 [node name="DashCast3D" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
-visible = false
 shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -12)
 max_results = 1
@@ -42,7 +33,6 @@ debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
 
 [node name="DashCastDrop" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1.6, 0)
-visible = false
 shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -50)
 max_results = 1
@@ -54,7 +44,6 @@ mesh = SubResource("SphereMesh_qu4wy")
 surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
 
 [node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
-visible = false
 MantleEndLocationDistanceFromWall = 0.25
 MantleHeightCastStart = 2.0
 

systems/mantle/MantleSystem.cs

@@ -18,6 +18,7 @@ public partial class MantleSystem: Node3D
     private ShapeCast3D _inAirWallDetect;
     private ShapeCast3D _groundedWallDetect;
     public Curve3D MantleCurve { get; private set; }
+    public Vector3 FirstMantleProfilePoint { get; private set; } = Vector3.Zero;
     
     public bool IsMantlePossible { get; private set; } = false;
     public const int WallProfileCastCount = 7;
@@ -56,13 +57,15 @@ public partial class MantleSystem: Node3D
         IsMantlePossible = false;
         if (!isColliding) return;
         
-        // Check if collide with wall
+        // Check if face something wall-like that should be climbable 
         var collisionNormal = isGrounded ? _groundedWallDetect.GetCollisionNormal(0) : _inAirWallDetect.GetCollisionNormal(0);
-        if (collisionNormal.Y > 0.9f) return;
+        if (collisionNormal.Y > 0.7f) return;
         
+        var spaceState = GetWorld3D().DirectSpaceState;
         MantleCurve = new Curve3D();
         MantleCurve.AddPoint(Vector3.Zero);
-        var hasFirstProfileHit = false;
+        var hasFirstProfileHit = false; 
+        var previousProfilePoint = GlobalPosition;
         foreach (var wallProfileShapecast in _wallProfileShapecasts)
         {
             // Haven't met the wall yet
@@ -73,54 +76,34 @@ public partial class MantleSystem: Node3D
             // Got to the other side of the wall, we stop there
             if (!wallProfileShapecast.IsColliding())
             {
-                MantleCurve.AddPoint(ToLocal(globalTargetPosition));
+                // MantleCurve.AddPoint(ToLocal(globalTargetPosition));
                 break;
             }
 
             var profilePoint = wallProfileShapecast.GetCollisionPoint(0);
             var profileNormal = wallProfileShapecast.GetCollisionNormal(0);
+            var shape = wallProfileShapecast.Shape as SphereShape3D;
+            var shapeRadius = shape == null ? 0.125f : shape.Radius;
+            var centerOfShape = profilePoint + profileNormal * shapeRadius;
             
             // Check if we collided parallel to a wall
-            var isCollisionSameAsTarget = globalTargetPosition.IsEqualApprox(profilePoint);
+            var isCollisionSameAsTarget = globalTargetPosition.IsEqualApprox(centerOfShape);
             var isCollidingWithWall = profileNormal.Y < 0.1f;
             if (isCollisionSameAsTarget || isCollidingWithWall) continue;
             
+            // Check if the path from the previous point makes us go through a wall
+            var query = PhysicsRayQueryParameters3D.Create(previousProfilePoint, centerOfShape, wallProfileShapecast.CollisionMask);
+            var result = spaceState.IntersectRay(query);
+            if (result.Count > 0) break; // We are going through a wall, we stop there
+            
             // We have a valid collision
+            if (!hasFirstProfileHit) FirstMantleProfilePoint = centerOfShape;
             hasFirstProfileHit = true;
-            MantleCurve.AddPoint(ToLocal(profilePoint));
+            previousProfilePoint = centerOfShape;
+            MantleCurve.AddPoint(ToLocal(centerOfShape));
         }
         if (MantleCurve.PointCount == 1) return;
         
         IsMantlePossible = true;
     }
-
-    public Option<Vector3> FindMantle()
-    {
-        if (!_wallInFrontCast3D.IsColliding())
-        {
-            return Option<Vector3>.None;
-        }
-        if (_wallInFrontCast3D.GetCollisionNormal(0).Y > 0.8f)
-        {
-            return Option<Vector3>.None;
-        }
-        
-        var collisionPoint = _wallInFrontCast3D.GetCollisionPoint(0);
-        var collisionNormal = _wallInFrontCast3D.GetCollisionNormal(0);
-        return FindMantleLocationAtPoint(collisionPoint, collisionNormal);
-    }
-
-    public Option<Vector3> FindMantleLocationAtPoint(Vector3 point, Vector3 wallNormal)
-    {
-        var horizontalEndLocation = point - wallNormal * MantleEndLocationDistanceFromWall;
-        var shapeCastStartLocation = horizontalEndLocation + Vector3.Up * MantleHeightCastStart;
-        
-        _mantleCast3D.SetGlobalPosition(shapeCastStartLocation);
-        var targetLocation = Vector3.Down * MantleHeightCastStart + Vector3.Up * MaxStepHeight;
-        _mantleCast3D.SetTargetPosition(targetLocation);
-        
-        if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y >= 0.1f)
-            return Option.Some(_mantleCast3D.GetCollisionPoint(0));
-        return Option<Vector3>.None;
-    }
 }

systems/mantle/mantle_system.tscn

@@ -58,47 +58,47 @@ collision_mask = 2
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.5)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
-target_position = Vector3(0, -2.375, 0)
+target_position = Vector3(0, -2.125, 0)
 collision_mask = 2
 
 [node name="ShapeCast2" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.75)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
-target_position = Vector3(0, -2.375, 0)
+target_position = Vector3(0, -2.125, 0)
 collision_mask = 2
 
 [node name="ShapeCast3" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
-target_position = Vector3(0, -2.375, 0)
+target_position = Vector3(0, -2.125, 0)
 collision_mask = 2
 
 [node name="ShapeCast4" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.25)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
-target_position = Vector3(0, -2.375, 0)
+target_position = Vector3(0, -2.125, 0)
 collision_mask = 2
 
 [node name="ShapeCast5" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.5)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
-target_position = Vector3(0, -2.375, 0)
+target_position = Vector3(0, -2.125, 0)
 collision_mask = 2
 
 [node name="ShapeCast6" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.75)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
-target_position = Vector3(0, -2.375, 0)
+target_position = Vector3(0, -2.125, 0)
 collision_mask = 2
 
 [node name="ShapeCast7" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -2)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
-target_position = Vector3(0, -2.375, 0)
+target_position = Vector3(0, -2.125, 0)
 collision_mask = 2