diff --git a/maps/levels/tuto_sword_parry.tscn b/maps/levels/tuto_sword_parry.tscn index 5c37b157..d335d70e 100644 --- a/maps/levels/tuto_sword_parry.tscn +++ b/maps/levels/tuto_sword_parry.tscn @@ -22,7 +22,7 @@ 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, 59.5, 0, 0) +transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0, 0) [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) @@ -286,20 +286,119 @@ use_collision = true collision_layer = 256 collision_mask = 65553 -[node name="CSGBox3D109" type="CSGBox3D" parent="Tutorial" index="0" unique_id=531736596] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -4.75, -2.25) +[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(19.5, 8.5, 14) +size = Vector3(9, 8.5, 6) material = ExtResource("3_wsc2c") -[node name="CSGBox3D110" type="CSGBox3D" parent="Tutorial" index="1" unique_id=731833071] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.5, -29.25) +[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(19.5, 27, 14) +size = Vector3(9, 5.5, 2) material = ExtResource("3_wsc2c") -[node name="CSGBox3D111" type="CSGBox3D" parent="Tutorial" index="2" unique_id=923535141] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -21.75, -18.75) +[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(19.5, 25.5, 35) +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") diff --git a/scenes/player_controller/PlayerController.tscn b/scenes/player_controller/PlayerController.tscn index cd04db49..ccdadd57 100644 --- a/scenes/player_controller/PlayerController.tscn +++ b/scenes/player_controller/PlayerController.tscn @@ -415,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 diff --git a/scenes/player_controller/scripts/PlayerController.cs b/scenes/player_controller/scripts/PlayerController.cs index 3639ab3c..cc162300 100644 --- a/scenes/player_controller/scripts/PlayerController.cs +++ b/scenes/player_controller/scripts/PlayerController.cs @@ -713,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"); @@ -1827,7 +1827,7 @@ public partial class PlayerController : CharacterBody3D, public void ReduceTimeScaleWhileAiming() { Engine.SetTimeScale(TimeScaleAimInAir); - _timeScaleAimInAirTimer.Start(); + // _timeScaleAimInAirTimer.Start(); } public void ResetTimeScale() {