scene saved

addons/guide/guide_action.gd

@@ -250,5 +250,3 @@ func _editor_name() -> String:
 		return name
 		
 	return resource_path.get_file().replace(".tres", "")
-
-

godot_state_charts_examples/history_states/history_demo.tscn

@@ -2,12 +2,12 @@
 
 [ext_resource type="Texture2D" uid="uid://bgw8xgbwc2flx" path="res://godot_state_charts_examples/history_states/white_rectangle.svg" id="1_3v23e"]
 [ext_resource type="PackedScene" uid="uid://bcwkugn6v3oy7" path="res://addons/godot_state_charts/utilities/state_chart_debugger.tscn" id="2_fgw1q"]
-[ext_resource type="Script" path="res://addons/godot_state_charts/state_chart.gd" id="2_pqmip"]
-[ext_resource type="Script" path="res://godot_state_charts_examples/history_states/history_demo.gd" id="2_vphtk"]
-[ext_resource type="Script" path="res://addons/godot_state_charts/compound_state.gd" id="3_nsw2j"]
-[ext_resource type="Script" path="res://addons/godot_state_charts/history_state.gd" id="4_0qaqv"]
-[ext_resource type="Script" path="res://addons/godot_state_charts/atomic_state.gd" id="5_lh5sp"]
-[ext_resource type="Script" path="res://addons/godot_state_charts/transition.gd" id="6_xvm5g"]
+[ext_resource type="Script" uid="uid://couw105c3bde4" path="res://addons/godot_state_charts/state_chart.gd" id="2_pqmip"]
+[ext_resource type="Script" uid="uid://bad613wfktgah" path="res://godot_state_charts_examples/history_states/history_demo.gd" id="2_vphtk"]
+[ext_resource type="Script" uid="uid://jk2jm1g6q853" path="res://addons/godot_state_charts/compound_state.gd" id="3_nsw2j"]
+[ext_resource type="Script" uid="uid://b4dwolbvt8our" path="res://addons/godot_state_charts/history_state.gd" id="4_0qaqv"]
+[ext_resource type="Script" uid="uid://cytafq8i1y8qm" path="res://addons/godot_state_charts/atomic_state.gd" id="5_lh5sp"]
+[ext_resource type="Script" uid="uid://cf1nsco3w0mf6" path="res://addons/godot_state_charts/transition.gd" id="6_xvm5g"]
 [ext_resource type="Theme" uid="uid://s2bj74tt0y7f" path="res://godot_state_charts_examples/new_theme.tres" id="8_najew"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_kl3ga"]

player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import

@@ -1,36 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://lp2pt8mtj7ty"
-path.s3tc="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex"
-path.etc2="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"
-metadata={
-"imported_formats": ["s3tc_bptc", "etc2_astc"],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png"
-dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex", "res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"]
-
-[params]
-
-compress/mode=2
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=true
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=0

player_controller/Examples/MovementTestbed/LowGravityArea3D.cs

@@ -1,33 +0,0 @@
-using Godot;
-
-// This script is an example of how you can create game systems that
-// interact with PlayerController. This script applies a low gravity effect
-// to any PlayerController that enters the Area3D. It does this by modifying
-// the value of AdditionalGravityPower owned by the Gravity child of
-// PlayerController.
-
-namespace Movementtests.player_controller.Examples.MovementTestbed;
-
-public partial class LowGravityArea3D : Area3D
-{
-	[Export] public float GravityReduction { set; get; } = 0.4f;
-
-	public override void _Ready()
-	{
-		BodyEntered += (Node3D body) =>
-		{
-			if (body is PlayerController player) {
-				player.Gravity.AdditionalGravityPower *= GravityReduction;
-				GD.Print("Low Gravity Zone Entered");
-			}
-		};
-		BodyExited += (Node3D body) =>
-		{
-			if (body is PlayerController player) {
-				player.Gravity.AdditionalGravityPower /= GravityReduction;
-				GD.Print("Low Gravity Zone Exited");
-			}
-		};
-	}
-}
-

player_controller/Examples/MovementTestbed/LowGravityArea3D.cs.uid

@@ -1 +0,0 @@
-uid://ctypnlbfptf03

player_controller/PlayerController.tscn

@@ -1,30 +1,33 @@
-[gd_scene load_steps=38 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=44 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="Curve" uid="uid://c2a8soliruf35" path="res://systems/dash/dash_time_dilation.tres" id="2_2q0ik"]
 [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"]
 [ext_resource type="Script" uid="uid://dv7v1ywmbvvcd" path="res://player_controller/Scripts/HealthSystem.cs" id="5_umw0l"]
 [ext_resource type="Script" uid="uid://vuq8rjq3vegn" path="res://player_controller/Scripts/Stamina.cs" id="6_lxtc4"]
 [ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://player_controller/Scripts/StairsSystem.cs" id="7_bmt5a"]
-[ext_resource type="Resource" uid="uid://dgfww8118d8gj" path="res://systems/inputs/base_mode/aim.tres" id="7_cresl"]
 [ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/base_mode/aim_release.tres" id="8_lhb11"]
 [ext_resource type="Script" uid="uid://dd1yrt7eiiyf4" path="res://player_controller/Scripts/CapsuleCollider.cs" id="8_lmtjd"]
 [ext_resource type="Resource" uid="uid://c3e0ivgaxrsyb" path="res://systems/inputs/base_mode/aim_down.tres" id="8_obsfv"]
 [ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="8_qu4wy"]
 [ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/base_mode/aim_cancel.tres" id="9_5p2qc"]
-[ext_resource type="Script" uid="uid://bt0xv2q8iv1vn" path="res://player_controller/Scripts/Gravity.cs" id="9_lsueh"]
+[ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="9_nob5r"]
 [ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="10_4u7i3"]
 [ext_resource type="Script" uid="uid://g8idirw62qe0" path="res://player_controller/Scripts/Bobbing.cs" id="10_7wk1w"]
+[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/empower_down.tres" id="10_nodcl"]
 [ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="11_cresl"]
+[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/empower_release.tres" id="11_ruloh"]
 [ext_resource type="PackedScene" uid="uid://0ysqmqphq6mq" path="res://systems/head/head_system.tscn" id="11_rxwoh"]
-[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/drop.tres" id="12_34snm"]
+[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="12_34snm"]
 [ext_resource type="Script" uid="uid://b6k73aj5povgv" path="res://player_controller/Scripts/FieldOfView.cs" id="12_m2mxi"]
+[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="Resource" uid="uid://bw5k2gsv3jqcv" path="res://systems/inputs/base_mode/throw.tres" id="16_nob5r"]
 [ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"]
 [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="Script" uid="uid://dyy5njw6pxoh4" path="res://systems/move/MoveSystem.cs" id="20_rxwoh"]
 [ext_resource type="PackedScene" uid="uid://dbe5f0p6lvqtr" path="res://systems/tween_queue/tween_queue_system.tscn" id="22_rpwev"]
 [ext_resource type="PackedScene" uid="uid://bcwkugn6v3oy7" path="res://addons/godot_state_charts/utilities/state_chart_debugger.tscn" id="24_q5h8a"]
 [ext_resource type="Script" uid="uid://couw105c3bde4" path="res://addons/godot_state_charts/state_chart.gd" id="25_wv70j"]
@@ -36,15 +39,38 @@
 [ext_resource type="PackedScene" uid="uid://ckm3d6k08a72u" path="res://systems/weapon/weapon.tscn" id="29_wv70j"]
 [ext_resource type="Script" uid="uid://bhuwv2nlcrunt" path="res://player_controller/PlayerUi.cs" id="30_2ghaa"]
 [ext_resource type="Texture2D" uid="uid://bnwj7ltdfximr" path="res://icon.svg" id="30_h23go"]
+[ext_resource type="Texture2D" uid="uid://chvt6g0xn5c2m" path="res://systems/dash/light-ring.jpg" id="32_lgpc8"]
+[ext_resource type="Script" uid="uid://b4dwolbvt8our" path="res://addons/godot_state_charts/history_state.gd" id="41_ruloh"]
 
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_xc2g5"]
 height = 1.7
 
+[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2q0ik"]
+blend_mode = 1
+
 [node name="Player" type="CharacterBody3D"]
 script = ExtResource("1_poq2x")
-TimeScaleAimInAir = 0.15
-MaxJumpBoostAfterDashing = 0.7
+WalkSpeed = 7.5
+AccelerationAir = 2.0
+DecelerationAir = 0.1
+Weight = 5.0
+SimpleJumpStartVelocity = 8.0
+SimpleJumpHangTimeInFrames = 1
+SimpleJumpGravityLesseningFactor = 2.5
+DoubleJumpStartVelocity = 15.0
+DoubleJumpHangTimeInFrames = 3
+DoubleJumpGravityLesseningFactor = 1.5
+MegaJumpStartVelocity = 30.0
+MegaJumpHangTimeInFrames = 12
+MegaJumpGravityLesseningFactor = 1.2
+WallJumpStartVelocity = 8.0
+SimpleDashStrength = 15.0
+PoweredDashStrength = 50.0
+WallHugGravityLesseningFactor = 15.0
+WallHugDownwardMaxSpeed = 8.0
+WallHugHorizontalDeceleration = 0.5
 MaxNumberOfDashActions = 2
+DashTimeDilationCurve = ExtResource("2_2q0ik")
 
 [node name="InputController" type="Node3D" parent="."]
 script = ExtResource("16_v31n3")
@@ -52,13 +78,17 @@ base_mode = ExtResource("3_cresl")
 move = ExtResource("17_h6vvl")
 rotate_y = ExtResource("4_rxwoh")
 rotate_floorplane = ExtResource("5_4u7i3")
-aim_pressed = ExtResource("7_cresl")
 aim_down = ExtResource("8_obsfv")
+aim_pressed = ExtResource("9_nob5r")
 aim_released = ExtResource("8_lhb11")
-aim_canceled = ExtResource("9_5p2qc")
 jump = ExtResource("10_4u7i3")
+jump_pressed = ExtResource("13_nob5r")
+empower_down = ExtResource("10_nodcl")
+empower_released = ExtResource("11_ruloh")
+aim_canceled = ExtResource("9_5p2qc")
 hit = ExtResource("11_cresl")
-drop = ExtResource("12_34snm")
+dash = ExtResource("12_34snm")
+throw = ExtResource("16_nob5r")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
@@ -120,18 +150,6 @@ target_position = Vector3(0, 1, 0)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.296, 1.4, 0)
 target_position = Vector3(0, 1, 0)
 
-[node name="MoveSystem" type="Node3D" parent="."]
-script = ExtResource("20_rxwoh")
-WalkSpeed = 7.2
-DecelerationSpeedFactorFloor = 7.0
-ApexHoldTime = 0.1
-
-[node name="Gravity" type="Node3D" parent="."]
-script = ExtResource("9_lsueh")
-Weight = 3.5
-StartVelocity = 0.7
-JumpFromDashSpeedFactor = 4.0
-
 [node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")]
 
 [node name="WallHugSystem" type="Node3D" parent="."]
@@ -165,12 +183,11 @@ transform = Transform3D(1, 0, 0, 0, 0.173648, -0.984808, 0, 0.984808, 0.173648,
 ThrowForce = 15.0
 StraightThrowDuration = 0.05
 
-[node name="CoyoteTime" type="Timer" parent="."]
-wait_time = 0.2
+[node name="DashCooldown" type="Timer" parent="."]
 one_shot = true
 
-[node name="DashCooldown" type="Timer" parent="."]
-wait_time = 0.2
+[node name="PowerCooldown" type="Timer" parent="."]
+wait_time = 2.0
 one_shot = true
 
 [node name="TimeScaleAimInAir" type="Timer" parent="."]
@@ -178,16 +195,11 @@ wait_time = 2.0
 one_shot = true
 ignore_time_scale = true
 
-[node name="TimeAfterDashing" type="Timer" parent="."]
-wait_time = 0.3
-one_shot = true
-
 [node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")]
 offset_left = 1524.0
 offset_top = 1.0
 offset_right = -8.0
 offset_bottom = 1.0
-enabled = false
 initial_node_to_watch = NodePath("../StateChart")
 
 [node name="UI" type="CanvasLayer" parent="."]
@@ -220,6 +232,25 @@ layout_mode = 2
 texture = ExtResource("30_h23go")
 expand_mode = 2
 
+[node name="DashCooldownIndicator" type="ColorRect" parent="UI"]
+unique_name_in_owner = true
+offset_left = 910.0
+offset_top = 549.0
+offset_right = 1010.0
+offset_bottom = 559.0
+
+[node name="CenterContainer" type="CenterContainer" parent="UI"]
+custom_minimum_size = Vector2(1920, 1080)
+offset_right = 1919.0
+offset_bottom = 1080.0
+
+[node name="CenterIcon" type="TextureRect" parent="UI/CenterContainer"]
+material = SubResource("CanvasItemMaterial_2q0ik")
+custom_minimum_size = Vector2(5, 5)
+layout_mode = 2
+texture = ExtResource("32_lgpc8")
+expand_mode = 1
+
 [node name="StateChart" type="Node" parent="."]
 script = ExtResource("25_wv70j")
 metadata/_custom_type_script = "uid://couw105c3bde4"
@@ -227,99 +258,148 @@ metadata/_custom_type_script = "uid://couw105c3bde4"
 [node name="Root" type="Node" parent="StateChart"]
 script = ExtResource("27_infe6")
 
-[node name="Actions" type="Node" parent="StateChart/Root"]
+[node name="Aim" type="Node" parent="StateChart/Root"]
 script = ExtResource("26_infe6")
-initial_state = NodePath("WeaponInHand")
-metadata/_custom_type_script = "uid://c1vp0ojjvaby1"
+initial_state = NodePath("Off")
 
-[node name="AimCanceled" type="Node" parent="StateChart/Root/Actions"]
-script = ExtResource("27_34snm")
-
-[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/AimCanceled"]
+[node name="ToOff" type="Node" parent="StateChart/Root/Aim"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
+to = NodePath("../Off")
 event = &"aim_released"
 delay_in_seconds = "0.0"
 
-[node name="WeaponInHand" type="Node" parent="StateChart/Root/Actions"]
+[node name="Off" type="Node" parent="StateChart/Root/Aim"]
 script = ExtResource("27_34snm")
 
-[node name="ToAiming" type="Node" parent="StateChart/Root/Actions/WeaponInHand"]
+[node name="ToOn" type="Node" parent="StateChart/Root/Aim/Off"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Aiming")
+to = NodePath("../../On")
 event = &"aim_down"
 delay_in_seconds = "0.0"
 
-[node name="Aiming" type="Node" parent="StateChart/Root/Actions"]
+[node name="On" type="Node" parent="StateChart/Root/Aim"]
 script = ExtResource("27_34snm")
 
-[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/Aiming"]
+[node name="ToCancel" type="Node" parent="StateChart/Root/Aim/On"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../AimCanceled")
-event = &"aim_canceled"
+to = NodePath("../../Canceled")
+event = &"cancel_aim"
 delay_in_seconds = "0.0"
 
-[node name="ToDashing" type="Node" parent="StateChart/Root/Actions/Aiming"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Dashing")
-event = &"aim_released"
-delay_in_seconds = "0.0"
-
-[node name="ToWeaponThrown" type="Node" parent="StateChart/Root/Actions/Aiming"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponThrown")
-event = &"hit_pressed"
-delay_in_seconds = "0.0"
-
-[node name="Dashing" type="Node" parent="StateChart/Root/Actions"]
+[node name="Canceled" type="Node" parent="StateChart/Root/Aim"]
 script = ExtResource("27_34snm")
 
-[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/Dashing"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
-event = &"dash_ended"
-delay_in_seconds = "0.0"
+[node name="Empower" type="Node" parent="StateChart/Root"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Off")
 
-[node name="ToHanging" type="Node" parent="StateChart/Root/Actions/Dashing"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Hanging")
-event = &"dash_to_planted"
-delay_in_seconds = "0.0"
-
-[node name="WeaponThrown" type="Node" parent="StateChart/Root/Actions"]
+[node name="Off" type="Node" parent="StateChart/Root/Empower"]
 script = ExtResource("27_34snm")
 
-[node name="OnAim" type="Node" parent="StateChart/Root/Actions/WeaponThrown"]
+[node name="ToOn" type="Node" parent="StateChart/Root/Empower/Off"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Dashing")
-event = &"aim_pressed"
+to = NodePath("../../On")
+event = &"empower_down"
 delay_in_seconds = "0.0"
 
-[node name="Hanging" type="Node" parent="StateChart/Root/Actions"]
+[node name="On" type="Node" parent="StateChart/Root/Empower"]
 script = ExtResource("27_34snm")
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Actions/Hanging"]
+[node name="ToOff" type="Node" parent="StateChart/Root/Empower/On"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
-event = &"jump"
+to = NodePath("../../Off")
+event = &"empower_released"
 delay_in_seconds = "0.0"
 
-[node name="OnDrop" type="Node" parent="StateChart/Root/Actions/Hanging"]
+[node name="PowerReserve" type="Node" parent="StateChart/Root"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Full")
+
+[node name="ToExpired" type="Node" parent="StateChart/Root/PowerReserve"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
-event = &"crouch"
+to = NodePath("../Expired")
+event = &"expired"
 delay_in_seconds = "0.0"
 
-[node name="OnMantle" type="Node" parent="StateChart/Root/Actions/Hanging"]
+[node name="Recharge" type="Node" parent="StateChart/Root/PowerReserve"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
-event = &"mantle"
+to = NodePath("../AtLeastOneCharge")
+event = &"recharge"
 delay_in_seconds = "0.0"
 
+[node name="ToFull" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Full")
+event = &"fully_charged"
+delay_in_seconds = "0.0"
+
+[node name="Expired" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("27_34snm")
+
+[node name="AtLeastOneCharge" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("27_34snm")
+
+[node name="Full" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("27_34snm")
+
+[node name="PowerUsed" type="Node" parent="StateChart/Root/PowerReserve/Full"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../AtLeastOneCharge")
+event = &"power_used"
+delay_in_seconds = "0.0"
+
+[node name="WeaponState" type="Node" parent="StateChart/Root"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("InHand")
+metadata/_custom_type_script = "uid://c1vp0ojjvaby1"
+
+[node name="ToPlanted" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Planted")
+event = &"plant_weapon"
+delay_in_seconds = "0.0"
+
+[node name="ToHand" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../InHand")
+event = &"recover_weapond"
+delay_in_seconds = "0.0"
+
+[node name="InHand" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("27_34snm")
+
+[node name="ToThrown" type="Node" parent="StateChart/Root/WeaponState/InHand"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Flying")
+event = &"throw"
+delay_in_seconds = "0.0"
+
+[node name="Flying" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("27_34snm")
+
+[node name="ToPlanted" type="Node" parent="StateChart/Root/WeaponState/Flying"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Planted")
+event = &"plant_weapon"
+delay_in_seconds = "0.0"
+
+[node name="Planted" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("27_34snm")
+
 [node name="Movement" type="Node" parent="StateChart/Root"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("Grounded")
 
+[node name="Reset" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("41_ruloh")
+default_state = NodePath("../Grounded")
+
+[node name="OnFall" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Airborne/Falling")
+event = &"falling"
+delay_in_seconds = "0.0"
+
 [node name="OnMantle" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../Mantling")
@@ -328,117 +408,155 @@ delay_in_seconds = "0.0"
 
 [node name="OnHang" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../Hanging")
+to = NodePath("../OnWall/Hanging")
 event = &"dash_to_planted"
 delay_in_seconds = "0.0"
 
-[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
-script = ExtResource("26_infe6")
-initial_state = NodePath("Standing")
-
-[node name="Standing" type="Node" parent="StateChart/Root/Movement/Grounded"]
-script = ExtResource("27_34snm")
-
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
+[node name="OnPoweredDash" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../Airborne/Jump")
-event = &"jump"
-delay_in_seconds = "0.0"
-
-[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../../Airborne/CoyoteEnabled")
-event = &"start_falling"
-delay_in_seconds = "0.0"
-
-[node name="OnCrouch" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Crouched")
-event = &"crouch"
-delay_in_seconds = "0.0"
-
-[node name="Crouched" type="Node" parent="StateChart/Root/Movement/Grounded"]
-script = ExtResource("27_34snm")
-
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded/Crouched"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../../Airborne/Jump")
-event = &"jump"
-delay_in_seconds = "0.0"
-
-[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded/Crouched"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../../Airborne/CoyoteEnabled")
-event = &"start_falling"
-delay_in_seconds = "0.0"
-
-[node name="OnStandUp" type="Node" parent="StateChart/Root/Movement/Grounded/Crouched"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Standing")
-event = &"crouch"
+to = NodePath("../Dashing/PoweredDash")
+event = &"powered_dash"
 delay_in_seconds = "0.0"
 
 [node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("27_34snm")
 
-[node name="ToGrounded" type="Node" parent="StateChart/Root/Movement/Mantling"]
+[node name="OnMantleFinished" type="Node" parent="StateChart/Root/Movement/Mantling"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Grounded/Standing")
-event = &"to_grounded"
+to = NodePath("../../Grounded")
+event = &"grounded"
 delay_in_seconds = "0.0"
 
-[node name="Hanging" type="Node" parent="StateChart/Root/Movement"]
+[node name="Jump" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("SimpleJump")
+
+[node name="SimpleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
 script = ExtResource("27_34snm")
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Hanging"]
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/JumpFromWall")
+to = NodePath("../../MegaJump")
+event = &"megajump"
+delay_in_seconds = "0.0"
+
+[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/DoubleJumpEnabled")
+event = &"jump_ended"
+delay_in_seconds = "0.0"
+
+[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("27_34snm")
+
+[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="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/Falling")
+event = &"jump_ended"
+delay_in_seconds = "0.0"
+
+[node name="MegaJump" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("27_34snm")
+
+[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/MegaJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/Falling")
+event = &"jump_ended"
+delay_in_seconds = "0.0"
+
+[node name="Dashing" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Dash")
+
+[node name="OnDashEnded" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Airborne/Reset")
+event = &"dash_finished"
+delay_in_seconds = "0.0"
+
+[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Mantling")
+event = &"mantle"
+delay_in_seconds = "0.0"
+
+[node name="Dash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
+[node name="PoweredDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
+[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="OnDrop" type="Node" parent="StateChart/Root/Movement/Hanging"]
+[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")
-event = &"crouch"
+event = &"start_falling"
 delay_in_seconds = "0.0"
 
 [node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("CoyoteEnabled")
 
-[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Grounded/Standing")
-event = &"grounded"
-delay_in_seconds = "0.0"
+[node name="Reset" type="Node" parent="StateChart/Root/Movement/Airborne"]
+script = ExtResource("41_ruloh")
+default_state = NodePath("../CoyoteEnabled")
 
 [node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../WallHugging")
+to = NodePath("../../OnWall/Hugging")
 event = &"wall_hug"
 delay_in_seconds = "0.0"
 
-[node name="WallHugging" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("27_34snm")
-
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/WallHugging"]
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../JumpFromWall")
-event = &"jump"
+to = NodePath("../../Dashing/Dash")
+event = &"dash"
 delay_in_seconds = "0.0"
 
-[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/Airborne/WallHugging"]
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"start_falling"
+to = NodePath("../../Grounded")
+event = &"grounded"
 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")
+to = NodePath("../../../Jump/SimpleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
@@ -448,52 +566,19 @@ to = NodePath("../../DoubleJumpEnabled")
 event = &"coyote_expired"
 delay_in_seconds = "0.0"
 
-[node name="Jump" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("27_34snm")
-
-[node name="ToDoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne/Jump"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../DoubleJumpEnabled")
-event = &"to_double_jump"
-delay_in_seconds = "0.0"
-
-[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/Jump"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"jump_from_dash"
-delay_in_seconds = "0.0"
-
-[node name="JumpFromWall" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("27_34snm")
-
-[node name="JumpedFromWall" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"jump_from_wall"
-delay_in_seconds = "0.0"
-
-[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"jump_from_dash"
-delay_in_seconds = "0.0"
-
 [node name="DoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("27_34snm")
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../DoubleJump")
-event = &"jump"
+to = NodePath("../../../Jump/MegaJump")
+event = &"megajump"
 delay_in_seconds = "0.0"
 
-[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("27_34snm")
-
-[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJump"]
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"to_falling"
+to = NodePath("../../../Jump/DoubleJump")
+event = &"jump"
 delay_in_seconds = "0.0"
 
 [node name="Falling" type="Node" parent="StateChart/Root/Movement/Airborne"]
@@ -505,13 +590,80 @@ to = NodePath("../../DoubleJumpEnabled")
 event = &"enable_double_jump"
 delay_in_seconds = "0.0"
 
+[node name="OnWall" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Hugging")
+
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Grounded")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Jump/DoubleJump")
+event = &"jump"
+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="HugCanceled" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("27_34snm")
+
+[node name="ToHanging" type="Node" parent="StateChart/Root/Movement/OnWall/HugCanceled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Hanging")
+event = &"oh_hit_wall"
+delay_in_seconds = "0.0"
+
+[node name="Hugging" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("27_34snm")
+
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Grounded")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
+[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/CoyoteEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
+[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../HugCanceled")
+event = &"dash"
+delay_in_seconds = "0.0"
+
+[node name="Hanging" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("27_34snm")
+
+[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/OnWall/Hanging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Hugging")
+event = &"dash"
+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"]
 [connection signal="input_aim_released" from="InputController" to="." method="OnInputAimReleased"]
-[connection signal="input_drop" from="InputController" to="." method="OnInputDropPressed"]
+[connection signal="input_dash" from="InputController" to="." method="OnInputDashPressed"]
+[connection signal="input_empower_down" from="InputController" to="." method="OnInputEmpowerDown"]
+[connection signal="input_empower_released" from="InputController" to="." method="OnInputEmpowerReleased"]
 [connection signal="input_hit" from="InputController" to="." method="OnInputHitPressed"]
-[connection signal="input_jump" from="InputController" to="." method="OnInputJumpPressed"]
+[connection signal="input_jump_ended" from="InputController" to="." method="OnInputJumpEnded"]
+[connection signal="input_jump_ongoing" from="InputController" to="." method="OnInputJumpOngoing"]
+[connection signal="input_jump_started" from="InputController" to="." method="OnInputJumpStarted"]
 [connection signal="input_move" from="InputController" to="." method="OnInputMove"]
 [connection signal="input_rotate_floorplane" from="InputController" to="." method="OnInputRotateFloorplane"]
 [connection signal="input_rotate_y" from="InputController" to="." method="OnInputRotateY"]
+[connection signal="input_throw" from="InputController" to="." method="OnInputThrowPressed"]
+[connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]

player_controller/Scripts/HealthSystem.cs

@@ -107,7 +107,6 @@ public partial class HealthSystem : Node3D
 	private float _currentHealthInPrevFrame;
 
 	private float _currentVelocityYInAir;
-	private Gravity _gravity;
 
 	private CharacterBody3D _characterBody3D;
 
@@ -144,7 +143,6 @@ public partial class HealthSystem : Node3D
 
 	public struct HealthSystemInitParams
 	{
-		public Gravity Gravity;
 		public CharacterBody3D Parent;
 		public Camera3D Camera;
 		public Node3D Head;
@@ -160,7 +158,6 @@ public partial class HealthSystem : Node3D
 		
 		_currentSpeed = SpeedMin;
 
-		_gravity = initParams.Gravity;
 		_characterBody3D = initParams.Parent;
 		_camera = initParams.Camera;
 		

project.godot

@@ -15,7 +15,7 @@ warnings/check_invalid_track_paths=false
 [application]
 
 config/name="Movement tests"
-run/main_scene="uid://dwo50456dv6va"
+run/main_scene="uid://pk8ypa04qy6x"
 config/features=PackedStringArray("4.4", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 

systems/dash/DashSystem.cs

@@ -4,6 +4,9 @@ namespace Movementtests.systems;
 
 public partial class DashSystem: Node3D
 {
+    public record DashLocation(bool HasHit, Vector3 TargetLocation);
+    
+    
     [Export(PropertyHint.Range, "0,0.2,0.01,or_greater")]
     public float DashSpeed { get; set; } = 0.1f;
     [Export(PropertyHint.Range, "0,1000,1,or_greater")]
@@ -37,6 +40,10 @@ public partial class DashSystem: Node3D
     public delegate void DashStartedEventHandler();
     [Signal]
     public delegate void DashEndedEventHandler();
+    [Signal]
+    public delegate void DashProgressEventHandler(float progress);
+    
+    private Vector3 _globalDashPosition = Vector3.Zero;
 
     public void Init(Node3D head, Camera3D camera, TweenQueueSystem tweenQueueSystem)
     {
@@ -56,14 +63,14 @@ public partial class DashSystem: Node3D
         _dashIndicatorAnim = GetNode<AnimationPlayer>("DashIndicator/AnimationPlayer");
     }
 
-    private void ComputeDashLocation()
+    private DashLocation ComputeDashLocation()
     {
-        TargetLocation = _dashCast3D.ToGlobal(_dashCast3D.TargetPosition);
-        HasHit = _dashCast3D.IsColliding();
-        if (!HasHit)
+        
+        var targetLocation = _dashCast3D.ToGlobal(_dashCast3D.TargetPosition);
+        var hasHit = _dashCast3D.IsColliding();
+        if (!hasHit)
         {
-            PlannedPlayerLocation = TargetLocation;
-            return;
+            return new DashLocation(false, targetLocation);
         }
         
         CollisionPoint = _dashCast3D.GetCollisionPoint(0);
@@ -76,12 +83,23 @@ public partial class DashSystem: Node3D
         // Pushes the point down when dashing to under a platform so head doesn't clip
         var maxPushDownDistance = 0.9f;
         var correctionProportion = (float) Mathf.Remap(CollisionNormal.Y, -0.5, -1, 0, 1);
-        var proportion = (float) Mathf.Remap(_dashCast3D.GlobalRotation.X, 0, 1.57, 0, 1);
-        PlannedPlayerLocation = locationAlongPath 
+        var proportion = (float)Mathf.Remap(_dashCast3D.GlobalRotation.X, 0, 1.57, 0, 1);
+        var finalLocation = locationAlongPath
                             + CollisionNormal
                             * maxPushDownDistance
                             * Mathf.Clamp(proportion, 0, 1)
                             * Mathf.Clamp(correctionProportion, 0, 1);
+        
+        return new DashLocation(true, finalLocation);
+    }
+
+    public DashLocation GetDashLocationInDirection(Vector3 direction)
+    {
+        var angle = Mathf.Atan2(direction.X, direction.Z);
+        GD.Print(angle);
+        var rotation = _head.Rotation.Y + angle*2.0f;
+        _dashCast3D.SetRotation(new Vector3(0, rotation, 0));
+        return ComputeDashLocation();
     }
 
     public void PrepareDash()
@@ -93,7 +111,7 @@ public partial class DashSystem: Node3D
             _head.Rotation.Y,
             _camera.Rotation.Z));
 
-        ComputeDashLocation();
+        (HasHit, PlannedPlayerLocation) = ComputeDashLocation();
         
         ShouldMantle = false;
         var mantleLocation = Vector3.Zero;
@@ -121,14 +139,18 @@ public partial class DashSystem: Node3D
     public void DashTweenEnded()
     {
         EmitSignal(SignalName.DashEnded);
+        _dashTarget.SetVisible(false);
     }
 
     public void Dash()
     {
         EmitSignal(SignalName.DashStarted);
-        _dashTarget.SetVisible(false);
+        
         var dashTweenInputs = new TweenQueueSystem.TweenInputs(PlannedPlayerLocation, DashSpeed);
         var dashTween = _tweenQueueSystem.TweenToLocation(dashTweenInputs);
+        // dashTween.SetTrans(Tween.TransitionType.Cubic);
+        // dashTween.SetEase(Tween.EaseType.Out);
+        dashTween.TweenMethod(Callable.From<float>(Dashing), 0.0f, 1.0f, DashSpeed);
         dashTween.Finished += DashTweenEnded;
         if (ShouldMantle)
         {
@@ -136,10 +158,17 @@ public partial class DashSystem: Node3D
             return;
         }
 
-        var dashIndicator = (CpuParticles3D) DashIndicatorScene.Instantiate();
-        GetTree().GetRoot().AddChild(dashIndicator);
-        dashIndicator.GlobalPosition = _dashTarget.GlobalPosition;
-        dashIndicator.SetEmitting(true);
+        // var dashIndicator = (CpuParticles3D) DashIndicatorScene.Instantiate();
+        // GetTree().GetRoot().AddChild(dashIndicator);
+        // _globalDashPosition = _dashTarget.GlobalPosition + 1.5f*Vector3.Up;
+        // dashIndicator.GlobalPosition = _globalDashPosition;
+        // dashIndicator.SetEmitting(true);
+    }
+
+    public void Dashing(float proportion)
+    {
+        _dashTarget.SetGlobalPosition(_globalDashPosition);
+        EmitSignalDashProgress(proportion);
     }
 
     public void DashToThrownWeapon()

systems/dash/dash_time_dilation.tres

@@ -0,0 +1,5 @@
+[gd_resource type="Curve" format=3 uid="uid://c2a8soliruf35"]
+
+[resource]
+_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.5, 1), -1.89032e-07, -1.89032e-07, 0, 0, Vector2(0.8, 0.05), -9.56219, 0.0, 0, 1, Vector2(0.995, 0.05), 0.0, 0.0, 0, 0, Vector2(1, 1), -0.0540619, -0.0540619, 0, 0]
+point_count = 5

systems/inputs/base_mode/aim_pressed.tres

@@ -1,9 +1,9 @@
-[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://dgfww8118d8gj"]
+[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://bebstkm608wxx"]
 
-[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_tm2gl"]
+[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_bvbvh"]
 
 [resource]
-script = ExtResource("1_tm2gl")
+script = ExtResource("1_bvbvh")
 name = &""
 action_value_type = 0
 block_lower_priority_actions = true

systems/inputs/base_mode/base_mode.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=71 format=3 uid="uid://bl5crtu1gkrtr"]
+[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=90 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"]
@@ -13,18 +13,22 @@
 [ext_resource type="Script" uid="uid://bjm4myqxg4phm" path="res://addons/guide/modifiers/guide_modifier_scale.gd" id="11_j3axn"]
 [ext_resource type="Script" uid="uid://ckggy40lm0vjc" path="res://addons/guide/modifiers/guide_modifier_negate.gd" id="12_kxb2c"]
 [ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="13_v2ywt"]
-[ext_resource type="Resource" uid="uid://dgfww8118d8gj" path="res://systems/inputs/base_mode/aim.tres" id="14_vtk18"]
 [ext_resource type="Resource" uid="uid://c3e0ivgaxrsyb" path="res://systems/inputs/base_mode/aim_down.tres" id="14_yp12v"]
 [ext_resource type="Script" uid="uid://b52rqq28tuqpg" path="res://addons/guide/triggers/guide_trigger_pressed.gd" id="15_fykw6"]
 [ext_resource type="Script" uid="uid://b4cdrn4paoj3i" path="res://addons/guide/triggers/guide_trigger_down.gd" id="15_g6bbx"]
+[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/empower_down.tres" id="16_0qat1"]
+[ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="16_li5ak"]
 [ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/base_mode/aim_release.tres" id="16_rvpjj"]
 [ext_resource type="Script" uid="uid://biiggjw6tv4uq" path="res://addons/guide/triggers/guide_trigger_released.gd" id="17_s8kjn"]
 [ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/base_mode/aim_cancel.tres" id="18_vibkn"]
+[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/empower_release.tres" id="19_li5ak"]
 [ext_resource type="Script" uid="uid://rvttn472ix6v" path="res://addons/guide/inputs/guide_input_joy_button.gd" id="19_qkgmj"]
 [ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="21_818lq"]
 [ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="22_2hs2y"]
-[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/drop.tres" id="22_qmhk6"]
+[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://bw5k2gsv3jqcv" path="res://systems/inputs/base_mode/throw.tres" id="24_yp12v"]
+[ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="25_si4d4"]
 
 [sub_resource type="Resource" id="Resource_vkvga"]
 script = ExtResource("4_1rw8g")
@@ -131,32 +135,6 @@ action = ExtResource("13_v2ywt")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qu2wi")])
 metadata/_guide_input_mappings_collapsed = true
 
-[sub_resource type="Resource" id="Resource_ufouq"]
-script = ExtResource("10_cvxqo")
-axis = 4
-joy_index = -1
-
-[sub_resource type="Resource" id="Resource_li5ak"]
-script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
-
-[sub_resource type="Resource" id="Resource_qbthx"]
-script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
-input = SubResource("Resource_ufouq")
-modifiers = Array[ExtResource("5_0qat1")]([])
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_li5ak")])
-metadata/_guide_triggers_collapsed = false
-
-[sub_resource type="Resource" id="Resource_0hmrk"]
-script = ExtResource("1_qmhk6")
-action = ExtResource("14_vtk18")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qbthx")])
-metadata/_guide_input_mappings_collapsed = false
-
 [sub_resource type="Resource" id="Resource_si4d4"]
 script = ExtResource("10_cvxqo")
 axis = 4
@@ -180,6 +158,31 @@ triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_2tfaw")])
 script = ExtResource("1_qmhk6")
 action = ExtResource("14_yp12v")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_q86qg")])
+metadata/_guide_input_mappings_collapsed = false
+
+[sub_resource type="Resource" id="Resource_llfhp"]
+script = ExtResource("10_cvxqo")
+axis = 4
+joy_index = -1
+
+[sub_resource type="Resource" id="Resource_ib0yi"]
+script = ExtResource("15_fykw6")
+actuation_threshold = 0.5
+
+[sub_resource type="Resource" id="Resource_r6kml"]
+script = ExtResource("3_yp12v")
+override_action_settings = false
+is_remappable = false
+display_name = ""
+display_category = ""
+input = SubResource("Resource_llfhp")
+modifiers = Array[ExtResource("5_0qat1")]([])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ib0yi")])
+
+[sub_resource type="Resource" id="Resource_tb8ii"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("16_li5ak")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_r6kml")])
 
 [sub_resource type="Resource" id="Resource_cqc4k"]
 script = ExtResource("10_cvxqo")
@@ -206,6 +209,55 @@ action = ExtResource("16_rvpjj")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_bkx7d")])
 metadata/_guide_input_mappings_collapsed = false
 
+[sub_resource type="Resource" id="Resource_fykw6"]
+script = ExtResource("10_cvxqo")
+axis = 5
+joy_index = -1
+
+[sub_resource type="Resource" id="Resource_rvpjj"]
+script = ExtResource("15_fykw6")
+actuation_threshold = 0.5
+
+[sub_resource type="Resource" id="Resource_s8kjn"]
+script = ExtResource("3_yp12v")
+override_action_settings = false
+is_remappable = false
+display_name = ""
+display_category = ""
+input = SubResource("Resource_fykw6")
+modifiers = Array[ExtResource("5_0qat1")]([])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rvpjj")])
+metadata/_guide_triggers_collapsed = false
+
+[sub_resource type="Resource" id="Resource_vibkn"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("16_0qat1")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn")])
+
+[sub_resource type="Resource" id="Resource_qkgmj"]
+script = ExtResource("10_cvxqo")
+axis = 5
+joy_index = -1
+
+[sub_resource type="Resource" id="Resource_st2ej"]
+script = ExtResource("17_s8kjn")
+actuation_threshold = 0.5
+
+[sub_resource type="Resource" id="Resource_818lq"]
+script = ExtResource("3_yp12v")
+override_action_settings = false
+is_remappable = false
+display_name = ""
+display_category = ""
+input = SubResource("Resource_qkgmj")
+modifiers = Array[ExtResource("5_0qat1")]([])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_st2ej")])
+
+[sub_resource type="Resource" id="Resource_2hs2y"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("19_li5ak")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq")])
+
 [sub_resource type="Resource" id="Resource_lfx76"]
 script = ExtResource("19_qkgmj")
 button = 2
@@ -230,15 +282,36 @@ script = ExtResource("1_qmhk6")
 action = ExtResource("18_vibkn")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_4ee3d")])
 
-[sub_resource type="Resource" id="Resource_oapce"]
+[sub_resource type="Resource" id="Resource_1fkas"]
 script = ExtResource("19_qkgmj")
 button = 0
 joy_index = -1
 
-[sub_resource type="Resource" id="Resource_j3mg7"]
+[sub_resource type="Resource" id="Resource_6pxii"]
 script = ExtResource("15_fykw6")
 actuation_threshold = 0.5
 
+[sub_resource type="Resource" id="Resource_jy4f1"]
+script = ExtResource("3_yp12v")
+override_action_settings = false
+is_remappable = false
+display_name = ""
+display_category = ""
+input = SubResource("Resource_1fkas")
+modifiers = Array[ExtResource("5_0qat1")]([])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_6pxii")])
+metadata/_guide_triggers_collapsed = false
+
+[sub_resource type="Resource" id="Resource_d2r0d"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("25_si4d4")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_jy4f1")])
+
+[sub_resource type="Resource" id="Resource_oapce"]
+script = ExtResource("19_qkgmj")
+button = 0
+joy_index = -1
+
 [sub_resource type="Resource" id="Resource_8w5gu"]
 script = ExtResource("3_yp12v")
 override_action_settings = false
@@ -247,7 +320,7 @@ display_name = ""
 display_category = ""
 input = SubResource("Resource_oapce")
 modifiers = Array[ExtResource("5_0qat1")]([])
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_j3mg7")])
+triggers = Array[ExtResource("8_2tfaw")]([])
 metadata/_guide_triggers_collapsed = false
 
 [sub_resource type="Resource" id="Resource_xt1x5"]
@@ -255,7 +328,7 @@ script = ExtResource("1_qmhk6")
 action = ExtResource("21_818lq")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_8w5gu")])
 
-[sub_resource type="Resource" id="Resource_nf3uo"]
+[sub_resource type="Resource" id="Resource_li5ak"]
 script = ExtResource("19_qkgmj")
 button = 10
 joy_index = -1
@@ -270,7 +343,7 @@ override_action_settings = false
 is_remappable = false
 display_name = ""
 display_category = ""
-input = SubResource("Resource_nf3uo")
+input = SubResource("Resource_li5ak")
 modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_paxxe")])
 
@@ -300,12 +373,36 @@ triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_yp12v")])
 
 [sub_resource type="Resource" id="Resource_0qat1"]
 script = ExtResource("1_qmhk6")
-action = ExtResource("22_qmhk6")
+action = ExtResource("23_g6bbx")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1rw8g")])
 metadata/_guide_input_mappings_collapsed = false
 
+[sub_resource type="Resource" id="Resource_j3axn"]
+script = ExtResource("19_qkgmj")
+button = 3
+joy_index = -1
+
+[sub_resource type="Resource" id="Resource_kxb2c"]
+script = ExtResource("15_fykw6")
+actuation_threshold = 0.5
+
+[sub_resource type="Resource" id="Resource_v2ywt"]
+script = ExtResource("3_yp12v")
+override_action_settings = false
+is_remappable = false
+display_name = ""
+display_category = ""
+input = SubResource("Resource_j3axn")
+modifiers = Array[ExtResource("5_0qat1")]([])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")])
+
+[sub_resource type="Resource" id="Resource_vtk18"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("24_yp12v")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt")])
+
 [resource]
 script = ExtResource("23_llfhp")
 display_name = ""
-mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_0hmrk"), SubResource("Resource_cvxqo"), SubResource("Resource_iihs4"), SubResource("Resource_0s4kt"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1")])
+mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_0s4kt"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18")])
 metadata/_custom_type_script = "uid://dsa1dnifd6w32"

systems/inputs/base_mode/empower_down.tres

@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://b334rau1yxmm7"]
+
+[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_06ocg"]
+
+[resource]
+script = ExtResource("1_06ocg")
+name = &""
+action_value_type = 0
+block_lower_priority_actions = true
+emit_as_godot_actions = false
+is_remappable = false
+display_name = ""
+display_category = ""
+metadata/_custom_type_script = "uid://cluhc11vixkf1"

systems/inputs/base_mode/empower_release.tres

@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://bbce5wfwxpns1"]
+
+[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_v6tj6"]
+
+[resource]
+script = ExtResource("1_v6tj6")
+name = &""
+action_value_type = 0
+block_lower_priority_actions = true
+emit_as_godot_actions = false
+is_remappable = false
+display_name = ""
+display_category = ""
+metadata/_custom_type_script = "uid://cluhc11vixkf1"

systems/inputs/base_mode/jump_pressed.tres

@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://55b0dsvioj08"]
+
+[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_4yfi4"]
+
+[resource]
+script = ExtResource("1_4yfi4")
+name = &""
+action_value_type = 0
+block_lower_priority_actions = true
+emit_as_godot_actions = false
+is_remappable = false
+display_name = ""
+display_category = ""
+metadata/_custom_type_script = "uid://cluhc11vixkf1"

systems/inputs/base_mode/throw.tres

@@ -0,0 +1,14 @@
+[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://bw5k2gsv3jqcv"]
+
+[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_7f0q6"]
+
+[resource]
+script = ExtResource("1_7f0q6")
+name = &""
+action_value_type = 0
+block_lower_priority_actions = true
+emit_as_godot_actions = false
+is_remappable = false
+display_name = ""
+display_category = ""
+metadata/_custom_type_script = "uid://cluhc11vixkf1"

systems/inputs/input_system.gd

@@ -10,55 +10,93 @@ class_name InputController
 @export var rotate_floorplane:GUIDEAction
 
 @export_group("Trigger actions")
-@export var aim_pressed:GUIDEAction
+@export_subgroup("Aim")
 @export var aim_down:GUIDEAction
+@export var aim_pressed:GUIDEAction
 @export var aim_released:GUIDEAction
-@export var aim_canceled:GUIDEAction
+@export_subgroup("Jump")
 @export var jump:GUIDEAction
+@export var jump_pressed:GUIDEAction
+@export_subgroup("Other")
+@export var empower_down:GUIDEAction
+@export var empower_released:GUIDEAction
+@export var aim_canceled:GUIDEAction
 @export var hit:GUIDEAction
-@export var drop:GUIDEAction
+@export var dash:GUIDEAction
+@export var throw:GUIDEAction
 
 signal input_move(value: Vector3)
 signal input_rotate_y(value: float)
 signal input_rotate_floorplane(value: float)
 
+# Jump
+signal input_jump_started
+signal input_jump_ongoing
+signal input_jump_ended
+
 signal input_aim_pressed
 signal input_aim_down
 signal input_aim_released
+
+signal input_empower_down
+signal input_empower_released
 signal input_aim_canceled
-signal input_jump
+
 signal input_hit
-signal input_drop
+signal input_dash
+signal input_throw
 
 func _ready() -> void:
 	GUIDE.enable_mapping_context(base_mode)
 	
-	aim_pressed.triggered.connect(on_input_aim_pressed)
 	aim_down.triggered.connect(on_input_aim_down)
+	aim_pressed.triggered.connect(on_input_aim_pressed)
 	aim_released.triggered.connect(on_input_aim_released)
+	empower_down.triggered.connect(on_input_empower_down)
+	empower_released.triggered.connect(on_input_empower_released)
 	aim_canceled.triggered.connect(on_input_aim_canceled)
-	jump.triggered.connect(on_input_jump)
-	hit.triggered.connect(on_input_hit)
-	drop.triggered.connect(on_input_drop)
 	
-func on_input_drop():
-	input_drop.emit()
+	jump_pressed.triggered.connect(on_input_jump_started)
+	jump.triggered.connect(on_input_jump_ongoing)
+	jump.completed.connect(on_input_jump_ended)
+	
+	hit.triggered.connect(on_input_hit)
+	dash.triggered.connect(on_input_dash)
+	throw.triggered.connect(on_input_throw)
+
+func on_input_dash():
+	input_dash.emit()
+	
+func on_input_throw():
+	input_throw.emit()
 
 func on_input_hit():
 	input_hit.emit()
 
-func on_input_jump():
-	input_jump.emit()
+func on_input_jump_started():
+	input_jump_started.emit()
 
-func on_input_aim_pressed():
-	input_aim_pressed.emit()
+func on_input_jump_ongoing():
+	input_jump_ongoing.emit()
+
+func on_input_jump_ended():
+	input_jump_ended.emit()
 
 func on_input_aim_down():
 	input_aim_down.emit()
 	
+func on_input_aim_pressed():
+	input_aim_pressed.emit()
+
 func on_input_aim_released():
 	input_aim_released.emit()
 
+func on_input_empower_down():
+	input_empower_down.emit()
+
+func on_input_empower_released():
+	input_empower_released.emit()
+
 func on_input_aim_canceled():
 	input_aim_canceled.emit()
 

systems/move/simple_jump.tres

@@ -0,0 +1,5 @@
+[gd_resource type="Curve" format=3 uid="uid://buxwd3wd0nln5"]
+
+[resource]
+_data = [Vector2(0, 0), 0.0, 3.01651, 0, 0, Vector2(0.996169, 1), 0.0, 0.0, 0, 0]
+point_count = 2

systems/tween_queue/TweenQueueSystem.cs

@@ -28,6 +28,7 @@ public partial class TweenQueueSystem : Node3D
         var (location, duration) = inputs;
 		
         var tween = GetTree().CreateTween();
+        tween.SetParallel(true);
         tween.TweenProperty(_tweenObject, "global_position", location, duration);
         tween.TweenCallback(_tweenEndedCallback);
         _isTweening = true;

systems/wall_hug/WallHugSystem.cs

@@ -5,8 +5,11 @@ using RustyOptions;
 
 namespace Movementtests.systems;
 
+
 public partial class WallHugSystem : Node3D
 {
+    [Signal]
+    public delegate void WallDetectedEventHandler();
     
     private List<RayCast3D> _raycasts;
     
@@ -19,6 +22,13 @@ public partial class WallHugSystem : Node3D
         _raycasts.Add(GetNode<RayCast3D>("right"));
     }
 
+    public override void _PhysicsProcess(double delta)
+    {
+        base._PhysicsProcess(delta);
+        if (IsWallHugging())
+            EmitSignal(SignalName.WallDetected);
+    }
+
     public bool IsWallHugging()
     {
         foreach (RayCast3D raycast in _raycasts)