started working on sword dash tutorial and bullet time is now unlimited while aiming in air

recover weapon if walking on it
ci back
2026-02-10 16:44:45 +01:00 · 2026-02-10 15:27:30 +01:00 · 2026-02-10 09:41:44 +01:00 · 2026-02-10 09:35:26 +01:00 · 2026-02-10 09:26:09 +01:00 · 2026-02-10 09:11:09 +01:00
3 changed files with 320 additions and 137 deletions
--- a/maps/levels/tuto_sword_parry.tscn
+++ b/maps/levels/tuto_sword_parry.tscn
@@ -22,258 +22,383 @@ metadata/_custom_type_script = "uid://baiapod3csndf"
 [node name="Main" unique_id=955321579 instance=ExtResource("1_8n6bu")]

 [node name="Player" parent="." index="6" unique_id=1309399929]
-transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 3, 0, -1.5)
+transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0, 0)

-[node name="PlaytestArena" parent="." index="7" unique_id=664535670 instance=ExtResource("2_wsc2c")]
+[node name="Playground" type="Node3D" parent="." index="7" unique_id=2099606598]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 57.5, 0, 0)

-[node name="CSGBox3D108" type="CSGBox3D" parent="PlaytestArena" index="88" unique_id=47922109]
+[node name="PlaytestArena" parent="Playground" index="0" unique_id=664535670 instance=ExtResource("2_wsc2c")]
+
+[node name="CSGBox3D108" type="CSGBox3D" parent="Playground/PlaytestArena" index="88" unique_id=47922109]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 8.75, 2.25)
 use_collision = true
 size = Vector3(1, 17.5, 9.5)
 material = ExtResource("3_wsc2c")

-[node name="Targets" type="Node3D" parent="." index="8" unique_id=1727473773]
+[node name="Targets" type="Node3D" parent="Playground" index="1" unique_id=1727473773]

-[node name="FixedDashthroughTarget" parent="Targets" index="0" unique_id=1291663508 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget" parent="Playground/Targets" index="0" unique_id=1291663508 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 17, 13.5, -9)

-[node name="FixedDashthroughTarget8" parent="Targets" index="1" unique_id=475406577 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget8" parent="Playground/Targets" index="1" unique_id=475406577 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 17, 23, -34)

-[node name="FixedDashthroughTarget9" parent="Targets" index="2" unique_id=168635463 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget9" parent="Playground/Targets" index="2" unique_id=168635463 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 35.5, 30.5, -42.5)

-[node name="FixedDashthroughTarget10" parent="Targets" index="3" unique_id=119396227 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget10" parent="Playground/Targets" index="3" unique_id=119396227 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 26, 30.5, -42.5)

-[node name="FixedDashthroughTarget7" parent="Targets" index="4" unique_id=282429016 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget7" parent="Playground/Targets" index="4" unique_id=282429016 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 10.5, 5.5, -9)

-[node name="FixedDashthroughTarget6" parent="Targets" index="5" unique_id=437890277 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget6" parent="Playground/Targets" index="5" unique_id=437890277 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 8, 6, -30.5)

-[node name="FixedDashthroughTarget4" parent="Targets" index="6" unique_id=1484691271 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget4" parent="Playground/Targets" index="6" unique_id=1484691271 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 30.5, 5, -33.5)

-[node name="FixedDashthroughTarget5" parent="Targets" index="7" unique_id=434257222 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget5" parent="Playground/Targets" index="7" unique_id=434257222 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 26.5, 9.5, -44)

-[node name="FixedDashthroughTarget2" parent="Targets" index="8" unique_id=272400108 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget2" parent="Playground/Targets" index="8" unique_id=272400108 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 27, 13.5, -9)

-[node name="FixedDashthroughTarget3" parent="Targets" index="9" unique_id=1008201593 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget3" parent="Playground/Targets" index="9" unique_id=1008201593 instance=ExtResource("4_invhv")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 43, 6, -8.5)

-[node name="FlyingEnemies" type="Node3D" parent="." index="9" unique_id=1518759273]
+[node name="FlyingEnemies" type="Node3D" parent="Playground" index="2" unique_id=1518759273]

-[node name="FlyingEnemy" parent="FlyingEnemies" index="0" unique_id=2090203407 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy" parent="Playground/FlyingEnemies" index="0" unique_id=2090203407 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 15.5, 7, -9)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy10" parent="FlyingEnemies" index="1" unique_id=1610354388 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy10" parent="Playground/FlyingEnemies" index="1" unique_id=1610354388 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.5, 7, 0.5)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy11" parent="FlyingEnemies" index="2" unique_id=1671862122 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy11" parent="Playground/FlyingEnemies" index="2" unique_id=1671862122 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28, 7, 1.5)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy4" parent="FlyingEnemies" index="3" unique_id=665537400 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy4" parent="Playground/FlyingEnemies" index="3" unique_id=665537400 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 33, 6, -12)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy5" parent="FlyingEnemies" index="4" unique_id=1592183094 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy5" parent="Playground/FlyingEnemies" index="4" unique_id=1592183094 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 45, 6, -12)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy9" parent="FlyingEnemies" index="5" unique_id=842890582 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy9" parent="Playground/FlyingEnemies" index="5" unique_id=842890582 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 45, 6, -1.5)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy2" parent="FlyingEnemies" index="6" unique_id=188061312 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy2" parent="Playground/FlyingEnemies" index="6" unique_id=188061312 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5, 11, -24)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy12" parent="FlyingEnemies" index="7" unique_id=821624940 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy12" parent="Playground/FlyingEnemies" index="7" unique_id=821624940 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 8.5, -24)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy3" parent="FlyingEnemies" index="8" unique_id=412581083 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy3" parent="Playground/FlyingEnemies" index="8" unique_id=412581083 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7, 14, -32.5)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy6" parent="FlyingEnemies" index="9" unique_id=779578466 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy6" parent="Playground/FlyingEnemies" index="9" unique_id=779578466 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26, 23.5, -23)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy7" parent="FlyingEnemies" index="10" unique_id=1163439326 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy7" parent="Playground/FlyingEnemies" index="10" unique_id=1163439326 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 34, 23.5, -23)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="FlyingEnemy8" parent="FlyingEnemies" index="11" unique_id=1979706254 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
+[node name="FlyingEnemy8" parent="Playground/FlyingEnemies" index="11" unique_id=1979706254 node_paths=PackedStringArray("Target") instance=ExtResource("8_dkfm7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 43, 23.5, -23)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RMovement = SubResource("Resource_nwk5u")

-[node name="GroundedEnemies" type="Node3D" parent="." index="10" unique_id=1101330520]
+[node name="GroundedEnemies" type="Node3D" parent="Playground" index="3" unique_id=1101330520]

-[node name="Enemy3" parent="GroundedEnemies" index="0" unique_id=1159989424 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy3" parent="Playground/GroundedEnemies" index="0" unique_id=1159989424 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 25, 0, -8.336809)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy11" parent="GroundedEnemies" index="1" unique_id=1747444936 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy11" parent="Playground/GroundedEnemies" index="1" unique_id=1747444936 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 17, 8, 3.6631908)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy12" parent="GroundedEnemies" index="2" unique_id=283117081 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy12" parent="Playground/GroundedEnemies" index="2" unique_id=283117081 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 36.5, 11, -4.836809)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy13" parent="GroundedEnemies" index="3" unique_id=970022638 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy13" parent="Playground/GroundedEnemies" index="3" unique_id=970022638 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 36.5, 12, -19.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy18" parent="GroundedEnemies" index="4" unique_id=2077088475 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy18" parent="Playground/GroundedEnemies" index="4" unique_id=2077088475 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 30.5, 12, -19.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy19" parent="GroundedEnemies" index="5" unique_id=2023773341 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy19" parent="Playground/GroundedEnemies" index="5" unique_id=2023773341 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 36.5, 7.5, -19.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy25" parent="GroundedEnemies" index="6" unique_id=1101329723 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy25" parent="Playground/GroundedEnemies" index="6" unique_id=1101329723 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 46, 7.5, -19.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy26" parent="GroundedEnemies" index="7" unique_id=855220553 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy26" parent="Playground/GroundedEnemies" index="7" unique_id=855220553 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 46, 12, -35.336807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy20" parent="GroundedEnemies" index="8" unique_id=1255215986 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy20" parent="Playground/GroundedEnemies" index="8" unique_id=1255215986 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 30.5, 7.5, -19.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy21" parent="GroundedEnemies" index="9" unique_id=2098915426 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy21" parent="Playground/GroundedEnemies" index="9" unique_id=2098915426 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 36.5, 0.5, -19.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy22" parent="GroundedEnemies" index="10" unique_id=246912749 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy22" parent="Playground/GroundedEnemies" index="10" unique_id=246912749 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 30.5, 0.5, -19.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy14" parent="GroundedEnemies" index="11" unique_id=211015190 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy14" parent="Playground/GroundedEnemies" index="11" unique_id=211015190 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 41, 17.5, -33.336807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy15" parent="GroundedEnemies" index="12" unique_id=1164179421 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy15" parent="Playground/GroundedEnemies" index="12" unique_id=1164179421 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 31, 17.5, -33.336807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy16" parent="GroundedEnemies" index="13" unique_id=1169725422 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy16" parent="Playground/GroundedEnemies" index="13" unique_id=1169725422 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 24.5, 17.5, -33.336807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy17" parent="GroundedEnemies" index="14" unique_id=1951666189 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy17" parent="Playground/GroundedEnemies" index="14" unique_id=1951666189 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 17.5, 17.5, -22.836807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy23" parent="GroundedEnemies" index="15" unique_id=1348057502 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy23" parent="Playground/GroundedEnemies" index="15" unique_id=1348057502 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 17.5, 24.5, -43.336807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy24" parent="GroundedEnemies" index="16" unique_id=2068813971 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy24" parent="Playground/GroundedEnemies" index="16" unique_id=2068813971 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 45, 24.5, -43.336807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy4" parent="GroundedEnemies" index="17" unique_id=366059658 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy4" parent="Playground/GroundedEnemies" index="17" unique_id=366059658 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 10.5, 0, -18.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy27" parent="GroundedEnemies" index="18" unique_id=883912991 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
-transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 13.5, 0, 1.1631908)
-Target = NodePath("../../Player")
-RHealth = SubResource("Resource_xy0m1")
-RMovement = SubResource("Resource_nwk5u")
-
-[node name="Enemy7" parent="GroundedEnemies" index="19" unique_id=1389063523 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy7" parent="Playground/GroundedEnemies" index="18" unique_id=1389063523 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 25.5, 4, -27.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy10" parent="GroundedEnemies" index="20" unique_id=836898496 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy27" parent="Playground/GroundedEnemies" index="19" unique_id=854456486 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 20, 0, -44.836807)
+Target = NodePath("../../../Player")
+RHealth = SubResource("Resource_xy0m1")
+RMovement = SubResource("Resource_nwk5u")
+
+[node name="Enemy10" parent="Playground/GroundedEnemies" index="20" unique_id=836898496 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 30.5, 11, -33.336807)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy8" parent="GroundedEnemies" index="21" unique_id=1015624071 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy8" parent="Playground/GroundedEnemies" index="21" unique_id=1015624071 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 34.5, 1.5, -27.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy9" parent="GroundedEnemies" index="22" unique_id=827865590 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy9" parent="Playground/GroundedEnemies" index="22" unique_id=827865590 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 46.5, 0, -27.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy5" parent="GroundedEnemies" index="23" unique_id=1267116862 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy5" parent="Playground/GroundedEnemies" index="23" unique_id=1267116862 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 4, 0, -18.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy6" parent="GroundedEnemies" index="24" unique_id=1147823180 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy6" parent="Playground/GroundedEnemies" index="24" unique_id=1147823180 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 16.5, 7, -17.33681)
-Target = NodePath("../../Player")
+Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
 RMovement = SubResource("Resource_nwk5u")
+
+[node name="Tutorial" type="CSGCombiner3D" parent="." index="8" unique_id=1168290062]
+use_collision = true
+collision_layer = 256
+collision_mask = 65553
+
+[node name="DashWithMantle" type="CSGCombiner3D" parent="Tutorial" index="0" unique_id=128667834]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 0, -36.5)
+
+[node name="CSGBox3D109" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="0" unique_id=531736596]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -4.75, 4)
+use_collision = true
+size = Vector3(9, 8.5, 6)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D112" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="1" unique_id=565292599]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -6.25, 0)
+use_collision = true
+size = Vector3(9, 5.5, 2)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D113" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="2" unique_id=28433553]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -7.75, -2)
+use_collision = true
+size = Vector3(9, 2.5, 2)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D110" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="3" unique_id=731833071]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 6, -12.125)
+use_collision = true
+size = Vector3(5, 1, 4.75)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D115" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="4" unique_id=173458015]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 5.625, -14)
+use_collision = true
+size = Vector3(9, 29.25, 1)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D116" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="5" unique_id=1750512788]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 7, -12.125)
+use_collision = true
+size = Vector3(1, 1, 4.75)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D117" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="6" unique_id=391729778]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 7, -12.125)
+use_collision = true
+size = Vector3(1, 1, 4.75)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="7" unique_id=1284139577]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0.625, 10)
+use_collision = true
+size = Vector3(3, 2.25, 6)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="8" unique_id=1204742131]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 16.5, 4.75)
+use_collision = true
+size = Vector3(12, 1, 2.5)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D111" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="9" unique_id=923535141]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -11.125, -3.75)
+use_collision = true
+size = Vector3(9, 4.25, 21.5)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial" index="1" unique_id=1217279859]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -4.75, 0)
+use_collision = true
+size = Vector3(9, 8.5, 14)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D116" type="CSGBox3D" parent="Tutorial" index="2" unique_id=720911926]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 12.75, -11.75)
+use_collision = true
+size = Vector3(18, 22, 37.5)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D115" type="CSGBox3D" parent="Tutorial" index="3" unique_id=995233474]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, -1, -26.5)
+use_collision = true
+size = Vector3(18, 1, 6)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial" index="4" unique_id=1412582714]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.875, -3.75, -30)
+use_collision = true
+size = Vector3(11.75, 11, 1)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D121" type="CSGBox3D" parent="Tutorial" index="5" unique_id=697302898]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.5, 0.125, -30)
+use_collision = true
+size = Vector3(3, 3.25, 1)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D117" type="CSGBox3D" parent="Tutorial" index="6" unique_id=603171965]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -6.25, -8)
+use_collision = true
+size = Vector3(9, 5.5, 2)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D118" type="CSGBox3D" parent="Tutorial" index="7" unique_id=1950738925]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -7.75, -10)
+use_collision = true
+size = Vector3(9, 2.5, 2)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D120" type="CSGBox3D" parent="Tutorial" index="8" unique_id=1024529143]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -21.75, -11.625)
+use_collision = true
+size = Vector3(9, 25.5, 37.75)
+material = ExtResource("3_wsc2c")
+
+[node name="CSGBox3D122" type="CSGBox3D" parent="Tutorial" index="9" unique_id=1261455320]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.5, 16.5, -27.5)
+use_collision = true
+size = Vector3(3, 1, 6)
+material = ExtResource("3_wsc2c")
--- a/scenes/player_controller/PlayerController.tscn
+++ b/scenes/player_controller/PlayerController.tscn
@@ -77,6 +77,9 @@ radius = 0.45
 [sub_resource type="SphereShape3D" id="SphereShape3D_q14ux"]
 radius = 1.0

+[sub_resource type="SphereShape3D" id="SphereShape3D_u8rdp"]
+radius = 1.5
+
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nodcl"]
 transparency = 1
 albedo_color = Color(0, 0.627451, 0.6313726, 0.49019608)
@@ -134,7 +137,7 @@ SimpleJumpHangTimeInFrames = 1
 SimpleJumpGravityLesseningFactor = 2.0
 DoubleJumpHangTimeInFrames = 3
 DoubleJumpGravityLesseningFactor = 1.5
-WallJumpStartVelocity = 8.0
+WallJumpStartVelocity = 12.0
 MaxNumberOfEmpoweredActions = 3
 SimpleDashStrength = 18.0
 SimpleDashTime = 0.2
@@ -155,7 +158,9 @@ WallHugGravityLesseningFactor = 15.0
 WallHugDownwardMaxSpeed = 4.0
 WallHugHorizontalDeceleration = 1.0
 WallRunUpwardVelocityFactor = 0.5
-MinimumWallRunUpwardVelocity = 3.0
+MinimumWallRunUpwardSpeed = 4.0
+WallRunAltitudeLossSpeed = 8.0
+WallRunSpeedThreshold = 7.0

 [node name="CHealth" parent="." unique_id=1244478698 instance=ExtResource("3_q7bng")]
 RHealth = ExtResource("4_m8gvy")
@@ -326,6 +331,14 @@ gravity_scale = 3.0
 ThrowForce = 300.0
 StraightThrowDuration = 0.05

+[node name="SwordPickup" type="Area3D" parent="." unique_id=1990087390]
+collision_layer = 0
+collision_mask = 65536
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="SwordPickup" unique_id=547241277]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
+shape = SubResource("SphereShape3D_u8rdp")
+
 [node name="DashIndicator" type="Node3D" parent="." unique_id=1279477982]
 visible = false

@@ -382,6 +395,10 @@ shape = SubResource("SphereShape3D_ue7xq")
 [node name="InvincibilityTime" type="Timer" parent="." unique_id=1244463585]
 one_shot = true

+[node name="WeaponThrowUncatchable" type="Timer" parent="." unique_id=2141801011]
+wait_time = 0.2
+one_shot = true
+
 [node name="AttackCooldown" type="Timer" parent="." unique_id=1620959518]
 wait_time = 0.3
 one_shot = true
@@ -391,7 +408,6 @@ wait_time = 0.8
 one_shot = true

 [node name="AirborneDashCooldown" type="Timer" parent="." unique_id=976335884]
-wait_time = 0.5
 one_shot = true

 [node name="PowerCooldown" type="Timer" parent="." unique_id=1091679675]
@@ -399,7 +415,7 @@ wait_time = 2.0
 one_shot = true

 [node name="TimeScaleAimInAir" type="Timer" parent="." unique_id=1346687662]
-wait_time = 2.0
+wait_time = 5.0
 one_shot = true
 ignore_time_scale = true

@@ -1158,3 +1174,4 @@ delay_in_seconds = "0.0"
 [connection signal="input_slide_ended" from="InputController" to="." method="OnInputSlideEnded"]
 [connection signal="input_slide_started" from="InputController" to="." method="OnInputSlideStarted"]
 [connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]
+[connection signal="body_entered" from="SwordPickup" to="." method="WalkOnWeapon"]
--- a/scenes/player_controller/scripts/PlayerController.cs
+++ b/scenes/player_controller/scripts/PlayerController.cs
@@ -240,10 +240,11 @@ public partial class PlayerController : CharacterBody3D,
 	[Export(PropertyHint.Range, "0,2,0.01,or_greater")]
 	public float WallRunUpwardVelocityFactor { get; set; } = 0.05f;
 	[Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-	public float MinimumWallRunUpwardVelocity { get; set; } = 2f;
+	public float MinimumWallRunUpwardSpeed { get; set; } = 2f;
+	[Export(PropertyHint.Range, "0,30,0.1,or_greater")]
+	public float MinimumWallRunHorizontalSpeed { get; set; } = 12f;
 	[Export(PropertyHint.Range, "1,20,0.1,or_greater")]
 	public float WallRunAltitudeLossSpeed { get; set; } = 10f;
-	
 	[Export(PropertyHint.Range, "1,20,0.1,or_greater")]
 	public float WallRunSpeedThreshold  { get; set; } = 8f;
 	
@@ -316,6 +317,7 @@ public partial class PlayerController : CharacterBody3D,

 	// Timers
 	private Timer _timeScaleAimInAirTimer;
+	private Timer _weaponThrowUncatchableTimer;
 	private Timer _simpleDashCooldownTimer;
 	private Timer _airborneDashCooldownTimer;
 	private Timer _powerCooldownTimer;
@@ -515,6 +517,7 @@ public partial class PlayerController : CharacterBody3D,
 		
 		// State timers
 		_powerCooldownTimer = GetNode<Timer>("PowerCooldown");
+		_weaponThrowUncatchableTimer = GetNode<Timer>("WeaponThrowUncatchable");
 		_timeScaleAimInAirTimer = GetNode<Timer>("TimeScaleAimInAir");
 		_simpleDashCooldownTimer = GetNode<Timer>("DashCooldown");
 		_airborneDashCooldownTimer = GetNode<Timer>("AirborneDashCooldown");
@@ -617,6 +620,7 @@ public partial class PlayerController : CharacterBody3D,
 		_onWall.StateExited += OnWallStopped;
 		_onWallHugging.StatePhysicsProcessing += HandleWallHugging;
 		_onWallHanging.StatePhysicsProcessing += HandleWallHanging;
+		_onWallRunning.StateEntered += OnWallRunStarted;
 		_onWallRunning.StatePhysicsProcessing += HandleWallRunning;
 		
 		_onWallHanging.StateExited += RecoverWeapon;
@@ -709,11 +713,11 @@ public partial class PlayerController : CharacterBody3D,
 	{
 		_isWallJumpAvailable = true;
 		_canDashAirborne = true;
+		ResetTimeScale();
 		
 		if (_simpleDashCooldownTimer.IsStopped())
 			_simpleDashCooldownTimer.Start();
 		
-
 		if (_bufferedAction == BufferedActions.MantleJump)
 		{
 			_playerState.SendEvent("jump");
@@ -725,6 +729,9 @@ public partial class PlayerController : CharacterBody3D,
 				_bufferedAction = BufferedActions.None;
 				return;
 			}
+
+			_canDash = true;
+			_canDashAirborne = true;
 			_playerState.SendEvent("dash");
 		}
 		
@@ -733,16 +740,18 @@ public partial class PlayerController : CharacterBody3D,
 			_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");
-		}
+		// if (_bufferedAction == BufferedActions.Dash && _currentInputBufferFrames > 0)
+		// {
+		// 	if (GetMoveInput().Length() < Mathf.Epsilon)
+		// 	{
+		// 		_bufferedAction = BufferedActions.None;
+		// 		return;
+		// 	}
+		// 	// _canDash = true;
+		// 	// _canDashAirborne = true;
+		// 	_currentInputBufferFrames = 0;
+		// 	_playerState.SendEvent("dash");
+		// }
 	}

 	public void OnAirborneToGrounded()
@@ -866,7 +875,6 @@ public partial class PlayerController : CharacterBody3D,
 		// Should we start a wall run
 		if (ShouldStartWallRun())
 		{
-			SetVerticalVelocity(GetWallRunStartVerticalVelocity());
 			_playerState.SendEvent("wall_run");
 			return;
 		}
@@ -1100,8 +1108,14 @@ public partial class PlayerController : CharacterBody3D,
 			if (!_canDashAirborne)
 				return;
 			_canDashAirborne = false;
+			_airborneDashCooldownTimer.Start();
+			_playerState.SendEvent("dash");
+			return;
 		}
-
+		
+		if (!_canDash) return;
+		_canDash = false;
+		_simpleDashCooldownTimer.Start();
 		_playerState.SendEvent("dash");
 	}
 	public void SimpleDashInDirection(Vector3 direction, float strength = -1)
@@ -1126,13 +1140,13 @@ public partial class PlayerController : CharacterBody3D,
 			return;
 		}

-		if (!_canDash)
-		{
-			var dashEvent = isOnFloorCustom() ? "grounded" : "dash_finished";
-			_playerState.SendEvent(dashEvent);
-			return;
-		}
-		_canDash = false;
+		// if (!_canDash)
+		// {
+		// 	var dashEvent = isOnFloorCustom() ? "grounded" : "dash_finished";
+		// 	_playerState.SendEvent(dashEvent);
+		// 	return;
+		// }
+		// _canDash = false;
 		SimpleDash();
 		_bufferedAction = BufferedActions.None;
 	}
@@ -1175,6 +1189,11 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public void OnWallStarted()
 	{
+		if (_simpleDashCooldownTimer.IsStopped())
+			_canDash = true;
+		else
+			_simpleDashCooldownTimer.Start();
+		
 		if (!WallHugSystem.IsWallHugging())
 			return;
 		
@@ -1192,14 +1211,12 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public void HandleWallHugging(float delta)
 	{
-		_canDash = true;
-		_canDashAirborne = true;
+		// _canDash = true;
+		// _canDashAirborne = true;
 		
 		WallHug(delta);
 		if (ShouldStartWallRun())
 		{
-			var verticalVelocity = GetWallRunStartVerticalVelocity();
-			SetVerticalVelocity(verticalVelocity);
 			_playerState.SendEvent("wall_run");
 			return;
 		}
@@ -1212,6 +1229,17 @@ public partial class PlayerController : CharacterBody3D,
 	{
 		WallHang(delta);
 	}
+
+	public void OnWallRunStarted()
+	{
+		// Find horizontal velocity projected on the current wall
+		var hvel = new Vector3(Velocity.X, 0, Velocity.Z);
+		var hvelProjected = hvel.Slide(_wallHugStartNormal);
+		var hSpeed = Mathf.Max(hvel.Length(), MinimumWallRunHorizontalSpeed);
+		// Reorient horizontal velocity so we keep it coplanar with the wall without losing speed
+		var finalHVel = hvelProjected.Normalized() * hSpeed;
+		Velocity = finalHVel + Vector3.Up*GetWallRunStartVerticalVelocity();
+	}
 	public void HandleWallRunning(float delta)
 	{
 		// _canDash = false;
@@ -1243,7 +1271,7 @@ public partial class PlayerController : CharacterBody3D,
 	{
 		var hvel = new Vector3(Velocity.X, 0, Velocity.Z);
 		var hvelProjected = hvel.Slide(_wallHugStartNormal);
-		return Mathf.Max(hvelProjected.Length() * WallRunUpwardVelocityFactor, MinimumWallRunUpwardVelocity);
+		return Mathf.Max(hvelProjected.Length() * WallRunUpwardVelocityFactor, MinimumWallRunUpwardSpeed);
 	}

 	public bool ShouldStartWallRun()
@@ -1256,7 +1284,7 @@ public partial class PlayerController : CharacterBody3D,
 		var isCoplanarEnough = Velocity.AngleTo(wallNormal) > Math.PI/4 && Velocity.AngleTo(wallNormal) < 3*Math.PI/4;
 		var isGoingDownwards = Velocity.AngleTo(Vector3.Down) < Math.PI/4;
 		var isLookingInDirectionOfRun = hvelProjected.AngleTo(-HeadSystem.GetForwardHorizontalVector()) < Math.PI/2;
-		var shouldStart = haveEnoughSpeed && isCoplanarEnough && !isGoingDownwards && isIndeedWall && isLookingInDirectionOfRun;
+		var shouldStart = haveEnoughSpeed && !isGoingDownwards && isIndeedWall && isCoplanarEnough && isLookingInDirectionOfRun;

 		var debugText = "--------------\n";
 		debugText += shouldStart ? "WALL RUN STARTED\n" : "NO WALL RUN\n";
@@ -1371,12 +1399,11 @@ public partial class PlayerController : CharacterBody3D,
 	{
 		if (IsTryingToMantle()) _playerState.SendEvent("mantle");
 		
-		// if (ShouldStartWallRun() && Velocity.Y < WallRunUpwardVelocity)
-		// {
-		// 	SetVerticalVelocity(WallRunUpwardVelocity);
-		// 	_playerState.SendEvent("wall_run");
-		// 	return;
-		// }
+		if (ShouldStartWallRun() && !_isJumpInputPressed)
+		{
+			_playerState.SendEvent("wall_run");
+			return;
+		}
 		
 		// Update horizontal velocity
 		var horizontalVelocity = ComputeHVelocityAir(delta);
@@ -1434,8 +1461,9 @@ public partial class PlayerController : CharacterBody3D,
 		{
 			ComputeJumpFromWallHSpeed(WallJumpStartVelocity);
 		}
+		
 		// Remove the ability to dash straight away so you cannot scale up the wall
-		_canDashAirborne = false;
+		// _canDashAirborne = false;
 		_airborneDashCooldownTimer.Start();
 		_isWallJumpAvailable = false;
 	}
@@ -1768,6 +1796,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void PerformEmpoweredAction()
 	{
 		_isWallJumpAvailable = true;
+		_canDashAirborne = true;
 		EmpoweredActionsLeft--;
 		_playerState.SendEvent(EmpoweredActionsLeft <= 0 ? "expired" : "power_used");
 	}
@@ -1798,7 +1827,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void ReduceTimeScaleWhileAiming()
 	{
 		Engine.SetTimeScale(TimeScaleAimInAir);
-		_timeScaleAimInAirTimer.Start();
+		// _timeScaleAimInAirTimer.Start();
 	}
 	public void ResetTimeScale()
 	{
@@ -1865,7 +1894,7 @@ public partial class PlayerController : CharacterBody3D,
 			var plannedDashLocation = targetable.GetTargetGlobalPosition() + Vector3.Down*_playerHeight/2;
 			travel = plannedDashLocation - GlobalPosition;
 			_dashDirection = travel.Normalized();
-			var postDashLocation = plannedDashLocation + 2*_dashDirection;
+			var postDashLocation = plannedDashLocation + _dashDirection;
 			var wallBehindQuery = PhysicsRayQueryParameters3D.Create(GlobalPosition + Vector3.Up*HeadSystem.Position.Y, postDashLocation, GroundDetector.CollisionMask);
 			var wallBehindResult = _spaceState.IntersectRay(wallBehindQuery);
 			shouldRebound = wallBehindResult.Count > 0;
@@ -1933,6 +1962,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void ThrowWeapon()
 	{
 		_audioStream.SwitchToClipByName("attacks");
+		_weaponThrowUncatchableTimer.Start();
 		
 		_playerState.SendEvent("cancel_aim");
 		RemoveChildNode(WeaponSystem);
@@ -1953,6 +1983,7 @@ public partial class PlayerController : CharacterBody3D,
 		HeadSystem.ShowWeapon();
 		WeaponSystem.ResetWeapon();
 		RecoverChildNode(WeaponSystem);
+		_audioStream.SwitchToClipByName("parry");
 	}
 	
 	public void DashToFlyingWeapon()
@@ -2034,6 +2065,16 @@ public partial class PlayerController : CharacterBody3D,
 		
 		_playerState.SendEvent(resultingEvent);
 	}
+	public void WalkOnWeapon(Node3D other)
+	{
+		if (_weaponDash.Active) return;  // Don't recover weapon if already dashing to it
+		if (WeaponSystem.InHandState.Active) return;  // Don't recover weapon if in hand
+		if (!_weaponThrowUncatchableTimer.IsStopped()) return; // Don't get weapon back if timer is still running
+		if (WeaponSystem.PlantObject is ITargetable) return;  // Don't recover weapon planted in target
+		
+		RecoverWeapon();
+		WeaponSystem.PlantObject = null;
+	}

 	public void ManageAttackedEnemyPostDash(Node enemy)
 	{
@@ -2202,7 +2243,7 @@ public partial class PlayerController : CharacterBody3D,
 		var travel = plannedDashLocation - GlobalPosition;
 		_dashDirection = travel.Normalized();

-		var postDashLocation = plannedDashLocation + 2*_dashDirection;
+		var postDashLocation = plannedDashLocation + _dashDirection;
 		var wallBehindQuery = PhysicsRayQueryParameters3D.Create(GlobalPosition + Vector3.Up*HeadSystem.Position.Y, postDashLocation, GroundDetector.CollisionMask);
 		var wallBehindResult = _spaceState.IntersectRay(wallBehindQuery);
 		var shouldRebound = wallBehindResult.Count > 0;
@@ -2266,7 +2307,7 @@ public partial class PlayerController : CharacterBody3D,
 		
 		if (_onWallHanging.Active) return;

-		if (_aiming.Active && WeaponSystem.InHandState.Active)
+		if (_aiming.Active && WeaponSystem.InHandState.Active && CanPerformEmpoweredAction())
 		{
 			ThrowWeapon();
 			return;
Author	SHA1	Message	Date
Minimata	aaa9b102c1	started working on sword dash tutorial and bullet time is now unlimited while aiming in air 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 / Test (push) Successful in 6m44s Details Create tag and build when new code gets to main / Export (push) Successful in 8m17s Details	2026-02-10 16:44:45 +01:00
Minimata	cb348667f5	recover weapon if walking on it	2026-02-10 15:27:30 +01:00
Minimata	8d23a95c68	ci back All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 18s Details Create tag and build when new code gets to main / Test (push) Successful in 6m13s Details Create tag and build when new code gets to main / Export (push) Successful in 8m45s Details	2026-02-10 09:41:44 +01:00
Minimata	a9809abc27	removing sa mere Some checks failed 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 / Test (push) Failing after 5m10s Details	2026-02-10 09:35:26 +01:00
Minimata	db65c02e75	trying a simpler workflow	2026-02-10 09:26:09 +01:00
Minimata	5d49d6d681	player back at correct location for tuto sword 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 / Test (push) Successful in 7m17s Details Create tag and build when new code gets to main / Export (push) Successful in 9m40s Details	2026-02-10 09:11:09 +01:00
Minimata	fa0e511b3a	removed ability to scale up wall by mashing dash and jump buttons Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 21s Details Create tag and build when new code gets to main / Test (push) Failing after 2m44s Details Create tag and build when new code gets to main / Export (push) Successful in 8m44s Details	2026-02-09 17:58:13 +01:00