moving away from blend files and using explicit imports through gltf

weapon clip fix
fixed mantle after dash bug
2025-10-03 15:45:40 +02:00 · 2025-09-16 11:01:31 +02:00 · 2025-09-16 10:28:41 +02:00 · 2025-09-16 09:43:21 +02:00 · 2025-09-16 09:40:20 +02:00 · 2025-09-15 17:33:48 +02:00
49 changed files with 1815 additions and 980 deletions
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -40,7 +40,7 @@ jobs:
    runs-on: ubuntu-latest
    needs: BumpTag
    container:
-      image: barichello/godot-ci:mono-4.4.1
+      image: barichello/godot-ci:mono-4.5

    steps:
      - name: Install node, curl and zip
--- a/tests.csproj
+++ b/tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.1">
+<Project Sdk="Godot.NET.Sdk/4.5.0">
  <PropertyGroup>
    <TargetFramework>net8.0</TargetFramework>
    <EnableDynamicLoading>true</EnableDynamicLoading>
--- a/tests.csproj.old
+++ b/tests.csproj.old
@@ -0,0 +1,131 @@
+<Project Sdk="Godot.NET.Sdk/4.4.1">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <RootNamespace>Movementtests</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="export_presets.cfg" />
+    <Content Include="menus\assets\git_logo\Git-Logo-2Color.png" />
+    <Content Include="menus\assets\git_logo\Git-Logo-2Color.png.import" />
+    <Content Include="menus\assets\git_logo\LICENSE.txt" />
+    <Content Include="menus\assets\godot_engine_logo\LICENSE.txt" />
+    <Content Include="menus\assets\godot_engine_logo\logo_vertical_color_dark.png" />
+    <Content Include="menus\assets\godot_engine_logo\logo_vertical_color_dark.png.import" />
+    <Content Include="menus\assets\icon.png" />
+    <Content Include="menus\assets\icon.png.import" />
+    <Content Include="menus\ATTRIBUTION.md" />
+    <Content Include="menus\resources\themes\expedition.tres" />
+    <Content Include="menus\resources\themes\gravity.tres" />
+    <Content Include="menus\resources\themes\grow.tres" />
+    <Content Include="menus\resources\themes\lab.tres" />
+    <Content Include="menus\resources\themes\lore.tres" />
+    <Content Include="menus\resources\themes\steal_this_theme.tres" />
+    <Content Include="menus\scenes\credits\scrollable_credits.gd" />
+    <Content Include="menus\scenes\credits\scrollable_credits.gd.uid" />
+    <Content Include="menus\scenes\credits\scrollable_credits.tscn" />
+    <Content Include="menus\scenes\credits\scrolling_credits.gd" />
+    <Content Include="menus\scenes\credits\scrolling_credits.gd.uid" />
+    <Content Include="menus\scenes\credits\scrolling_credits.tscn" />
+    <Content Include="menus\scenes\end_credits\end_credits.gd" />
+    <Content Include="menus\scenes\end_credits\end_credits.gd.uid" />
+    <Content Include="menus\scenes\end_credits\end_credits.tscn" />
+    <Content Include="menus\scenes\game_scene\configurable_sub_viewport.gd" />
+    <Content Include="menus\scenes\game_scene\configurable_sub_viewport.gd.uid" />
+    <Content Include="menus\scenes\game_scene\game_ui.tscn" />
+    <Content Include="menus\scenes\game_scene\input_display_label.gd" />
+    <Content Include="menus\scenes\game_scene\input_display_label.gd.uid" />
+    <Content Include="menus\scenes\game_scene\levels\level.gd" />
+    <Content Include="menus\scenes\game_scene\levels\level.gd.uid" />
+    <Content Include="menus\scenes\game_scene\levels\level_1.tscn" />
+    <Content Include="menus\scenes\game_scene\levels\level_2.tscn" />
+    <Content Include="menus\scenes\game_scene\levels\level_3.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorials\tutorial_1.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorials\tutorial_2.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorials\tutorial_3.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorial_manager.gd" />
+    <Content Include="menus\scenes\game_scene\tutorial_manager.gd.uid" />
+    <Content Include="menus\scenes\loading_screen\level_loading_screen.tscn" />
+    <Content Include="menus\scenes\loading_screen\loading_screen.gd" />
+    <Content Include="menus\scenes\loading_screen\loading_screen.gd.uid" />
+    <Content Include="menus\scenes\loading_screen\loading_screen.tscn" />
+    <Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.gd" />
+    <Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.gd.uid" />
+    <Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.tscn" />
+    <Content Include="menus\scenes\menus\level_select_menu\level_select_menu.gd" />
+    <Content Include="menus\scenes\menus\level_select_menu\level_select_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\level_select_menu\level_select_menu.tscn" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu.gd" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu.tscn" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.gd" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.gd.uid" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.gd" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\game\game_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\game\game_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\game\game_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.gd" />
+    <Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_extras_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu_with_mouse_sensitivity.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu_with_tabs.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.gd" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu_with_extras.tscn" />
+    <Content Include="menus\scenes\opening\opening.gd" />
+    <Content Include="menus\scenes\opening\opening.gd.uid" />
+    <Content Include="menus\scenes\opening\opening.tscn" />
+    <Content Include="menus\scenes\opening\opening_with_logo.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\game_won_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\game_won_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\game_won_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\level_lost_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\level_lost_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\level_lost_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\level_won_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\level_won_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\level_won_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\mini_options_overlaid_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.gd" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\pause_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\pause_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\pause_menu.tscn" />
+    <Content Include="menus\scripts\game_state.gd" />
+    <Content Include="menus\scripts\game_state.gd.uid" />
+    <Content Include="menus\scripts\level_list_and_state_manager.gd" />
+    <Content Include="menus\scripts\level_list_and_state_manager.gd.uid" />
+    <Content Include="menus\scripts\level_state.gd" />
+    <Content Include="menus\scripts\level_state.gd.uid" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="addons\" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="RustyOptions" Version="0.10.1" />
+  </ItemGroup>
+</Project>
--- a/addons/guide/guide_action.gd
+++ b/addons/guide/guide_action.gd
@@ -250,5 +250,3 @@ func _editor_name() -> String:
 		return name
 		
 	return resource_path.get_file().replace(".tres", "")
-
-
--- a/assets/greyboxing/Guard
+++ b/assets/greyboxing/Guard
--- a/assets/greyboxing/Guard
+++ b/assets/greyboxing/Guard
@@ -0,0 +1,42 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://2huty67y1g5w"
+path="res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"
+
+[deps]
+
+source_file="res://assets/greyboxing/Guard tower.glb"
+dest_files=["res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1
--- a/assets/greyboxing/guard_tower.tscn
+++ b/assets/greyboxing/guard_tower.tscn
--- a/authoring/.gdignore
+++ b/authoring/.gdignore
--- a/authoring/greyboxing/city.blend
+++ b/authoring/greyboxing/city.blend
--- a/authoring/greyboxing/city.blend1
+++ b/authoring/greyboxing/city.blend1
--- a/godot_state_charts_examples/history_states/history_demo.tscn
+++ b/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"]
--- a/icon.svg.import
+++ b/icon.svg.import
@@ -3,25 +3,27 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bnwj7ltdfximr"
-path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
+path.s3tc="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex"
+path.etc2="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.etc2.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
 }

 [deps]

 source_file="res://icon.svg"
-dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
+dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex", "res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.etc2.ctex"]

 [params]

-compress/mode=0
+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=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,7 +33,7 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0
 svg/scale=1.0
 editor/scale_with_editor_scale=false
 editor/convert_colors_with_editor_theme=false
--- a/maps/city.tscn
+++ b/maps/city.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://dmkw8cmalm5k"]
+[gd_scene load_steps=15 format=3 uid="uid://dmkw8cmalm5k"]

 [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
 [ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"]
@@ -10,6 +10,7 @@
 [ext_resource type="PackedScene" uid="uid://482s38k0yv35" path="res://maps/Components/stairs.tscn" id="8_pxgdh"]
 [ext_resource type="PackedScene" uid="uid://cmfagvnymc2yr" path="res://assets/ladder/ladder.fbx" id="9_ukfuy"]
 [ext_resource type="PackedScene" uid="uid://bod7boex72igr" path="res://assets/ladder/ladder-top.fbx" id="10_wctvs"]
+[ext_resource type="PackedScene" uid="uid://dip6cce5gtwi8" path="res://assets/greyboxing/guard_tower.tscn" id="11_wctvs"]

 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"]
 sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
@@ -31,7 +32,7 @@ ssil_enabled = true
 [node name="Main" type="Node3D"]

 [node name="Player" parent="." instance=ExtResource("1_2vsi6")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7981, 101, 0.300598)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.0247686, 107.458466, -0.69836044)

 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_1bvp3")
@@ -51,10 +52,6 @@ use_collision = true
 collision_layer = 3
 collision_mask = 5

-[node name="Map" type="Sprite3D" parent="Greybox"]
-transform = Transform3D(5.65685, -5.65685, -2.47269e-08, 0, -3.49691e-07, 0.8, -5.65685, -5.65685, -2.47269e-08, 141.335, 0, -122.33)
-texture = ExtResource("3_ruo5i")
-
 [node name="CSGBox3D11" type="CSGBox3D" parent="Greybox"]
 transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 149.932, -1, -129.284)
 use_collision = true
@@ -62,6 +59,7 @@ size = Vector3(398.5, 1, 288.5)
 material = ExtResource("3_cieeo")

 [node name="GuardTower" type="CSGCombiner3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -83.7691, 0, 0.750248)

 [node name="CSGBox3D6" type="CSGBox3D" parent="Greybox/GuardTower"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 45.75, 0)
@@ -1182,3 +1180,10 @@ transform = Transform3D(0.747027, 0, -0.664797, 0, 1, 0, 0.664797, 0, 0.747027,
 use_collision = true
 size = Vector3(16, 19, 4.5)
 material = ExtResource("3_cieeo")
+
+[node name="Map" type="Sprite3D" parent="."]
+transform = Transform3D(0, -8, -3.49691e-08, 0, -3.49691e-07, 0.8, -8, 0, 0, 13.4386, 0, -186.439)
+texture = ExtResource("3_ruo5i")
+
+[node name="Guard tower" parent="." instance=ExtResource("11_wctvs")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1.5, 0.5)
--- a/player_controller/Examples/MovementTestbed/Hills/Hills_1.tscn
+++ b/player_controller/Examples/MovementTestbed/Hills/Hills_1.tscn
--- a/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png
+++ b/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png
--- a/player_controller/Examples/MovementTestbed/Hills/terrain_mesh.mesh
+++ b/player_controller/Examples/MovementTestbed/Hills/terrain_mesh.mesh
--- a/player_controller/Examples/MovementTestbed/Hills/terrain_mesh.mesh.depren
+++ b/player_controller/Examples/MovementTestbed/Hills/terrain_mesh.mesh.depren
--- a/player_controller/Examples/MovementTestbed/LowGravityArea3D.cs
+++ b/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");
-			}
-		};
-	}
-}
-
--- a/player_controller/Examples/MovementTestbed/LowGravityArea3D.cs.uid
+++ b/player_controller/Examples/MovementTestbed/LowGravityArea3D.cs.uid
@@ -1 +0,0 @@
-uid://ctypnlbfptf03
--- a/player_controller/Examples/MovementTestbed/MovementTestbed.tscn
+++ b/player_controller/Examples/MovementTestbed/MovementTestbed.tscn
--- a/player_controller/PlayerController.tscn
+++ b/player_controller/PlayerController.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=36 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=43 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="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="3_cresl"]
@@ -7,24 +7,26 @@
 [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"]
@@ -34,15 +36,42 @@
 [ext_resource type="Script" uid="uid://tjiji63wlom5" path="res://systems/wall_hug/WallHugSystem.cs" id="27_n7qhm"]
 [ext_resource type="Script" uid="uid://cf1nsco3w0mf6" path="res://addons/godot_state_charts/transition.gd" id="28_n7qhm"]
 [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
-MaxNumberOfDashActions = 3
+WalkSpeed = 7.5
+AccelerationAir = 2.0
+DecelerationAir = 0.1
+Weight = 5.0
+MantleTime = 0.2
+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
+MaxNumberOfEmpoweredActions = 3
+SimpleDashStrength = 15.0
+PoweredDashStrength = 30.0
+AimedDashTime = 0.2
+PostDashSpeed = 30.0
+WallHugGravityLesseningFactor = 15.0
+WallHugDownwardMaxSpeed = 8.0
+WallHugHorizontalDeceleration = 0.5

 [node name="InputController" type="Node3D" parent="."]
 script = ExtResource("16_v31n3")
@@ -50,13 +79,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)
@@ -66,6 +99,7 @@ mesh = SubResource("CapsuleMesh_xc2g5")
 [node name="CapsuleCollider" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
 shape = ExtResource("13_r7i3q")
+debug_color = Color(0, 0.6, 0.701961, 0.341176)
 script = ExtResource("8_lmtjd")
 CapsuleDefaultHeight = 1.7

@@ -118,18 +152,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="."]
@@ -153,7 +175,7 @@ target_position = Vector3(-1, 0, 0)
 collision_mask = 2

 [node name="DashSystem" parent="." instance=ExtResource("18_q5h8a")]
-DashSpeed = 0.1
+DashSpeed = 0.2
 PostDashSpeed = 30.0

 [node name="WeaponRoot" type="Node3D" parent="."]
@@ -163,12 +185,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="."]
@@ -176,17 +197,63 @@ 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 = 1530.0
+offset_left = 1524.0
 offset_top = 1.0
-offset_right = -2.0
+offset_right = -8.0
 offset_bottom = 1.0
+enabled = false
 initial_node_to_watch = NodePath("../StateChart")

+[node name="UI" type="CanvasLayer" parent="."]
+script = ExtResource("30_2ghaa")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="UI"]
+offset_right = 128.0
+offset_bottom = 81.0
+
+[node name="DashesLabel" type="Label" parent="UI/VBoxContainer"]
+layout_mode = 2
+text = "Dashes"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="UI/VBoxContainer"]
+custom_minimum_size = Vector2(0, 30)
+layout_mode = 2
+
+[node name="Dash1" type="TextureRect" parent="UI/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
+
+[node name="Dash2" type="TextureRect" parent="UI/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
+
+[node name="Dash3" type="TextureRect" parent="UI/VBoxContainer/HBoxContainer"]
+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"
@@ -194,99 +261,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")
@@ -295,117 +411,179 @@ 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"
+to = NodePath("../Dashing/PoweredDash")
+event = &"powered_dash"
 delay_in_seconds = "0.0"

-[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
+[node name="OnAimedDash" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../Airborne/CoyoteEnabled")
-event = &"start_falling"
+to = NodePath("../Dashing/AimedDash")
+event = &"aimed_dash"
 delay_in_seconds = "0.0"

-[node name="OnCrouch" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
+[node name="OnWeaponDash" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Crouched")
-event = &"crouch"
+to = NodePath("../Dashing/ToWeaponDash")
+event = &"weapon_dash"
 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"]
+[node name="ToPlantedWeapon" 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/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("../OnWall/Hanging")
+event = &"to_planted"
 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="AimedDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
+[node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
+[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
+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"

@@ -415,52 +593,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"]
@@ -472,13 +617,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/SimpleJump")
+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"]
--- a/player_controller/PlayerUi.cs
+++ b/player_controller/PlayerUi.cs
@@ -0,0 +1,26 @@
+using Godot;
+using System;
+
+public partial class PlayerUi : CanvasLayer
+{
+    private TextureRect[] _dashIcons = new TextureRect[3];
+    
+    public override void _Ready()
+    {
+        base._Ready();
+        
+        _dashIcons[0] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash1");
+        _dashIcons[1] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash2");
+        _dashIcons[2] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash3");
+    }
+
+    public void SetNumberOfDashesLeft(int numberOfDashes)
+    {
+        int index = 1;
+        foreach (var dashIcon in _dashIcons)
+        {
+            dashIcon.SetVisible(index <= numberOfDashes);
+            index++;
+        }
+    } 
+}
--- a/player_controller/PlayerUi.cs.uid
+++ b/player_controller/PlayerUi.cs.uid
@@ -0,0 +1 @@
+uid://bhuwv2nlcrunt
--- a/player_controller/Scripts/HealthSystem.cs
+++ b/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;
 		
--- a/player_controller/Scripts/PlayerController.cs
+++ b/player_controller/Scripts/PlayerController.cs
--- a/project.godot
+++ b/project.godot
@@ -15,8 +15,8 @@ warnings/check_invalid_track_paths=false
 [application]

 config/name="Movement tests"
-run/main_scene="uid://dwo50456dv6va"
-config/features=PackedStringArray("4.4", "C#", "Forward Plus")
+run/main_scene="uid://pk8ypa04qy6x"
+config/features=PackedStringArray("4.5", "C#", "Forward Plus")
 config/icon="res://icon.svg"

 [autoload]
@@ -29,7 +29,7 @@ ProjectUISoundController="*res://addons/maaacks_game_template/base/scenes/autolo

 [display]

-window/size/viewport_width=1980
+window/size/viewport_width=1920
 window/size/viewport_height=1080

 [dotnet]
--- a/systems/dash/DashSystem.cs
+++ b/systems/dash/DashSystem.cs
@@ -4,8 +4,11 @@ namespace Movementtests.systems;

 public partial class DashSystem: Node3D
 {
+    public record DashLocation(bool HasHit, Vector3 TargetLocation, Vector3 CollisionPoint, Vector3 CollisionNormal);
+    
+    
    [Export(PropertyHint.Range, "0,0.2,0.01,or_greater")]
-    public float DashSpeed { get; set; } = 0.05f;
+    public float DashSpeed { get; set; } = 0.1f;
    [Export(PropertyHint.Range, "0,1000,1,or_greater")]
    public float PostDashSpeed { get; set; } = 0f;
    
@@ -13,7 +16,7 @@ public partial class DashSystem: Node3D
    public Vector3 TargetLocation { get; set; }
    public Vector3 CollisionPoint { get; set; }
    public Vector3 CollisionNormal { get; set; }
-    public Vector3 PlannedPlayerLocation { get; set; }
+    public Vector3 PlannedLocation { get; set; }
    
    public bool ShouldMantle { get; set; }
    public Vector3 PlannedMantleLocation { get; set; }
@@ -27,111 +30,103 @@ public partial class DashSystem: Node3D

    private MantleSystem _mantleSystem;
    private MeshInstance3D _dashTarget;
+    private CpuParticles3D _dashIndicator;
+    private AnimationPlayer _dashIndicatorAnim;
    
+    [Export]
+    public PackedScene DashIndicatorScene { get; set; }

    [Signal]
    public delegate void DashStartedEventHandler();
    [Signal]
    public delegate void DashEndedEventHandler();
+    [Signal]
+    public delegate void DashProgressEventHandler(float progress);
+    
+    private Vector3 _globalDashPosition = Vector3.Zero;
+
+    private float _playerHeight;
+    private float _playerRadius;
+    
+    public float DashCastRadius { get; set; }

    public void Init(Node3D head, Camera3D camera, TweenQueueSystem tweenQueueSystem)
    {
        _dashCast3D = GetNode<ShapeCast3D>("DashCast3D");
+        var dashShape = _dashCast3D.GetShape() as SphereShape3D;
+        DashCastRadius = dashShape!.Radius;
+        
        _playerCast3D = GetNode<ShapeCast3D>("PlayerShapeCast3D");
+        var playerShape = _playerCast3D.GetShape() as CapsuleShape3D;
+        _playerHeight = playerShape!.Height;
+        _playerRadius = playerShape!.Radius;
        
        _head = head;
        _camera = camera;
        _tweenQueueSystem = tweenQueueSystem;
        
        _mantleSystem = GetNode<MantleSystem>("MantleSystem");
-        _mantleSystem.Init(this);
+        _mantleSystem.Init();
        
        _dashTarget = GetNode<MeshInstance3D>("DashTarget");
        _dashTarget.SetVisible(false);
+        _dashIndicator = GetNode<CpuParticles3D>("DashIndicator");
+        _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, Vector3.Zero, Vector3.Zero);
        }
-        
-        CollisionPoint = _dashCast3D.GetCollisionPoint(0);
-        CollisionNormal = _dashCast3D.GetCollisionNormal(0);
+
+        var collisionPoint = _dashCast3D.GetCollisionPoint(0);
+        var collisionNormal = _dashCast3D.GetCollisionNormal(0);
        
        var fraction = _dashCast3D.GetClosestCollisionSafeFraction();
-        var globalSweepPath = TargetLocation - _dashCast3D.GlobalPosition;
+        var globalSweepPath = targetLocation - _dashCast3D.GlobalPosition;
        var locationAlongPath = _dashCast3D.GlobalPosition + globalSweepPath * fraction;
-
-        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 + CollisionNormal * maxPushDownDistance * proportion * correctionProportion;
+        return new DashLocation(true, locationAlongPath, collisionPoint, collisionNormal);
    }

    public void PrepareDash()
    {
-        _dashTarget.SetVisible(false);
-        
        _dashCast3D.SetRotation(new Vector3(
            _camera.Rotation.X,
            _head.Rotation.Y,
            _camera.Rotation.Z));

-        ComputeDashLocation();
+        (HasHit, PlannedLocation, CollisionPoint, CollisionNormal) = ComputeDashLocation();
        
        ShouldMantle = false;
        var mantleLocation = Vector3.Zero;
        if (HasHit && Mathf.Abs(CollisionNormal.Y) < 0.5f)
        {
-            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(CollisionPoint, CollisionNormal);
+            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(PlannedLocation, CollisionNormal);
            ShouldMantle = mantleResult.IsSome(out mantleLocation);
        }
        PlannedMantleLocation = mantleLocation;
        
+        // Setup dash target
        var targetColor = HasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
        targetColor = ShouldMantle ? new Color(0.2f, 0.2f, 1f) : targetColor;
-        
        var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
        targetMaterial.SetAlbedo(targetColor);
        _dashTarget.SetVisible(true);
-        _dashTarget.SetGlobalPosition(PlannedPlayerLocation);
+        var targetLocation = ShouldMantle ? PlannedMantleLocation : PlannedLocation;
+        _dashTarget.SetGlobalPosition(targetLocation);
    }

-    public void CancelDash()
+    public void StopPreparingDash()
    {
        _dashTarget.SetVisible(false);
    }

-    public void DashTweenEnded()
+    public void StartPreparingDash()
    {
-        EmitSignal(SignalName.DashEnded);
-    }
-
-    public void Dash()
-    {
-        EmitSignal(SignalName.DashStarted);
-        _dashTarget.SetVisible(false);
-        var dashTweenInputs = new TweenQueueSystem.TweenInputs(PlannedPlayerLocation, 0.1f);
-        var dashTween = _tweenQueueSystem.TweenToLocation(dashTweenInputs);
-        dashTween.Finished += DashTweenEnded;
-        if (ShouldMantle)
-        {
-            _tweenQueueSystem.QueueTween(PlannedMantleLocation, 0.2f);
-        }
-    }
-
-    public void DashToThrownWeapon()
-    {
-        
-    }
-
-    public void DashToPlantedWeapon()
-    {
-        
+        _dashTarget.SetVisible(true);
    }
 }
--- a/systems/dash/dash_indicator.tscn
+++ b/systems/dash/dash_indicator.tscn
@@ -0,0 +1,79 @@
+[gd_scene load_steps=7 format=3 uid="uid://hd0868f4pb63"]
+
+[ext_resource type="Texture2D" uid="uid://chvt6g0xn5c2m" path="res://systems/dash/light-ring.jpg" id="1_jadbb"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tqt6i"]
+transparency = 1
+blend_mode = 1
+shading_mode = 0
+albedo_texture = ExtResource("1_jadbb")
+billboard_mode = 1
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_jngg2"]
+orientation = 2
+
+[sub_resource type="Animation" id="Animation_fmn25"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:mesh:size")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(2, 2)]
+}
+
+[sub_resource type="Animation" id="Animation_stbcc"]
+resource_name = "start"
+length = 0.2
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:mesh:size")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.2),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(2, 2), Vector2(0, 0)]
+}
+tracks/1/type = "method"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath(".")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0.2),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"queue_free"
+}]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_3aile"]
+_data = {
+&"RESET": SubResource("Animation_fmn25"),
+&"start": SubResource("Animation_stbcc")
+}
+
+[node name="DashIndicator" type="CPUParticles3D"]
+material_override = SubResource("StandardMaterial3D_tqt6i")
+emitting = false
+amount = 1
+lifetime = 0.5
+one_shot = true
+mesh = SubResource("PlaneMesh_jngg2")
+gravity = Vector3(0, 0, 0)
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+&"": SubResource("AnimationLibrary_3aile")
+}
+autoplay = "start"
--- a/systems/dash/dash_system.tscn
+++ b/systems/dash/dash_system.tscn
@@ -1,8 +1,11 @@
-[gd_scene load_steps=6 format=3 uid="uid://cqduhd4opgwvm"]
+[gd_scene load_steps=8 format=3 uid="uid://cqduhd4opgwvm"]

 [ext_resource type="Script" uid="uid://dwoppk8j5fxeg" path="res://systems/dash/DashSystem.cs" id="1_hwig2"]
 [ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="2_jngg2"]
 [ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="2_pff7b"]
+[ext_resource type="PackedScene" uid="uid://hd0868f4pb63" path="res://systems/dash/dash_indicator.tscn" id="2_tqt6i"]
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_jngg2"]

 [sub_resource type="SphereMesh" id="SphereMesh_qu4wy"]

@@ -10,16 +13,18 @@

 [node name="DashSystem" type="Node3D"]
 script = ExtResource("1_hwig2")
+DashIndicatorScene = ExtResource("2_tqt6i")

 [node name="PlayerShapeCast3D" type="ShapeCast3D" parent="."]
+visible = false
 shape = ExtResource("2_jngg2")
 target_position = Vector3(0, 0, 0)
 collision_mask = 2
 debug_shape_custom_color = Color(0.863327, 0.636844, 0, 1)

 [node name="DashCast3D" type="ShapeCast3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.68, 0)
-shape = ExtResource("2_jngg2")
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
+shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -12)
 max_results = 1
 collision_mask = 2
@@ -30,5 +35,8 @@ mesh = SubResource("SphereMesh_qu4wy")
 surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")

 [node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
-MantleEndLocationDistanceFromWall = 0.3
+MantleEndLocationDistanceFromWall = 0.25
 MantleHeightCastStart = 2.0
+
+[node name="DashIndicator" parent="." instance=ExtResource("2_tqt6i")]
+visible = false
--- a/systems/dash/dash_time_dilation.tres
+++ b/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
--- a/systems/dash/light-ring.jpg
+++ b/systems/dash/light-ring.jpg
--- a/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import
+++ b/player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png.import
@@ -2,9 +2,9 @@

 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"
+uid="uid://chvt6g0xn5c2m"
+path.s3tc="res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.s3tc.ctex"
+path.etc2="res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -12,8 +12,8 @@ metadata={

 [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"]
+source_file="res://systems/dash/light-ring.jpg"
+dest_files=["res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.s3tc.ctex", "res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.etc2.ctex"]

 [params]

--- a/systems/inputs/base_mode/aim_pressed.tres
+++ b/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
--- a/systems/inputs/base_mode/base_mode.tres
+++ b/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,24 +13,25 @@
 [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")
-x = 0
-y = 1
-joy_index = -1

 [sub_resource type="Resource" id="Resource_kb1id"]
 script = ExtResource("6_li5ak")
@@ -39,17 +40,11 @@ order = 2
 [sub_resource type="Resource" id="Resource_rwam6"]
 script = ExtResource("7_si4d4")
 lower_threshold = 0.1
-upper_threshold = 1.0

 [sub_resource type="Resource" id="Resource_1igva"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_vkvga")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_kb1id"), SubResource("Resource_rwam6")])
-triggers = Array[ExtResource("8_2tfaw")]([])

 [sub_resource type="Resource" id="Resource_88x08"]
 script = ExtResource("1_qmhk6")
@@ -60,33 +55,21 @@ metadata/_guide_input_mappings_collapsed = true
 [sub_resource type="Resource" id="Resource_05q5j"]
 script = ExtResource("10_cvxqo")
 axis = 2
-joy_index = -1

 [sub_resource type="Resource" id="Resource_tn8ci"]
 script = ExtResource("7_si4d4")
-lower_threshold = 0.2
-upper_threshold = 1.0

 [sub_resource type="Resource" id="Resource_1koh7"]
 script = ExtResource("11_j3axn")
 scale = Vector3(0.3, 0.3, 0.3)
-apply_delta_time = false

 [sub_resource type="Resource" id="Resource_eep0a"]
 script = ExtResource("12_kxb2c")
-x = true
-y = true
-z = true

 [sub_resource type="Resource" id="Resource_dew8i"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_05q5j")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_tn8ci"), SubResource("Resource_1koh7"), SubResource("Resource_eep0a")])
-triggers = Array[ExtResource("8_2tfaw")]([])

 [sub_resource type="Resource" id="Resource_tgr2g"]
 script = ExtResource("1_qmhk6")
@@ -97,33 +80,21 @@ metadata/_guide_input_mappings_collapsed = true
 [sub_resource type="Resource" id="Resource_pf0ii"]
 script = ExtResource("10_cvxqo")
 axis = 3
-joy_index = -1

 [sub_resource type="Resource" id="Resource_nh7x4"]
 script = ExtResource("7_si4d4")
-lower_threshold = 0.2
-upper_threshold = 1.0

 [sub_resource type="Resource" id="Resource_04n84"]
 script = ExtResource("11_j3axn")
 scale = Vector3(0.1, 0.1, 0.1)
-apply_delta_time = false

 [sub_resource type="Resource" id="Resource_m3aj7"]
 script = ExtResource("12_kxb2c")
-x = true
-y = true
-z = true

 [sub_resource type="Resource" id="Resource_qu2wi"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_pf0ii")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_nh7x4"), SubResource("Resource_04n84"), SubResource("Resource_m3aj7")])
-triggers = Array[ExtResource("8_2tfaw")]([])

 [sub_resource type="Resource" id="Resource_iarn8"]
 script = ExtResource("1_qmhk6")
@@ -131,73 +102,51 @@ 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
-joy_index = -1

 [sub_resource type="Resource" id="Resource_2tfaw"]
 script = ExtResource("15_g6bbx")
-actuation_threshold = 0.5

 [sub_resource type="Resource" id="Resource_q86qg"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_si4d4")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_2tfaw")])

 [sub_resource type="Resource" id="Resource_cvxqo"]
 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
+
+[sub_resource type="Resource" id="Resource_ib0yi"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_r6kml"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_llfhp")
+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")
 axis = 4
-joy_index = -1

 [sub_resource type="Resource" id="Resource_vanwy"]
 script = ExtResource("17_s8kjn")
-actuation_threshold = 0.5

 [sub_resource type="Resource" id="Resource_bkx7d"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_cqc4k")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_vanwy")])

 [sub_resource type="Resource" id="Resource_iihs4"]
@@ -206,23 +155,51 @@ 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
+
+[sub_resource type="Resource" id="Resource_rvpjj"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_s8kjn"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_fykw6")
+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
+
+[sub_resource type="Resource" id="Resource_st2ej"]
+script = ExtResource("17_s8kjn")
+
+[sub_resource type="Resource" id="Resource_818lq"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_qkgmj")
+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
-joy_index = -1

 [sub_resource type="Resource" id="Resource_oruo7"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5

 [sub_resource type="Resource" id="Resource_4ee3d"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_lfx76")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oruo7")])

 [sub_resource type="Resource" id="Resource_0s4kt"]
@@ -230,24 +207,29 @@ script = ExtResource("1_qmhk6")
 action = ExtResource("18_vibkn")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_4ee3d")])

+[sub_resource type="Resource" id="Resource_1fkas"]
+script = ExtResource("19_qkgmj")
+
+[sub_resource type="Resource" id="Resource_6pxii"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_jy4f1"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_1fkas")
+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_j3mg7"]
-script = ExtResource("15_fykw6")
-actuation_threshold = 0.5

 [sub_resource type="Resource" id="Resource_8w5gu"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_oapce")
-modifiers = Array[ExtResource("5_0qat1")]([])
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_j3mg7")])
 metadata/_guide_triggers_collapsed = false

 [sub_resource type="Resource" id="Resource_xt1x5"]
@@ -255,23 +237,16 @@ 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

 [sub_resource type="Resource" id="Resource_paxxe"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5

 [sub_resource type="Resource" id="Resource_500v3"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
-input = SubResource("Resource_nf3uo")
-modifiers = Array[ExtResource("5_0qat1")]([])
+input = SubResource("Resource_li5ak")
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_paxxe")])

 [sub_resource type="Resource" id="Resource_ew1hw"]
@@ -282,30 +257,39 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_500v3")])
 [sub_resource type="Resource" id="Resource_g6bbx"]
 script = ExtResource("19_qkgmj")
 button = 1
-joy_index = -1

 [sub_resource type="Resource" id="Resource_yp12v"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5

 [sub_resource type="Resource" id="Resource_1rw8g"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_g6bbx")
-modifiers = Array[ExtResource("5_0qat1")]([])
 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
+
+[sub_resource type="Resource" id="Resource_kxb2c"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_v2ywt"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_j3axn")
+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"
--- a/systems/inputs/base_mode/dash.tres
+++ b/systems/inputs/base_mode/dash.tres
--- a/systems/inputs/base_mode/empower_down.tres
+++ b/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"
--- a/systems/inputs/base_mode/empower_release.tres
+++ b/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"
--- a/systems/inputs/base_mode/jump_pressed.tres
+++ b/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"
--- a/systems/inputs/base_mode/throw.tres
+++ b/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"
--- a/systems/inputs/input_system.gd
+++ b/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)
+	
+	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)
-	drop.triggered.connect(on_input_drop)
+	dash.triggered.connect(on_input_dash)
+	throw.triggered.connect(on_input_throw)

-func on_input_drop():
-	input_drop.emit()
+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()

--- a/systems/mantle/MantleSystem.cs
+++ b/systems/mantle/MantleSystem.cs
@@ -5,50 +5,40 @@ namespace Movementtests.systems;

 public partial class MantleSystem: Node3D
 {
-    [Export(PropertyHint.Range, "0,2,0.1,suffix:m,or_greater")]
+    [Export(PropertyHint.Range, "0,2,0.01,suffix:m,or_greater")]
    public float MantleEndLocationDistanceFromWall { get; set; } = 1f;
    [Export(PropertyHint.Range, "0,10,0.1,suffix:m,or_greater")]
    public float MantleHeightCastStart { get; set; } = 2f;
    [Export(PropertyHint.Range, "0,10,0.01,suffix:m,or_greater")]
    public float MaxStepHeight = 0.5f;
    
-    private Node3D _head;
    private ShapeCast3D _wallInFrontCast3D;
    private ShapeCast3D _mantleCast3D;
    private RayCast3D _mantleCheckCast3D;
    
    private Option<Vector3> _mantleLocation;

-    public void Init(Node3D head)
+    public void Init()
    {
-        _head = head;
        _wallInFrontCast3D = GetNode<ShapeCast3D>("WallInFrontCast3D");
        _mantleCast3D = GetNode<ShapeCast3D>("MantleCast3D");
    }

-    public override void _PhysicsProcess(double delta)
+    public Option<Vector3> FindMantleForHeadRotation(float rotation)
    {
-        base._PhysicsProcess(delta);
-        
        _wallInFrontCast3D.SetRotation(new Vector3(
            _wallInFrontCast3D.Rotation.X,
-            _head.Rotation.Y,
+            rotation,
            _wallInFrontCast3D.Rotation.Z));

        if (!_wallInFrontCast3D.IsColliding())
        {
-            _mantleLocation = Option<Vector3>.None;
-            return;
+            return Option<Vector3>.None;
        }
        
        var collisionPoint = _wallInFrontCast3D.GetCollisionPoint(0);
        var collisionNormal = _wallInFrontCast3D.GetCollisionNormal(0);
-        _mantleLocation = FindMantleLocationAtPoint(collisionPoint, collisionNormal);
-    }
-
-    public Option<Vector3> FindMantleInFrontOfPlayer()
-    {
-        return _mantleLocation;
+        return FindMantleLocationAtPoint(collisionPoint, collisionNormal);
    }

    public Option<Vector3> FindMantleLocationAtPoint(Vector3 point, Vector3 wallNormal)
@@ -59,8 +49,8 @@ public partial class MantleSystem: Node3D
        _mantleCast3D.SetGlobalPosition(shapeCastStartLocation);
        var targetLocation = Vector3.Down * MantleHeightCastStart + Vector3.Up * MaxStepHeight;
        _mantleCast3D.SetTargetPosition(targetLocation);
-
-        if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y > 0.9f)
+        
+        if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y >= 0.1f)
            return Option.Some(_mantleCast3D.GetCollisionPoint(0));
        return Option<Vector3>.None;
    }
--- a/systems/move/MoveSystem.cs
+++ b/systems/move/MoveSystem.cs
@@ -218,22 +218,4 @@ public partial class MoveSystem : Node3D
        var jumpVelocity = jumpForce * effectiveJumpDirection * boost;
        _parent.Velocity = currentHorizontalVelocity + jumpVelocity;
    }
-
-    public bool CanMantle()
-    {
-        var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
-        return mantleLocationResult.IsSome(out _);
-    }
-
-    public Option<Tween> Mantle()
-    {
-        var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
-        if (mantleLocationResult.IsSome(out var mantleLocation))
-        {
-            var duration = 0.1f * mantleLocation.DistanceTo(_parent.Position);
-            var tween = _tweenQueueSystem.TweenToLocation(new TweenQueueSystem.TweenInputs(mantleLocation, duration));
-            return tween.Some();
-        }
-        return Option<Tween>.None;
-    }
 }
--- a/systems/move/simple_jump.tres
+++ b/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
--- a/systems/tween_queue/TweenQueueSystem.cs
+++ b/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;
--- a/systems/wall_hug/WallHugSystem.cs
+++ b/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)
--- a/systems/weapon/WeaponSystem.cs
+++ b/systems/weapon/WeaponSystem.cs
@@ -54,7 +54,7 @@ public partial class WeaponSystem : RigidBody3D
        PlantLocation = collisionLocation;
        PlantNormal = collisionNormal;
        LookAt(end);
-        
+    
        var tween = _tweenQueueSystem.TweenToLocation(new TweenQueueSystem.TweenInputs(end, StraightThrowDuration));
        if (hasHit)
            tween.Finished += PlantWeaponInWall;
--- a/systems/weapon/weapon.tscn
+++ b/systems/weapon/weapon.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=3 uid="uid://ckm3d6k08a72u"]
+[gd_scene load_steps=10 format=3 uid="uid://ckm3d6k08a72u"]

 [ext_resource type="Script" uid="uid://iii3wfto4t5b" path="res://systems/weapon/WeaponSystem.cs" id="1_csqwk"]
 [ext_resource type="PackedScene" uid="uid://dbe5f0p6lvqtr" path="res://systems/tween_queue/tween_queue_system.tscn" id="2_x1nha"]
@@ -11,7 +11,14 @@
 height = 1.0
 radius = 0.1

+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_5owyf"]
+use_z_clip_scale = true
+z_clip_scale = 0.9
+use_fov_override = true
+fov_override = 70.0
+
 [sub_resource type="CylinderMesh" id="CylinderMesh_x1nha"]
+material = SubResource("StandardMaterial3D_5owyf")
 top_radius = 0.0
 bottom_radius = 0.05
 height = 1.0
--- a/tools/generate_collisions.gd
+++ b/tools/generate_collisions.gd
@@ -0,0 +1,40 @@
+@tool
+extends Node3D
+
+@export_tool_button("Generate collisions", "Callable") var generate_col_action = generate_collisions
+
+@export_group("Layers and masks")
+@export_flags_3d_physics var collision_layer
+@export_flags_3d_physics var collision_mask
+
+func get_all_children_of_type(node, type) -> Array:
+	var nodes : Array = []
+	for child in node.get_children():
+		if is_instance_of(child, type):
+			nodes.append(child)
+		if child.get_child_count() > 0:
+			nodes.append_array(get_all_children_of_type(child, type))
+	return nodes
+
+func clear_collisions_on_meshes(meshes: Array):
+	for mesh_instance: MeshInstance3D in meshes:
+		for child in mesh_instance.get_children():
+			child.queue_free()
+
+func generate_collisions_on_meshes(meshes: Array):
+	for mesh_instance: MeshInstance3D in meshes:
+		mesh_instance.create_trimesh_collision()
+		
+func set_collision_mask_on_bodies(bodies: Array):
+	for staticbody: StaticBody3D in bodies:
+		staticbody.collision_layer = collision_layer
+		staticbody.collision_mask = collision_mask
+
+func generate_collisions():
+	var mesh_instances = get_all_children_of_type(self, MeshInstance3D)
+	clear_collisions_on_meshes(mesh_instances)
+	generate_collisions_on_meshes(mesh_instances)
+	
+	var staticbody_instances = get_all_children_of_type(self, StaticBody3D)
+	set_collision_mask_on_bodies(staticbody_instances)
+	
--- a/tools/generate_collisions.gd.uid
+++ b/tools/generate_collisions.gd.uid
@@ -0,0 +1 @@
+uid://do8vihuwc4iib
Author	SHA1	Message	Date
Minimata	c1e8235895	moving away from blend files and using explicit imports through gltf All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Successful in 3m37s Details	2025-10-03 15:45:40 +02:00
Minimata	1813973daa	weapon clip fix Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Has been cancelled Details	2025-09-16 11:01:31 +02:00
Minimata	7b036c5889	fixed mantle after dash bug Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Failing after 2s Details	2025-09-16 10:28:41 +02:00
Minimata	88d20431ce	updated CI to godot 4.5 Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Failing after 2s Details	2025-09-16 09:43:21 +02:00
Minimata	d15542e4ed	ported to Godot 5 and fixed collisions on tooling script Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Has been cancelled Details	2025-09-16 09:40:20 +02:00
Minimata	63ea62ff74	some greyboxing attempt Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Failing after 3h13m16s Details	2025-09-15 17:33:48 +02:00
Minimata	c563390796	Merge branch 'main' of https://git.game-dev.space/minimata/MovementTests Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Failing after 3h5m23s Details	2025-09-13 19:15:41 +02:00
Minimata	5f37f39558	deleted useless stuss	2025-09-13 19:15:38 +02:00
Alexandre Serex	4922e597d9	Merge pull request 'test adding a blend file mesh' (#2 ) from more-rework into main Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Has been cancelled Details Reviewed-on: #2	2025-09-13 17:14:19 +00:00
Minimata	739968afbf	test adding a clend file mesh	2025-09-13 19:11:50 +02:00
Alexandre Serex	e0301064bb	Merge pull request 'more-rework' (#1 ) from more-rework into main Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 8s Details Create tag and build when new code gets to main / Export (push) Failing after 3m58s Details Reviewed-on: #1	2025-09-13 16:57:41 +00:00
Minimata	925b7004c0	complete move patterns	2025-09-13 18:57:11 +02:00
Minimata	e6cdb26ee0	throwing weapon back on	2025-09-12 14:54:08 +02:00
Minimata	49ba007613	mantling seems to work	2025-09-11 18:12:34 +02:00
Minimata	285365becf	least worst version	2025-09-11 16:36:27 +02:00
Minimata	00c4c1ddfa	scene saved	2025-09-09 16:23:45 +02:00
Minimata	f4d5a02e42	fucked up	2025-09-09 16:09:59 +02:00
Minimata	5087cb58bc	god dayum wall hugging on point man	2025-08-18 14:54:41 +02:00
Minimata	4f9005d016	revamped megajump and air control	2025-08-07 16:13:21 +02:00
Minimata	f905e55f65	revamped jump	2025-08-05 12:12:07 +02:00
Minimata	0d6d1c86de	moved movement code to player	2025-07-29 16:41:31 +02:00
Minimata	ffdb3366a5	two empoered actions on cooldown	2025-07-29 11:08:02 +02:00
Minimata	cd9e6da4e9	trying with cooldown	2025-07-28 18:51:51 +02:00
Minimata	77c62c74de	changing acceleration factors	2025-07-28 17:27:23 +02:00
Minimata	3df89c6d28	i dunno man	2025-07-22 16:18:43 +02:00
Minimata	9d29ec8ee4	trying other setup	2025-07-22 11:51:48 +02:00
Minimata	4c16ad4f9a	dash and jump	2025-07-21 14:40:48 +02:00
Minimata	374012569b	fix: forgot to commit curve resource All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 9s Details Create tag and build when new code gets to main / Export (push) Successful in 4m4s Details	2025-07-11 10:34:46 +02:00
Minimata	98b6537fdd	feat: time dilation and indicator	2025-07-11 10:34:20 +02:00
Minimata	e3d10840c9	fix: dash indicator vfx works All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 7s Details Create tag and build when new code gets to main / Export (push) Successful in 3m41s Details	2025-07-06 22:18:59 +02:00
Minimata	e4880d42f9	feat: removed crouch and added a UI for available jumps All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 6s Details Create tag and build when new code gets to main / Export (push) Successful in 3m40s Details	2025-07-06 15:11:25 +02:00