fix: inputs were eaten by a tutorial text because of node ordering

probably fixed stuttering of the camera and weapon animations
mana bar
2026-03-18 11:10:06 +01:00 · 2026-03-18 11:02:08 +01:00 · 2026-03-15 21:26:59 +01:00 · 2026-03-11 16:29:09 +01:00 · 2026-03-11 15:56:17 +01:00 · 2026-03-10 09:22:39 +01:00
76 changed files with 2272 additions and 2475 deletions
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -39,51 +39,52 @@ jobs:
          INITIAL_VERSION: 0.1.0
          DEFAULT_BUMP: patch
  
-  Test:
-    runs-on: godot
-#    env:
-#      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
-    steps:
-      - name: Checkout with LFS
-        uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main
-        
-      - name: Setup Godot
-        id: setup-godot
-        uses: https://git.game-dev.space/minimata/setup-godot.git@main
-        with:
-          godot-version: ${GODOT_VERSION}
-          dotnet-version: ${DOTNET_VERSION}
-          
-      - name: Run C# Tests
-        env:
-          GODOT_BIN: ${{ steps.setup-godot.outputs.godot_bin }}
-        shell: bash
-        run: |
-          dotnet test --no-build --settings .runsettings --results-directory ./reports --logger "console;verbosity=normal" --logger "trx;LogFileName=results.xml" -- GdUnit4.Parameters="--verbose --headless --import"
-      
-      
-      #      - name: Run tests
-#        uses: godot-gdunit-labs/gdUnit4-action@v1
+#  Test:
+#    runs-on: godot
+##    env:
+##      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
+#    steps:
+#      - name: Checkout with LFS
+#        uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main
+#        
+#      - name: Setup Godot
+#        id: setup-godot
+#        uses: https://git.game-dev.space/minimata/setup-godot.git@main
 #        with:
 #          godot-version: ${GODOT_VERSION}
-#          godot-net: true
-#          godot-force-mono: true
 #          dotnet-version: ${DOTNET_VERSION}
-#          paths: |
-#            res://tests/
-#          publish-report: false
-#          upload-report: false
-#          console-verbosity: 'normal'
-#          arguments: "--verbose --headless --import"
-
-      - name: Upload test report
-        uses: actions/upload-artifact@v3-node20
-        with:
-          name: Test Report
-          path: ${{ github.workspace }}/reports/test-result.html
+#          
+#      - name: Run C# Tests
+#        env:
+#          GODOT_BIN: ${{ steps.setup-godot.outputs.godot_bin }}
+#        shell: bash
+#        run: |
+#          dotnet test --no-build --settings .runsettings --results-directory ./reports --logger "console;verbosity=normal" --logger "trx;LogFileName=results.xml" -- GdUnit4.Parameters="--verbose --headless --import"
+#      
+##      - name: Run tests
+##        uses: godot-gdunit-labs/gdUnit4-action@v1
+##        with:
+##          godot-version: ${GODOT_VERSION}
+##          godot-net: true
+##          godot-force-mono: true
+##          dotnet-version: ${DOTNET_VERSION}
+##          paths: |
+##            res://tests/
+##          publish-report: false
+##          upload-report: false
+##          console-verbosity: 'normal'
+##          arguments: "--verbose --headless --import"
+#
+#      - name: Upload test report
+#        uses: actions/upload-artifact@v3-node20
+#        with:
+#          name: Test Report
+#          path: ${{ github.workspace }}/reports/test-result.html

  Export:
    runs-on: godot
+    env:
+      RUNNER_TOOL_CACHE: /toolcache # Runner Tool Cache
    needs: 
      - BumpTag

@@ -106,6 +107,7 @@ jobs:
        run: |
          mkdir -v -p build/windows
          ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
+          ls -la build/windows
          
 #      - name: Setup Butler
 #        shell: bash
--- a/.gitea/workflows/release-branch.yaml
+++ b/.gitea/workflows/release-branch.yaml
@@ -63,6 +63,7 @@ jobs:
        run: |
          mkdir -v -p build/windows
          ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
+          ls -la build/windows
          zip -r Windows.zip build/windows
      - name: Upload Windows to itch.io
        shell: bash
@@ -79,7 +80,7 @@ jobs:
          mkdir -v -p build/windowsArm
          ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
          zip -r WindowsArm.zip build/windowsArm
-      - name: Upload Windows to itch.io
+      - name: Upload Windows ARM to itch.io
        shell: bash
        env:
          BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }}
@@ -94,7 +95,7 @@ jobs:
          mkdir -v -p build/linux
          ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64
          zip -r Linux.zip build/linux
-      - name: Upload Windows to itch.io
+      - name: Upload Linux to itch.io
        shell: bash
        env:
          BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }}
@@ -109,7 +110,7 @@ jobs:
          mkdir -v -p build/mac
          ${{ steps.setup-godot.outputs.godot_bin }} --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
          zip -r Mac.zip build/mac     
-      - name: Upload Windows to itch.io
+      - name: Upload Mac to itch.io
        shell: bash
        env:
          BUTLER_API_KEY: ${{ secrets.BUTLER_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,11 @@
 *.translation

 .output.txt
+
+*.suo
+*.user
+_ReSharper.*
+*.DotSettings.user
+bin
+obj
+packages
--- a/tests.csproj
+++ b/tests.csproj
@@ -125,27 +125,14 @@
    </ItemGroup>
    <ItemGroup>
        <Folder Include="addons\" />
-        <Folder Include="tests\components\" />
-        <Folder Include="tests\enemies\" />
+        <Folder Include="tests\" />
+        <Folder Include="tools\" />
    </ItemGroup>
    <ItemGroup>
        <PackageReference Include="RustyOptions" Version="0.10.1" />
    </ItemGroup>
    <Import Project="addons/forge/Forge.props" />
    
-    <!-- XUnit -->
-    <ItemGroup>
-        <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Using Include="Xunit" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.2" />
-    </ItemGroup>
-    
    <!-- gdUnit4 package dependencies -->
    <ItemGroup>
        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
--- a/tests.csproj.old
+++ b/tests.csproj.old
@@ -1,131 +0,0 @@
-<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/tests.csproj.old.1
+++ b/tests.csproj.old.1
@@ -1,142 +0,0 @@
-<Project Sdk="Godot.NET.Sdk/4.5.0">
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <EnableDynamicLoading>true</EnableDynamicLoading>
-    <RootNamespace>Movementtests</RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include=".runsettings" />
-    <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>
-  <!-- gdUnit4 package dependencies -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0"/>
-    <PackageReference Include="gdUnit4.api" Version="5.1.0-rc3"/>
-    <PackageReference Include="gdUnit4.test.adapter" Version="3.0.0"/>
-    <PackageReference Include="gdUnit4.analyzers" Version="1.0.0">
-      <PrivateAssets>none</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-</Project>
--- a/tests.sln.DotSettings.user
+++ b/tests.sln.DotSettings.user
@@ -1,14 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAction_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F7c0f83388bfc4d2c9d09befcec9dd79bc90908_003Fb8_003F4d300c4d_003FAction_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAction_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F7c0f83388bfc4d2c9d09befcec9dd79bc90908_003F87_003Fded27e2d_003FAction_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnemy_005FScriptMethods_002Egenerated_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F8e71dc81611862c01a2cb998a1f327de14747655_003FEnemy_005FScriptMethods_002Egenerated_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F716d154fef5cbe863cd637bd32beda6e3cec5f12e8fed2dc5b2d8149a0d558ab_003FNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fdf73a4db74df89d59655c5fb6326406f47fbfa9af1fa81518fe0a07c49d34133_003FNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASceneTree_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F8d6960554e939a669841b1ece03d27df4ab42f92bb80be3767eaec8cdaccf84b_003FSceneTree_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
-	
-	
-	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=dd9a7ac6_002Dbb9b_002D4001_002Db145_002D15e6509b7e78/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
-  &lt;Solution /&gt;&#xD;
-&lt;/SessionState&gt;</s:String>
-	<s:String x:Key="/Default/Housekeeping/UnitTestingMru/UnitTestRunner/RunConfigurationFilename/@EntryValue">D:\Godot\Projects\movement-tests\.runsettings</s:String>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=floorplane/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
--- a/assets/meshes/city/guard_tower.tscn
+++ b/assets/meshes/city/guard_tower.tscn
--- a/Mouse/Vector/keyboard_escape_outline.svg.import
+++ b/Mouse/Vector/keyboard_escape_outline.svg.import
@@ -3,19 +3,21 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://goerc3svgoqd"
-path="res://.godot/imported/keyboard_escape_outline.svg-5abd6c168b832eae20b6e1164ac06548.ctex"
+path.s3tc="res://.godot/imported/keyboard_escape_outline.svg-5abd6c168b832eae20b6e1164ac06548.s3tc.ctex"
+path.etc2="res://.godot/imported/keyboard_escape_outline.svg-5abd6c168b832eae20b6e1164ac06548.etc2.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
 }

 [deps]

 source_file="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_escape_outline.svg"
-dest_files=["res://.godot/imported/keyboard_escape_outline.svg-5abd6c168b832eae20b6e1164ac06548.ctex"]
+dest_files=["res://.godot/imported/keyboard_escape_outline.svg-5abd6c168b832eae20b6e1164ac06548.s3tc.ctex", "res://.godot/imported/keyboard_escape_outline.svg-5abd6c168b832eae20b6e1164ac06548.etc2.ctex"]

 [params]

-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/uastc_level=0
@@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0
 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=""
@@ -37,7 +39,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/Series/Vector/xbox_button_menu_outline.svg.import
+++ b/Series/Vector/xbox_button_menu_outline.svg.import
@@ -3,19 +3,21 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://b580m114ivbse"
-path="res://.godot/imported/xbox_button_menu_outline.svg-505b86f2a024b9e033f596e6a1373a04.ctex"
+path.s3tc="res://.godot/imported/xbox_button_menu_outline.svg-505b86f2a024b9e033f596e6a1373a04.s3tc.ctex"
+path.etc2="res://.godot/imported/xbox_button_menu_outline.svg-505b86f2a024b9e033f596e6a1373a04.etc2.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
 }

 [deps]

 source_file="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_menu_outline.svg"
-dest_files=["res://.godot/imported/xbox_button_menu_outline.svg-505b86f2a024b9e033f596e6a1373a04.ctex"]
+dest_files=["res://.godot/imported/xbox_button_menu_outline.svg-505b86f2a024b9e033f596e6a1373a04.s3tc.ctex", "res://.godot/imported/xbox_button_menu_outline.svg-505b86f2a024b9e033f596e6a1373a04.etc2.ctex"]

 [params]

-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/uastc_level=0
@@ -23,7 +25,7 @@ compress/rdo_quality_loss=0.0
 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=""
@@ -37,7 +39,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/export_presets.cfg
+++ b/export_presets.cfg
@@ -46,7 +46,7 @@ kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
 rm -rf \"{temp_dir}\""
 dotnet/include_scripts_content=false
 dotnet/include_debug_symbols=true
-dotnet/embed_build_outputs=false
+dotnet/embed_build_outputs=true
 texture_format/bptc=true
 texture_format/s3tc=true
 texture_format/etc=false
@@ -125,7 +125,7 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi
 Remove-Item -Recurse -Force '{temp_dir}'"
 dotnet/include_scripts_content=false
 dotnet/include_debug_symbols=true
-dotnet/embed_build_outputs=false
+dotnet/embed_build_outputs=true
 texture_format/bptc=true
 texture_format/s3tc=true
 texture_format/etc=false
@@ -472,4 +472,4 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi
 Remove-Item -Recurse -Force '{temp_dir}'"
 dotnet/include_scripts_content=false
 dotnet/include_debug_symbols=true
-dotnet/embed_build_outputs=false
+dotnet/embed_build_outputs=true
--- a/forge/ForgeManager.cs
+++ b/forge/ForgeManager.cs
@@ -0,0 +1,22 @@
+using Gamesmiths.Forge.Cues;
+using Gamesmiths.Forge.Tags;
+using Godot;
+
+namespace Movementtests.tools;
+
+public partial class ForgeManager : Node
+{
+    public CuesManager CuesManager { get; private set; } = new CuesManager();
+    public TagsManager TagsManager { get; private set; } = new TagsManager(
+    [
+        "character.player",
+        "class.warrior",
+        "status.stunned",
+        "status.burning",
+        "status.immune.fire",
+        "cues.damage.fire",
+        "events.combat.damage",
+        "events.combat.hit",
+        "cooldown.empoweredAction",
+    ]);
+}
--- a/forge/ForgeManager.cs.uid
+++ b/forge/ForgeManager.cs.uid
@@ -0,0 +1 @@
+uid://c75tpswl62eew
--- a/forge/abilities/REmpoweredAction.cs
+++ b/forge/abilities/REmpoweredAction.cs
@@ -0,0 +1,78 @@
+using Gamesmiths.Forge.Abilities;
+using Gamesmiths.Forge.Effects;
+using Gamesmiths.Forge.Effects.Components;
+using Gamesmiths.Forge.Effects.Duration;
+using Gamesmiths.Forge.Effects.Magnitudes;
+using Gamesmiths.Forge.Effects.Modifiers;
+using Gamesmiths.Forge.Tags;
+using Godot;
+
+namespace Movementtests.forge.abilities;
+
+[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_animation.png")]
+public partial class REmpoweredAction(float cost, float cooldown, float manaRegenPause) : Resource
+{
+    [Export(PropertyHint.Range, "0,100,1,or_greater")]
+    public float Cost { get; set; } = cost;
+
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float Cooldown { get; set; } = cooldown;
+
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float ManaRegenPause { get; set; } = manaRegenPause;
+    
+    public REmpoweredAction() : this(20.0f, 1.0f, 3.0f)
+    {
+    }
+
+    public EffectData CostEffect()
+    {
+        return new(
+            "Empowered Action Mana Cost",
+            new DurationData(DurationType.Instant),
+            new[]
+            {
+                new Modifier(
+                    "PlayerAttributeSet.Mana",
+                    ModifierOperation.FlatBonus,
+                    new ModifierMagnitude(
+                        MagnitudeCalculationType.ScalableFloat,
+                        new ScalableFloat(-Cost)
+                    )
+                )
+            });
+    }
+
+    public EffectData CooldownEffect(TagsManager tagsManager)
+    {
+        return new(
+            "Empowered Action Cooldown",
+            new DurationData(
+                DurationType.HasDuration,
+                new ModifierMagnitude(
+                    MagnitudeCalculationType.ScalableFloat,
+                    new ScalableFloat(Cooldown))),
+            effectComponents: new[]
+            {
+                new ModifierTagsEffectComponent(
+                    tagsManager.RequestTagContainer(new[] { "cooldown.empoweredAction" })
+                )
+            });
+    }
+}
+
+
+public class EmpoweredActionBehavior : IAbilityBehavior
+{
+    public void OnStarted(AbilityBehaviorContext context)
+    {
+        // Apply costs and cooldowns
+        context.AbilityHandle.CommitAbility();
+        context.InstanceHandle.End();
+    }
+
+    public void OnEnded(AbilityBehaviorContext context)
+    {
+        // Do any necessary cleanups
+    }
+}
--- a/forge/abilities/REmpoweredAction.cs.uid
+++ b/forge/abilities/REmpoweredAction.cs.uid
@@ -0,0 +1 @@
+uid://d0l07gcx1ef18
--- a/forge/effects/RManaRegen.cs
+++ b/forge/effects/RManaRegen.cs
@@ -0,0 +1,46 @@
+using Gamesmiths.Forge.Effects;
+using Gamesmiths.Forge.Effects.Duration;
+using Gamesmiths.Forge.Effects.Magnitudes;
+using Gamesmiths.Forge.Effects.Modifiers;
+using Gamesmiths.Forge.Effects.Periodic;
+using Godot;
+
+namespace Movementtests.tools.effects;
+
+[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_liquid.png")]
+public partial class RManaRegen(float manaRegenRate, float frequency) : Resource
+{
+    [Export(PropertyHint.Range, "0,100,0.1,or_greater")] 
+    public float ManaRegenRate { get; set; } = manaRegenRate;
+    
+    [Export(PropertyHint.Range, "0.01,1,0.01,or_greater")] 
+    public float Frequency { get; set; } = frequency;
+
+    public RManaRegen() : this(1.0f, 0.1f)
+    {
+    }
+    
+    public EffectData ManaRegen()
+    {
+        return new EffectData(
+            "Mana Regen",
+            durationData: new DurationData(
+                DurationType.Infinite
+            ),
+            modifiers: [
+                new Modifier(
+                    "PlayerAttributeSet.Mana",
+                    ModifierOperation.FlatBonus,
+                    new ModifierMagnitude(
+                        MagnitudeCalculationType.ScalableFloat,
+                        new ScalableFloat(ManaRegenRate * Frequency))
+                    )
+            ],
+            periodicData: new PeriodicData(
+                Period: new ScalableFloat(Frequency),
+                ExecuteOnApplication: true,
+                PeriodInhibitionRemovedPolicy: PeriodInhibitionRemovedPolicy.ResetPeriod
+            )
+        );
+    }
+}
--- a/forge/effects/RManaRegen.cs.uid
+++ b/forge/effects/RManaRegen.cs.uid
@@ -0,0 +1 @@
+uid://di04jvuqp0h7m
--- a/global.json
+++ b/global.json
@@ -1,5 +0,0 @@
-{
-  "test": {
-    "runner": "Microsoft.Testing.Platform"
-  }
-}
--- a/interfaces/IHealthable.cs
+++ b/interfaces/IHealthable.cs
@@ -10,7 +10,7 @@ public interface IHealthable
    event Action<IHealthable, HealthChangedRecord> HealthChanged;
    event Action<IHealthable> HealthDepleted;
    
-    [Export] RHealth RHealth { get; set; }
+    [Export] RHealth? RHealth { get; set; }
    
    float CurrentHealth { get; set; }
    
--- a/interfaces/IKnockbackable.cs
+++ b/interfaces/IKnockbackable.cs
@@ -6,7 +6,7 @@ public record KnockbackRecord(DamageRecord DamageRecord, float ForceMultiplier =

 public interface IKnockbackable
 {
-    [Export] RKnockback RKnockback { get; set;}
+    [Export] RKnockback? RKnockback { get; set;}
    
    public void RegisterKnockback(KnockbackRecord record);
    public Vector3 ComputeKnockback();
--- a/maps/_old/city.tscn
+++ b/maps/_old/city.tscn
@@ -451,6 +451,7 @@ MovementInputs = SubResource("Resource_pxspk")
 HealthInputs = ExtResource("27_lgco8")
 DamageInputs = ExtResource("28_51ivn")
 Target = NodePath("../Player")
+IsActiveOnStart = false

 [node name="Spawner2" parent="." unique_id=717610670 node_paths=PackedStringArray("Target") instance=ExtResource("24_qwuk2")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 31, 7.5, -88)
@@ -459,6 +460,7 @@ MovementInputs = ExtResource("30_3w3wd")
 HealthInputs = ExtResource("31_5hbxb")
 DamageInputs = ExtResource("32_hmdts")
 Target = NodePath("../Player")
+IsActiveOnStart = false

 [connection signal="timeout" from="TutorialController/WaitToShowBlockingTuto" to="TutorialController" method="_show_weapon_tutorial"]
 [connection signal="body_exited" from="TutoTriggers/TriggerTutoMove" to="TutorialController" method="hide_tutorials"]
--- a/maps/levels/tuto_movement.tscn
+++ b/maps/levels/tuto_movement.tscn
@@ -15,6 +15,8 @@
 [ext_resource type="Texture2D" uid="uid://2h3y7dj0iwet" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_stick_l_up.svg" id="12_pu6f4"]
 [ext_resource type="Texture2D" uid="uid://bsxtadecl3657" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_shift_outline.svg" id="13_6rkcg"]
 [ext_resource type="Texture2D" uid="uid://crw70luu8rge" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_arrows_up_outline.svg" id="13_rbrma"]
+[ext_resource type="Texture2D" uid="uid://b580m114ivbse" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_menu_outline.svg" id="16_8xoi0"]
+[ext_resource type="Texture2D" uid="uid://goerc3svgoqd" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_escape_outline.svg" id="17_atuqk"]

 [sub_resource type="BoxShape3D" id="BoxShape3D_6c6r2"]
 size = Vector3(6.5, 9, 7.5)
@@ -34,6 +36,9 @@ size = Vector3(10, 6.5, 3)
 [sub_resource type="BoxShape3D" id="BoxShape3D_p8dgc"]
 size = Vector3(3, 6.5, 5.5)

+[sub_resource type="BoxShape3D" id="BoxShape3D_7hd1j"]
+size = Vector3(6.75, 8.25, 7.25)
+
 [node name="Main" unique_id=955321579 instance=ExtResource("1_jyq54")]

 [node name="DirectionalLight3D" parent="." index="5" unique_id=1357990191]
@@ -1032,6 +1037,16 @@ tuto_text = "Dash"
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.25, -3.75)
 shape = SubResource("BoxShape3D_p8dgc")

+[node name="TutoTrigger10" parent="Tutorials" index="8" unique_id=1955529780 instance=ExtResource("7_r26ni")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.904569, 25, -48.72998)
+first_input_icon = ExtResource("16_8xoi0")
+first_input_icon_keyboard = ExtResource("17_atuqk")
+tuto_text = "Select next level when ready"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorials/TutoTrigger10" index="1" unique_id=1398626070]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.875, 1.125, -4.625)
+shape = SubResource("BoxShape3D_7hd1j")
+
 [node name="Player" parent="." index="11" unique_id=1309399929]
 transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, -0.5, 0.4102497, 0.5415039)
 HasSword = false
--- a/maps/levels/tuto_sword_parry.tscn
+++ b/maps/levels/tuto_sword_parry.tscn
@@ -1,51 +1,53 @@
 [gd_scene format=3 uid="uid://e81wsmpen58r"]

-[ext_resource type="PackedScene" uid="uid://55wehh6xombr" path="res://maps/_templates/main_scene_template.tscn" id="1_8n6bu"]
-[ext_resource type="PackedScene" uid="uid://y77cdg7gg3y7" path="res://maps/levels/_arenas/playtest_1.tscn" id="2_wsc2c"]
-[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/materials/greybox/m_greybox.tres" id="3_wsc2c"]
-[ext_resource type="PackedScene" uid="uid://qup00a7x2sji" path="res://scenes/fixed_dash_target/fixed_dashthrough_target.tscn" id="4_invhv"]
-[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/grounded_enemy/grounded_enemy.tscn" id="5_ofbe2"]
-[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://scenes/components/movement/RMovement.cs" id="6_cgfmf"]
-[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="7_hr4qv"]
-[ext_resource type="PackedScene" uid="uid://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy/flying_enemy.tscn" id="8_dkfm7"]
-[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://scenes/components/damage/RDamage.cs" id="9_ofbe2"]
-[ext_resource type="PackedScene" uid="uid://b8aet6m4m2i83" path="res://scenes/tuto_trigger/TutoTrigger.tscn" id="10_dkfm7"]
-[ext_resource type="Texture2D" uid="uid://nrhxjdpuje3f" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg" id="11_xy0m1"]
-[ext_resource type="Texture2D" uid="uid://dx2mk8qd6g8uh" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/mouse_right_outline.svg" id="12_t5o40"]
-[ext_resource type="Texture2D" uid="uid://cjh5cnvdbq5ku" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg" id="13_t5o40"]
-[ext_resource type="Texture2D" uid="uid://bsxtadecl3657" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_shift_outline.svg" id="14_prjj8"]
-[ext_resource type="Texture2D" uid="uid://dyjvbsvbriii4" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg" id="15_05lnh"]
-[ext_resource type="Texture2D" uid="uid://bhlrmh5v3fa2n" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/mouse_left_outline.svg" id="16_t5o40"]
-[ext_resource type="Texture2D" uid="uid://db6uqhcmcfs5t" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_lb_outline.svg" id="17_prjj8"]
-[ext_resource type="Texture2D" uid="uid://ybwqghk70io" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_f_outline.svg" id="18_1opdv"]
+[ext_resource type="PackedScene" uid="uid://55wehh6xombr" path="res://maps/_templates/main_scene_template.tscn" id="1_8yh7j"]
+[ext_resource type="PackedScene" uid="uid://y77cdg7gg3y7" path="res://maps/levels/_arenas/playtest_1.tscn" id="2_eiocl"]
+[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/materials/greybox/m_greybox.tres" id="3_4m8g1"]
+[ext_resource type="PackedScene" uid="uid://qup00a7x2sji" path="res://scenes/fixed_dash_target/fixed_dashthrough_target.tscn" id="4_4u5eu"]
+[ext_resource type="PackedScene" uid="uid://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy/flying_enemy.tscn" id="5_dl1un"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://scenes/components/movement/RMovement.cs" id="6_465vr"]
+[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/grounded_enemy/grounded_enemy.tscn" id="7_egib5"]
+[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="8_a01g8"]
+[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://scenes/components/damage/RDamage.cs" id="9_doqxp"]
+[ext_resource type="PackedScene" uid="uid://b8aet6m4m2i83" path="res://scenes/tuto_trigger/TutoTrigger.tscn" id="10_vqwwk"]
+[ext_resource type="Texture2D" uid="uid://nrhxjdpuje3f" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg" id="11_bdsxx"]
+[ext_resource type="Texture2D" uid="uid://dx2mk8qd6g8uh" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/mouse_right_outline.svg" id="12_2usyc"]
+[ext_resource type="Texture2D" uid="uid://cjh5cnvdbq5ku" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg" id="13_ocbap"]
+[ext_resource type="Texture2D" uid="uid://bsxtadecl3657" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_shift_outline.svg" id="14_4hfom"]
+[ext_resource type="Texture2D" uid="uid://dyjvbsvbriii4" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg" id="15_1s3jl"]
+[ext_resource type="Texture2D" uid="uid://bhlrmh5v3fa2n" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/mouse_left_outline.svg" id="16_ca01l"]
+[ext_resource type="Texture2D" uid="uid://b580m114ivbse" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_menu_outline.svg" id="17_5461m"]
+[ext_resource type="Texture2D" uid="uid://goerc3svgoqd" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_escape_outline.svg" id="18_22eiu"]
+[ext_resource type="Texture2D" uid="uid://db6uqhcmcfs5t" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_lb_outline.svg" id="19_ci5dp"]
+[ext_resource type="Texture2D" uid="uid://ybwqghk70io" path="res://assets/ui/input-prompts/Keyboard & Mouse/Vector/keyboard_f_outline.svg" id="20_4ouww"]

 [sub_resource type="Resource" id="Resource_nwk5u"]
-script = ExtResource("6_cgfmf")
+script = ExtResource("6_465vr")
 GravityModifier = 5.0
 metadata/_custom_type_script = "uid://dtpxijlnb2c5"

 [sub_resource type="Resource" id="Resource_xy0m1"]
-script = ExtResource("7_hr4qv")
+script = ExtResource("8_a01g8")
 StartingHealth = 100.0
 metadata/_custom_type_script = "uid://baiapod3csndf"

 [sub_resource type="Resource" id="Resource_invhv"]
-script = ExtResource("7_hr4qv")
+script = ExtResource("8_a01g8")
 StartingHealth = 1.0
 metadata/_custom_type_script = "uid://baiapod3csndf"

 [sub_resource type="Resource" id="Resource_cgfmf"]
-script = ExtResource("9_ofbe2")
+script = ExtResource("9_doqxp")
 DamageType = 2
 metadata/_custom_type_script = "uid://jitubgv6judn"

 [sub_resource type="Resource" id="Resource_05lnh"]
-script = ExtResource("7_hr4qv")
+script = ExtResource("8_a01g8")
 StartingHealth = 100.0
 metadata/_custom_type_script = "uid://baiapod3csndf"

 [sub_resource type="Resource" id="Resource_t5o40"]
-script = ExtResource("7_hr4qv")
+script = ExtResource("8_a01g8")
 StartingHealth = 100.0
 metadata/_custom_type_script = "uid://baiapod3csndf"

@@ -64,263 +66,266 @@ size = Vector3(5.5, 4.5, 2)
 [sub_resource type="BoxShape3D" id="BoxShape3D_prjj8"]
 size = Vector3(2, 3.25, 5.25)

+[sub_resource type="BoxShape3D" id="BoxShape3D_trte5"]
+size = Vector3(6.75, 8.25, 7.25)
+
 [sub_resource type="BoxShape3D" id="BoxShape3D_1opdv"]
 size = Vector3(8.25, 3.25, 2.75)

-[node name="Main" unique_id=955321579 instance=ExtResource("1_8n6bu")]
+[node name="Main" unique_id=955321579 instance=ExtResource("1_8yh7j")]

 [node name="Playground" type="Node3D" parent="." index="7" unique_id=2099606598]
 transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -8.25, 13, 58.5)

-[node name="PlaytestArena" parent="Playground" index="0" unique_id=664535670 instance=ExtResource("2_wsc2c")]
+[node name="PlaytestArena" parent="Playground" index="0" unique_id=664535670 instance=ExtResource("2_eiocl")]

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

 [node name="Targets" type="Node3D" parent="Playground" index="1" unique_id=1727473773]

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

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

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

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

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

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

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

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

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

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

 [node name="FlyingEnemies" type="Node3D" parent="Playground" index="2" unique_id=1518759273]

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

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

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

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

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

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

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

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

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

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

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

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

 [node name="GroundedEnemies" type="Node3D" parent="Playground" index="3" unique_id=1101330520]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-[node name="Enemy6" parent="Playground/GroundedEnemies" index="24" unique_id=1147823180 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy6" parent="Playground/GroundedEnemies" index="24" unique_id=1147823180 node_paths=PackedStringArray("Target") instance=ExtResource("7_egib5")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 16.5, 7, -17.33681)
 Target = NodePath("../../../Player")
 RHealth = SubResource("Resource_xy0m1")
@@ -331,27 +336,27 @@ use_collision = true
 collision_layer = 256
 collision_mask = 65553

-[node name="FixedDashthroughTarget11" parent="Tutorial" index="0" unique_id=2053952229 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget11" parent="Tutorial" index="0" unique_id=2053952229 instance=ExtResource("4_4u5eu")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -7.25, 20.5, -27.5)

-[node name="FixedDashthroughTarget13" parent="Tutorial" index="1" unique_id=1470128508 instance=ExtResource("4_invhv")]
+[node name="FixedDashthroughTarget13" parent="Tutorial" index="1" unique_id=1470128508 instance=ExtResource("4_4u5eu")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 1.3647223, 23.75, -13.75)

-[node name="Enemy28" parent="Tutorial" index="2" unique_id=1765389924 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy28" parent="Tutorial" index="2" unique_id=1765389924 node_paths=PackedStringArray("Target") instance=ExtResource("7_egib5")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -5, 22, 16.5)
 Target = NodePath("../../Player")
 RHealth = SubResource("Resource_invhv")
 RDamage = SubResource("Resource_cgfmf")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy29" parent="Tutorial" index="3" unique_id=1071267369 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy29" parent="Tutorial" index="3" unique_id=1071267369 node_paths=PackedStringArray("Target") instance=ExtResource("7_egib5")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, -10, 22, 28.75)
 Target = NodePath("../../Player")
 RHealth = SubResource("Resource_05lnh")
 RDamage = SubResource("Resource_cgfmf")
 RMovement = SubResource("Resource_nwk5u")

-[node name="Enemy30" parent="Tutorial" index="4" unique_id=1982933011 node_paths=PackedStringArray("Target") instance=ExtResource("5_ofbe2")]
+[node name="Enemy30" parent="Tutorial" index="4" unique_id=1982933011 node_paths=PackedStringArray("Target") instance=ExtResource("7_egib5")]
 transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 0.25, 22, 28.75)
 Target = NodePath("../../Player")
 RHealth = SubResource("Resource_t5o40")
@@ -360,12 +365,12 @@ RMovement = SubResource("Resource_nwk5u")

 [node name="Triggers" type="Node3D" parent="Tutorial" index="5" unique_id=1531131828]

-[node name="TutoTrigger5" parent="Tutorial/Triggers" index="0" unique_id=840713937 instance=ExtResource("10_dkfm7")]
+[node name="TutoTrigger5" parent="Tutorial/Triggers" index="0" unique_id=840713937 instance=ExtResource("10_vqwwk")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 23.25, -24.25)
-first_input_icon = ExtResource("11_xy0m1")
-first_input_icon_keyboard = ExtResource("12_t5o40")
-second_input_icon = ExtResource("13_t5o40")
-second_input_icon_keyboard = ExtResource("14_prjj8")
+first_input_icon = ExtResource("11_bdsxx")
+first_input_icon_keyboard = ExtResource("12_2usyc")
+second_input_icon = ExtResource("13_ocbap")
+second_input_icon_keyboard = ExtResource("14_4hfom")
 input_related_text = "while aiming at target"
 tuto_text = "Blink through"

@@ -373,22 +378,22 @@ tuto_text = "Blink through"
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.75, 0.625, 1.75)
 shape = SubResource("BoxShape3D_xy0m1")

-[node name="TutoTrigger" parent="Tutorial/Triggers" index="1" unique_id=1215265305 instance=ExtResource("10_dkfm7")]
+[node name="TutoTrigger" parent="Tutorial/Triggers" index="1" unique_id=1215265305 instance=ExtResource("10_vqwwk")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 0, -4.5)
-first_input_icon = ExtResource("11_xy0m1")
-first_input_icon_keyboard = ExtResource("12_t5o40")
-second_input_icon = ExtResource("13_t5o40")
-second_input_icon_keyboard = ExtResource("14_prjj8")
+first_input_icon = ExtResource("11_bdsxx")
+first_input_icon_keyboard = ExtResource("12_2usyc")
+second_input_icon = ExtResource("13_ocbap")
+second_input_icon_keyboard = ExtResource("14_4hfom")
 tuto_text = "Blink"

 [node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger" index="1" unique_id=1774867326]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, -3.75, -6.75)
 shape = SubResource("BoxShape3D_05lnh")

-[node name="TutoTrigger3" parent="Tutorial/Triggers" index="2" unique_id=460767120 instance=ExtResource("10_dkfm7")]
+[node name="TutoTrigger3" parent="Tutorial/Triggers" index="2" unique_id=460767120 instance=ExtResource("10_vqwwk")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.75, 7, -49)
-first_input_icon = ExtResource("11_xy0m1")
-first_input_icon_keyboard = ExtResource("12_t5o40")
+first_input_icon = ExtResource("11_bdsxx")
+first_input_icon_keyboard = ExtResource("12_2usyc")
 input_related_text = "in air"
 tuto_text = "slows down time"

@@ -396,10 +401,10 @@ tuto_text = "slows down time"
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.625, 0.875)
 shape = SubResource("BoxShape3D_dkfm7")

-[node name="TutoTrigger4" parent="Tutorial/Triggers" index="3" unique_id=321542244 instance=ExtResource("10_dkfm7")]
+[node name="TutoTrigger4" parent="Tutorial/Triggers" index="3" unique_id=321542244 instance=ExtResource("10_vqwwk")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.5, 17.75, -27.5)
-first_input_icon = ExtResource("15_05lnh")
-first_input_icon_keyboard = ExtResource("16_t5o40")
+first_input_icon = ExtResource("15_1s3jl")
+first_input_icon_keyboard = ExtResource("16_ca01l")
 input_related_text = "at target"
 tuto_text = "dash through"

@@ -407,10 +412,10 @@ tuto_text = "dash through"
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, 1.75, 0)
 shape = SubResource("BoxShape3D_nwk5u")

-[node name="TutoTrigger6" parent="Tutorial/Triggers" index="4" unique_id=26112457 instance=ExtResource("10_dkfm7")]
+[node name="TutoTrigger6" parent="Tutorial/Triggers" index="4" unique_id=26112457 instance=ExtResource("10_vqwwk")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.75, 22.75, 11.25)
-first_input_icon = ExtResource("15_05lnh")
-first_input_icon_keyboard = ExtResource("16_t5o40")
+first_input_icon = ExtResource("15_1s3jl")
+first_input_icon_keyboard = ExtResource("16_ca01l")
 input_related_text = "at enemy"
 tuto_text = "dash through"

@@ -418,22 +423,32 @@ tuto_text = "dash through"
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.625, 1.75, -0.75)
 shape = SubResource("BoxShape3D_prjj8")

-[node name="TutoTrigger7" parent="Tutorial/Triggers" index="5" unique_id=271532103 instance=ExtResource("10_dkfm7")]
+[node name="TutoTrigger7" parent="Tutorial/Triggers" index="5" unique_id=271532103 instance=ExtResource("10_vqwwk")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 22.75, 30.25)
-first_input_icon = ExtResource("11_xy0m1")
-first_input_icon_keyboard = ExtResource("12_t5o40")
-second_input_icon = ExtResource("15_05lnh")
-second_input_icon_keyboard = ExtResource("16_t5o40")
+first_input_icon = ExtResource("11_bdsxx")
+first_input_icon_keyboard = ExtResource("12_2usyc")
+second_input_icon = ExtResource("15_1s3jl")
+second_input_icon_keyboard = ExtResource("16_ca01l")
 tuto_text = "throw weapon"

 [node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger7" index="1" unique_id=1932556219]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.875, 4)
 shape = SubResource("BoxShape3D_prjj8")

-[node name="TutoTrigger8" parent="Tutorial/Triggers" index="6" unique_id=36196488 instance=ExtResource("10_dkfm7")]
+[node name="TutoTrigger10" parent="Tutorial/Triggers" index="6" unique_id=71362747 instance=ExtResource("10_vqwwk")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.779568, 25, 66.52002)
+first_input_icon = ExtResource("17_5461m")
+first_input_icon_keyboard = ExtResource("18_22eiu")
+tuto_text = "Select next level when ready"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Tutorial/Triggers/TutoTrigger10" index="1" unique_id=1583388762]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.875, 1.125, -4.625)
+shape = SubResource("BoxShape3D_trte5")
+
+[node name="TutoTrigger8" parent="Tutorial/Triggers" index="7" unique_id=36196488 instance=ExtResource("10_vqwwk")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 21.75, 28.25)
-first_input_icon = ExtResource("17_prjj8")
-first_input_icon_keyboard = ExtResource("18_1opdv")
+first_input_icon = ExtResource("19_ci5dp")
+first_input_icon_keyboard = ExtResource("20_4ouww")
 input_related_text = "at enemy"
 tuto_text = "knockback"

@@ -448,310 +463,317 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9, 0, -36.5)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -4.75, 4)
 use_collision = true
 size = Vector3(9, 8.5, 6)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D112" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="1" unique_id=565292599]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -6.25, 0)
 use_collision = true
 size = Vector3(9, 5.5, 2)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D113" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="2" unique_id=28433553]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -7.75, -2)
 use_collision = true
 size = Vector3(9, 2.5, 2)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D110" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="3" unique_id=731833071]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 6, -12.125)
 use_collision = true
 size = Vector3(5, 1, 4.75)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D115" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="4" unique_id=173458015]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 5.625, -14)
 use_collision = true
 size = Vector3(9, 29.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D116" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="5" unique_id=1750512788]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 7, -12.125)
 use_collision = true
 size = Vector3(1, 1, 4.75)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D117" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="6" unique_id=391729778]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.5, 7, -12.125)
 use_collision = true
 size = Vector3(1, 1, 4.75)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D134" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="7" unique_id=1136091363]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 21.5, 46.125)
 use_collision = true
 size = Vector3(5, 1, 4.75)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D135" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="8" unique_id=748140231]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 22.5, 46.125)
 use_collision = true
 size = Vector3(1, 1, 4.75)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D136" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="9" unique_id=436209430]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 22.5, 46.125)
 use_collision = true
 size = Vector3(1, 1, 4.75)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D137" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="10" unique_id=1930091014]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 22.5, 58)
 use_collision = true
 size = Vector3(1, 1, 11)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D138" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="11" unique_id=1299444131]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 22.5, 58)
 use_collision = true
 size = Vector3(1, 1, 11)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D139" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="12" unique_id=1708119368]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 22.5, 68.625)
 use_collision = true
 size = Vector3(1, 1, 3.25)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D140" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="13" unique_id=762102441]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 22.5, 68.625)
 use_collision = true
 size = Vector3(1, 1, 3.25)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D120" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="14" unique_id=1446497915]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 17, 6.75)
 use_collision = true
 size = Vector3(1, 2, 6.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D127" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="15" unique_id=1731176595]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7, 17, 10.5)
 use_collision = true
 size = Vector3(4, 2, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="16" unique_id=1284139577]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 0.625, 10)
 use_collision = true
 size = Vector3(3, 2.25, 6)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="17" unique_id=1204742131]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 16.5, 4.75)
 use_collision = true
 size = Vector3(12, 1, 2.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D118" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="18" unique_id=1985192046]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 23.125, 6.5)
 use_collision = true
 size = Vector3(18, 12.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D130" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="19" unique_id=1502907002]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.25, 23.125, 44)
 use_collision = true
 size = Vector3(7.5, 12.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D131" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="20" unique_id=632272709]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.25, 23.125, 43)
 use_collision = true
 size = Vector3(7.5, 12.25, 3)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D123" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="21" unique_id=696789507]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 23.125, 10.5)
 use_collision = true
 size = Vector3(7.25, 12.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D125" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="22" unique_id=1937274848]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 23.125, 7.5)
 use_collision = true
 size = Vector3(7.25, 12.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D132" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="23" unique_id=249644458]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 29.625, 25.25)
 use_collision = true
 size = Vector3(18, 0.75, 38.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D126" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="24" unique_id=1606556480]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.125, 18.25, 9)
 use_collision = true
 size = Vector3(7.75, 2.5, 4)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D128" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="25" unique_id=1927103381]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.375, 25.375, 9)
 use_collision = true
 size = Vector3(7.25, 7.75, 2)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D124" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="26" unique_id=1068505352]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.5, 19.487345, 11.25)
 use_collision = true
 size = Vector3(3, 5, 8.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D129" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="27" unique_id=302301078]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.25, 19.487345, 38.625)
 use_collision = true
 size = Vector3(9.5, 5, 11.75)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D133" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="28" unique_id=672467040]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 21.487345, 58)
 use_collision = true
 size = Vector3(5, 1, 11)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D141" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="29" unique_id=1207463075]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 21.487345, 70.5)
 use_collision = true
 size = Vector3(5, 1, 7)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D121" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="30" unique_id=302433684]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.875, 23.125, 26.25)
 use_collision = true
 size = Vector3(13.75, 12.25, 30.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D122" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="31" unique_id=1125662345]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.5, 23.125, 25.25)
 use_collision = true
 size = Vector3(1, 12.25, 36.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D111" type="CSGBox3D" parent="Tutorial/DashWithMantle" index="32" unique_id=923535141]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -11.125, -3.75)
 use_collision = true
 size = Vector3(9, 4.25, 21.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D142" type="CSGBox3D" parent="Tutorial" index="7" unique_id=886061699]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 22, 34)
 use_collision = true
 size = Vector3(2, 2, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D145" type="CSGBox3D" parent="Tutorial" index="8" unique_id=1440927327]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 12.25, 34)
 use_collision = true
 size = Vector3(12, 17.5, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D139" type="CSGBox3D" parent="Tutorial" index="9" unique_id=1561729125]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 21.5, 28.75)
 use_collision = true
 size = Vector3(12, 1, 3.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D146" type="CSGBox3D" parent="Tutorial" index="10" unique_id=1614862969]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.75, 23, 55.75)
 use_collision = true
 size = Vector3(19.5, 1, 3.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D147" type="CSGBox3D" parent="Tutorial" index="11" unique_id=1320459108]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.875, 23, 67.25)
 use_collision = true
 size = Vector3(3.25, 1, 19.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D140" type="CSGBox3D" parent="Tutorial" index="12" unique_id=124463390]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.5, 25.125, 34)
 use_collision = true
 size = Vector3(5, 8.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D141" type="CSGBox3D" parent="Tutorial" index="13" unique_id=164888540]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 25.125, 34)
 use_collision = true
 size = Vector3(5, 8.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D114" type="CSGBox3D" parent="Tutorial" index="14" unique_id=1217279859]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -4.75, 0)
 use_collision = true
 size = Vector3(9, 8.5, 14)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D116" type="CSGBox3D" parent="Tutorial" index="15" unique_id=720911926]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 9.375, -11.75)
 use_collision = true
 size = Vector3(18, 15.25, 37.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D115" type="CSGBox3D" parent="Tutorial" index="16" unique_id=995233474]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, -1, -26.5)
 use_collision = true
 size = Vector3(18, 1, 6)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D119" type="CSGBox3D" parent="Tutorial" index="17" unique_id=1412582714]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.875, -3.75, -30)
 use_collision = true
 size = Vector3(11.75, 11, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D121" type="CSGBox3D" parent="Tutorial" index="18" unique_id=697302898]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.5, 0.125, -30)
 use_collision = true
 size = Vector3(3, 3.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D117" type="CSGBox3D" parent="Tutorial" index="19" unique_id=603171965]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -6.25, -8)
 use_collision = true
 size = Vector3(9, 5.5, 2)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D123" type="CSGBox3D" parent="Tutorial" index="20" unique_id=765166179]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 0.625, 6)
 use_collision = true
 size = Vector3(9, 2.25, 2)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D118" type="CSGBox3D" parent="Tutorial" index="21" unique_id=1950738925]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -7.75, -10)
 use_collision = true
 size = Vector3(9, 2.5, 2)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D120" type="CSGBox3D" parent="Tutorial" index="22" unique_id=1024529143]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, -21.75, -11.75)
 use_collision = true
 size = Vector3(9, 25.5, 37.5)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D122" type="CSGBox3D" parent="Tutorial" index="23" unique_id=1261455320]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -15.5, 16.5, -28.5)
 use_collision = true
 size = Vector3(3, 1, 4)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

 [node name="CSGBox3D143" type="CSGBox3D" parent="Tutorial" index="24" unique_id=1090375546]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5, 27.625, 34)
 use_collision = true
 size = Vector3(2, 3.25, 1)
-material = ExtResource("3_wsc2c")
+material = ExtResource("3_4m8g1")

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

 [node name="PlayerFellRespawn" parent="." index="10" unique_id=479136076]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.5, 1.5, 0)
+
+[node name="OmniLight3D" type="OmniLight3D" parent="." index="13" unique_id=702421172]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 25, 4)
+
+[node name="OmniLight3D2" type="OmniLight3D" parent="." index="14" unique_id=2016820716]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.5, 25, -9.5)
+omni_range = 12.0
--- a/maps/levels/tuto_enemies.tscn
+++ b/maps/levels/tuto_enemies.tscn
@@ -13,6 +13,10 @@
 [ext_resource type="Resource" uid="uid://dg1xbjhyhgnnk" path="res://scenes/enemies/flying_enemy/flying_enemy_health.tres" id="11_5jlg7"]
 [ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy/flying_enemy_damage.tres" id="12_pjgox"]
 [ext_resource type="PackedScene" uid="uid://qup00a7x2sji" path="res://scenes/fixed_dash_target/fixed_dashthrough_target.tscn" id="13_iq67o"]
+[ext_resource type="PackedScene" uid="uid://b8aet6m4m2i83" path="res://scenes/tuto_trigger/TutoTrigger.tscn" id="14_lthgu"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_lthgu"]
+size = Vector3(7.5, 3.75, 10.25)

 [node name="Main" unique_id=955321579 instance=ExtResource("1_k7f42")]

@@ -101,5 +105,12 @@ transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 27, 13.5, -9)
 [node name="FixedDashthroughTarget3" parent="Targets" index="9" unique_id=1106453232 instance=ExtResource("13_iq67o")]
 transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 43, 6, -8.5)

-[node name="Player" parent="." index="14" unique_id=1309399929]
+[node name="TutoTrigger5" parent="." index="14" unique_id=840713937 instance=ExtResource("14_lthgu")]
+tuto_text = "Try to survive!"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTrigger5" index="1" unique_id=1820790391]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, 0.625, -1.875)
+shape = SubResource("BoxShape3D_lthgu")
+
+[node name="Player" parent="." index="15" unique_id=1309399929]
 transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 3, 0, 0)
--- a/menus/scenes/menus/level_select_menu/level_select_menu.gd
+++ b/menus/scenes/menus/level_select_menu/level_select_menu.gd
@@ -17,18 +17,14 @@ func _ready() -> void:
 ## A fresh level list is propgated into the ItemList, and the file names are cleaned
 func add_levels_to_container() -> void:
 	level_buttons_container.clear()
-	var max_level_reached := GameState.get_max_level_reached()
-	var level_iter := 0
 	for file_path in scene_lister.files:
-		# if level_iter > max_level_reached : break
-		level_iter += 1
 		var file_name := file_path.get_file()  # e.g., "level_1.tscn"
 		file_name = file_name.trim_suffix(".tscn")  # Remove the ".tscn" extension
 		file_name = file_name.replace("_", " ")  # Replace underscores with spaces
 		file_name = file_name.capitalize()  # Convert to proper case
-		if file_path.contains("/gyms/"): file_name = "[GYM] " + file_name
-		if file_path.contains("/museums/"): file_name = "[MUS] " + file_name
-		if file_path.contains("/zoos/"): file_name = "[ZOO] " + file_name
+		if file_path.contains("/gyms/"): continue # file_name = "[GYM] " + file_name
+		if file_path.contains("/museums/"): continue # file_name = "[MUS] " + file_name
+		if file_path.contains("/zoos/"): continue # file_name = "[ZOO] " + file_name
 		var button_name := str(file_name)
 		level_buttons_container.add_item(button_name)

--- a/menus/scenes/menus/level_select_menu/level_select_menu.tscn
+++ b/menus/scenes/menus/level_select_menu/level_select_menu.tscn
@@ -43,7 +43,7 @@ item_0/text = "1 - ExampleLevel"

 [node name="SceneLister" type="Node" parent="." unique_id=149935027]
 script = ExtResource("3_stdqw")
-files = Array[String](["res://maps/gyms/metrics.tscn", "res://maps/levels/tuto_enemies.tscn", "res://maps/levels/tuto_movement.tscn", "res://maps/levels/tuto_sword_parry.tscn", "res://maps/zoos/grounded_flying_ennemies.tscn"])
+files = Array[String](["res://maps/levels/1 - tuto_movement.tscn", "res://maps/levels/2 - tuto_sword.tscn", "res://maps/levels/3 - tuto_enemies.tscn", "res://maps/zoos/grounded_flying_ennemies.tscn", "res://maps/gyms/metrics.tscn"])
 directory = "res://maps"

 [connection signal="item_activated" from="Control/LevelButtonsContainer" to="." method="_on_level_buttons_container_item_activated"]
--- a/menus/scenes/overlaid_menus/pause_menu.gd
+++ b/menus/scenes/overlaid_menus/pause_menu.gd
@@ -1 +1,11 @@
 extends PauseMenu
+
+@export var level_selection_menu: PackedScene = preload("uid://fybssggvts5q")
+
+func _on_select_level_pressed() -> void:
+	var menu: LevelSelectMenu = level_selection_menu.instantiate()
+	menu.level_selected.connect(_on_level_selected)
+	add_child(menu)
+	
+func _on_level_selected() -> void:
+	close()
--- a/menus/scenes/overlaid_menus/pause_menu.tscn
+++ b/menus/scenes/overlaid_menus/pause_menu.tscn
@@ -3,12 +3,20 @@
 [ext_resource type="PackedScene" uid="uid://b5cd6sa8qq4vc" path="res://addons/maaacks_game_template/base/scenes/overlaid_menu/menus/pause_menu.tscn" id="1_0paax"]
 [ext_resource type="Script" uid="uid://bwvomv4eww4fg" path="res://menus/scenes/overlaid_menus/pause_menu.gd" id="2_ek1hy"]
 [ext_resource type="PackedScene" uid="uid://dim045la3mijk" path="res://menus/scenes/overlaid_menus/mini_options_overlaid_menu.tscn" id="3_e0t2r"]
+[ext_resource type="PackedScene" uid="uid://fybssggvts5q" path="res://menus/scenes/menus/level_select_menu/level_select_menu.tscn" id="3_nfx08"]

 [node name="PauseMenu" unique_id=750750590 instance=ExtResource("1_0paax")]
 top_level = true
 script = ExtResource("2_ek1hy")
+level_selection_menu = ExtResource("3_nfx08")
 options_packed_scene = ExtResource("3_e0t2r")
 main_menu_scene = "res://menus/scenes/menus/main_menu/main_menu_with_animations.tscn"

+[node name="SelectLevel" type="Button" parent="MenuPanelContainer/MarginContainer/BoxContainer/MenuButtonsMargin/MenuButtons" parent_id_path=PackedInt32Array(738685969) index="2" unique_id=1879165831]
+layout_mode = 2
+text = "Select level
+"
+
 [connection signal="tree_entered" from="." to="." method="on_enter_tree"]
 [connection signal="tree_exited" from="." to="." method="on_exit_tree"]
+[connection signal="pressed" from="MenuPanelContainer/MarginContainer/BoxContainer/MenuButtonsMargin/MenuButtons/SelectLevel" to="." method="_on_select_level_pressed"]
--- a/obj/movement-tests.csproj.nuget.dgspec.json
+++ b/obj/movement-tests.csproj.nuget.dgspec.json
@@ -1,79 +0,0 @@
-{
-  "format": 1,
-  "restore": {
-    "D:\\Godot\\Projects\\movement-tests\\movement-tests.csproj": {}
-  },
-  "projects": {
-    "D:\\Godot\\Projects\\movement-tests\\movement-tests.csproj": {
-      "version": "1.0.0",
-      "restore": {
-        "projectUniqueName": "D:\\Godot\\Projects\\movement-tests\\movement-tests.csproj",
-        "projectName": "movement-tests",
-        "projectPath": "D:\\Godot\\Projects\\movement-tests\\movement-tests.csproj",
-        "packagesPath": "C:\\Users\\Minimata\\.nuget\\packages\\",
-        "outputPath": "D:\\Godot\\Projects\\movement-tests\\obj\\",
-        "projectStyle": "PackageReference",
-        "fallbackFolders": [
-          "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
-        ],
-        "configFilePaths": [
-          "C:\\Users\\Minimata\\AppData\\Roaming\\NuGet\\NuGet.Config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
-          "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
-        ],
-        "originalTargetFrameworks": [
-          "net8.0"
-        ],
-        "sources": {
-          "C:\\Program Files (x86)\\Microsoft SDKs\\NuGetPackages\\": {},
-          "https://api.nuget.org/v3/index.json": {}
-        },
-        "frameworks": {
-          "net8.0": {
-            "targetAlias": "net8.0",
-            "projectReferences": {}
-          }
-        },
-        "warningProperties": {
-          "warnAsError": [
-            "NU1605"
-          ]
-        },
-        "restoreAuditProperties": {
-          "enableAudit": "true",
-          "auditLevel": "low",
-          "auditMode": "direct"
-        },
-        "SdkAnalysisLevel": "9.0.300"
-      },
-      "frameworks": {
-        "net8.0": {
-          "targetAlias": "net8.0",
-          "dependencies": {
-            "xunit.v3.mtp-v2": {
-              "target": "Package",
-              "version": "[3.2.2, )"
-            }
-          },
-          "imports": [
-            "net461",
-            "net462",
-            "net47",
-            "net471",
-            "net472",
-            "net48",
-            "net481"
-          ],
-          "assetTargetFallback": true,
-          "warn": true,
-          "frameworkReferences": {
-            "Microsoft.NETCore.App": {
-              "privateAssets": "all"
-            }
-          },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.301/PortableRuntimeIdentifierGraph.json"
-        }
-      }
-    }
-  }
-}
--- a/obj/movement-tests.csproj.nuget.g.props
+++ b/obj/movement-tests.csproj.nuget.g.props
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
-    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Minimata\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
-    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
-  </PropertyGroup>
-  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\Minimata\.nuget\packages\" />
-    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
-  </ItemGroup>
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.testing.platform\2.0.2\buildTransitive\net8.0\Microsoft.Testing.Platform.props" Condition="Exists('$(NuGetPackageRoot)microsoft.testing.platform\2.0.2\buildTransitive\net8.0\Microsoft.Testing.Platform.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.testing.platform.msbuild\2.0.2\buildTransitive\Microsoft.Testing.Platform.MSBuild.props" Condition="Exists('$(NuGetPackageRoot)microsoft.testing.platform.msbuild\2.0.2\buildTransitive\Microsoft.Testing.Platform.MSBuild.props')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.testing.extensions.telemetry\2.0.2\buildTransitive\net8.0\Microsoft.Testing.Extensions.Telemetry.props" Condition="Exists('$(NuGetPackageRoot)microsoft.testing.extensions.telemetry\2.0.2\buildTransitive\net8.0\Microsoft.Testing.Extensions.Telemetry.props')" />
-    <Import Project="$(NuGetPackageRoot)xunit.v3.core.mtp-v2\3.2.2\buildTransitive\xunit.v3.core.mtp-v2.props" Condition="Exists('$(NuGetPackageRoot)xunit.v3.core.mtp-v2\3.2.2\buildTransitive\xunit.v3.core.mtp-v2.props')" />
-  </ImportGroup>
-  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Pkgxunit_analyzers Condition=" '$(Pkgxunit_analyzers)' == '' ">C:\Users\Minimata\.nuget\packages\xunit.analyzers\1.27.0</Pkgxunit_analyzers>
-  </PropertyGroup>
-</Project>
--- a/obj/movement-tests.csproj.nuget.g.targets
+++ b/obj/movement-tests.csproj.nuget.g.targets
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <Import Project="$(NuGetPackageRoot)microsoft.testing.platform\2.0.2\buildTransitive\net8.0\Microsoft.Testing.Platform.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.testing.platform\2.0.2\buildTransitive\net8.0\Microsoft.Testing.Platform.targets')" />
-    <Import Project="$(NuGetPackageRoot)microsoft.testing.platform.msbuild\2.0.2\buildTransitive\Microsoft.Testing.Platform.MSBuild.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.testing.platform.msbuild\2.0.2\buildTransitive\Microsoft.Testing.Platform.MSBuild.targets')" />
-    <Import Project="$(NuGetPackageRoot)xunit.v3.core.mtp-v2\3.2.2\buildTransitive\xunit.v3.core.mtp-v2.targets" Condition="Exists('$(NuGetPackageRoot)xunit.v3.core.mtp-v2\3.2.2\buildTransitive\xunit.v3.core.mtp-v2.targets')" />
-  </ImportGroup>
-</Project>
--- a/obj/project.assets.json
+++ b/obj/project.assets.json
--- a/obj/project.nuget.cache
+++ b/obj/project.nuget.cache
@@ -1,28 +0,0 @@
-{
-  "version": 2,
-  "dgSpecHash": "C+vE0OBbgVo=",
-  "success": true,
-  "projectFilePath": "D:\\Godot\\Projects\\movement-tests\\movement-tests.csproj",
-  "expectedPackageFiles": [
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.applicationinsights\\2.23.0\\microsoft.applicationinsights.2.23.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\6.0.0\\microsoft.bcl.asyncinterfaces.6.0.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.testing.extensions.telemetry\\2.0.2\\microsoft.testing.extensions.telemetry.2.0.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.testing.extensions.trxreport.abstractions\\2.0.2\\microsoft.testing.extensions.trxreport.abstractions.2.0.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.testing.platform\\2.0.2\\microsoft.testing.platform.2.0.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.testing.platform.msbuild\\2.0.2\\microsoft.testing.platform.msbuild.2.0.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\microsoft.win32.registry\\5.0.0\\microsoft.win32.registry.5.0.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\system.diagnostics.diagnosticsource\\5.0.0\\system.diagnostics.diagnosticsource.5.0.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\system.security.accesscontrol\\5.0.0\\system.security.accesscontrol.5.0.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\system.security.principal.windows\\5.0.0\\system.security.principal.windows.5.0.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.analyzers\\1.27.0\\xunit.analyzers.1.27.0.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.v3.assert\\3.2.2\\xunit.v3.assert.3.2.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.v3.common\\3.2.2\\xunit.v3.common.3.2.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.v3.core.mtp-v2\\3.2.2\\xunit.v3.core.mtp-v2.3.2.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.v3.extensibility.core\\3.2.2\\xunit.v3.extensibility.core.3.2.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.v3.mtp-v2\\3.2.2\\xunit.v3.mtp-v2.3.2.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.v3.runner.common\\3.2.2\\xunit.v3.runner.common.3.2.2.nupkg.sha512",
-    "C:\\Users\\Minimata\\.nuget\\packages\\xunit.v3.runner.inproc.console\\3.2.2\\xunit.v3.runner.inproc.console.3.2.2.nupkg.sha512"
-  ],
-  "logs": []
-}
--- a/project.godot
+++ b/project.godot
@@ -30,6 +30,7 @@ Shaker="*uid://c7flmumgr5w3u"
 CsgToolkitAutoload="*uid://w8ad8q4lneis"
 "Forge Bootstrap"="*uid://ba8fquhtwu5mu"
 GlobalHelpers="*uid://dqcm83o8e66a2"
+ForgeManager="*uid://c75tpswl62eew"

 [display]

--- a/scenes/components/health/RHealth.cs
+++ b/scenes/components/health/RHealth.cs
@@ -3,14 +3,10 @@ using System;
 using Movementtests.interfaces;

 [GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_heart.png")]
-public partial class RHealth : Resource
+public partial class RHealth(float startingHealth) : Resource
 {
    [Export]
-    public float StartingHealth { get; set;}
+    public float StartingHealth { get; set;} = startingHealth;

    public RHealth() : this(100.0f) {}
-    public RHealth(float startingHealth)
-    {
-        StartingHealth = startingHealth;
-    }
 }
--- a/scenes/enemies/Enemy.cs
+++ b/scenes/enemies/Enemy.cs
@@ -1,7 +1,14 @@
 using System;
+using Gamesmiths.Forge.Core;
+using Gamesmiths.Forge.Effects;
+using Gamesmiths.Forge.Events;
+using Gamesmiths.Forge.Tags;
 using Godot;
 using Movementtests.interfaces;
+using Movementtests.scenes.enemies;
+using Movementtests.scenes.player_controller.scripts;
 using Movementtests.systems;
+using Movementtests.tools;

 [GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_beetle.png")]
 public partial class Enemy : CharacterBody3D, 
@@ -13,7 +20,8 @@ public partial class Enemy : CharacterBody3D,
 	ISpawnable,
 	IKnockbackable,
 	ITargetable,
-	IStunnable
+	IStunnable,
+	IForgeEntity
 {
 	// Signals and events
 	public event Action<IDamageable, DamageRecord> DamageTaken = null!;
@@ -55,6 +63,12 @@ public partial class Enemy : CharacterBody3D,
 		set => CHealth.CurrentHealth = value;
 	}
 	
+	public EntityAttributes Attributes { get; set; } = null!;
+	public EntityTags Tags { get; set; } = null!;
+	public EffectsManager EffectsManager { get; set; } = null!;
+	public EntityAbilities Abilities { get; set; } = null!;
+	public EventManager Events { get; set; } = null!;
+	
 	// Private stuff
 	private Area3D _damageBox = null!;
 	internal Node3D _target = null!;
@@ -71,6 +85,21 @@ public partial class Enemy : CharacterBody3D,
 		_damageBox = GetNode<Area3D>("DamageBox");
 		_target = GetNode<Node3D>("CTarget");
 		
+		// Forge stuff
+		var forgeManager = GetTree().Root.GetNode<ForgeManager>("ForgeManager")!;
+		var baseTags = new TagContainer(
+			forgeManager.TagsManager,
+			[
+				Tag.RequestTag(forgeManager.TagsManager, "character.player"),
+				Tag.RequestTag(forgeManager.TagsManager, "class.warrior")
+			]);
+
+		Attributes = new EntityAttributes(new EnemyAttributeSet());
+		Tags = new EntityTags(baseTags);
+		EffectsManager = new EffectsManager(this, forgeManager.CuesManager);
+		Abilities = new(this);
+		Events = new();
+		
 		CDamageable = (GetNode<Node>("CDamageable") as IDamageable)!;
 		CMovement = (GetNode<Node>("CMovement") as IMoveable)!;
 		CHealth = (GetNode<Node>("CHealth") as IHealthable)!;
--- a/scenes/enemies/EnemyAttributeSet.cs
+++ b/scenes/enemies/EnemyAttributeSet.cs
@@ -0,0 +1,16 @@
+using Gamesmiths.Forge.Attributes;
+namespace Movementtests.scenes.enemies;
+
+public class EnemyAttributeSet : AttributeSet
+{
+    public EntityAttribute Health { get; }
+    public EntityAttribute Strength { get; }
+    public EntityAttribute Speed { get; }
+
+    public EnemyAttributeSet()
+    {
+        Health = InitializeAttribute(nameof(Health), 100, 0, 150);
+        Strength = InitializeAttribute(nameof(Strength), 10, 0, 99);
+        Speed = InitializeAttribute(nameof(Speed), 5, 0, 10);
+    }
+}
--- a/scenes/enemies/EnemyAttributeSet.cs.uid
+++ b/scenes/enemies/EnemyAttributeSet.cs.uid
@@ -0,0 +1 @@
+uid://nqxdkkg3l7go
--- a/scenes/player_controller/PlayerController.tscn
+++ b/scenes/player_controller/PlayerController.tscn
@@ -5,6 +5,7 @@
 [ext_resource type="Script" uid="uid://jitubgv6judn" path="res://scenes/components/damage/RDamage.cs" id="2_x835q"]
 [ext_resource type="Script" uid="uid://b44cse62qru7j" path="res://scenes/components/knockback/RKnockback.cs" id="3_cb2lu"]
 [ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://inputs/base_mode/base_mode.tres" id="3_cresl"]
+[ext_resource type="Resource" uid="uid://dtmhtlix2amme" path="res://scenes/player_controller/resources/player_mana_regen.tres" id="3_n24vh"]
 [ext_resource type="PackedScene" uid="uid://c4ikbhojckpnc" path="res://scenes/components/health/CHealth.tscn" id="3_q7bng"]
 [ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="4_abfq8"]
 [ext_resource type="Resource" uid="uid://bjyd801wvverk" path="res://scenes/player_controller/resources/player_health.tres" id="4_m8gvy"]
@@ -17,6 +18,7 @@
 [ext_resource type="Resource" uid="uid://t612lts1wi1s" path="res://inputs/base_mode/move_right.tres" id="6_q7bng"]
 [ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://scenes/player_controller/scripts/StairsSystem.cs" id="7_bmt5a"]
 [ext_resource type="Resource" uid="uid://brswsknpgwal2" path="res://inputs/base_mode/move_front.tres" id="7_m8gvy"]
+[ext_resource type="Resource" uid="uid://7dpkk5rk3di5" path="res://scenes/player_controller/resources/forge_empowered_action.tres" id="7_qheee"]
 [ext_resource type="PackedScene" uid="uid://bctpe34ddamg5" path="res://scenes/components/knockback/CKnockback.tscn" id="7_x835q"]
 [ext_resource type="Resource" uid="uid://s1l0n1iitc6m" path="res://inputs/base_mode/move_back.tres" id="8_jb43f"]
 [ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://inputs/base_mode/aim_release.tres" id="8_lhb11"]
@@ -109,9 +111,14 @@ radius = 1.5
 [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2q0ik"]
 blend_mode = 1

+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_n24vh"]
+bg_color = Color(0.15869555, 0.64034444, 0.906125, 1)
+
 [node name="Player" type="CharacterBody3D" unique_id=709076448]
 collision_mask = 272
 script = ExtResource("1_poq2x")
+EmpoweredAction = ExtResource("7_qheee")
+ManaRegen = ExtResource("3_n24vh")
 AimAssistStrength = 0.3
 AimAssistReductionWhenCloseToTarget = 0.1
 AimAssistReductionStartDistance = 8.0
@@ -223,12 +230,10 @@ debug_color = Color(0, 0.6, 0.701961, 0.341176)

 [node name="HeadSystem" parent="." unique_id=1203743757 instance=ExtResource("11_rxwoh")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
+LookSensitivity = 0.16
 CameraInclineAcceleration = 20.0
 GroundedCameraIncline = 3.0
 SlidingJitterAmplitude = 0.2
-WeaponSway = 8.0
-WeaponLookRotation = 10.0
-WeaponAdjustmentSpeed = 1.0

 [node name="MantleSystem" parent="HeadSystem" unique_id=98905505 instance=ExtResource("8_qu4wy")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.6, 0)
@@ -551,6 +556,22 @@ offset_bottom = -71.99939
 grow_horizontal = 2
 grow_vertical = 0

+[node name="Manabar" parent="UI" unique_id=1713862004 instance=ExtResource("47_76kmc")]
+unique_name_in_owner = true
+layout_mode = 1
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+offset_left = -859.0
+offset_top = -84.0
+offset_right = -347.0
+offset_bottom = -72.0
+grow_horizontal = 2
+grow_vertical = 0
+BarStyle = SubResource("StyleBoxFlat_n24vh")
+
 [node name="StateChart" type="Node" parent="." unique_id=1675830632]
 script = ExtResource("25_wv70j")
 metadata/_custom_type_script = "uid://couw105c3bde4"
--- a/scenes/player_controller/PlayerUi.cs
+++ b/scenes/player_controller/PlayerUi.cs
@@ -5,9 +5,10 @@ using Movementtests.interfaces;
 [GlobalClass, Icon("res://assets/ui/IconGodotNode/control/icon_text_panel.png")]
 public partial class PlayerUi : Control
 {
-    internal TextureRect[] _dashIcons = new TextureRect[3];
-    private TextureRect _enemyTarget;
-    private Healthbar _healthbar;
+    internal TextureRect[] DashIcons = new TextureRect[3];
+    private TextureRect _enemyTarget = null!;
+    private Healthbar _healthbar = null!;
+    private Healthbar _manabar = null!;
    
    public enum TargetState
    {
@@ -25,12 +26,13 @@ public partial class PlayerUi : Control
    
    public override void _Ready()
    {
-        _dashIcons[0] = GetNode<TextureRect>("%Dash1");
-        _dashIcons[1] = GetNode<TextureRect>("%Dash2");
-        _dashIcons[2] = GetNode<TextureRect>("%Dash3");
+        DashIcons[0] = GetNode<TextureRect>("%Dash1");
+        DashIcons[1] = GetNode<TextureRect>("%Dash2");
+        DashIcons[2] = GetNode<TextureRect>("%Dash3");

        _enemyTarget = GetNode<TextureRect>("%EnemyTarget");
        _healthbar = GetNode<Healthbar>("%Healthbar");
+        _manabar = GetNode<Healthbar>("%Manabar");
    }

    public void Initialize(float initialHealth)
@@ -59,7 +61,7 @@ public partial class PlayerUi : Control
    public void SetNumberOfDashesLeft(int numberOfDashes)
    {
        int index = 1;
-        foreach (var dashIcon in _dashIcons)
+        foreach (var dashIcon in DashIcons)
        {
            dashIcon.SetVisible(index <= numberOfDashes);
            index++;
@@ -70,4 +72,9 @@ public partial class PlayerUi : Control
    {
        _healthbar.CurrentHealth = healthChanged.CurrentHealth;
    }
+
+    public void OnManaChanged(float newValue)
+    {
+        _manabar.CurrentHealth = newValue;
+    }
 }
--- a/scenes/player_controller/components/dash/DashSystem.cs
+++ b/scenes/player_controller/components/dash/DashSystem.cs
@@ -19,28 +19,26 @@ public partial class DashSystem: Node3D
    public Vector3 TargetLocation { get; set; }
    public Vector3 CollisionPoint { get; set; }
    public Vector3 CollisionNormal { get; set; }
-    public GodotObject CollidedObject { get; set; }
+    public GodotObject? CollidedObject { get; set; }
    public Vector3 PlannedLocation { get; set; }
    
    public bool ShouldMantle { get; set; }
    public Vector3 PlannedMantleLocation { get; set; }
-    public MantleSystem MantleSystem { get; set; }
+    public MantleSystem MantleSystem { get; set; } = null!;
        
-    internal HeadSystem _head;
-    public ShapeCast3D DashCast3D;
-    internal Camera3D _camera;
-    internal Vector3 _dashDirection = Vector3.Zero;
+    internal HeadSystem Head = null!;
+    public ShapeCast3D DashCast3D = null!;
+    internal Camera3D Camera = null!;
+    internal Vector3 DashDirection = Vector3.Zero;
    
-    internal ShapeCast3D _dashCastDrop;
-    internal MeshInstance3D _dashDropIndicator;
-    internal MeshInstance3D _dashDropLocationIndicator;
+    internal ShapeCast3D DashCastDrop = null!;
+    internal MeshInstance3D DashDropIndicator = null!;
+    internal MeshInstance3D DashDropLocationIndicator = null!;
+    internal MeshInstance3D DashTarget = null!;
+    internal CpuParticles3D DashIndicator = null!;
+    internal AnimationPlayer DashIndicatorAnim = null!;

-    internal MeshInstance3D _dashTarget;
-    internal CpuParticles3D _dashIndicator;
-    internal AnimationPlayer _dashIndicatorAnim;
-    
-    [Export]
-    public PackedScene DashIndicatorScene { get; set; }
+    [Export] public PackedScene DashIndicatorScene { get; set; } = null!;

    [Signal]
    public delegate void DashStartedEventHandler();
@@ -59,22 +57,22 @@ public partial class DashSystem: Node3D
        var dashShape = DashCast3D.GetShape() as SphereShape3D;
        DashCastRadius = dashShape!.Radius;
        
-        _dashCastDrop = GetNode<ShapeCast3D>("DashCastDrop");
-        _dashDropIndicator = GetNode<MeshInstance3D>("DashDropIndicator");
-        _dashDropIndicator.Visible = false;
-        _dashDropLocationIndicator = GetNode<MeshInstance3D>("DashDropLocationIndicator");
-        _dashDropLocationIndicator.Visible = false;
+        DashCastDrop = GetNode<ShapeCast3D>("DashCastDrop");
+        DashDropIndicator = GetNode<MeshInstance3D>("DashDropIndicator");
+        DashDropIndicator.Visible = false;
+        DashDropLocationIndicator = GetNode<MeshInstance3D>("DashDropLocationIndicator");
+        DashDropLocationIndicator.Visible = false;
        
-        _head = head;
-        _camera = camera;
+        Head = head;
+        Camera = camera;
        
        MantleSystem = GetNode<MantleSystem>("MantleSystem");
        MantleSystem.Init();
        
-        _dashTarget = GetNode<MeshInstance3D>("DashTarget");
-        _dashTarget.SetVisible(false);
-        _dashIndicator = GetNode<CpuParticles3D>("DashIndicator");
-        _dashIndicatorAnim = GetNode<AnimationPlayer>("DashIndicator/AnimationPlayer");
+        DashTarget = GetNode<MeshInstance3D>("DashTarget");
+        DashTarget.SetVisible(false);
+        DashIndicator = GetNode<CpuParticles3D>("DashIndicator");
+        DashIndicatorAnim = GetNode<AnimationPlayer>("DashIndicator/AnimationPlayer");
    }

    internal DashLocation ComputeDashLocation()
@@ -98,13 +96,13 @@ public partial class DashSystem: Node3D

    public void PrepareDash()
    {
-        DashCast3D.SetRotation(_head.GetGlobalLookRotation());
+        DashCast3D.SetRotation(Head.GetGlobalLookRotation());

        (HasHit, PlannedLocation, CollisionPoint, CollisionNormal, CollidedObject) = ComputeDashLocation();
        CanDashThroughTarget = false;
-        if (CollidedObject is ITargetable targetable)
+        if (CollidedObject is ITargetable)
        {
-            _dashTarget.SetVisible(false);
+            DashTarget.SetVisible(false);
            CanDashThroughTarget = true;
            return;
        }
@@ -112,7 +110,7 @@ public partial class DashSystem: Node3D
        MantleSystem.SetGlobalPosition(PlannedLocation);
        MantleSystem.SetRotation(new Vector3(
            MantleSystem.Rotation.X,
-            _head.Rotation.Y,   
+            Head.Rotation.Y,   
            MantleSystem.Rotation.Z));
        MantleSystem.ProcessMantle(false);
        ShouldMantle = MantleSystem.IsMantlePossible;
@@ -120,41 +118,18 @@ public partial class DashSystem: Node3D
        // 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);
+        var targetMaterial = (StandardMaterial3D) DashTarget.GetSurfaceOverrideMaterial(0);
        targetMaterial.SetAlbedo(targetColor);
-        _dashTarget.SetVisible(true);
+        DashTarget.SetVisible(true);
        var targetLocation = ShouldMantle ? MantleSystem.FirstMantleProfilePoint : PlannedLocation;
-        _dashTarget.SetGlobalPosition(targetLocation);
-        return;
-        
-        var shouldShowDropIndicator = !HasHit && !ShouldMantle;
-        _dashDropIndicator.SetVisible(shouldShowDropIndicator);
-        _dashDropLocationIndicator.SetVisible(shouldShowDropIndicator);
-        if (shouldShowDropIndicator)
-        {
-            _dashCastDrop.GlobalPosition = targetLocation;  // Place drop indication cast at dash location
-            var startDropLocation = targetLocation;  // Start of the drop is the dash target location 
-            
-            // End of the drop is either max cast distance or first collision
-            var hasDropLocationHit = _dashCastDrop.IsColliding();
-            var endDropLocation = hasDropLocationHit ? _dashCastDrop.GetCollisionPoint(0) : _dashCastDrop.ToGlobal(DashCast3D.TargetPosition);
-            
-            // Only show drop location indicator if drop cast has hit
-            _dashDropLocationIndicator.SetVisible(hasDropLocationHit);
-            _dashDropLocationIndicator.SetGlobalPosition(endDropLocation);
-            
-            var dropLength = (endDropLocation - startDropLocation).Length();
-            var dropDirection = (endDropLocation - startDropLocation).Normalized();
-            _dashDropIndicator.SetScale(new Vector3(1, dropLength, 1));
-            _dashDropIndicator.SetGlobalPosition(startDropLocation + dropDirection * dropLength * 0.5f);
-        }
+        DashTarget.SetGlobalPosition(targetLocation);
    }

    public void StopPreparingDash()
    {
        CanDashThroughTarget = false;
-        _dashTarget.SetVisible(false);
-        _dashDropIndicator.SetVisible(false);
-        _dashDropLocationIndicator.SetVisible(false);
+        DashTarget.SetVisible(false);
+        DashDropIndicator.SetVisible(false);
+        DashDropLocationIndicator.SetVisible(false);
    }
 }
--- a/scenes/player_controller/components/head/HeadSystem.cs
+++ b/scenes/player_controller/components/head/HeadSystem.cs
@@ -39,12 +39,12 @@ public partial class HeadSystem : Node3D
        float BobbingMultiplier, 
        float FovMultiplier);
    
-    internal Camera3D _camera;
-    internal Marker3D _cameraAnchor;
-    internal AnimationPlayer _animationPlayer;
-    internal AnimationTree _animationTree;
+    internal Camera3D Camera = null!;
+    internal Node3D CameraAnchor = null!;
+    internal AnimationPlayer AnimationPlayer = null!;
+    internal AnimationTree AnimationTree = null!;
 	
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
    public float LookSensitivity { get; set; } = 1f;
 	
    [ExportGroup("Camera incline")]
@@ -84,43 +84,40 @@ public partial class HeadSystem : Node3D
    public float FovMaxedOutSpeed { get; set; } = 20f;
    
    [ExportGroup("First Person rig")]
-    internal Node3D _fpRig;
-    internal Node3D _rightHandedWeapon;
-    internal Node3D _leftHandedWeapon;
-    internal Node3D _fpDisplacedRig;
-    internal Vector3 _fpDisplacedRigInitialRotation;
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-    public float WeaponSway { get; set; } = 5f;
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-    public float WeaponLookRotation { get; set; } = 1f;
+    internal Node3D FpRig = null!;
+    internal Node3D RightHandedWeapon = null!;
+    internal Vector3 RightHandedWeaponInitialRotation = Vector3.Zero;
+    internal Node3D LeftHandedWeapon = null!;
+    internal Vector3 LeftHandedWeaponInitialRotation = Vector3.Zero;
+    [Export(PropertyHint.Range, "0,20,1,or_greater")]
+    public float WeaponSway { get; set; } = 15f;
    [Export(PropertyHint.Range, "0,200,1,or_greater")]
    public float WeaponMoveRotation { get; set; } = 80f;
-    [Export(PropertyHint.Range, "0,20,0.1,or_greater")]
-    public float WeaponAdjustmentSpeed { get; set; } = 10f;
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-    public float DisplacedWeaponSway { get; set; } = 5f;
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-    public float DisplacedWeaponLookRotation { get; set; } = 1f;
-    [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
+    [Export(PropertyHint.Range, "0,20,1,or_greater")]
+    public float WeaponAdjustmentSpeed { get; set; } = 1f;
+    [Export(PropertyHint.Range, "0,2,0.01,or_greater")]
+    public float DisplacedWeaponSway { get; set; } = 0.8f;
+    [Export(PropertyHint.Range, "0,0.5,0.01,or_greater")]
    public float DisplacedWeaponMoveRotation { get; set; } = 0.1f;
-    [Export(PropertyHint.Range, "0,20,0.1,or_greater")]
-    public float DisplacedWeaponAdjustmentSpeed { get; set; } = 10f;
+    [Export(PropertyHint.Range, "0,20,1,or_greater")]
+    public float DisplacedWeaponAdjustmentSpeed { get; set; } = 12f;
    
    public void Init()
    {
-        _isPlayingForcingAnim = false;
+        IsPlayingForcingAnim = false;
        
        Input.SetMouseMode(Input.MouseModeEnum.Captured);
-        _camera = GetNode<Camera3D>("CameraSmooth/Camera3D");
-        _cameraAnchor = GetNode<Marker3D>("CameraAnchor");
-        _animationPlayer = GetNode<AnimationPlayer>("AnimationPlayer");
-        _animationTree = GetNode<AnimationTree>("AnimationTree");
+        Camera = GetNode<Camera3D>("CameraSmooth/Camera3D");
+        CameraAnchor = GetNode<Node3D>("CameraSmooth/CameraAnchor");
+        //_cameraAnchor = GetNode<Camera3D>("CameraSmooth/Camera3D");
+        AnimationPlayer = GetNode<AnimationPlayer>("AnimationPlayer");
+        AnimationTree = GetNode<AnimationTree>("AnimationTree");
        
-        _fpRig = GetNode<Node3D>("FPRig");
-        _rightHandedWeapon = GetNode<Node3D>("FPRig/Sword");
-        _leftHandedWeapon = GetNode<Node3D>("FPRig/Parry");
-        _fpDisplacedRig = GetNode<Node3D>("FPRig/Sword");
-        _fpDisplacedRigInitialRotation = _fpDisplacedRig.Rotation;
+        FpRig = GetNode<Node3D>("FPRig");
+        RightHandedWeapon = GetNode<Node3D>("FPRig/Sword/SwordMesh");
+        RightHandedWeaponInitialRotation = RightHandedWeapon.Rotation;
+        LeftHandedWeapon = GetNode<Node3D>("FPRig/Parry/ParryMesh");
+        LeftHandedWeaponInitialRotation = LeftHandedWeapon.Rotation;

        _slidingNoise.NoiseType = FastNoiseLite.NoiseTypeEnum.Perlin;
        _slidingNoise.SetFrequency(SlidingJitterFrequency);
@@ -128,34 +125,34 @@ public partial class HeadSystem : Node3D

    public void SetWeaponsVisible(bool swordVisible, bool parryVisible)
    {
-        _rightHandedWeapon.Visible = swordVisible;
-        _leftHandedWeapon.Visible = parryVisible;
+        RightHandedWeapon.Visible = swordVisible;
+        LeftHandedWeapon.Visible = parryVisible;
    }

    public void OnMantle()
    {
-        _animationTree.Set("parameters/OnMantle/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
+        AnimationTree.Set("parameters/OnMantle/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
    }
    public void OnJumpStarted()
    {
-        _animationTree.Set("parameters/OnJumpStart/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
+        AnimationTree.Set("parameters/OnJumpStart/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
    }
    public void OnJumpEnded()
    {
-        _animationTree.Set("parameters/OnJumpEnd/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
+        AnimationTree.Set("parameters/OnJumpEnd/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
    }
    public void OnHit()
    {
-        _animationTree.Set("parameters/OnHit/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
+        AnimationTree.Set("parameters/OnHit/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
    }
    public void OnParry()
    {
-        _animationTree.Set("parameters/OnParry/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
+        AnimationTree.Set("parameters/OnParry/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
    }
    public void OnStartDeathAnimation()
    {
-        _isPlayingForcingAnim = true;
-        _animationTree.Set("parameters/OnDie/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
+        IsPlayingForcingAnim = true;
+        AnimationTree.Set("parameters/OnDie/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
    }

    public void OnDeathAnimationFinished()
@@ -190,8 +187,8 @@ public partial class HeadSystem : Node3D
        EmitSignalHitboxDeactivated();
    }

-    internal bool _footstepEmitted;
-    internal bool _isPlayingForcingAnim;
+    internal bool FootstepEmitted;
+    internal bool IsPlayingForcingAnim;

    public void ResetHeadBobbing()
    {
@@ -200,10 +197,10 @@ public partial class HeadSystem : Node3D

    public void LookAround(CameraParameters inputs)
    {
-        if (_isPlayingForcingAnim)
+        if (IsPlayingForcingAnim)
        {
-            _camera.Position = Vector3.Zero;
-            _camera.Rotation = Vector3.Zero;
+            Camera.Position = Vector3.Zero;
+            Camera.Rotation = Vector3.Zero;
            return;
        }
            
@@ -223,7 +220,7 @@ public partial class HeadSystem : Node3D
        RotateY(angleForHorizontalRotation);

        // Vertical movement of head
-        Vector3 currentCameraRotation = _cameraAnchor.Rotation;
+        Vector3 currentCameraRotation = CameraAnchor.Rotation;
        currentCameraRotation.X += Convert.ToSingle(lookDir.Y * LookSensitivity * sensitivitMultiplier);
        currentCameraRotation.X = Mathf.Clamp(currentCameraRotation.X, Mathf.DegToRad(-90f), Mathf.DegToRad(90f));
        
@@ -242,18 +239,18 @@ public partial class HeadSystem : Node3D
            cameraIncline = Mathf.DegToRad(GroundedCameraIncline * cameraInclineFactor * -1.0f);
        }
        currentCameraRotation.Z = (float) Mathf.Lerp(currentCameraRotation.Z, cameraIncline, delta * CameraInclineAcceleration);
-        _cameraAnchor.Rotation = currentCameraRotation;
+        CameraAnchor.Rotation = currentCameraRotation;

        if (withCameraJitter)
        {
-            _cameraAnchor.Position = Vector3.Down*SlidingCameraHeightOffset;
+            CameraAnchor.Position = Vector3.Down*SlidingCameraHeightOffset;
            float noise1D = _slidingNoise.GetNoise1D(Time.GetTicksMsec());
            float noiseAmplitude = SlidingJitterAmplitude*Mathf.Clamp(playerVelocity.Length(), 0f, 1f);
-            _cameraAnchor.Position += Vector3.Up*noise1D*noiseAmplitude;
+            CameraAnchor.Position += Vector3.Up*noise1D*noiseAmplitude;
        }
        else
        {
-            _cameraAnchor.Position = Vector3.Zero;
+            CameraAnchor.Position = Vector3.Zero;
        }
        
        Vector3 newPositionForCamera = Vector3.Zero;
@@ -268,25 +265,24 @@ public partial class HeadSystem : Node3D
            newPositionForCamera.Y = Mathf.Sin(_bobbingAccumulator * BobbingFrequency) * BobbingAmplitude * bobbingMultiplier;
            newPositionForCamera.X = Mathf.Cos(_bobbingAccumulator * BobbingFrequency / 2.0f) * BobbingAmplitude * bobbingMultiplier;

-            if (newPositionForCamera.Y < -0.07 && !_footstepEmitted) Footstep(); 
-            if (newPositionForCamera.Y > 0) _footstepEmitted = false;
+            if (newPositionForCamera.Y < -0.07 * bobbingMultiplier && !FootstepEmitted) Footstep(); 
+            if (newPositionForCamera.Y > 0) FootstepEmitted = false;
            
            // Offset bobbing for weapon rig
            newPositionForRig.Y = Mathf.Cos(_bobbingAccumulator * BobbingFrequency) * BobbingAmplitude * bobbingMultiplier * 0.2f;
            newPositionForRig.X = Mathf.Sin(_bobbingAccumulator * BobbingFrequency / 2.0f) * BobbingAmplitude * bobbingMultiplier * 0.2f;
        }
-        _cameraAnchor.Position += newPositionForCamera;
-        
-        _camera.GlobalTransform = _cameraAnchor.GetGlobalTransformInterpolated();
+        CameraAnchor.Position += newPositionForCamera;
+        Camera.GlobalTransform = CameraAnchor.GetGlobalTransformInterpolated();
        
        // First person rig adjustments
-        _fpRig.GlobalTransform = _cameraAnchor.GetGlobalTransformInterpolated();
+        FpRig.GlobalTransform = Camera.GlobalTransform;
        // Apply bobbing
-        _fpRig.Position += newPositionForRig;
+        FpRig.Position += newPositionForRig;
        
        // Rotate the whole rig based on movement input
-        var newRigRotation = _fpRig.Rotation;
-        var camTilt = Mathf.Lerp(_fpRig.Rotation.Z, cameraIncline*WeaponMoveRotation, delta*WeaponAdjustmentSpeed);
+        var newRigRotation = FpRig.Rotation;
+        var camTilt = Mathf.Lerp(FpRig.Rotation.Z, CameraAnchor.Rotation.Z*WeaponMoveRotation, delta * WeaponAdjustmentSpeed);
        newRigRotation.Z = (float) camTilt;

        // Rotate the whole rig based on camera rotation input
@@ -294,50 +290,54 @@ public partial class HeadSystem : Node3D
        newRigRotation.Y = Mathf.Lerp(newRigRotation.Y, -lookDir.X*WeaponSway, (float) delta * WeaponAdjustmentSpeed);
        
        // Apply
-        _fpRig.Rotation = newRigRotation;
+        FpRig.Rotation = newRigRotation;
        
-        // Compute displaced rig adjustments, starting with movement input
-        var newDisplacedRigRotation = _fpDisplacedRig.Rotation;
-
-        var howMuchForward = ComputeHowMuchInputForward(playerInput);
-        var howMuchSideways = ComputeHowMuchInputSideways(playerInput);
-        var displacedCamTiltForward = Mathf.Lerp(newDisplacedRigRotation.Z, 
-            _fpDisplacedRigInitialRotation.Z + howMuchForward*DisplacedWeaponMoveRotation, 
-            delta*DisplacedWeaponAdjustmentSpeed);
-        var displacedCamTiltSide = Mathf.Lerp(newDisplacedRigRotation.X, 
-            _fpDisplacedRigInitialRotation.X - howMuchSideways*DisplacedWeaponMoveRotation, 
-            delta*DisplacedWeaponAdjustmentSpeed);
-        
-        newDisplacedRigRotation.X = (float) displacedCamTiltSide;
-        newDisplacedRigRotation.Z = (float) displacedCamTiltForward;
-        
-        var displacedSwayY = Mathf.Lerp(newDisplacedRigRotation.Y, 
-            _fpDisplacedRigInitialRotation.Y - lookDir.X*DisplacedWeaponSway, 
-            delta*DisplacedWeaponAdjustmentSpeed);
-        newDisplacedRigRotation.Y = (float) displacedSwayY;
-        
-        // Apply
-        _fpDisplacedRig.Rotation = newDisplacedRigRotation;
+        // Compute sword meshes procedural adjustments
+        RightHandedWeapon.Rotation = ComputeRotationForFpMesh(RightHandedWeapon, RightHandedWeaponInitialRotation, playerInput, lookDir, (float) delta);
+        LeftHandedWeapon.Rotation = ComputeRotationForFpMesh(LeftHandedWeapon, LeftHandedWeaponInitialRotation, playerInput, lookDir, (float) delta);

        // Camera adjustments
        float velocityClamped = Mathf.Clamp(playerVelocity.Length(), 0.5f, FovMaxedOutSpeed);
        float targetFov = BaseFov + FovChangeFactor * velocityClamped * fovMultiplier;
-        _camera.Fov = Mathf.Lerp(_camera.Fov, targetFov, (float) delta * FovChangeSpeed);
+        Camera.Fov = Mathf.Lerp(Camera.Fov, targetFov, (float) delta * FovChangeSpeed);
+    }
+
+    public Vector3 ComputeRotationForFpMesh(Node3D mesh, Vector3 initialRotation, Vector3 playerInput, Vector2 lookDir, float delta)
+    {
+        var newMeshRotation = mesh.Rotation;
+        var howMuchForward = ComputeHowMuchInputForward(playerInput);
+        var howMuchSideways = ComputeHowMuchInputSideways(playerInput);
+        var displacedCamTiltForward = Mathf.Lerp(newMeshRotation.Z, 
+            initialRotation.Z + howMuchForward*DisplacedWeaponMoveRotation, 
+            delta * DisplacedWeaponAdjustmentSpeed);
+        var displacedCamTiltSide = Mathf.Lerp(newMeshRotation.X, 
+            initialRotation.X - howMuchSideways*DisplacedWeaponMoveRotation, 
+            delta * DisplacedWeaponAdjustmentSpeed);
+        
+        newMeshRotation.X = displacedCamTiltSide;
+        newMeshRotation.Z = displacedCamTiltForward;
+        
+        var displacedSwayY = Mathf.Lerp(newMeshRotation.Y, 
+            initialRotation.Y - lookDir.X*DisplacedWeaponSway, 
+            delta * DisplacedWeaponAdjustmentSpeed);
+        newMeshRotation.Y = displacedSwayY;
+        
+        return newMeshRotation;
    }

    public void Footstep()
    {
-        _footstepEmitted = true;
+        FootstepEmitted = true;
        EmitSignalStepFoot();
    }

    public void HideWeapon()
    {
-        _rightHandedWeapon.Visible = false;   
+        RightHandedWeapon.Visible = false;   
    }
    public void ShowWeapon()
    {
-        _rightHandedWeapon.Visible = true;
+        RightHandedWeapon.Visible = true;
    }

    public float ComputeCameraInclineFactor(Vector3 direction)
@@ -368,15 +368,15 @@ public partial class HeadSystem : Node3D

    public Vector3 GetGlobalForwardVector()
    {
-        return _camera.GlobalBasis.Z;
+        return Camera.GlobalBasis.Z;
    }

    public Vector3 GetGlobalLookRotation()
    {
        return new Vector3(
-            _camera.Rotation.X,
+            Camera.Rotation.X,
            Rotation.Y,
-            _camera.Rotation.Z);
+            Camera.Rotation.Z);
    }

    public void SetHeight(float height)
--- a/scenes/player_controller/components/head/head_system.tscn
+++ b/scenes/player_controller/components/head/head_system.tscn
@@ -654,9 +654,6 @@ _data = {

 [node name="HeadSystem" type="Node3D" unique_id=2067407038]
 script = ExtResource("1_8abgy")
-WeaponMoveRotation = 20.0
-DisplacedWeaponSway = 1.0
-DisplacedWeaponAdjustmentSpeed = 8.0

 [node name="FPRig" type="Node3D" parent="." unique_id=922968399]
 transform = Transform3D(0.9999998, 0, 0, 0, 1.0000002, 0, 0, 0, 1.0000002, 0, 0, 0)
@@ -678,6 +675,9 @@ mesh = ExtResource("3_1ay6d")
 [node name="CameraSmooth" type="Node3D" parent="." unique_id=2072010960]
 transform = Transform3D(0.9999998, -0.00011616429, 0, 0.00011616431, 0.99999964, 0, 0, 0, 0.99999976, 0, 0, 0)

+[node name="CameraAnchor" type="Marker3D" parent="CameraSmooth" unique_id=1554357312]
+transform = Transform3D(1.0000002, 0.00011616435, 0, -0.000116164374, 1.0000004, 0, 0, 0, 1.0000002, 0, 0, 0)
+
 [node name="Camera3D" type="Camera3D" parent="CameraSmooth" unique_id=544372058]
 transform = Transform3D(1, 0, 0, 0, 1.0000002, 0, 0, 0, 1.0000001, 0, 0, 0)
 current = true
@@ -702,8 +702,6 @@ fade_out = 0.5547845
 shakerPreset = SubResource("Resource_se3kf")
 metadata/_custom_type_script = "uid://dnlxsrumw6ygp"

-[node name="CameraAnchor" type="Marker3D" parent="." unique_id=1554357312]
-
 [node name="AnimationPlayer" type="AnimationPlayer" parent="." unique_id=1831491746]
 root_node = NodePath("../CameraSmooth/Camera3D")
 libraries/ = SubResource("AnimationLibrary_0hyrq")
--- a/scenes/player_controller/components/weapon/WeaponSystem.cs
+++ b/scenes/player_controller/components/weapon/WeaponSystem.cs
@@ -22,12 +22,11 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer
    [Export(PropertyHint.Range, "0,0.2,0.01,or_greater")]
    public float StraightThrowDuration { get; set; } = 0.1f;
    
-    private StateChart       _weaponState;
-    public StateChartState  InHandState;
-    public StateChartState  FlyingState;
-    public StateChartState  PlantedState;
-    
-    private ShapeCast3D _dashCast3D;
+    private StateChart       _weaponState = null!;
+    public StateChartState  InHandState = null!;
+    public StateChartState  FlyingState = null!;
+    public StateChartState  PlantedState = null!;
+    private ShapeCast3D _dashCast3D = null!;
    
    private Transform3D _startTransform;
    private Vector3 _startMeshRotation;
@@ -35,11 +34,11 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer
    private Vector3 _throwDirection;
    public Vector3 PlantLocation { get; set; }
    public Vector3 PlantNormal { get; set; }
-    public Node PlantObject { get; set; }
+    public Node? PlantObject { get; set; }

-    public MeshInstance3D WeaponLocationIndicator { get; set; }
-    public StandardMaterial3D WeaponLocationIndicatorMaterial { get; set; }
-    public MeshInstance3D WeaponMesh { get; set; }
+    public MeshInstance3D WeaponLocationIndicator { get; set; } = null!;
+    public StandardMaterial3D WeaponLocationIndicatorMaterial { get; set; } = null!;
+    public MeshInstance3D WeaponMesh { get; set; } = null!;

    public void Init()
    {
@@ -50,7 +49,7 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer

        WeaponLocationIndicator = GetNode<MeshInstance3D>("WeaponLocationIndicator");
        WeaponLocationIndicator.Visible = false;
-        WeaponLocationIndicatorMaterial = WeaponLocationIndicator.GetActiveMaterial(0) as StandardMaterial3D;
+        WeaponLocationIndicatorMaterial = (WeaponLocationIndicator.GetActiveMaterial(0) as StandardMaterial3D)!;
        
        WeaponMesh = GetNode<MeshInstance3D>("Weapon");
        _startMeshRotation = WeaponMesh.Rotation;
@@ -100,7 +99,6 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer
        
        
        var tween = GetTree().CreateTween();
-        tween.SetParallel(true);
        tween.TweenProperty(this, "global_position", end, StraightThrowDuration);
        if (hasHit)
        {
--- a/scenes/player_controller/resources/forge_empowered_action.tres
+++ b/scenes/player_controller/resources/forge_empowered_action.tres
@@ -0,0 +1,10 @@
+[gd_resource type="Resource" script_class="REmpoweredAction" format=3 uid="uid://7dpkk5rk3di5"]
+
+[ext_resource type="Script" uid="uid://d0l07gcx1ef18" path="res://forge/abilities/REmpoweredAction.cs" id="1_1rxoq"]
+
+[resource]
+script = ExtResource("1_1rxoq")
+Cost = 30.0
+Cooldown = 0.5
+ManaRegenPause = 2.0
+metadata/_custom_type_script = "uid://d0l07gcx1ef18"
--- a/scenes/player_controller/resources/player_mana_regen.tres
+++ b/scenes/player_controller/resources/player_mana_regen.tres
@@ -0,0 +1,9 @@
+[gd_resource type="Resource" script_class="RManaRegen" format=3 uid="uid://dtmhtlix2amme"]
+
+[ext_resource type="Script" uid="uid://di04jvuqp0h7m" path="res://forge/effects/RManaRegen.cs" id="1_ecb1p"]
+
+[resource]
+script = ExtResource("1_ecb1p")
+ManaRegenRate = 20.0
+Frequency = 0.05
+metadata/_custom_type_script = "uid://di04jvuqp0h7m"
--- a/scenes/player_controller/scripts/PlayerAttributeSet.cs
+++ b/scenes/player_controller/scripts/PlayerAttributeSet.cs
@@ -0,0 +1,19 @@
+using Gamesmiths.Forge.Attributes;
+
+namespace Movementtests.scenes.player_controller.scripts;
+
+public class PlayerAttributeSet : AttributeSet
+{
+    public EntityAttribute Health { get; }
+    public EntityAttribute Mana { get; }
+    public EntityAttribute Strength { get; }
+    public EntityAttribute Speed { get; }
+
+    public PlayerAttributeSet()
+    {
+        Health = InitializeAttribute(nameof(Health), 100, 0, 150);
+        Mana = InitializeAttribute(nameof(Mana), 100, 0, 100);
+        Strength = InitializeAttribute(nameof(Strength), 10, 0, 99);
+        Speed = InitializeAttribute(nameof(Speed), 5, 0, 10);
+    }
+}
--- a/scenes/player_controller/scripts/PlayerAttributeSet.cs.uid
+++ b/scenes/player_controller/scripts/PlayerAttributeSet.cs.uid
@@ -0,0 +1 @@
+uid://budtqogrwod6w
--- a/scenes/player_controller/scripts/PlayerController.cs
+++ b/scenes/player_controller/scripts/PlayerController.cs
@@ -1,11 +1,22 @@
 using System;
 using System.Collections.Generic;
+using Gamesmiths.Forge.Abilities;
+using Gamesmiths.Forge.Core;
+using Gamesmiths.Forge.Effects;
+using Gamesmiths.Forge.Events;
+using Gamesmiths.Forge.Tags;
+
 using Godot;
 using GodotStateCharts;
+
 using Movementtests.addons.godot_state_charts.csharp;
 using Movementtests.interfaces;
 using Movementtests.systems;
 using Movementtests.player_controller.Scripts;
+using Movementtests.scenes.player_controller.scripts;
+using Movementtests.tools;
+using Movementtests.forge.abilities;
+using Movementtests.tools.effects;
 using RustyOptions;

 [GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_character.png")]
@@ -13,7 +24,8 @@ public partial class PlayerController : CharacterBody3D,
 	IDamageable, 
 	IDamageDealer,
 	IHealthable,
-	IKnockbackable
+	IKnockbackable,
+	IForgeEntity
 {
 	// Enums
 	public enum AllowedInputs
@@ -42,43 +54,55 @@ public partial class PlayerController : CharacterBody3D,
 	[Signal]
 	public delegate void PlayerDiedEventHandler();

-	public event Action<IDamageable, DamageRecord> DamageTaken;
-	public event Action<IHealthable, HealthChangedRecord> HealthChanged;
-	public event Action<IHealthable> HealthDepleted;
+	public event Action<IDamageable, DamageRecord> DamageTaken = null!;
+	public event Action<IHealthable, HealthChangedRecord> HealthChanged = null!;
+	public event Action<IHealthable> HealthDepleted = null!;
 	
 	///////////////////////////
 	// Public stuff //
 	///////////////////////////
-	public HeadSystem       HeadSystem;
-	public StairsSystem     StairsSystem;
-	public MantleSystem     MantleSystem;
-	public DashSystem       DashSystem;
-	public CollisionShape3D StandingCollider;
-	public CollisionShape3D SlideCollider;
-	public WeaponSystem     WeaponSystem;
-	public WallHugSystem    WallHugSystem;
-	public PlayerUi		    PlayerUi;
-	public TextureRect      DashIndicator;
-	public ColorRect        PowerCooldownIndicator;
-	public Node3D           DashIndicatorNode;
-	public MeshInstance3D   DashIndicatorMesh;
-	public CylinderMesh     DashIndicatorMeshCylinder;
-	public RayCast3D        WallRunSnapper;
-	public ShapeCast3D      GroundDetector;
-	public ShapeCast3D      CeilingDetector;
-	public RayCast3D        DirectGroundDetector;
-	public Area3D           WeaponHitbox;
-	public AudioStreamPlayer3D SfxPlayer;
+	public HeadSystem       HeadSystem = null!;
+	public StairsSystem     StairsSystem = null!;
+	public MantleSystem     MantleSystem = null!;
+	public DashSystem       DashSystem = null!;
+	public CollisionShape3D StandingCollider = null!;
+	public CollisionShape3D SlideCollider = null!;
+	public WeaponSystem     WeaponSystem = null!;
+	public WallHugSystem    WallHugSystem = null!;
+	public PlayerUi		    PlayerUi = null!;
+	public TextureRect      DashIndicator = null!;
+	public ColorRect        PowerCooldownIndicator = null!;
+	public Node3D           DashIndicatorNode = null!;
+	public MeshInstance3D   DashIndicatorMesh = null!;
+	public CylinderMesh     DashIndicatorMeshCylinder = null!;
+	public RayCast3D        WallRunSnapper = null!;
+	public ShapeCast3D      GroundDetector = null!;
+	public ShapeCast3D      CeilingDetector = null!;
+	public RayCast3D        DirectGroundDetector = null!;
+	public Area3D           WeaponHitbox = null!;
+	public AudioStreamPlayer3D SfxPlayer = null!;
 	
-	public ShapeCast3D DashDamageDetector;
-	public Area3D SlidingEnemyDetector;
+	public ShapeCast3D DashDamageDetector = null!;
+	public Area3D SlidingEnemyDetector = null!;
+	
+	public EntityAttributes Attributes { get; set; } = null!;
+	public EntityTags Tags { get; set; } = null!;
+	public EffectsManager EffectsManager { get; set; } = null!;
+	public EntityAbilities Abilities { get; set; } = null!;
+	public EventManager Events { get; set; } = null!;

 	// Inspector stuff
-	[Export] public Marker3D TutorialWeaponTarget;
+	[Export] public Marker3D TutorialWeaponTarget = null!;
 	[Export] public bool TutorialDone { get; set; }
 	[Export] public bool HasSword { get; set; } = true;
 	[Export] public bool HasParry { get; set; } = true;
 	
+	// Forge stuff
+	[ExportCategory("Forge")]
+	[ExportGroup("General")]
+	[Export] public REmpoweredAction EmpoweredAction = null!;
+	[Export] public RManaRegen ManaRegen = null!;
+	
 	// Combat stuff
 	[ExportCategory("Combat")]
 	[ExportGroup("General")]
@@ -89,10 +113,9 @@ public partial class PlayerController : CharacterBody3D,
 	[Export(PropertyHint.Range, "0,10f,0.1,or_greater")]
 	public float AimAssistReductionStartDistance { get; set; } = 10f;

-	[ExportGroup("Damage")]
-	[Export] public RDamage RDamage { get; set; }
-	[Export] public RKnockback RKnockback { get; set; }
-	[Export] public RHealth RHealth { get; set; }
+	[ExportGroup("Damage")] [Export] public RDamage RDamage { get; set; } = null!;
+	[Export] public RKnockback? RKnockback { get; set; } = null!;
+	[Export] public RHealth? RHealth { get; set; } = null!;
 	
 	[ExportGroup("Targeting")]
 	[Export(PropertyHint.Range, "0,20,0.1,or_greater")] 
@@ -102,7 +125,7 @@ public partial class PlayerController : CharacterBody3D,
 	
 	[ExportGroup("Instantiation")]
 	[Export]
-	public PackedScene Explosion { get; set; }
+	public PackedScene Explosion { get; set; } = null!;
 	
 	// Movement stuff
 	[ExportCategory("Movement")]
@@ -129,7 +152,7 @@ public partial class PlayerController : CharacterBody3D,
 	[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
 	public float MantleTime { get; set; } = 0.1f;
 	[Export]
-	public PackedScene MantlePath { get; set; }
+	public PackedScene MantlePath { get; set; } = null!;
 	
 	[Export(PropertyHint.Range, "0,50,0.1")]
 	public float MantleDashStrength { get; set; } = 15f;
@@ -254,8 +277,8 @@ public partial class PlayerController : CharacterBody3D,
 	// Stairs and shit
 	private float _lastFrameWasOnFloor = -Mathf.Inf;
 	private const int NumOfHeadCollisionDetectors = 4;
-	private RayCast3D[] _headCollisionDetectors;
-	private AudioStreamPlaybackInteractive _audioStream;
+	private RayCast3D[] _headCollisionDetectors = null!;
+	private AudioStreamPlaybackInteractive _audioStream = null!;

 	// Basic movement
 	private bool _movementEnabled = true;
@@ -265,8 +288,8 @@ public partial class PlayerController : CharacterBody3D,
 	private float _inputRotateFloorplane;
 	
 	// Basic falling
-	internal float _targetSpeed;
-	internal float _gravity;
+	internal float TargetSpeed;
+	internal float Gravity;

 	// Jump stuff
 	private int _currentInputBufferFrames;
@@ -276,10 +299,10 @@ public partial class PlayerController : CharacterBody3D,
 	
 	// Mantle stuff
 	private bool _shouldMantleOnDashEnded;
-	private Path _mantlePath; 
+	private Path? _mantlePath;
 	private bool _customMantle;
 	private Transform3D _customMantleStartTransform;
-	private Curve3D _customMantleCurve;
+	private Curve3D _customMantleCurve = null!;
 	private Vector3 _mantleStartPosition;
 	private Vector3 _velocityOnMantleStarted = Vector3.Zero;
 	
@@ -290,7 +313,7 @@ public partial class PlayerController : CharacterBody3D,
 	private Vector3 _currentWallContactPoint = Vector3.Zero;
 	
 	// Dash stuff
-	internal bool _canDash = true;
+	internal bool CanDash = true;
 	private bool _canDashAirborne = true;
 	private float _playerHeight;
 	private float _playerRadius;
@@ -316,61 +339,61 @@ public partial class PlayerController : CharacterBody3D,
 	private float _aimAssistMultiplier = 1.0f;

 	// Timers
-	private Timer _timeScaleAimInAirTimer;
-	private Timer _weaponThrowUncatchableTimer;
-	private Timer _simpleDashCooldownTimer;
-	private Timer _airborneDashCooldownTimer;
-	private Timer _powerCooldownTimer;
-	private Timer _invincibilityTimer;
-	private Timer _attackCooldown;
+	private Timer _timeScaleAimInAirTimer = null!;
+	private Timer _weaponThrowUncatchableTimer = null!;
+	private Timer _simpleDashCooldownTimer = null!;
+	private Timer _airborneDashCooldownTimer = null!;
+	private Timer _powerCooldownTimer = null!;
+	private Timer _invincibilityTimer = null!;
+	private Timer _attackCooldown = null!;
 	
 	// State chart
-	private StateChart       _playerState;
+	private StateChart       _playerState = null!;
 	
-	private StateChartState  _aiming;
-	private StateChartState  _powerExpired;
-	private StateChartState  _powerRecharging;
-	private StateChartState  _powerFull;
+	private StateChartState  _aiming = null!;
+	private StateChartState  _powerExpired = null!;
+	private StateChartState  _powerRecharging = null!;
+	private StateChartState  _powerFull = null!;
 	
-	private StateChartState  _grounded;
-	private StateChartState  _airborne;
-	private StateChartState  _coyoteEnabled;
-	private StateChartState  _jumping;
-	private StateChartState  _simpleJump;
-	private StateChartState  _doubleJump;
-	private StateChartState  _mantling;
-	private StateChartState  _simpleDash;
-	private StateChartState  _aimedDash;
-	private StateChartState  _weaponDash;
-	private StateChartState  _sliding;
-	private StateChartState  _groundSliding;
-	private StateChartState  _airGliding;
-	private StateChartState  _airGlidingDoubleJump;
-	private StateChartState  _slideCanceled;
-	private StateChartState  _slamming;
-	private StateChartState  _onWall;
-	private StateChartState  _onWallHugging;
-	private StateChartState  _onWallHanging;
-	private StateChartState  _onWallRunning;
+	private StateChartState  _grounded = null!;
+	private StateChartState  _airborne = null!;
+	private StateChartState  _coyoteEnabled = null!;
+	private StateChartState  _jumping = null!;
+	private StateChartState  _simpleJump = null!;
+	private StateChartState  _doubleJump = null!;
+	private StateChartState  _mantling = null!;
+	private StateChartState  _simpleDash = null!;
+	private StateChartState  _aimedDash = null!;
+	private StateChartState  _weaponDash = null!;
+	private StateChartState  _sliding = null!;
+	private StateChartState  _groundSliding = null!;
+	private StateChartState  _airGliding = null!;
+	private StateChartState  _airGlidingDoubleJump = null!;
+	private StateChartState  _slideCanceled = null!;
+	private StateChartState  _slamming = null!;
+	private StateChartState  _onWall = null!;
+	private StateChartState  _onWallHugging = null!;
+	private StateChartState  _onWallHanging = null!;
+	private StateChartState  _onWallRunning = null!;
 	
-	private StateChartState  _attackStandard;
-	private StateChartState  _attackDash;
-	private StateChartState  _parryStandard;
-	private StateChartState  _parryDash;
+	private StateChartState  _attackStandard = null!;
+	private StateChartState  _attackDash = null!;
+	private StateChartState  _parryStandard = null!;
+	private StateChartState  _parryDash = null!;
 	
-	private Transition       _onJumpFromWall;
-	private Transition       _onJumpFromWallFalling;
-	private Transition       _onJumpFromWallRunning;
-	private Transition       _onLeaveWallFromRun;
-	private Transition       _onAirborneToGrounded;
+	private Transition       _onJumpFromWall = null!;
+	private Transition       _onJumpFromWallFalling = null!;
+	private Transition       _onJumpFromWallRunning = null!;
+	private Transition       _onLeaveWallFromRun = null!;
+	private Transition       _onAirborneToGrounded = null!;
 	
-	private Transition       _onGroundSlideJump;
-	private Transition       _onAirGlideDoubleJump;
+	private Transition       _onGroundSlideJump = null!;
+	private Transition       _onAirGlideDoubleJump = null!;
 	
 	// Damage
-	public CDamageable CDamageable { get; set; }
-	public CHealth CHealth { get; set; }
-	public CKnockback CKnockback { get; set; }
+	public CDamageable? CDamageable { get; set; }
+	public CHealth? CHealth { get; set; }
+	public CKnockback? CKnockback { get; set; }
 	public float CurrentHealth { get; set; }

 	private bool _isInvincible;
@@ -383,9 +406,12 @@ public partial class PlayerController : CharacterBody3D,
 	
 	private readonly List<IDamageable> _hitEnemies = new List<IDamageable>();

-	private ShapeCast3D _closeEnemyDetector;
-	private RayCast3D _aimAssisRayCast;
-	private Camera3D _camera;
+	private ShapeCast3D _closeEnemyDetector = null!;
+	private RayCast3D _aimAssisRayCast = null!;
+	private Camera3D _camera = null!;
+	
+	private AbilityHandle? _empoweredActionHandle;
+	private ActiveEffectHandle? _manaRegenEffectHandle;

 	public override void _Ready()
 	{
@@ -402,18 +428,55 @@ public partial class PlayerController : CharacterBody3D,
 		_aimAssisRayCast = GetNode<RayCast3D>("AimAssistRayCast");
 		_aimAssisRayCast.TargetPosition = _aimAssisRayCast.TargetPosition.Normalized() * (TargetingDistance*1.5f);
 		
+		// Forge stuff
+		var forgeManager = GetTree().Root.GetNode<ForgeManager>("ForgeManager")!;
+		var baseTags = new TagContainer(
+			forgeManager.TagsManager,
+			[
+				Tag.RequestTag(forgeManager.TagsManager, "character.player"),
+				Tag.RequestTag(forgeManager.TagsManager, "class.warrior")
+			]);
+
+		Attributes = new EntityAttributes(new PlayerAttributeSet());
+		Tags = new EntityTags(baseTags);
+		EffectsManager = new EffectsManager(this, forgeManager.CuesManager);
+		Abilities = new(this);
+		Events = new();
+
+		var empoweredActionData = new AbilityData(
+			name: "Empowered Action",
+			costEffect: EmpoweredAction.CostEffect(),
+			cooldownEffects: [EmpoweredAction.CooldownEffect(forgeManager.TagsManager)],
+			instancingPolicy: AbilityInstancingPolicy.PerEntity,
+			behaviorFactory: () => new EmpoweredActionBehavior());
+		
+		// Grant permanently
+		_empoweredActionHandle = Abilities.GrantAbilityPermanently(
+			empoweredActionData,
+			abilityLevel: 1,
+			levelOverridePolicy: LevelComparison.None,
+			sourceEntity: this);
+
+		var manaRegenEffect = new Effect(ManaRegen.ManaRegen(), new EffectOwnership(this, this));
+		_manaRegenEffectHandle = EffectsManager.ApplyEffect(manaRegenEffect);
+		
+		var health = Attributes["PlayerAttributeSet.Health"].CurrentValue; // 100
+		var mana = Attributes["PlayerAttributeSet.Mana"].CurrentValue; // 100
+		var strength = Attributes["PlayerAttributeSet.Strength"].CurrentValue; // 10
+		var speed = Attributes["PlayerAttributeSet.Speed"].CurrentValue; // 5
+		
 		// DashIndicator = GetNode<TextureRect>("%DashIndicator");
 		PowerCooldownIndicator = GetNode<ColorRect>("%DashCooldownIndicator");
 		PowerCooldownIndicator.Visible = false;
 		EmpoweredActionsLeft = MaxNumberOfEmpoweredActions;
-		_targetSpeed = WalkSpeed;
+		TargetSpeed = WalkSpeed;
 		DashIndicatorNode = GetNode<Node3D>("DashIndicator");
 		DashIndicatorMesh = GetNode<MeshInstance3D>("DashIndicator/DashIndicatorMesh");
-		DashIndicatorMeshCylinder = DashIndicatorMesh.Mesh as CylinderMesh;
+		DashIndicatorMeshCylinder = (DashIndicatorMesh.Mesh as CylinderMesh)!;
 		DashIndicatorMesh.Visible = false;
 		
 		SfxPlayer = GetNode<AudioStreamPlayer3D>("SFXPlayer");
-		_audioStream = SfxPlayer.GetStreamPlayback() as AudioStreamPlaybackInteractive;
+		_audioStream = (SfxPlayer.GetStreamPlayback() as AudioStreamPlaybackInteractive)!;
 		
 		// Camera stuff
 		HeadSystem = GetNode<HeadSystem>("HeadSystem");
@@ -539,7 +602,7 @@ public partial class PlayerController : CharacterBody3D,
 		
 		// Movement stuff
 		// Getting universal setting from GODOT editor to be in sync
-		_gravity = (float)ProjectSettings.GetSetting("physics/3d/default_gravity");
+		Gravity = (float)ProjectSettings.GetSetting("physics/3d/default_gravity");
 		MantleSystem.Init();
 		StairsSystem.Init(stairsBelowRayCast3D, stairsAheadRayCast3D, cameraSmooth);
 		DashSystem.Init(HeadSystem, _camera);
@@ -701,7 +764,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void SetPlayerHealthOverride(float newHealthValue)
 	{
 		RHealth.StartingHealth = newHealthValue;
-		CHealth.CurrentHealth = newHealthValue;
+		CHealth!.CurrentHealth = newHealthValue;
 		PlayerUi.Initialize(CHealth.CurrentHealth);
 	}
 	public void SetPlayerDamageOverride(float newDamageValue)
@@ -734,7 +797,7 @@ public partial class PlayerController : CharacterBody3D,
 				return;
 			}

-			_canDash = true;
+			CanDash = true;
 			_canDashAirborne = true;
 			_playerState.SendEvent("dash");
 		}
@@ -761,7 +824,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void OnAirborneToGrounded()
 	{
 		HeadSystem.OnJumpEnded();
-		_audioStream!.SwitchToClipByName("land");
+		_audioStream.SwitchToClipByName("land");
 	}

 	public bool IsGroundLike()
@@ -968,7 +1031,7 @@ public partial class PlayerController : CharacterBody3D,
 	// Utilities //
 	///////////////////////////
 	
-	public float CalculateGravityForce() => _gravity * Weight;
+	public float CalculateGravityForce() => Gravity * Weight;
 	
 	// Camera stuff
 	private Vector2 ComputeAimAssist()
@@ -1031,8 +1094,8 @@ public partial class PlayerController : CharacterBody3D,
 		
 		var acceleration = dir.Length() > 0 ? accelerationFactor : decelerationFactor;
        
-		float xAcceleration = Mathf.Lerp(Velocity.X, dir.X * _targetSpeed, delta * acceleration);
-		float zAcceleration = Mathf.Lerp(Velocity.Z, dir.Z * _targetSpeed, delta * acceleration);
+		float xAcceleration = Mathf.Lerp(Velocity.X, dir.X * TargetSpeed, delta * acceleration);
+		float zAcceleration = Mathf.Lerp(Velocity.Z, dir.Z * TargetSpeed, delta * acceleration);
 		return new Vector3(xAcceleration, 0, zAcceleration);
 	}
 	public Vector3 ComputeHVelocityGround(float delta)
@@ -1091,7 +1154,7 @@ public partial class PlayerController : CharacterBody3D,
 	///////////////////////////
 	public void DashCooldownTimeout()
 	{
-		_canDash = true;
+		CanDash = true;
 	}
 	public void AirborneDashCooldownTimeout()
 	{
@@ -1124,8 +1187,8 @@ public partial class PlayerController : CharacterBody3D,
 			return;
 		}
 		
-		if (!_canDash) return;
-		_canDash = false;
+		if (!CanDash) return;
+		CanDash = false;
 		_simpleDashCooldownTimer.Start();
 		_playerState.SendEvent("dash");
 	}
@@ -1166,7 +1229,7 @@ public partial class PlayerController : CharacterBody3D,
 		if (MantleSystem.IsMantlePossible && IsPlayerInputtingForward())
 		{
 			// _bufferedAction = BufferedActions.MantleDash;
-			_canDash = true;  // Restore dash ability
+			CanDash = true;  // Restore dash ability
 			_playerState.SendEvent("mantle");
 		}
 	}
@@ -1203,7 +1266,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void OnWallStarted()
 	{
 		if (_simpleDashCooldownTimer.IsStopped())
-			_canDash = true;
+			CanDash = true;
 		else
 			_simpleDashCooldownTimer.Start();
 		
@@ -1452,7 +1515,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void OnJumpStarted(float verticalVelocity)
 	{
 		HeadSystem.OnJumpStarted();
-		_audioStream!.SwitchToClipByName("jump");
+		_audioStream.SwitchToClipByName("jump");
 		
 		_framesSinceJumpAtApex = 0;
 		var angle = GetFloorAngle();
@@ -1474,7 +1537,7 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public void OnDoubleJumpStarted()
 	{
-		_canDash = true;
+		CanDash = true;
 		// _canDashAirborne = true;
 		OnJumpStarted(DoubleJumpStartVelocity);
 		_bufferedAction = BufferedActions.None;
@@ -1559,7 +1622,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void OnMantleStarted()
 	{
 		HeadSystem.OnMantle();
-		_audioStream!.SwitchToClipByName("mantle");
+		_audioStream.SwitchToClipByName("mantle");

 		_mantlePath = MantlePath.Instantiate() as Path;
 		if (_mantlePath == null)
@@ -1584,11 +1647,11 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public void HandleMantling(float delta)
 	{
-		GlobalPosition = _mantlePath.Target.GlobalPosition;
+		GlobalPosition = _mantlePath!.Target.GlobalPosition;
 	}
 	public void MantleFinished()
 	{
-		_mantlePath.Teardown();
+		_mantlePath!.Teardown();
 		
 		// SetVelocity(_finalCurveDirection.Normalized() * _speedOverCurve);
 		
@@ -1667,8 +1730,8 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public void SlideStarted()
 	{
-		_targetSpeed = Velocity.Length();
-		_audioStream!.SwitchToClipByName("glide");
+		TargetSpeed = Velocity.Length();
+		_audioStream.SwitchToClipByName("glide");
 		SetupSlideCollision();
 		
 		SlidingEnemyDetector.Monitoring = true;
@@ -1741,7 +1804,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void OnSlideCanceled()
 	{
 		SetupStandingCollision();
-		_targetSpeed = WalkSpeed;
+		TargetSpeed = WalkSpeed;
 	}
 	public void HandleSlideCanceled(float delta)
 	{
@@ -1802,8 +1865,8 @@ public partial class PlayerController : CharacterBody3D,
 		IsInvincible = false;
 		
 		SetupStandingCollision();
-		_audioStream!.SwitchToClipByName("footsteps");
-		_targetSpeed = WalkSpeed;
+		_audioStream.SwitchToClipByName("footsteps");
+		TargetSpeed = WalkSpeed;
 	}

 	public void EnemyHitWhileSliding(Node enemy)
@@ -1836,7 +1899,7 @@ public partial class PlayerController : CharacterBody3D,
 	{
 		SetHorizontalVelocity(Vector2.Zero);
 		SetVerticalVelocity(-SlamSpeed);
-		_audioStream!.SwitchToClipByName("dash");
+		_audioStream.SwitchToClipByName("dash");
 	}
 	public void HandleSlam(float delta)
 	{
@@ -1845,7 +1908,7 @@ public partial class PlayerController : CharacterBody3D,
 	public void SlamEnded()
 	{
 		HeadSystem.OnGetHit();
-		_audioStream!.SwitchToClipByName("slam");
+		_audioStream.SwitchToClipByName("slam");

 		if (Explosion.Instantiate() is not Explosion explosion) return;
 		explosion.Radius = 10f;
@@ -1880,10 +1943,53 @@ public partial class PlayerController : CharacterBody3D,
 	
 	public bool CanPerformEmpoweredAction()
 	{
+		if(_empoweredActionHandle == null) return false;
+		var cooldowns = _empoweredActionHandle.GetCooldownData();
+		foreach (var cd in cooldowns)
+		{
+			//GD.Print($"Cooldown remaining: {cd.RemainingTime}");
+		}
+		var costs = _empoweredActionHandle.GetCostData();
+		foreach (var cost in costs)
+		{
+			// Assuming you want to check Mana costs
+			if (cost.Attribute == "PlayerAttributeSet.Mana")
+			{
+				//GD.Print($"Mana Cost: {cost.Cost}");
+			}
+		}
+
+		var canActivate = _empoweredActionHandle.CanActivate(out var failures);
+		if (!canActivate)
+		{
+			GD.PrintErr($"Cannot activate empowered action: {failures}");
+			if (failures.HasFlag(AbilityActivationFailures.Cooldown)) GD.PrintErr("In Cooldown");
+			if (failures.HasFlag(AbilityActivationFailures.InsufficientResources)) GD.PrintErr("Not Enough Mana");
+		}
+		return canActivate;
 		return EmpoweredActionsLeft > 0 && TutorialDone;
 	}
 	public void PerformEmpoweredAction()
 	{
+		if(_empoweredActionHandle == null) return;
+		
+		var canActivate = _empoweredActionHandle.Activate(out var failures);
+		if (!canActivate)
+		{
+			GD.PrintErr($"Cannot activate empowered action: {failures}");
+			if (failures.HasFlag(AbilityActivationFailures.Cooldown)) GD.PrintErr("In Cooldown");
+			if (failures.HasFlag(AbilityActivationFailures.InsufficientResources)) GD.PrintErr("Not Enough Mana");
+		}
+		else
+		{
+			GD.Print($"Remaining mana: {Attributes["PlayerAttributeSet.Mana"].CurrentValue}");
+		}
+		
+		// Inhibit Mana Regeneration for a while after using an empowered action
+		// TODO: Use Forge events instead of relying on direct referencing
+		_manaRegenEffectHandle!.SetInhibit(true);
+		GetTree().CreateTimer(EmpoweredAction.ManaRegenPause).Timeout += () => {_manaRegenEffectHandle!.SetInhibit(false);};
+		
 		_isWallJumpAvailable = true;
 		_canDashAirborne = true;
 		EmpoweredActionsLeft--;
@@ -1978,7 +2084,7 @@ public partial class PlayerController : CharacterBody3D,
 		_dashDirection = travel.Normalized();

 		var shouldRebound = false;
-		if (DashSystem.CanDashThroughTarget && DashSystem.CollidedObject is ITargetable targetable)
+		if (DashSystem is { CanDashThroughTarget: true, CollidedObject: ITargetable targetable })
 		{
 			var plannedDashLocation = targetable.GetTargetGlobalPosition() + Vector3.Down*_playerHeight/2;
 			travel = plannedDashLocation - GlobalPosition;
@@ -2063,7 +2169,7 @@ public partial class PlayerController : CharacterBody3D,
 			DashSystem.HasHit,
 			DashSystem.CollisionPoint,
 			DashSystem.CollisionNormal,
-			DashSystem.CollidedObject as Node);
+			(DashSystem.CollidedObject as Node)!);
 	}
 	public void RecoverWeapon()
 	{
@@ -2167,7 +2273,7 @@ public partial class PlayerController : CharacterBody3D,
 		WeaponSystem.PlantObject = null;
 	}

-	public void ManageAttackedEnemyPostDash(Node enemy)
+	public void ManageAttackedEnemyPostDash(Node? enemy)
 	{
 		if (enemy is IDamageable damageable)
 		{
@@ -2190,14 +2296,10 @@ public partial class PlayerController : CharacterBody3D,
 		_spaceState = GetWorld3D().DirectSpaceState;
 		
 		if (_currentInputBufferFrames > 0) _currentInputBufferFrames -= 1;
-		
 		// Limit maximum speed
 		if (Velocity.Length() > AbsoluteMaxSpeed)
 			Velocity = Velocity.Normalized() * AbsoluteMaxSpeed;
 		
-		// Manage head and camera movement
-		LookAround(delta);
-		
 		// Manage general movement
 		Velocity += ComputeKnockback();
 		MoveSlideAndHandleStairs((float) delta);
@@ -2205,19 +2307,20 @@ public partial class PlayerController : CharacterBody3D,
 		// Manage gameplay systems
 		MantleSystem.ProcessMantle(_grounded.Active);
 		HandleEnemyTargeting();
+	}

-		// Manage dash target and tutorial specific stuff
-		// if (WeaponSystem.InHandState.Active && !_aiming.Active && TutorialDone)
-		// {
-		// 	DashIndicatorMesh.Visible = false;
-		// }
-		// if (!WeaponSystem.InHandState.Active && TutorialDone)
-		// {
-		// 	DashIndicatorMesh.Visible = true;
-		// 	
-		// 	DashIndicatorMeshCylinder.Height = WeaponSystem.GlobalPosition.DistanceTo(GlobalPosition) * 2;
-		// 	DashIndicatorNode.LookAt(WeaponSystem.GlobalPosition);
-		// }
+	private float _oldMana = 100;
+	public override void _Process(double delta)
+	{
+		// Manage head and camera movement
+		LookAround(delta);
+		
+		EffectsManager.UpdateEffects(delta);
+		// TODO: change for actual Cue
+		var currentMana = Attributes["PlayerAttributeSet.Mana"].CurrentValue;
+		if (Mathf.Abs(currentMana - _oldMana) > Mathf.Epsilon)
+			PlayerUi.OnManaChanged(currentMana);
+		_oldMana = currentMana;
 	}

 	///////////////////////////
@@ -2227,7 +2330,7 @@ public partial class PlayerController : CharacterBody3D,
 	private bool _isEnemyInDashAttackRange;
 	private Vector3 _targetHitLocation;
 	private Vector3 _targetLocation;
-	private Object _targetObject;
+	private Object? _targetObject;
 	public void HandleEnemyTargeting()
 	{
 		_isEnemyInDashAttackRange = false;
@@ -2235,7 +2338,7 @@ public partial class PlayerController : CharacterBody3D,
 		var enemyTargetState = PlayerUi.TargetState.NoTarget;
 		var positionOnScreen = Vector2.Zero;
 		
-		if (DashSystem.CanDashThroughTarget && DashSystem.CollidedObject is ITargetable dashTarget)
+		if (DashSystem is { CanDashThroughTarget: true, CollidedObject: ITargetable dashTarget })
 		{
 			enemyTargetState = PlayerUi.TargetState.TargetWouldKill;
 			_targetLocation = dashTarget.GetTargetGlobalPosition();
@@ -2279,11 +2382,11 @@ public partial class PlayerController : CharacterBody3D,
 		if (IsInvincible) 
 			return damageRecord with { Damage = new RDamage(0, damageRecord.Damage.DamageType) };
 		
-		var finalDamage = CDamageable.TakeDamage(damageRecord);
+		var finalDamage = CDamageable!.TakeDamage(damageRecord);
 		DamageTaken?.Invoke(this, finalDamage);
 		
 		HeadSystem.OnGetHit();
-		_audioStream!.SwitchToClipByName("damage_taken");
+		_audioStream.SwitchToClipByName("damage_taken");
 		TriggerHitstop();
 		OnHitInvincibility();
 		
@@ -2292,7 +2395,7 @@ public partial class PlayerController : CharacterBody3D,

 	public DamageRecord ComputeDamage(DamageRecord damageRecord)
 	{
-		return CDamageable.ComputeDamage(damageRecord);
+		return CDamageable!.ComputeDamage(damageRecord);
 	}

 	public void OnHitInvincibility()
@@ -2305,24 +2408,24 @@ public partial class PlayerController : CharacterBody3D,
 	{
 		_attackCooldown.Start();
 		HeadSystem.OnHit();
-		_audioStream!.SwitchToClipByName("attacks");
+		_audioStream.SwitchToClipByName("attacks");
 	}

 	public void OnStandardParryStarted()
 	{
 		_attackCooldown.Start();
 		HeadSystem.OnParry();
-		_audioStream!.SwitchToClipByName("parry");
+		_audioStream.SwitchToClipByName("parry");
 	}

-	private PhysicsDirectSpaceState3D _spaceState;
+	private PhysicsDirectSpaceState3D _spaceState = null!;
 	public void StartDashAction(bool isParry)
 	{
 		if (isParry) HeadSystem.OnParry();
 		else HeadSystem.OnHit();
 		
 		var streamName = isParry ? "parry" : "attacks";
-		_audioStream!.SwitchToClipByName(streamName);
+		_audioStream.SwitchToClipByName(streamName);
 		IsInvincible = true;
 		
 		var plannedDashLocation = _targetLocation + Vector3.Down*_playerHeight/2;
@@ -2452,7 +2555,7 @@ public partial class PlayerController : CharacterBody3D,
 		_hitEnemies.Clear();
 		
 		HeadSystem.OnHitTarget();
-		_audioStream!.SwitchToClipByName("hits");
+		_audioStream.SwitchToClipByName("hits");
 		TriggerHitstop();
 	}

@@ -2469,19 +2572,18 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public HealthChangedRecord ReduceHealth(IDamageable source, DamageRecord damageRecord)
 	{
-		GD.Print("That's NOT fine");
-		var record = CHealth.ReduceHealth(source, damageRecord);
+		var record = CHealth!.ReduceHealth(source, damageRecord);
 		HealthChanged?.Invoke(this, record);
 		return record;
 	}
 	public void RegisterKnockback(KnockbackRecord knockbackRecord)
 	{
-		CKnockback.RegisterKnockback(knockbackRecord);
+		CKnockback!.RegisterKnockback(knockbackRecord);
 	}

 	public Vector3 ComputeKnockback()
 	{
-		var kb = CKnockback.ComputeKnockback();
+		var kb = CKnockback!.ComputeKnockback();
 		return kb;
 	}

@@ -2500,10 +2602,9 @@ public partial class PlayerController : CharacterBody3D,
 		IsInvincible = false;
 	}
 	
-	
 	// Sound
 	public void OnFootStepped()
 	{
-		_audioStream!.SwitchToClipByName("footsteps");
+		_audioStream.SwitchToClipByName("footsteps");
 	}
 }
--- a/scenes/ui/healthbar/Healthbar.cs
+++ b/scenes/ui/healthbar/Healthbar.cs
@@ -4,8 +4,10 @@ using System;
 [GlobalClass, Icon("res://assets/ui/IconGodotNode/control/icon_heart.png")]
 public partial class Healthbar : ProgressBar
 {
-    private Timer _damageCatchUpTimer;
-    private ProgressBar _damagedHealth;
+    private Timer _damageCatchUpTimer = null!;
+    private ProgressBar _damagedHealth = null!;
+
+    [Export] public StyleBox? BarStyle;

    private float _currentHealth;
    public float CurrentHealth
@@ -21,6 +23,9 @@ public partial class Healthbar : ProgressBar
        
        _damageCatchUpTimer.Timeout += OnDamageCatchUp;
        Visible = false;
+        
+        if (BarStyle != null)
+            AddThemeStyleboxOverride("fill", BarStyle);
    }

    public void Initialize(float initialHealth)
--- a/scenes/ui/healthbar/healthbar.tscn
+++ b/scenes/ui/healthbar/healthbar.tscn
@@ -5,7 +5,7 @@
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_0sgot"]

 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0k5hr"]
-bg_color = Color(0.698864, 0.047356047, 0, 1)
+bg_color = Color(0.69803923, 0.047058824, 0, 1)

 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_0sgot"]
 bg_color = Color(0.14767182, 0.14767182, 0.14767176, 1)
--- a/stairs.gd
+++ b/stairs.gd
@@ -1 +0,0 @@
-extends "res://tools/generate_collisions.gd"
--- a/stairs.gd.uid
+++ b/stairs.gd.uid
@@ -1 +0,0 @@
-uid://nnccp057g34w
--- a/tests/components/DamageComponentUnitTest.cs
+++ b/tests/components/DamageComponentUnitTest.cs
@@ -0,0 +1,101 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.interfaces;
+using Movementtests.systems.damage;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class DamageComponentUnitTest
+{
+    [TestCase]
+    public void DamageModifierAppliesWhenTypeMatches()
+    {
+        var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
+        var modifier = new RDamageModifier(EDamageTypes.Normal, 2.0f);
+        var signalTriggered = false;
+        modifier.DamageTaken += (_, _) => signalTriggered = true;
+        
+        var result = modifier.TakeDamage(input);
+        
+        AssertFloat(result.Damage.DamageDealt).IsEqual(20.0f);
+        AssertBool(signalTriggered).IsTrue();
+    }
+
+    [TestCase]
+    public void DamageModifierIgnoresWhenTypeDifferent()
+    {
+        var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
+        var modifier = new RDamageModifier(EDamageTypes.Fire, 3.0f);
+        var signalTriggered = false;
+        modifier.DamageTaken += (_, _) => signalTriggered = true;
+        
+        var result = modifier.TakeDamage(input);
+        
+        AssertFloat(result.Damage.DamageDealt).IsEqual(0.0f);
+        AssertBool(signalTriggered).IsFalse();  // No damage actually taken
+    }
+
+    [TestCase]
+    public void DamageableSumsAllModifiers()
+    {
+        var mod1 = new RDamageModifier(EDamageTypes.Normal, 1.0f);
+        var mod2 = new RDamageModifier(EDamageTypes.Normal, 0.5f);
+
+        var damageable = new CDamageable();
+        damageable.DamageModifiers = new[] { mod1, mod2 };
+        var signalTriggered = false;
+        damageable.DamageTaken += (_, _) => signalTriggered = true;
+
+        var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
+        var result = damageable.TakeDamage(input);
+        
+        AssertFloat(result.Damage.DamageDealt).IsEqual(15.0f);
+        AssertBool(signalTriggered).IsTrue();
+    }
+    
+    [TestCase]
+    public void ComputeDamageModifierAppliesWhenTypeMatches()
+    {
+        var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
+        var modifier = new RDamageModifier(EDamageTypes.Normal, 2.0f);
+        var signalTriggered = false;
+        modifier.DamageTaken += (_, _) => signalTriggered = true;
+        
+        var result = modifier.ComputeDamage(input);
+        
+        AssertFloat(result.Damage.DamageDealt).IsEqual(20.0f);
+        AssertBool(signalTriggered).IsFalse();
+    }
+    [TestCase]
+    public void ComputeDamageModifierIgnoresWhenTypeDifferent()
+    {
+        var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
+        var modifier = new RDamageModifier(EDamageTypes.Fire, 3.0f);
+        var signalTriggered = false;
+        modifier.DamageTaken += (_, _) => signalTriggered = true;
+        
+        var result = modifier.ComputeDamage(input);
+        
+        AssertFloat(result.Damage.DamageDealt).IsEqual(0.0f);
+        AssertBool(signalTriggered).IsFalse();
+    }
+    [TestCase]
+    public void ComputeDamageableSumsAllModifiers()
+    {
+        var mod1 = new RDamageModifier(EDamageTypes.Normal, 1.0f);
+        var mod2 = new RDamageModifier(EDamageTypes.Normal, 0.5f);
+
+        var cDamageable = new CDamageable();
+        cDamageable.DamageModifiers = new[] { mod1, mod2 };
+        var signalTriggered = false;
+        cDamageable.DamageTaken += (_, _) => signalTriggered = true;
+
+        var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
+        var result = cDamageable.ComputeDamage(input);
+        
+        AssertFloat(result.Damage.DamageDealt).IsEqual(15.0f);
+        AssertBool(signalTriggered).IsFalse();
+    }
+}
--- a/tests/components/DamageComponentUnitTest.cs.uid
+++ b/tests/components/DamageComponentUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://db6rva7uccppc
--- a/tests/components/HealthComponentUnitTest.cs
+++ b/tests/components/HealthComponentUnitTest.cs
@@ -0,0 +1,55 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.interfaces;
+using Movementtests.systems.damage;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class HealthComponentUnitTest
+{
+    [TestCase]
+    public void ReadyInitializesCurrentHealth()
+    {
+        var cHealth = new CHealth();
+        cHealth.RHealth = new RHealth(150.0f);
+        cHealth._Ready();
+        AssertFloat(cHealth.CurrentHealth).IsEqual(150.0f);
+    }
+
+    [TestCase]
+    public void ReduceHealthDecreasesAndDoesNotDeplete()
+    {
+        var cHealth = new CHealth();
+        cHealth.RHealth = new RHealth(100.0f);
+        cHealth.CurrentHealth = 100.0f;
+
+        var damage = new DamageRecord(Vector3.Zero, new RDamage(25.0f, EDamageTypes.Normal));
+        var record = cHealth.ReduceHealth(source: null!, damageRecord: damage);
+
+        AssertFloat(cHealth.CurrentHealth).IsEqual(75.0f);
+        AssertFloat(record.CurrentHealth).IsEqual(75.0f);
+        AssertFloat(record.PreviousHealth).IsEqual(100.0f);
+        AssertFloat(record.MaxHealth).IsEqual(100.0f);
+    }
+
+    [TestCase]
+    public void ReduceHealthTriggersDepletionToZero()
+    {
+        var cHealth = new CHealth();
+        cHealth.RHealth = new RHealth(50.0f);
+        cHealth.CurrentHealth = 50.0f;
+
+        bool depleted = false;
+        cHealth.HealthDepleted += _ => depleted = true;
+
+        var damage = new DamageRecord(Vector3.Zero, new RDamage(100.0f, EDamageTypes.Normal));
+        var record = cHealth.ReduceHealth(source: null!, damageRecord: damage);
+
+        AssertBool(depleted).IsTrue();
+        AssertFloat(cHealth.CurrentHealth).IsEqual(0.0f);
+        AssertFloat(record.CurrentHealth).IsEqual(-50.0f);
+        AssertFloat(record.MaxHealth).IsEqual(50.0f);
+    }
+}
--- a/tests/components/HealthComponentUnitTest.cs.uid
+++ b/tests/components/HealthComponentUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://bd52i51hncgmf
--- a/tests/components/KnockbackComponentUnitTest.cs
+++ b/tests/components/KnockbackComponentUnitTest.cs
@@ -0,0 +1,32 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.interfaces;
+using Movementtests.systems.damage;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class KnockbackComponentUnitTest
+{
+    [TestCase]
+    public void RegisterAndComputeKnockback()
+    {
+        var cKnock = new CKnockback();
+        cKnock.RKnockback = new RKnockback(2.0f);
+        cKnock.GlobalPosition = Vector3.Zero;
+
+        var damage = new DamageRecord(new Vector3(10, 0, 0), new RDamage(0, EDamageTypes.Normal));
+        var record = new KnockbackRecord(damage, 1.5f);
+
+        cKnock.RegisterKnockback(record);
+        var force = cKnock.ComputeKnockback();
+
+        // Direction from source(10,0,0) to target(0,0,0) is (-1,0,0), scaled by modifier(2) and multiplier(1.5) => (-3,0,0)
+        AssertVector(force).IsEqual(new Vector3(-3, 0, 0));
+
+        // Second call returns zero since internal state resets
+        var second = cKnock.ComputeKnockback();
+        AssertVector(second).IsEqual(Vector3.Zero);
+    }
+}
--- a/tests/components/KnockbackComponentUnitTest.cs.uid
+++ b/tests/components/KnockbackComponentUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://bv0eionbgbig5
--- a/tests/components/MovementSystemUnitTest.cs
+++ b/tests/components/MovementSystemUnitTest.cs
@@ -0,0 +1,32 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.interfaces;
+using Movementtests.scenes.movement;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class MovementSystemUnitTest
+{
+    [TestCase]
+    public void GroundedMovementAcceleratesAndAppliesGravity()
+    {
+        var move = new CGroundedMovement();
+        move.RMovement = new RMovement(speed: 10.0f, acceleration: 1.0f, gravityModifier: 0.5f, targetHeight: 0.0f);
+        move.WallInFrontRayCast = new RayCast3D();
+        //move.GlobalPosition = Vector3.Zero;
+
+        var inputs = new MovementInputs(
+            Velocity: Vector3.Zero,
+            TargetLocation: new Vector3(10, 0, 0),
+            isOnFloor: false,
+            gravity: Vector3.Down * 9.8f,
+            delta: 1.0
+        );
+
+        var v = move.ComputeVelocity(inputs);
+
+        AssertVector(v).IsEqualApprox(new Vector3(10, -4.9f, 0), new Vector3(0.001f, 0.001f, 0.001f));
+    }
+}
--- a/tests/components/MovementSystemUnitTest.cs.uid
+++ b/tests/components/MovementSystemUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://cofj5s4x74ay
--- a/tests/enemies/EnemyUnitTest.cs
+++ b/tests/enemies/EnemyUnitTest.cs
@@ -0,0 +1,30 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.interfaces;
+using Movementtests.systems.damage;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class EnemyUnitTest
+{
+    [TestCase]
+    public void ComputeDamageNoComponent()
+    {
+        var enemy = new Enemy();
+        var input = new DamageRecord(Vector3.Zero, new RDamage(10.0f, EDamageTypes.Normal));
+
+        var result = enemy.ComputeDamage(input);
+        AssertFloat(result.Damage.DamageDealt).IsEqual(0.0f);
+    }
+
+    [TestCase]
+    public void Unstun()
+    {
+        var enemy = new Enemy();
+        enemy.IsStunned = true;
+        enemy.Unstun();
+        AssertBool(enemy.IsStunned).IsFalse();
+    }
+}
--- a/tests/enemies/EnemyUnitTest.cs.uid
+++ b/tests/enemies/EnemyUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://cojxgcs6xqqoq
--- a/tests/player/DashSystemUnitTest.cs
+++ b/tests/player/DashSystemUnitTest.cs
@@ -0,0 +1,55 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.systems;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class DashSystemUnitTest
+{
+    private DashSystem _dashSystem;
+
+    [BeforeTest]
+    public void SetupTest()
+    {
+        _dashSystem = new DashSystem();
+        
+        _dashSystem.DashCast3D = new ShapeCast3D();
+        _dashSystem.AddChild(_dashSystem.DashCast3D);
+        
+        _dashSystem.DashCastDrop = new ShapeCast3D();
+        _dashSystem.AddChild(_dashSystem.DashCastDrop);
+        
+        _dashSystem.DashTarget = new MeshInstance3D();
+        _dashSystem.AddChild(_dashSystem.DashTarget);
+        
+        _dashSystem.DashDropIndicator = new MeshInstance3D();
+        _dashSystem.AddChild(_dashSystem.DashDropIndicator);
+        
+        _dashSystem.DashDropLocationIndicator = new MeshInstance3D();
+        _dashSystem.AddChild(_dashSystem.DashDropLocationIndicator);
+    }
+
+    [AfterTest]
+    public void CleanupTest()
+    {
+        _dashSystem?.Free();
+    }
+
+    [TestCase]
+    public void TestStopPreparingDash()
+    {
+        _dashSystem.CanDashThroughTarget = true;
+        _dashSystem.DashTarget.Visible = true;
+        _dashSystem.DashDropIndicator.Visible = true;
+        _dashSystem.DashDropLocationIndicator.Visible = true;
+        
+        _dashSystem.StopPreparingDash();
+        
+        AssertBool(_dashSystem.CanDashThroughTarget).IsFalse();
+        AssertBool(_dashSystem.DashTarget.Visible).IsFalse();
+        AssertBool(_dashSystem.DashDropIndicator.Visible).IsFalse();
+        AssertBool(_dashSystem.DashDropLocationIndicator.Visible).IsFalse();
+    }
+}
--- a/tests/player/DashSystemUnitTest.cs.uid
+++ b/tests/player/DashSystemUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://pv570go4cxws
--- a/tests/player/HeadSystemUnitTest.cs
+++ b/tests/player/HeadSystemUnitTest.cs
@@ -0,0 +1,94 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.systems;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class HeadSystemUnitTest
+{
+    private HeadSystem _head;
+
+    [BeforeTest]
+    public void SetupTest()
+    {
+        _head = new HeadSystem();
+        _head.Camera = new Camera3D();
+        _head.AddChild(_head.Camera);
+        
+        // _head._cameraAnchor = new Marker3D();
+        _head.AddChild(_head.CameraAnchor);
+        
+        _head.FpRig = new Node3D();
+        _head.AddChild(_head.FpRig);
+        _head.CameraAnchor = new Node3D();
+        _head.AddChild(_head.CameraAnchor);
+        _head.RightHandedWeapon = new Node3D();
+        _head.AddChild(_head.RightHandedWeapon);
+        _head.LeftHandedWeapon = new Node3D();
+        _head.AddChild(_head.LeftHandedWeapon);
+    }
+
+    [AfterTest]
+    public void CleanupTest()
+    {
+        _head?.Free();
+    }
+
+    [TestCase]
+    public void TestResetHeadBobbing()
+    {
+        _head._bobbingAccumulator = 10.0f;
+        _head.ResetHeadBobbing();
+        AssertFloat(_head._bobbingAccumulator).IsEqual(0.0f);
+    }
+
+    [TestCase]
+    public void TestComputeHowMuchInputForward()
+    {
+        Vector3 forwardInput = new Vector3(0, 0, -1);
+        AssertFloat(_head.ComputeHowMuchInputForward(forwardInput)).IsEqual(1.0f);
+
+        Vector3 backwardInput = new Vector3(0, 0, 1);
+        AssertFloat(_head.ComputeHowMuchInputForward(backwardInput)).IsEqual(-1.0f);
+    }
+
+    [TestCase]
+    public void TestComputeHowMuchInputSideways()
+    {
+        Vector3 rightInput = new Vector3(1, 0, 0);
+        AssertFloat(_head.ComputeHowMuchInputSideways(rightInput)).IsEqual(1.0f);
+
+        Vector3 leftInput = new Vector3(-1, 0, 0);
+        AssertFloat(_head.ComputeHowMuchInputSideways(leftInput)).IsEqual(-1.0f);
+    }
+
+    [TestCase]
+    public void TestGetForwardHorizontalVector()
+    {
+        Vector3 forward = _head.GetForwardHorizontalVector();
+        AssertVector(forward).IsEqualApprox(Vector3.Back, new Vector3(0.001f, 0.001f, 0.001f));
+    }
+
+    [TestCase]
+    public void TestLookAroundRotation()
+    {
+        var inputs = new HeadSystem.CameraParameters(
+            Delta: 0.016,
+            LookDir: new Vector2(1, 0),
+            PlayerInput: Vector3.Zero,
+            PlayerVelocity: Vector3.Zero,
+            WallContactPoint: Vector3.Zero,
+            SensitivitMultiplier: 1.0f,
+            WithCameraJitter: false,
+            WithCameraBobbing: false,
+            BobbingMultiplier: 1.0f,
+            FovMultiplier: 1.0f
+        );
+
+        float initialY = _head.Rotation.Y;
+        _head.LookAround(inputs);
+        AssertFloat(_head.Rotation.Y).IsEqual(initialY + 1.0f);
+    }
+}
--- a/tests/player/HeadSystemUnitTest.cs.uid
+++ b/tests/player/HeadSystemUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://bp0xn8k3dmfkg
--- a/tests/player/PlayerControllerUnitTest.cs
+++ b/tests/player/PlayerControllerUnitTest.cs
@@ -0,0 +1,149 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.interfaces;
+using Movementtests.systems.damage;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class PlayerControllerUnitTest
+{
+    private PlayerController _player;
+
+    [BeforeTest]
+    public void SetupTest()
+    {
+        _player = new PlayerController();
+        _player.TargetSpeed = 7.0f;
+        _player.Gravity = 9.8f;
+        
+        var rHealth = new RHealth(100.0f);
+        _player.RHealth = rHealth;
+        _player.CHealth = new CHealth { RHealth = rHealth, CurrentHealth = 100.0f };
+    }
+
+    [AfterTest]
+    public void CleanupTest()
+    {
+        _player?.Free();
+    }
+
+    [TestCase]
+    public void TestCalculateGravityForce()
+    {
+        _player.Weight = 3.0f;
+        // gravity is 9.8f
+        AssertFloat(_player.CalculateGravityForce()).IsEqualApprox(29.4f, 0.001f);
+    }
+
+    [TestCase]
+    public void TestIsPlayerInputtingForward()
+    {
+        // Test Keyboard Input
+        _player.InputDeviceChanged(false);
+        _player.OnInputMoveKeyboard(Vector3.Forward);
+        AssertBool(_player.IsPlayerInputtingForward()).IsTrue();
+
+        _player.OnInputMoveKeyboard(Vector3.Back);
+        AssertBool(_player.IsPlayerInputtingForward()).IsFalse();
+
+        // Test Gamepad Input
+        _player.InputDeviceChanged(true);
+        _player.OnInputMove(new Vector3(0, 0, -1));
+        AssertBool(_player.IsPlayerInputtingForward()).IsTrue();
+    }
+
+    [TestCase]
+    public void TestSetVerticalVelocity()
+    {
+        _player.Velocity = new Vector3(1, 0, 2);
+        _player.SetVerticalVelocity(5.0f);
+        AssertVector(_player.Velocity).IsEqual(new Vector3(1, 5, 2));
+    }
+
+    [TestCase]
+    public void TestComputeHVelocityGround()
+    {
+        _player.Velocity = Vector3.Zero;
+        _player.AccelerationFloor = 10.0f;
+        
+        float delta = 0.1f;
+        Vector3 newVelocity = _player.ComputeHVelocity(delta, _player.AccelerationFloor, _player.DecelerationFloor, Vector3.Forward);
+        AssertVector(newVelocity).IsEqual(new Vector3(0, 0, -7.0f));
+    }
+
+    [TestCase]
+    public void TestComputeHVelocityAir()
+    {
+        _player.Velocity = new Vector3(5, 0, 0);
+        _player.AccelerationAir = 2.0f;
+        _player.DecelerationAir = 2.0f;
+        
+        float delta = 0.5f;
+        Vector3 newVelocity = _player.ComputeHVelocity(delta, _player.AccelerationAir, _player.DecelerationAir, Vector3.Zero);
+        
+        AssertVector(newVelocity).IsEqual(Vector3.Zero);
+    }
+
+    [TestCase]
+    public void TestReduceHealth()
+    {
+        var damageRecord = new DamageRecord(Vector3.Zero, new RDamage(25.0f, EDamageTypes.Normal));
+        _player.ReduceHealth(_player, damageRecord);
+        AssertFloat(_player.CHealth.CurrentHealth).IsEqual(75.0f);
+    }
+
+    [TestCase]
+    public void TestEmpoweredActionsLeft()
+    {
+        var mockUi = new PlayerUi();
+        var dashIcons = new TextureRect[3] { new TextureRect(), new TextureRect(), new TextureRect() };
+        mockUi.DashIcons = dashIcons;
+        
+        _player.PlayerUi = mockUi;
+        
+        _player.EmpoweredActionsLeft = 2;
+        AssertInt(_player.EmpoweredActionsLeft).IsEqual(2);
+        AssertBool(dashIcons[0].Visible).IsTrue();
+        AssertBool(dashIcons[1].Visible).IsTrue();
+        AssertBool(dashIcons[2].Visible).IsFalse();
+    }
+
+    [TestCase]
+    public void TestDashCooldownTimeout()
+    {
+        _player.CanDash = false;
+        _player.DashCooldownTimeout();
+        AssertBool(_player.CanDash).IsTrue();
+    }
+
+    [TestCase]
+    public void TestGetInputLocalHDirection()
+    {
+        _player.InputDeviceChanged(false);
+        _player.OnInputMoveKeyboard(new Vector3(1, 0, 1));
+        
+        Vector3 expected = new Vector3(1, 0, 1).Normalized();
+        AssertVector(_player.GetInputLocalHDirection()).IsEqualApprox(expected, new Vector3(0.001f, 0.001f, 0.001f));
+    }
+
+    [TestCase]
+    public void TestComputeKnockback()
+    {
+        var cKnockback = new CKnockback();
+        cKnockback.RKnockback = new RKnockback(10.0f);
+        _player.CKnockback = cKnockback;
+        
+        var damageRecord = new DamageRecord(new Vector3(10, 0, 0), new RDamage(0, EDamageTypes.Normal));
+        var knockbackRecord = new KnockbackRecord(damageRecord, 1.0f);
+        
+        _player.GlobalPosition = Vector3.Zero;
+        cKnockback.GlobalPosition = Vector3.Zero;
+        
+        _player.RegisterKnockback(knockbackRecord);
+        
+        Vector3 knockback = cKnockback.ComputeKnockback();
+        AssertVector(knockback).IsEqual(new Vector3(-10, 0, 0));
+    }
+}
--- a/tests/player/PlayerControllerUnitTest.cs.uid
+++ b/tests/player/PlayerControllerUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://kmphtu0ovixi
--- a/tests/player/WeaponSystemUnitTest.cs
+++ b/tests/player/WeaponSystemUnitTest.cs
@@ -0,0 +1,51 @@
+using Godot;
+using GdUnit4;
+using static GdUnit4.Assertions;
+using Movementtests.systems;
+using Movementtests.systems.damage;
+
+namespace Movementtests.tests;
+
+[TestSuite, RequireGodotRuntime]
+public class WeaponSystemUnitTest
+{
+    private WeaponSystem _weapon;
+
+    [BeforeTest]
+    public void SetupTest()
+    {
+        _weapon = new WeaponSystem();
+        _weapon.RDamage = new RDamage(5.0f, EDamageTypes.Normal);
+        
+        _weapon.WeaponMesh = new MeshInstance3D();
+        _weapon.AddChild(_weapon.WeaponMesh);
+        _weapon.WeaponLocationIndicator = new MeshInstance3D();
+        _weapon.AddChild(_weapon.WeaponLocationIndicator);
+    }
+
+    [AfterTest]
+    public void CleanupTest()
+    {
+        _weapon?.Free();
+    }
+
+    [TestCase]
+    public void TestWeaponLeftAndBackVisibility()
+    {
+        _weapon.Visible = false;
+
+        _weapon.WeaponLeft();
+        AssertBool(_weapon.Visible).IsTrue();
+
+        _weapon.WeaponBack();
+        AssertBool(_weapon.Visible).IsFalse();
+    }
+
+    [TestCase]
+    public void TestThrowWeaponOnCurveSetsUnfrozen()
+    {
+        _weapon.Freeze = true;
+        _weapon.ThrowWeaponOnCurve();
+        AssertBool(_weapon.Freeze).IsFalse();
+    }
+}
--- a/tests/player/WeaponSystemUnitTest.cs.uid
+++ b/tests/player/WeaponSystemUnitTest.cs.uid
@@ -0,0 +1 @@
+uid://vkv8aderakcb
--- a/tests/player/interactions/PlayerInteractionsTest.cs
+++ b/tests/player/interactions/PlayerInteractionsTest.cs
@@ -0,0 +1,50 @@
+using System.Threading.Tasks;
+using Godot;
+using GodotStateCharts;
+
+namespace Movementtests.tests;
+
+using GdUnit4;
+using static GdUnit4.Assertions;
+
+[TestSuite, RequireGodotRuntime]
+public class PlayerInteractionsTest
+{
+    private ISceneRunner _runner;
+    private Node _scene;
+    private PlayerController _player;
+
+    private readonly float _tolerance = 0.01f;
+    private readonly Vector3 _vectorTolerance = new Vector3(0.01f, 0.01f, 0.01f);
+    
+    [BeforeTest] 
+    public void SetupTest()
+    {
+        _runner = ISceneRunner.Load("res://tests/player/interactions/player_interactions_scene.tscn");
+
+        _scene = _runner.Scene()!;
+        var player = _scene.FindChild("Player") as PlayerController;
+        _player = player!;
+    }
+    [AfterTest] 
+    public void CleanupTest() {}
+   
+    [TestCase("BaseLocation")]
+    public async Task PlayerMoveForward(string markerName)
+    {
+        var marker = _scene.FindChild(markerName) as Marker3D;
+        AssertObject(marker).IsNotNull();
+        _player.GlobalPosition = marker!.GlobalPosition;
+        await _runner.AwaitIdleFrame();
+        
+        var startPos = _player.GlobalPosition;
+        
+        _runner.SimulateKeyPress(Key.W);
+        await _runner.AwaitMillis(300);
+        _runner.SimulateKeyRelease(Key.W);
+        
+        var endPos = _player.GlobalPosition;
+        var direction = startPos.DirectionTo(endPos);
+        AssertVector(direction).IsEqualApprox(Vector3.Forward, _vectorTolerance);
+    }
+}
--- a/tests/player/interactions/PlayerInteractionsTest.cs.uid
+++ b/tests/player/interactions/PlayerInteractionsTest.cs.uid
@@ -0,0 +1 @@
+uid://denedm5b8rmhh
--- a/tests/player/interactions/player_interactions_scene.tscn
+++ b/tests/player/interactions/player_interactions_scene.tscn
@@ -0,0 +1,35 @@
+[gd_scene format=3 uid="uid://l0lflvsjbyvs"]
+
+[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/materials/greybox/m_greybox.tres" id="1_dv0re"]
+[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://scenes/player_controller/PlayerController.tscn" id="2_52d52"]
+
+[node name="PlayerMovementScene" type="Node3D" unique_id=231040688]
+
+[node name="CSGCombiner3D" type="CSGCombiner3D" parent="." unique_id=241909240]
+use_collision = true
+collision_layer = 256
+collision_mask = 65553
+
+[node name="Ground" type="CSGBox3D" parent="CSGCombiner3D" unique_id=432200143]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.5, -0.5, -3.25)
+use_collision = true
+collision_layer = 256
+collision_mask = 65553
+size = Vector3(1000, 1, 1000)
+material = ExtResource("1_dv0re")
+
+[node name="Ground2" type="CSGBox3D" parent="CSGCombiner3D" unique_id=854660236]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.75, 0.5, -1.75)
+use_collision = true
+collision_layer = 256
+collision_mask = 65553
+size = Vector3(1.5, 1, 1.5)
+material = ExtResource("1_dv0re")
+
+[node name="Player" parent="." unique_id=709076448 instance=ExtResource("2_52d52")]
+TutorialDone = true
+
+[node name="BaseLocation" type="Marker3D" parent="." unique_id=1793710692]
+
+[node name="MantleLocation1" type="Marker3D" parent="." unique_id=550080845]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.75, 0, 0)
--- a/tests/player/movement/PlayerMovementTest.cs
+++ b/tests/player/movement/PlayerMovementTest.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Godot;
+using GodotStateCharts;

 namespace Movementtests.tests;

@@ -44,7 +45,7 @@ public class PlayerMovementTest
        var startPos = _player.GlobalPosition;
        
        _runner.SimulateKeyPress(Key.W);
-        await _runner.AwaitMillis(300);
+        await _runner.AwaitMillis(100);
        _runner.SimulateKeyRelease(Key.W);
        
        var endPos = _player.GlobalPosition;
@@ -63,17 +64,24 @@ public class PlayerMovementTest
        var startPos = _player.GlobalPosition;
        
        _runner.SimulateKeyPress(Key.Space);
-        await _runner.AwaitMillis(100);
-        _runner.SimulateKeyRelease(Key.Space);
+        await _runner.AwaitIdleFrame();
        
+        var jumping = StateChartState.Of(_player.GetNode("StateChart/Root/Movement/Jump"));
+        AssertBool(jumping.Active).IsTrue();
+        
+        _runner.SimulateKeyRelease(Key.Space);
+        await _runner.AwaitIdleFrame();
        var endPos = _player.GlobalPosition;
        var direction = startPos.DirectionTo(endPos);
        AssertVector(direction).IsEqualApprox(Vector3.Up, _vectorTolerance);
        AssertVector(_player.Velocity.Normalized()).IsEqualApprox(Vector3.Up, _vectorTolerance);
        
-        await _runner.AwaitMillis(500);
+        await _runner.AwaitMillis(600);
        endPos = _player.GlobalPosition;
        AssertVector(endPos - startPos).IsEqualApprox(Vector3.Zero, _vectorTolerance);
+        
+        var grounded = StateChartState.Of(_player.GetNode("StateChart/Root/Movement/Grounded"));
+        AssertBool(grounded.Active).IsTrue();
    }
   
    [TestCase("MantleLocation1")]
@@ -88,6 +96,9 @@ public class PlayerMovementTest
        
        _runner.SimulateKeyPress(Key.Space);
        await _runner.AwaitMillis(100);
+        var mantling = StateChartState.Of(_player.GetNode("StateChart/Root/Movement/Mantling"));
+        AssertBool(mantling.Active).IsTrue();
+        
        _runner.SimulateKeyRelease(Key.Space);
        await _runner.AwaitMillis(500);
        
--- a/xunit.runner.json
+++ b/xunit.runner.json
@@ -1,3 +0,0 @@
-{
-    "$schema": "https://xunit.net/schema/current/xunit.runner.schema.json"
-}
Author	SHA1	Message	Date
Minimata	4bcbda9690	fix: inputs were eaten by a tutorial text because of node ordering All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 24s Details Create tag and build when new code gets to main / Export (push) Successful in 5m12s Details Create tag and build when new code gets to main / ReleaseName (push) Successful in 3s Details Create tag and build when new code gets to main / Release (push) Successful in 13m52s Details	2026-03-18 11:10:06 +01:00
Minimata	e51ef5a517	probably fixed stuttering of the camera and weapon animations	2026-03-18 11:02:08 +01:00
Minimata	50de6abb5d	mana bar	2026-03-15 21:26:59 +01:00
Minimata	95616f61fc	Implemented mana regeneration All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 40s Details Create tag and build when new code gets to main / Export (push) Successful in 5m18s Details	2026-03-11 16:29:09 +01:00
Minimata	b15a4fef95	empowered action as a forge ability	2026-03-11 15:56:17 +01:00
Minimata	14d29d68bb	Setup empowered action as a Forge ability	2026-03-10 09:22:39 +01:00
Minimata	9d612682ec	created a normal process function All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 41s Details Create tag and build when new code gets to main / Export (push) Successful in 4m39s Details	2026-03-08 18:12:57 +01:00
Minimata	9bfe37af62	trying cache All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 30s Details Create tag and build when new code gets to main / Export (push) Successful in 4m56s Details	2026-03-08 10:08:06 +01:00
Minimata	55eba7fcc8	trying to remove xunit Some checks failed Create tag and build when new code gets to main / BumpTag (push) Successful in 27s Details Create tag and build when new code gets to main / Export (push) Failing after 3m37s Details	2026-03-08 09:49:18 +01:00
Minimata	7a3e61b86f	added lights in dark tutorial area	2026-03-08 09:46:33 +01:00
Minimata	8153ec07e7	Revert "removing tests because they might break the solution" This reverts commit `3a21f00528`.	2026-03-08 09:44:02 +01:00
Minimata	ddc85655be	Revert "removed internal" This reverts commit `5408f455af`.	2026-03-08 09:43:38 +01:00
Minimata	c92eb19a1c	Revert "removed null!" This reverts commit `290f79afd4`.	2026-03-08 09:43:12 +01:00
Minimata	290f79afd4	removed null! All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 20s Details Create tag and build when new code gets to main / Export (push) Successful in 4m52s Details	2026-02-26 19:18:27 +01:00
Minimata	5408f455af	removed internal All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 20s Details Create tag and build when new code gets to main / Export (push) Successful in 5m2s Details	2026-02-26 18:56:50 +01:00
Minimata	3a21f00528	removing tests because they might break the solution All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 21s Details Create tag and build when new code gets to main / Export (push) Successful in 4m50s Details	2026-02-26 18:42:46 +01:00
Minimata	22e8c27878	trying somthing All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 20s Details Create tag and build when new code gets to main / Export (push) Successful in 5m3s Details	2026-02-26 18:36:18 +01:00
Minimata	6c4454848a	removed something that has nothing to do on the vcs All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 25s Details Create tag and build when new code gets to main / Export (push) Successful in 4m52s Details	2026-02-26 18:15:50 +01:00
Minimata	175e67d2d6	export fix All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 21s Details Create tag and build when new code gets to main / Export (push) Successful in 4m53s Details	2026-02-26 17:55:02 +01:00
Minimata	ab69fa9323	trying to fix export All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 23s Details Create tag and build when new code gets to main / Export (push) Successful in 5m24s Details	2026-02-26 17:36:33 +01:00
Minimata	263990b086	more tuts All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 21s Details Create tag and build when new code gets to main / Export (push) Successful in 5m8s Details Create tag and build when new code gets to main / ReleaseName (push) Successful in 4s Details Create tag and build when new code gets to main / Release (push) Successful in 10m59s Details	2026-02-25 10:27:28 +01:00
Minimata	5da2aa31ab	basic forge setup and refactored for some warning All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 30s Details Create tag and build when new code gets to main / Export (push) Successful in 5m10s Details	2026-02-24 10:27:57 +01:00
Minimata	4f64139d61	removed useless stuff All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 24s Details Create tag and build when new code gets to main / Export (push) Successful in 4m59s Details	2026-02-23 15:29:08 +01:00
Minimata	de41bbeb8d	some other tests All checks were successful Create tag and build when new code gets to main / BumpTag (push) Successful in 20s Details Create tag and build when new code gets to main / Export (push) Successful in 5m5s Details	2026-02-23 15:22:57 +01:00
Minimata	a4873f183c	back with more tests	2026-02-22 17:25:45 +01:00
Minimata	d37ae8d26c	remove tests from ci for now because the loading of the runtime is broken and 2dog might change that, but when it's available	2026-02-22 17:24:12 +01:00
				`@@ -1 +0,0 @@`
				`extends "res://tools/generate_collisions.gd"`