F O G

Reviewed-on: #2

.gitea/workflows/main.yaml

@@ -40,16 +40,17 @@ jobs:
     runs-on: ubuntu-latest
     needs: BumpTag
     container:
-      image: barichello/godot-ci:mono-4.4.1
+      image: barichello/godot-ci:mono-4.5
 
     steps:
       - name: Install node, curl and zip
         run: |
           apt update && apt -y install curl zip nodejs          
       - name: Checkout with LFS
-        uses: https://git.game-dev.space/minimata/checkout-lfs.git@main
+        uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main
         with:
           checkout-version: 3
+            
       - name: Import resources and build solution
         run: |
           godot --headless --editor --build-solutions --quit --import --path $PWD          
@@ -67,16 +68,8 @@ jobs:
         run: |
           mkdir -v -p build/mac
           godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
-          zip -r Mac.zip build/mac
+          zip -r Mac.zip build/mac     
-#      - name: Upload to release
+          
-#        uses: akkuman/gitea-release-action@v1
-#        with:
-#          name: Running release
-#          tag_name: ${{ needs.BumpTag.outputs.tag_name }}
-#          files: |-
-#            Windows.zip
-#            Linux.zip
-#            Mac.zip                            
       - name: Upload to Itch
         uses: KikimoraGames/itch-publish@v0.0.3
         with:

Movement tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.4.1">
+<Project Sdk="Godot.NET.Sdk/4.5.0">
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <EnableDynamicLoading>true</EnableDynamicLoading>

Movement tests.csproj.old

@@ -0,0 +1,131 @@
+<Project Sdk="Godot.NET.Sdk/4.4.1">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <EnableDynamicLoading>true</EnableDynamicLoading>
+    <RootNamespace>Movementtests</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="export_presets.cfg" />
+    <Content Include="menus\assets\git_logo\Git-Logo-2Color.png" />
+    <Content Include="menus\assets\git_logo\Git-Logo-2Color.png.import" />
+    <Content Include="menus\assets\git_logo\LICENSE.txt" />
+    <Content Include="menus\assets\godot_engine_logo\LICENSE.txt" />
+    <Content Include="menus\assets\godot_engine_logo\logo_vertical_color_dark.png" />
+    <Content Include="menus\assets\godot_engine_logo\logo_vertical_color_dark.png.import" />
+    <Content Include="menus\assets\icon.png" />
+    <Content Include="menus\assets\icon.png.import" />
+    <Content Include="menus\ATTRIBUTION.md" />
+    <Content Include="menus\resources\themes\expedition.tres" />
+    <Content Include="menus\resources\themes\gravity.tres" />
+    <Content Include="menus\resources\themes\grow.tres" />
+    <Content Include="menus\resources\themes\lab.tres" />
+    <Content Include="menus\resources\themes\lore.tres" />
+    <Content Include="menus\resources\themes\steal_this_theme.tres" />
+    <Content Include="menus\scenes\credits\scrollable_credits.gd" />
+    <Content Include="menus\scenes\credits\scrollable_credits.gd.uid" />
+    <Content Include="menus\scenes\credits\scrollable_credits.tscn" />
+    <Content Include="menus\scenes\credits\scrolling_credits.gd" />
+    <Content Include="menus\scenes\credits\scrolling_credits.gd.uid" />
+    <Content Include="menus\scenes\credits\scrolling_credits.tscn" />
+    <Content Include="menus\scenes\end_credits\end_credits.gd" />
+    <Content Include="menus\scenes\end_credits\end_credits.gd.uid" />
+    <Content Include="menus\scenes\end_credits\end_credits.tscn" />
+    <Content Include="menus\scenes\game_scene\configurable_sub_viewport.gd" />
+    <Content Include="menus\scenes\game_scene\configurable_sub_viewport.gd.uid" />
+    <Content Include="menus\scenes\game_scene\game_ui.tscn" />
+    <Content Include="menus\scenes\game_scene\input_display_label.gd" />
+    <Content Include="menus\scenes\game_scene\input_display_label.gd.uid" />
+    <Content Include="menus\scenes\game_scene\levels\level.gd" />
+    <Content Include="menus\scenes\game_scene\levels\level.gd.uid" />
+    <Content Include="menus\scenes\game_scene\levels\level_1.tscn" />
+    <Content Include="menus\scenes\game_scene\levels\level_2.tscn" />
+    <Content Include="menus\scenes\game_scene\levels\level_3.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorials\tutorial_1.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorials\tutorial_2.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorials\tutorial_3.tscn" />
+    <Content Include="menus\scenes\game_scene\tutorial_manager.gd" />
+    <Content Include="menus\scenes\game_scene\tutorial_manager.gd.uid" />
+    <Content Include="menus\scenes\loading_screen\level_loading_screen.tscn" />
+    <Content Include="menus\scenes\loading_screen\loading_screen.gd" />
+    <Content Include="menus\scenes\loading_screen\loading_screen.gd.uid" />
+    <Content Include="menus\scenes\loading_screen\loading_screen.tscn" />
+    <Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.gd" />
+    <Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.gd.uid" />
+    <Content Include="menus\scenes\loading_screen\loading_screen_with_shader_caching.tscn" />
+    <Content Include="menus\scenes\menus\level_select_menu\level_select_menu.gd" />
+    <Content Include="menus\scenes\menus\level_select_menu\level_select_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\level_select_menu\level_select_menu.tscn" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu.gd" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu.tscn" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.gd" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.gd.uid" />
+    <Content Include="menus\scenes\menus\main_menu\main_menu_with_animations.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.gd" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_input_option_control.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\audio\audio_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\game\game_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\game\game_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\game\game_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.gd" />
+    <Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\game\reset_game_control\reset_game_control.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_extras_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\input\input_options_menu_with_mouse_sensitivity.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\master_options_menu_with_tabs.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.gd" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\mini_options_menu_with_reset.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu.gd" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu.gd.uid" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu.tscn" />
+    <Content Include="menus\scenes\menus\options_menu\video\video_options_menu_with_extras.tscn" />
+    <Content Include="menus\scenes\opening\opening.gd" />
+    <Content Include="menus\scenes\opening\opening.gd.uid" />
+    <Content Include="menus\scenes\opening\opening.tscn" />
+    <Content Include="menus\scenes\opening\opening_with_logo.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\game_won_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\game_won_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\game_won_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\level_lost_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\level_lost_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\level_lost_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\level_won_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\level_won_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\level_won_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\mini_options_overlaid_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.gd" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\overlaid_menu_container.tscn" />
+    <Content Include="menus\scenes\overlaid_menus\pause_menu.gd" />
+    <Content Include="menus\scenes\overlaid_menus\pause_menu.gd.uid" />
+    <Content Include="menus\scenes\overlaid_menus\pause_menu.tscn" />
+    <Content Include="menus\scripts\game_state.gd" />
+    <Content Include="menus\scripts\game_state.gd.uid" />
+    <Content Include="menus\scripts\level_list_and_state_manager.gd" />
+    <Content Include="menus\scripts\level_list_and_state_manager.gd.uid" />
+    <Content Include="menus\scripts\level_state.gd" />
+    <Content Include="menus\scripts\level_state.gd.uid" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="addons\" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="RustyOptions" Version="0.10.1" />
+  </ItemGroup>
+</Project>

addons/guide/guide_action.gd

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

assets/greybox/human_scale.tscn

@@ -0,0 +1,7 @@
+[gd_scene load_steps=2 format=3 uid="uid://bfriujv0l1yjy"]
+
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_3j616"]
+height = 1.8
+
+[node name="MeshInstance3D" type="MeshInstance3D"]
+mesh = SubResource("CapsuleMesh_3j616")

assets/greyboxing/Guard tower.glb.import

@@ -0,0 +1,42 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://2huty67y1g5w"
+path="res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"
+
+[deps]
+
+source_file="res://assets/greyboxing/Guard tower.glb"
+dest_files=["res://.godot/imported/Guard tower.glb-7dc55f179090ff4a70140c5e94077843.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/root_script=null
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_name_suffixes=true
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+materials/extract=0
+materials/extract_format=0
+materials/extract_path=""
+_subresources={}
+gltf/naming_version=2
+gltf/embedded_image_handling=1

assets/ladder/Textures/colormap.png.import

@@ -2,9 +2,9 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://lp2pt8mtj7ty"
+uid="uid://kyoessd1518w"
-path.s3tc="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex"
+path.s3tc="res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.s3tc.ctex"
-path.etc2="res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"
+path.etc2="res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
@@ -12,8 +12,8 @@ metadata={
 
 [deps]
 
-source_file="res://player_controller/Examples/MovementTestbed/Hills/kenney-green-checkerboar-cc0.png"
+source_file="res://assets/ladder/Textures/colormap.png"
-dest_files=["res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.s3tc.ctex", "res://.godot/imported/kenney-green-checkerboar-cc0.png-2ce8609a39a655125c8e037014f6f2db.etc2.ctex"]
+dest_files=["res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.s3tc.ctex", "res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.etc2.ctex"]
 
 [params]
 

assets/ladder/ladder-top.fbx.import

@@ -0,0 +1,38 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bod7boex72igr"
+path="res://.godot/imported/ladder-top.fbx-3af719d67bc92743407297e84a0e273a.scn"
+
+[deps]
+
+source_file="res://assets/ladder/ladder-top.fbx"
+dest_files=["res://.godot/imported/ladder-top.fbx-3af719d67bc92743407297e84a0e273a.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=true
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+fbx/importer=0
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1

assets/ladder/ladder.fbx.import

@@ -0,0 +1,38 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://cmfagvnymc2yr"
+path="res://.godot/imported/ladder.fbx-fde4412b36d0b69e88ef176d131d5cbb.scn"
+
+[deps]
+
+source_file="res://assets/ladder/ladder.fbx"
+dest_files=["res://.godot/imported/ladder.fbx-fde4412b36d0b69e88ef176d131d5cbb.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=true
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+fbx/importer=0
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1

assets/sky/citrus_orchard_road_puresky_4k.exr.import

@@ -0,0 +1,42 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d1w1flf6xdy6f"
+path.bptc="res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.bptc.ctex"
+path.astc="res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.astc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/sky/citrus_orchard_road_puresky_4k.exr"
+dest_files=["res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.bptc.ctex", "res://.godot/imported/citrus_orchard_road_puresky_4k.exr-c4b50f0c95051d3e2f93c8d518de8eb8.astc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

assets/sky/simple_sky.tres

@@ -0,0 +1,9 @@
+[gd_resource type="ProceduralSkyMaterial" format=3 uid="uid://bb4c25ot8f4rt"]
+
+[resource]
+sky_top_color = Color(0.68341744, 0.41567144, 0.87147236, 1)
+sky_horizon_color = Color(0.9058611, 0.56007004, 0.5634753, 1)
+ground_bottom_color = Color(0.68235296, 0.41568628, 0.87058824, 1)
+ground_horizon_color = Color(0.90588236, 0.56078434, 0.5647059, 1)
+ground_curve = 0.14420073
+sun_angle_max = 10.0

assets/sky/sky_12_2k.png.import

@@ -0,0 +1,42 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dtkyhk8q5qitp"
+path.s3tc="res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.s3tc.ctex"
+path.etc2="res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_2k.png"
+dest_files=["res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.s3tc.ctex", "res://.godot/imported/sky_12_2k.png-9ca073e8443d469e1cec2dec0d53efff.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

assets/sky/sky_12_cubemap_2k/cubemap_layout.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://7v8n5l1jwqms"
+path="res://.godot/imported/cubemap_layout.png-b6dae0db04ee7c9cbc9a7aadeb5ccab7.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_cubemap_2k/cubemap_layout.png"
+dest_files=["res://.godot/imported/cubemap_layout.png-b6dae0db04ee7c9cbc9a7aadeb5ccab7.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_12_cubemap_2k/nx.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://hdkvbhxv74j6"
+path="res://.godot/imported/nx.png-e15247724725306f62acfb90c21225be.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_cubemap_2k/nx.png"
+dest_files=["res://.godot/imported/nx.png-e15247724725306f62acfb90c21225be.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_12_cubemap_2k/ny.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b5i6hyvrf6wr6"
+path="res://.godot/imported/ny.png-edb2c080597642cc467608a8c1b7d3bd.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_cubemap_2k/ny.png"
+dest_files=["res://.godot/imported/ny.png-edb2c080597642cc467608a8c1b7d3bd.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_12_cubemap_2k/nz.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bujopqmkixx3e"
+path="res://.godot/imported/nz.png-af180c68b72cd850f86875d2f15512e2.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_cubemap_2k/nz.png"
+dest_files=["res://.godot/imported/nz.png-af180c68b72cd850f86875d2f15512e2.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_12_cubemap_2k/px.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://balk16vpipwxi"
+path="res://.godot/imported/px.png-7ea47271df79321386b0e32cb687208d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_cubemap_2k/px.png"
+dest_files=["res://.godot/imported/px.png-7ea47271df79321386b0e32cb687208d.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_12_cubemap_2k/py.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cf2j8rtis5j7m"
+path="res://.godot/imported/py.png-0d93a31a98aa56298cb968aa366790ff.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_cubemap_2k/py.png"
+dest_files=["res://.godot/imported/py.png-0d93a31a98aa56298cb968aa366790ff.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_12_cubemap_2k/pz.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bm7ihmtlp53ae"
+path="res://.godot/imported/pz.png-651528e7a908f53bf85a39c4afb837c5.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_12_cubemap_2k/pz.png"
+dest_files=["res://.godot/imported/pz.png-651528e7a908f53bf85a39c4afb837c5.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_15_2k.png.import

@@ -0,0 +1,42 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ca4kkq3w8cd4n"
+path.s3tc="res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.s3tc.ctex"
+path.etc2="res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_2k.png"
+dest_files=["res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.s3tc.ctex", "res://.godot/imported/sky_15_2k.png-635fc4f2c92a6d84fbe74d4b06ec849b.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

assets/sky/sky_15_cubemap_2k/cubemap_layout.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d1glcaopf33pm"
+path="res://.godot/imported/cubemap_layout.png-6cd743dfe803537ed52cf90d8f87fc09.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_cubemap_2k/cubemap_layout.png"
+dest_files=["res://.godot/imported/cubemap_layout.png-6cd743dfe803537ed52cf90d8f87fc09.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_15_cubemap_2k/nx.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ha35oqdprgxn"
+path="res://.godot/imported/nx.png-9940f01cf2d318eac22e77aed0924dea.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_cubemap_2k/nx.png"
+dest_files=["res://.godot/imported/nx.png-9940f01cf2d318eac22e77aed0924dea.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_15_cubemap_2k/ny.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://7nv6cngqgxck"
+path="res://.godot/imported/ny.png-aa2c4907898777556ecbcdf7f8c9cc9b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_cubemap_2k/ny.png"
+dest_files=["res://.godot/imported/ny.png-aa2c4907898777556ecbcdf7f8c9cc9b.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_15_cubemap_2k/nz.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bmpoy5dldy4qb"
+path="res://.godot/imported/nz.png-353d3b652e87892a2437b1cd16e570dc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_cubemap_2k/nz.png"
+dest_files=["res://.godot/imported/nz.png-353d3b652e87892a2437b1cd16e570dc.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_15_cubemap_2k/px.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://qsqveq4oifw4"
+path="res://.godot/imported/px.png-34404ac21659a59edf3d6c7f85f54bcb.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_cubemap_2k/px.png"
+dest_files=["res://.godot/imported/px.png-34404ac21659a59edf3d6c7f85f54bcb.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_15_cubemap_2k/py.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://m3475w1xwy25"
+path="res://.godot/imported/py.png-9566cd2f8ccdd1ce1116f23c6b3eb3a1.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_cubemap_2k/py.png"
+dest_files=["res://.godot/imported/py.png-9566cd2f8ccdd1ce1116f23c6b3eb3a1.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/sky/sky_15_cubemap_2k/pz.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cpebv08pjd3m5"
+path="res://.godot/imported/pz.png-dc8cc0e23d6ad35898672269481b4221.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/sky/sky_15_cubemap_2k/pz.png"
+dest_files=["res://.godot/imported/pz.png-dc8cc0e23d6ad35898672269481b4221.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

assets/stairs/Textures/colormap.png.import

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

assets/water/water.gdshader

@@ -0,0 +1,88 @@
+shader_type spatial;
+
+uniform vec3 albedo : source_color;
+uniform vec3 albedo2 : source_color;
+
+uniform float metallic : hint_range(0.0, 1.0, 0.01) = 0;
+uniform float roughness : hint_range(0.0, 1.0, 0.01) = 0.02;
+
+uniform sampler2D texture_normal;
+uniform sampler2D texture_normal2;
+
+uniform vec2 wave_direction = vec2(0.0, 0.0);
+uniform vec2 wave_direction2 = vec2(0.0, 0.0);
+uniform float time_scale : hint_range(0.0, 0.2, 0.005) = 0.025;
+
+uniform sampler2D depth_texture : hint_depth_texture, repeat_disable, filter_nearest;
+uniform sampler2D screen_texture : hint_screen_texture, repeat_disable, filter_nearest;
+
+uniform vec4 color_deep : source_color;
+uniform vec4 color_shallow : source_color;
+uniform float beers_law = 2.0;
+uniform float depth_offset = -0.75;
+uniform float depth_color_change = 5.0;
+
+uniform float edge_scale = 0.1;
+uniform float near = 1.0;
+uniform float far = 100.0;
+uniform vec3 edge_color : source_color;
+
+uniform sampler2D waves;
+uniform float noise_scale = 10.0;
+uniform float height_scale = 0.15;
+
+varying float height;
+varying vec3 world_pos;
+
+float fresnel(float amount, vec3 normal, vec3 view)
+{
+	return pow((1.0 - clamp(dot(normalize(normal), normalize(view)), 0.0, 1.0)), amount);
+}
+
+float edge(float depth)
+{
+	depth = 1.0 - 2.0*depth;
+	return near * far / (far + depth * (near - far));
+}
+
+void vertex() {
+	world_pos = (MODEL_MATRIX * vec4(VERTEX, 1.0)).xyz;
+	height = texture(waves, world_pos.xz / noise_scale + TIME * time_scale).r;
+	VERTEX.y += height * height_scale;
+}
+
+void fragment() {
+	float depth_tex = clamp(pow(texture(depth_texture, SCREEN_UV).r * depth_color_change, 5.0), 0.0, 1.0);
+	float depth = PROJECTION_MATRIX[3][2] / (clamp(depth_tex, 0.0, 1.0) + PROJECTION_MATRIX[2][2]);
+	float depth_blend = exp((depth+VERTEX.z + depth_offset) * -beers_law);
+	depth_blend = clamp(1.0 - depth_blend, 0.0, 1.0);
+	float depth_blend_power = clamp(pow(depth_blend, 2.5), 0.0, 1.0);
+	
+	vec3 screen_color = textureLod(screen_texture, SCREEN_UV, 0.0).rgb;
+	vec3 depth_color = mix(color_shallow.rgb, color_deep.rgb, depth_blend_power);
+	vec3 color = mix(screen_color*depth_color, depth_color*0.25, depth_blend_power*0.5);
+	
+	float z_depth = edge(texture(depth_texture, SCREEN_UV).x);
+	float z_pos = edge(FRAGCOORD.z);
+	float z_dif = z_depth - z_pos;
+	
+	vec2 time = (TIME * wave_direction) * time_scale;
+	vec2 time2 = (TIME * wave_direction2) * time_scale;
+	
+	vec3 normal = mix(texture(texture_normal, world_pos.xz/(noise_scale*2.0) + time).rgb, texture(texture_normal2, world_pos.xz/noise_scale + time2).rgb, 0.5);
+	float fresnel_alpha = fresnel(5.0, NORMAL, VIEW);
+	vec3 surface_color = mix(albedo, albedo2, fresnel_alpha);
+	
+	vec3 surface_and_depth_color = mix(surface_color, color, 0.75);
+	vec3 with_edges = mix(edge_color, surface_color, step(edge_scale, z_dif));
+	
+	ALBEDO = vec3(surface_color);
+	METALLIC = metallic;
+	ROUGHNESS = roughness;
+	NORMAL_MAP = normal;
+}
+
+//void light() {
+//	// Called for every pixel for every light affecting the material.
+//	// Uncomment to replace the default light processing function with this one.
+//}

assets/water/water.gdshader.uid

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

assets/water/water.tres

@@ -0,0 +1,56 @@
+[gd_resource type="ShaderMaterial" load_steps=8 format=3 uid="uid://bibpkiinj8gq7"]
+
+[ext_resource type="Shader" uid="uid://l11jog608jo1" path="res://assets/water/water.gdshader" id="1_441rt"]
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_441rt"]
+noise_type = 3
+fractal_type = 2
+
+[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_qceba"]
+noise = SubResource("FastNoiseLite_441rt")
+seamless = true
+as_normal_map = true
+bump_strength = 6.9
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_v5uja"]
+noise_type = 3
+seed = 10
+fractal_type = 2
+
+[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_oqpjr"]
+noise = SubResource("FastNoiseLite_v5uja")
+seamless = true
+as_normal_map = true
+bump_strength = 2.4
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_qceba"]
+fractal_octaves = 3
+
+[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_v5uja"]
+noise = SubResource("FastNoiseLite_qceba")
+seamless = true
+
+[resource]
+render_priority = 0
+shader = ExtResource("1_441rt")
+shader_parameter/albedo = Color(0, 0.32156864, 0.43137255, 1)
+shader_parameter/albedo2 = Color(0.23849446, 0.558395, 0.6758933, 1)
+shader_parameter/metallic = 0.01999999955296
+shader_parameter/roughness = 0.01999999955296
+shader_parameter/texture_normal = SubResource("NoiseTexture2D_qceba")
+shader_parameter/texture_normal2 = SubResource("NoiseTexture2D_oqpjr")
+shader_parameter/wave_direction = Vector2(2, 0)
+shader_parameter/wave_direction2 = Vector2(0, 1)
+shader_parameter/time_scale = 0.0249999994412
+shader_parameter/color_deep = Color(0, 0.32156864, 0.43137255, 1)
+shader_parameter/color_shallow = Color(0.37512296, 0.8792228, 0.9831924, 1)
+shader_parameter/beers_law = 0.01
+shader_parameter/depth_offset = -0.75
+shader_parameter/depth_color_change = 73.16
+shader_parameter/edge_scale = 0.395
+shader_parameter/near = 1.0
+shader_parameter/far = 100.0
+shader_parameter/edge_color = Color(0.816028, 0.99999994, 0.9852888, 1)
+shader_parameter/waves = SubResource("NoiseTexture2D_v5uja")
+shader_parameter/noise_scale = 10.0
+shader_parameter/height_scale = 0.1

assets/water/water.tscn

@@ -0,0 +1,13 @@
+[gd_scene load_steps=3 format=3 uid="uid://c066hc7yu36wx"]
+
+[ext_resource type="Material" uid="uid://bibpkiinj8gq7" path="res://assets/water/water.tres" id="1_6nw2d"]
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_i6g1k"]
+size = Vector2(1, 1)
+subdivide_width = 200
+subdivide_depth = 200
+
+[node name="Water" type="MeshInstance3D"]
+cast_shadow = 0
+mesh = SubResource("PlaneMesh_i6g1k")
+surface_material_override/0 = ExtResource("1_6nw2d")

godot_state_charts_examples/history_states/history_demo.tscn

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

icon.svg.import

@@ -3,25 +3,27 @@
 importer="texture"
 type="CompressedTexture2D"
 uid="uid://bnwj7ltdfximr"
-path="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"
+path.s3tc="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex"
+path.etc2="res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.etc2.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://icon.svg"
-dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex"]
+dest_files=["res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.s3tc.ctex", "res://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.etc2.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/high_quality=false
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,7 +33,7 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0
 svg/scale=1.0
 editor/scale_with_editor_scale=false
 editor/convert_colors_with_editor_theme=false

maps/GYMs/metrics.tscn

@@ -29,7 +29,7 @@ glow_enabled = true
 [node name="Main" type="Node3D"]
 
 [node name="Player" parent="." instance=ExtResource("1_1s2y7")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 6, -31)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1.5)
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_1bvp3")
@@ -286,6 +286,24 @@ use_collision = true
 size = Vector3(5, 10, 5)
 material = ExtResource("3_vvhq3")
 
+[node name="CSGBox3D30" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 9.5, -50)
+use_collision = true
+size = Vector3(5, 1, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D31" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 9.75, -50)
+use_collision = true
+size = Vector3(5, 0.5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D32" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11, 9.875, -50)
+use_collision = true
+size = Vector3(5, 0.25, 5)
+material = ExtResource("3_vvhq3")
+
 [node name="CSGBox3D26" type="CSGBox3D" parent="Greybox/JumpHeights"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.5, 6.25, -61.5)
 use_collision = true
@@ -309,3 +327,75 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.5, 10, -76.5)
 use_collision = true
 size = Vector3(5, 20, 5)
 material = ExtResource("3_vvhq3")
+
+[node name="Passageways" type="CSGCombiner3D" parent="Greybox"]
+
+[node name="CSGBox3D30" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 2.25, -6.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 1.5, -6.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 3)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D31" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 2.25, -16.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 0.5, -16.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 2)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D32" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 2.25, -26.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 0.5, -26.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 2.25, -36.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D37" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, -0.5, -36.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D14" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 4.5, -21.5)
+use_collision = true
+size = Vector3(0.5, 0.5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D16" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 4.5, -31.5)
+use_collision = true
+size = Vector3(0.25, 0.5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D15" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 4.5, -11.5)
+use_collision = true
+size = Vector3(1, 0.5, 5)
+material = ExtResource("3_vvhq3")

maps/city.tscn

@@ -1,832 +1,80 @@
-[gd_scene load_steps=10 format=3 uid="uid://dmkw8cmalm5k"]
+[gd_scene load_steps=13 format=3 uid="uid://dmkw8cmalm5k"]
 
 [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
+[ext_resource type="Texture2D" uid="uid://ca4kkq3w8cd4n" path="res://assets/sky/sky_15_2k.png" id="2_ruo5i"]
 [ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"]
-[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="3_cieeo"]
 [ext_resource type="Texture2D" uid="uid://7kcmi16gedd0" path="res://assets/LD-0001.png" id="3_ruo5i"]
-[ext_resource type="PackedScene" uid="uid://br76ixljh42i8" path="res://maps/Components/large_square_tower.tscn" id="4_omvc4"]
+[ext_resource type="PackedScene" uid="uid://dip6cce5gtwi8" path="res://assets/greyboxing/guard_tower.tscn" id="11_wctvs"]
-[ext_resource type="PackedScene" uid="uid://fxj0a6p5h6lm" path="res://maps/Components/small_square_tower.tscn" id="5_ruo5i"]
+[ext_resource type="PackedScene" uid="uid://c066hc7yu36wx" path="res://assets/water/water.tscn" id="12_i2xii"]
 
-[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"]
+[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_feb1n"]
-sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
+panorama = ExtResource("2_ruo5i")
-ground_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
 
 [sub_resource type="Sky" id="Sky_h2yge"]
-sky_material = SubResource("ProceduralSkyMaterial_0xm2m")
+sky_material = SubResource("PanoramaSkyMaterial_feb1n")
 
 [sub_resource type="Environment" id="Environment_1bvp3"]
 background_mode = 2
 sky = SubResource("Sky_h2yge")
-ambient_light_source = 2
+ambient_light_source = 3
-ambient_light_color = Color(0.576076, 0.459788, 0.652401, 1)
 reflected_light_source = 2
 tonemap_mode = 4
-tonemap_exposure = 1.32
 ssao_enabled = true
-ssao_radius = 3.61
 ssil_enabled = true
-ssil_radius = 8.4
 sdfgi_use_occlusion = true
-glow_enabled = true
+fog_light_energy = 0.0
+volumetric_fog_enabled = true
+volumetric_fog_density = 0.005
+volumetric_fog_albedo = Color(0.66990036, 0.47894412, 0.44653797, 1)
+volumetric_fog_emission = Color(1, 1, 1, 1)
+volumetric_fog_emission_energy = 0.1
+volumetric_fog_length = 200.0
+
+[sub_resource type="FastNoiseLite" id="FastNoiseLite_wxle6"]
+seed = 22
+frequency = 1.0
+
+[sub_resource type="NoiseTexture3D" id="NoiseTexture3D_pxgdh"]
+noise = SubResource("FastNoiseLite_wxle6")
+
+[sub_resource type="FogMaterial" id="FogMaterial_ukfuy"]
+density = 0.3
+height_falloff = 0.07596937
+edge_fade = 6.625852
+density_texture = SubResource("NoiseTexture3D_pxgdh")
 
 [node name="Main" type="Node3D"]
 
 [node name="Player" parent="." instance=ExtResource("1_2vsi6")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.7981, 101, 0.300598)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.21207, 64.344444, -41.363285)
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_1bvp3")
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-transform = Transform3D(-0.772218, 0.611111, 0.173844, 0.0446935, -0.220691, 0.974319, 0.633783, 0.760157, 0.143109, 0, 0, 0)
+transform = Transform3D(-0.78043425, 0.15240018, 0.60637933, 0.17673612, -0.8765135, 0.44775894, 0.5997381, 0.4566158, 0.6571267, 0, 0, 0)
+light_color = Color(0.9999997, 0.92698854, 0.88834643, 1)
+light_energy = 5.0
 shadow_enabled = true
+shadow_opacity = 0.95
+shadow_blur = 2.435
 
 [node name="DebugLayer" type="CanvasLayer" parent="."]
 
 [node name="GuideDebugger" parent="DebugLayer" instance=ExtResource("2_uet8a")]
 visible = false
 
-[node name="Greybox" type="CSGCombiner3D" parent="."]
+[node name="Map" type="Sprite3D" parent="."]
-transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, 0, 0, 0)
+transform = Transform3D(-3.278354e-07, -7.5, -3.278354e-08, 0, -3.278354e-07, 0.75, -7.5, 3.278354e-07, 1.4330142e-15, 7.1878185, 8.602432, -175.5159)
-use_collision = true
+visible = false
-collision_layer = 3
-collision_mask = 5
-
-[node name="Map" type="Sprite3D" parent="Greybox"]
-transform = Transform3D(5.65685, -5.65685, -2.47269e-08, 0, -3.49691e-07, 0.8, -5.65685, -5.65685, -2.47269e-08, 141.335, 0, -122.33)
 texture = ExtResource("3_ruo5i")
 
-[node name="GuardTower" type="CSGCombiner3D" parent="Greybox"]
+[node name="Guard tower" parent="." instance=ExtResource("11_wctvs")]
+transform = Transform3D(0.09033705, 0, 0.99591124, 0, 1, 0, -0.99591124, 0, 0.09033705, -4.6100636, 1.5, 0.5658741)
 
-[node name="CSGBox3D6" type="CSGBox3D" parent="Greybox/GuardTower"]
+[node name="Water" parent="." instance=ExtResource("12_i2xii")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 45.75, 0)
+transform = Transform3D(10000, 0, 0, 0, 1, 0, 0, 0, 10000, 0, 4.03932, -186.25941)
-use_collision = true
-size = Vector3(21, 91.5, 21)
-material = ExtResource("3_cieeo")
 
-[node name="CSGBox3D7" type="CSGBox3D" parent="Greybox/GuardTower"]
+[node name="FogVolume" type="FogVolume" parent="."]
-transform = Transform3D(-8.9407e-08, 0, -1, 0, 1, 0, 1, 0, -8.9407e-08, 0, 92, 10.5)
+transform = Transform3D(500, 0, 0, 0, 200, 0, 0, 0, 500, 0, 0, 0)
-use_collision = true
+material = SubResource("FogMaterial_ukfuy")
-size = Vector3(0.5, 1, 16)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D8" type="CSGBox3D" parent="Greybox/GuardTower"]
-transform = Transform3D(-8.9407e-08, 0, -1, 0, 1, 0, 1, 0, -8.9407e-08, 0, 92, -10.5)
-use_collision = true
-size = Vector3(0.5, 1, 16)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D11" type="CSGBox3D" parent="Greybox/GuardTower"]
-transform = Transform3D(-0.0871559, 0, -0.996195, 0, 1, 0, 0.996195, 0, -0.0871559, 29.4115, 40.5, -46.6885)
-use_collision = true
-size = Vector3(0.5, 1, 11.0214)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D12" type="CSGBox3D" parent="Greybox/GuardTower"]
-transform = Transform3D(-0.996195, 0, 0.0871559, 0, 1, 0, -0.0871559, 0, -0.996195, 34.1402, 40.5, -40.499)
-use_collision = true
-size = Vector3(0.5, 1, 11.0214)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D13" type="CSGBox3D" parent="Greybox/GuardTower"]
-transform = Transform3D(-0.996195, 0, 0.0871559, 0, 1, 0, -0.0871559, 0, -0.996195, 23.7052, 40.5, -41.7067)
-use_collision = true
-size = Vector3(0.5, 1, 10.52)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D9" type="CSGBox3D" parent="Greybox/GuardTower"]
-transform = Transform3D(-1, 0, 8.9407e-08, 0, 1, 0, -8.9407e-08, 0, -1, 10.5, 92, 0)
-use_collision = true
-size = Vector3(0.5, 1, 16)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D10" type="CSGBox3D" parent="Greybox/GuardTower"]
-transform = Transform3D(-1, 0, 1.78814e-07, 0, 1, 0, -1.78814e-07, 0, -1, -10.5, 92, 0)
-use_collision = true
-size = Vector3(0.5, 1, 16)
-material = ExtResource("3_cieeo")
-
-[node name="LargeSquareTower" parent="Greybox/GuardTower" instance=ExtResource("4_omvc4")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 96, 0)
-
-[node name="SmallSquareTower" parent="Greybox/GuardTower" instance=ExtResource("5_ruo5i")]
-transform = Transform3D(-0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, 10.5, 91.5, 10.5)
-
-[node name="SmallSquareTower2" parent="Greybox/GuardTower" instance=ExtResource("5_ruo5i")]
-transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107, -10.5, 91.5, 10.5)
-
-[node name="SmallSquareTower3" parent="Greybox/GuardTower" instance=ExtResource("5_ruo5i")]
-transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, -10.5, 91.5, -10.5)
-
-[node name="SmallSquareTower4" parent="Greybox/GuardTower" instance=ExtResource("5_ruo5i")]
-transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 10.5, 91.5, -10.5)
-
-[node name="HighWageResidentialBulk1" type="CSGCombiner3D" parent="Greybox"]
-
-[node name="CSGBox3D12" type="CSGBox3D" parent="Greybox/HighWageResidentialBulk1"]
-transform = Transform3D(-0.642788, 0, -0.766045, 0, 1, 0, 0.766045, 0, -0.642788, 122.539, 6.25, -7.09329)
-use_collision = true
-size = Vector3(66.5, 13.5, 32)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D13" type="CSGBox3D" parent="Greybox/HighWageResidentialBulk1"]
-transform = Transform3D(-0.0871557, 0, -0.996195, 0, 1, 0, 0.996195, 0, -0.0871557, 145.089, 6.25, -50.712)
-use_collision = true
-size = Vector3(59, 13.5, 36.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D16" type="CSGBox3D" parent="Greybox/HighWageResidentialBulk1"]
-transform = Transform3D(0.173648, 0, -0.984808, 0, 1, 0, 0.984808, 0, 0.173648, 126.82, 6.25, -45.9715)
-use_collision = true
-size = Vector3(13.5, 13.5, 4.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D17" type="CSGBox3D" parent="Greybox/HighWageResidentialBulk1"]
-transform = Transform3D(0.173648, 0, -0.984808, 0, 1, 0, 0.984808, 0, 0.173648, 112.63, 6.25, -60.2239)
-use_collision = true
-size = Vector3(17.5, 13.5, 20.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D18" type="CSGBox3D" parent="Greybox/HighWageResidentialBulk1"]
-transform = Transform3D(0.173648, 0, -0.984808, 0, 1, 0, 0.984808, 0, 0.173648, 117.839, 6.25, -26.3639)
-use_collision = true
-size = Vector3(23, 13.5, 22)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D15" type="CSGBox3D" parent="Greybox/HighWageResidentialBulk1"]
-transform = Transform3D(0.173648, -0.492404, -0.852869, 0, 0.866025, -0.5, 0.984808, 0.0868242, 0.150384, 111.947, -2.15266, -43.9817)
-use_collision = true
-size = Vector3(14, 13.5, 37)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D14" type="CSGBox3D" parent="Greybox/HighWageResidentialBulk1"]
-transform = Transform3D(0.819153, 0, -0.573577, 0, 1, 0, 0.573577, 0, 0.819153, 135.63, 6.25, -75.0023)
-use_collision = true
-size = Vector3(45, 13.5, 51.5)
-material = ExtResource("3_cieeo")
-
-[node name="Castle" type="CSGCombiner3D" parent="Greybox"]
-
-[node name="CSGBox3D19" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.939694, -0.17101, -0.296198, -1.29048e-08, 0.866026, -0.5, 0.34202, 0.469847, 0.813799, 109.798, 0.347346, -137.485)
-use_collision = true
-size = Vector3(32.5, 13.5, 47)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D20" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.766045, -0.321394, -0.556671, -2.69073e-08, 0.866026, -0.5, 0.642788, 0.383023, 0.663415, 129.363, 19.5973, -166.313)
-use_collision = true
-size = Vector3(38, 13.5, 50)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D21" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.342021, -0.469847, -0.813799, -2.69073e-08, 0.866026, -0.5, 0.939694, 0.17101, 0.296199, 161.564, 42.8473, -187.035)
-use_collision = true
-size = Vector3(36, 13.5, 61)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D22" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(-0.707108, -0.353554, -0.612374, -4.09099e-08, 0.866026, -0.5, 0.707108, -0.353554, -0.612373, 185.313, 57.5973, -190.231)
-use_collision = true
-size = Vector3(25.5, 13.5, 33)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D23" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 230.383, 73.25, -153.491)
-use_collision = true
-size = Vector3(95, 13.5, 138.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D31" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.766045, 0, -0.642788, 0, 1, 0, 0.642788, 0, 0.766045, 162.404, 73.25, -122.54)
-use_collision = true
-size = Vector3(65.5, 13.5, 61.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.866026, 0, -0.5, 0, 1, 0, 0.5, 0, 0.866026, 179.593, 73.25, -89.1927)
-use_collision = true
-size = Vector3(24.5, 13.5, 30)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 196.117, 73.25, -87.4249)
-use_collision = true
-size = Vector3(36, 13.5, 30)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D32" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.906309, 0, -0.422619, 0, 1, 0, 0.422619, 0, 0.906309, 140.804, 73.25, -102.907)
-use_collision = true
-size = Vector3(58, 13.5, 15)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D24" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 274.4, 73.25, -222.257)
-use_collision = true
-size = Vector3(90, 13.5, 21)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D25" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, 0.707107, 279.703, 73.25, -244.178)
-use_collision = true
-size = Vector3(27.5, 13.5, 21.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D26" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 263.44, 73.25, -251.249)
-use_collision = true
-size = Vector3(27.5, 13.5, 21.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D27" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 282.886, 73.25, -227.303)
-use_collision = true
-size = Vector3(27.5, 13.5, 30.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D28" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 249.298, 73.25, -231.9)
-use_collision = true
-size = Vector3(27.5, 13.5, 30.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D30" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(0.984809, 0, 0.173648, 0, 1, 0, -0.173648, 0, 0.984809, 172.577, 73.25, -154.471)
-use_collision = true
-size = Vector3(27.5, 13.5, 30.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D29" type="CSGBox3D" parent="Greybox/Castle"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 299.503, 73.25, -183.109)
-use_collision = true
-size = Vector3(27.5, 13.5, 30.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D11" type="CSGBox3D" parent="Greybox"]
-transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 149.932, -1, -129.284)
-use_collision = true
-size = Vector3(398.5, 1, 288.5)
-material = ExtResource("3_cieeo")
-
-[node name="LowWageResidentialBulk1" type="CSGCombiner3D" parent="Greybox"]
-
-[node name="CSGBox3D72" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.0923823, 0.257713, 0.961797, 1.91013e-08, 0.965926, -0.258819, -0.995726, 0.0239104, 0.0892344, 14.5298, 25.9843, -31.2152)
-use_collision = true
-size = Vector3(16, 2.5, 7)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D73" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.0923825, -0.257713, -0.961797, 1.80823e-08, 0.965926, -0.258819, 0.995725, -0.0239104, -0.0892344, 8.65631, 25.7921, -31.2282)
-use_collision = true
-size = Vector3(16.9297, 3, 6.58496)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D78" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.710809, 0.18205, 0.679421, 2.58575e-08, 0.965926, -0.258819, -0.703388, 0.183971, 0.686589, 18.6924, 28.7229, -58.4454)
-use_collision = true
-size = Vector3(8.56396, 2.5, 7.2876)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D80" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.984895, 0.0448205, 0.167272, 2.70257e-08, 0.965926, -0.258819, -0.173173, 0.25491, 0.951335, 25.3257, 26.7394, -60.877)
-use_collision = true
-size = Vector3(12.814, 2.5, 7.15942)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D84" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.989515, 0.0373876, 0.139532, 3.69442e-08, 0.965926, -0.258819, -0.144454, 0.256105, 0.955797, 36.2509, 25.7394, -62.4001)
-use_collision = true
-size = Vector3(9, 2.5, 7.15942)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D85" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.98478, 0.0449895, 0.167903, 5.00964e-08, 0.965926, -0.258819, -0.173826, 0.25488, 0.951223, 44.4792, 27.7394, -63.7371)
-use_collision = true
-size = Vector3(7.98438, 2.5, 7.15942)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D86" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.98478, 0.0449895, 0.167903, 5.00964e-08, 0.965926, -0.258819, -0.173826, 0.25488, 0.951223, 39.256, 36.2486, -67.5533)
-use_collision = true
-size = Vector3(17, 2.5, 3.36719)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D87" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.98478, -0.0449895, -0.167903, 4.9018e-08, 0.965926, -0.258819, 0.173826, -0.25488, -0.951223, 38.7948, 36.2505, -70.1114)
-use_collision = true
-size = Vector3(17, 2.5, 3.38135)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D81" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.984895, -0.0448205, -0.167272, 2.96061e-08, 0.965926, -0.258819, 0.173173, -0.25491, -0.951335, 24.324, 26.7394, -70.3224)
-use_collision = true
-size = Vector3(11.4692, 2.5, 7.15942)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D82" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.984895, -0.0448205, -0.167272, 2.96061e-08, 0.965926, -0.258819, 0.173173, -0.25491, -0.951335, 32.2252, 23.7394, -71.6953)
-use_collision = true
-size = Vector3(11.4692, 2.5, 7.15942)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D83" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.984895, -0.0448205, -0.167272, 2.96061e-08, 0.965926, -0.258819, 0.173173, -0.25491, -0.951335, 45.3851, 22.8064, -71.9158)
-use_collision = true
-size = Vector3(14.4873, 2.5, 11.3668)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D79" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.710809, -0.18205, -0.67942, -1.43491e-08, 0.965926, -0.258819, 0.703387, -0.183971, -0.686589, 14.1836, 28.4939, -62.8966)
-use_collision = true
-size = Vector3(8.56848, 3, 7.28589)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D74" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.0923823, 0.257713, 0.961797, 1.91013e-08, 0.965926, -0.258819, -0.995726, 0.0239104, 0.0892344, 14.9662, 24.1928, -42.2082)
-use_collision = true
-size = Vector3(10, 2.5, 7)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D75" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.0923825, -0.257713, -0.961797, 1.80823e-08, 0.965926, -0.258819, 0.995725, -0.0239104, -0.0892344, 9.51584, 24.0763, -43.7237)
-use_collision = true
-size = Vector3(8, 3, 6)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D76" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.0923823, 0.257713, 0.961797, 1.91013e-08, 0.965926, -0.258819, -0.995726, 0.0239104, 0.0892344, 16.0982, 23.1228, -52.1305)
-use_collision = true
-size = Vector3(10, 2.5, 6.4)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D77" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.0923825, -0.257713, -0.961797, 1.80823e-08, 0.965926, -0.258819, 0.995725, -0.0239104, -0.0892344, 11.0503, 22.922, -55.115)
-use_collision = true
-size = Vector3(15, 3, 6.05127)
-material = ExtResource("3_cieeo")
-
-[node name="CSGCombiner3D" type="CSGCombiner3D" parent="Greybox/LowWageResidentialBulk1"]
-
-[node name="CSGBox3D12" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/CSGCombiner3D"]
-transform = Transform3D(-1, 0, 8.9407e-08, 0, 1, 0, -8.9407e-08, 0, -1, 11, 9.75, -17.5)
-use_collision = true
-size = Vector3(12.5, 36.5, 14)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D70" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/CSGCombiner3D"]
-transform = Transform3D(0.00524756, 0.258816, 0.965914, 1.91013e-08, 0.965926, -0.258819, -0.999988, 0.0013582, 0.00506875, 13.6388, 27.9843, -17.5528)
-use_collision = true
-size = Vector3(13.8514, 2.5, 7)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D71" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/CSGCombiner3D"]
-transform = Transform3D(-0.0052478, -0.258816, -0.965914, 1.80823e-08, 0.965926, -0.258819, 0.999987, -0.00135827, -0.00506875, 7.78161, 27.7921, -16.118)
-use_collision = true
-size = Vector3(16.7817, 3, 6.58496)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D56" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/CSGCombiner3D"]
-transform = Transform3D(0.835489, 0, 0.54951, 0, 1, 0, -0.54951, 0, 0.835489, 15.9685, 26.25, -11.7048)
-operation = 2
-use_collision = true
-size = Vector3(15.5, 11.5, 4.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D13" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.996195, 0, 0.0871559, 0, 1, 0, -0.0871559, 0, -0.996195, 11.4763, 8.75, -31.7074)
-use_collision = true
-size = Vector3(12.5, 34.5, 15.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D40" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-1, 0, 8.9407e-08, 0, 1, 0, -8.9407e-08, 0, -1, 21.9413, 12.75, -34.4471)
-use_collision = true
-size = Vector3(9.5, 42.5, 20.3208)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D42" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 28.9676, 18.25, -34.2724)
-use_collision = true
-size = Vector3(10.5, 53.5, 6.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D44" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.996196, 0, 0.0871559, 0, 1, 0, -0.0871559, 0, -0.996196, 28.9539, 15.75, -41.4776)
-use_collision = true
-size = Vector3(11, 48.5, 11)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D43" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.866027, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866027, 29.5069, 18.25, -30.9702)
-use_collision = true
-size = Vector3(9.5, 53.5, 4)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D14" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.996195, 0, 0.0871559, 0, 1, 0, -0.0871559, 0, -0.996195, 12.5004, 8, -43.4127)
-use_collision = true
-size = Vector3(12.5, 33, 8)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D15" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.996195, 0, 0.0871559, 0, 1, 0, -0.0871559, 0, -0.996195, 13.3596, 7.5, -50.3643)
-use_collision = true
-size = Vector3(12, 32, 6)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D16" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.996195, 0, 0.0871559, 0, 1, 0, -0.0871559, 0, -0.996195, 14.0132, 7.5, -57.8357)
-use_collision = true
-size = Vector3(12, 32, 9)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D17" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, -0.707107, 16.4022, 11.75, -60.6551)
-use_collision = true
-size = Vector3(14, 34.5, 8.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D18" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 25.1351, 8.5, -65.6224)
-use_collision = true
-size = Vector3(17, 37, 11.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D70" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 25.1287, 27.8847, -65.6587)
-use_collision = true
-size = Vector3(3.22705, 2, 11.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D19" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.819152, 0, 0.573577, 0, 1, 0, -0.573577, 0, -0.819152, 17.4813, 7.25, -66.2272)
-use_collision = true
-size = Vector3(7.5, 34.5, 11.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D20" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 39.0384, 13.5, -68.8355)
-use_collision = true
-size = Vector3(6.5, 47, 17)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D21" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 34.5045, 8, -61.4358)
-use_collision = true
-size = Vector3(6.5, 36, 5.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D22" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 38.9361, 8, -62.2172)
-use_collision = true
-size = Vector3(6.5, 36, 3.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D23" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 44.5988, 9, -63.2157)
-use_collision = true
-size = Vector3(6.5, 38, 8)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D24" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 51.2462, 7.72998, -64.3878)
-use_collision = true
-size = Vector3(6.5, 35.46, 5.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D25" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 50.1175, 6.5, -70.7891)
-use_collision = true
-size = Vector3(6.5, 33, 5.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D26" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 44.7308, 6.26019, -75.4241)
-use_collision = true
-size = Vector3(4.5, 32.5204, 14.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D27" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 33.6517, 7, -73.4706)
-use_collision = true
-size = Vector3(4.5, 34, 8)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D28" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 23.0328, 4.75, -48.7511)
-use_collision = true
-size = Vector3(8.5, 29.5, 11.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D29" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 30.4189, 4, -50.0534)
-use_collision = true
-size = Vector3(8.5, 28, 3.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D30" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 36.8202, 5, -51.1821)
-use_collision = true
-size = Vector3(8.5, 30, 9.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D31" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.173648, 0, 0.984808, 0, 1, 0, -0.984808, 0, -0.173648, 46.4221, 5.5, -52.8752)
-use_collision = true
-size = Vector3(8.5, 31, 10)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D32" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0, 0.979341, 0, 1, 0, -0.979341, 0, 0.202218, 50.4097, 5.5, -51.9896)
-use_collision = true
-size = Vector3(14, 31, 4)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0, 0.979341, 0, 1, 0, -0.979341, 0, 0.202218, 47.0434, 5.5, -46.8134)
-use_collision = true
-size = Vector3(4.5, 31, 8.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D47" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0, 0.979341, 0, 1, 0, -0.979341, 0, 0.202218, 53.763, 21.25, -47.2128)
-use_collision = true
-size = Vector3(6, 0.5, 4.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0, 0.979341, 0, 1, 0, -0.979341, 0, 0.202218, 45.9312, 4.5, -41.427)
-use_collision = true
-size = Vector3(6.5, 29, 8.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D45" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0, 0.979341, 0, 1, 0, -0.979341, 0, 0.202218, 41.0345, 17.25, -42.4381)
-use_collision = true
-size = Vector3(6.5, 0.5, 1.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D46" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.998309, 0, 0.0581448, 0, 1, 0, -0.0581448, 0, 0.998309, 41.7928, 17.25, -46.9217)
-use_collision = true
-size = Vector3(6.5, 0.5, 3.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0, 0.979341, 0, 1, 0, -0.979341, 0, 0.202218, 45.1065, 5.5, -34.9602)
-use_collision = true
-size = Vector3(6.5, 31, 7.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0, 0.54951, 0, 1, 0, -0.54951, 0, 0.835489, 42.5173, 5.5, -31.9338)
-use_collision = true
-size = Vector3(8.5, 31, 7.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D37" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0, 0.54951, 0, 1, 0, -0.54951, 0, 0.835489, 34.0965, 4.75, -26.9939)
-use_collision = true
-size = Vector3(11, 29.5, 8.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D38" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0, 0.54951, 0, 1, 0, -0.54951, 0, 0.835489, 26.3024, 5.25, -22.466)
-use_collision = true
-size = Vector3(7, 30.5, 9.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D39" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0, 0.54951, 0, 1, 0, -0.54951, 0, 0.835489, 14.7541, 6, -16.3668)
-use_collision = true
-size = Vector3(19, 32, 12)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0.142223, 0.530786, 7.45058e-09, 0.965926, -0.258819, -0.54951, 0.21624, 0.80702, 17.0813, 22.1862, -13.1966)
-use_collision = true
-size = Vector3(19, 1.5, 3.85)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.835489, -0.142223, -0.530785, 1.99003e-08, 0.965926, -0.258819, 0.549509, -0.21624, -0.80702, 14.0595, 21.5897, -17.8717)
-use_collision = true
-size = Vector3(18.95, 1.5, 8.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D50" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0.142223, 0.530786, 7.45058e-09, 0.965926, -0.258819, -0.54951, 0.21624, 0.80702, 42.9414, 20.9447, -30.3565)
-use_collision = true
-size = Vector3(7.5, 2, 3.85)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D51" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.835489, -0.142223, -0.530785, 1.99003e-08, 0.965926, -0.258819, 0.549509, -0.21624, -0.80702, 40.7006, 20.5597, -33.3047)
-use_collision = true
-size = Vector3(7, 2.5, 5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D62" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.983926, 0.0462211, 0.1725, 2.01498e-08, 0.965926, -0.258819, -0.178585, 0.254659, 0.950399, 45.5489, 20.9352, -50.5065)
-use_collision = true
-size = Vector3(7.5, 2, 3.92305)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D63" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.983926, -0.046221, -0.1725, 1.64639e-08, 0.965926, -0.258819, 0.178585, -0.254658, -0.9504, 44.8807, 20.5597, -54.176)
-use_collision = true
-size = Vector3(7.5, 2.5, 5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D64" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.983926, 0.0462211, 0.1725, 2.01498e-08, 0.965926, -0.258819, -0.178585, 0.254659, 0.950399, 37.1403, 19.9352, -49.2673)
-use_collision = true
-size = Vector3(9.5, 2, 3.92305)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D65" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.983926, -0.046221, -0.1725, 1.64639e-08, 0.965926, -0.258819, 0.178585, -0.254658, -0.9504, 36.4722, 19.5597, -52.9368)
-use_collision = true
-size = Vector3(9.5, 2.5, 5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D68" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.983926, 0.0462211, 0.1725, 2.01498e-08, 0.965926, -0.258819, -0.178585, 0.254659, 0.950399, 23.7111, 19.9352, -46.7754)
-use_collision = true
-size = Vector3(11, 2, 3.92305)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D69" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.983926, -0.046221, -0.1725, 1.64639e-08, 0.965926, -0.258819, 0.178585, -0.254658, -0.9504, 23.5349, 19.5597, -50.5342)
-use_collision = true
-size = Vector3(10, 2.5, 5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D66" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.983926, 0.0462211, 0.1725, 2.01498e-08, 0.965926, -0.258819, -0.178585, 0.254659, 0.950399, 30.6537, 17.9352, -48.3442)
-use_collision = true
-size = Vector3(4, 2, 3.92305)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D67" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.983926, -0.046221, -0.1725, 1.64639e-08, 0.965926, -0.258819, 0.178585, -0.254658, -0.9504, 29.9856, 17.5597, -52.0137)
-use_collision = true
-size = Vector3(4, 2.5, 5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D56" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0.142223, 0.530786, 7.45058e-09, 0.965926, -0.258819, -0.54951, 0.21624, 0.80702, 27.594, 20.9447, -19.8873)
-use_collision = true
-size = Vector3(8, 2, 3.85)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D57" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.835489, -0.142223, -0.530785, 1.99003e-08, 0.965926, -0.258819, 0.549509, -0.21624, -0.80702, 25.164, 20.3655, -23.5782)
-use_collision = true
-size = Vector3(8, 2.5, 6.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D71" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.17527, 0.254812, 0.950975, 2.76232e-08, 0.965926, -0.258819, -0.984522, -0.0453627, -0.169298, 31.3255, 44.7558, -34.5483)
-use_collision = true
-size = Vector3(6.80225, 2, 5.47021)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D90" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.175269, -0.254813, -0.950975, 2.03337e-08, 0.965926, -0.258819, 0.984522, 0.0453628, 0.169297, 26.7037, 44.5328, -33.8839)
-use_collision = true
-size = Vector3(6.5, 2.5, 5.43604)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D91" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.501426, -0.223931, -0.835721, 1.20306e-08, 0.965926, -0.258819, 0.865203, 0.129778, 0.48434, 27.7153, 44.4813, -29.8682)
-use_collision = true
-size = Vector3(3.8844, 2.5, 5.03833)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D92" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.501426, 0.223931, 0.835721, 1.20306e-08, 0.965926, -0.258819, -0.865203, -0.129778, -0.48434, 31.3598, 44.4864, -31.9628)
-use_collision = true
-size = Vector3(3.8584, 2.5, 5.07788)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D88" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-1, -9.16272e-05, -0.000342578, 1.99003e-08, 0.965926, -0.258819, 0.00035429, -0.258819, -0.965927, 20.4544, 34.1536, -39.2039)
-use_collision = true
-size = Vector3(6.53027, 2.5, 10.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D89" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(1, 9.16123e-05, 0.000342488, 1.99003e-08, 0.965926, -0.258819, -0.000354171, 0.258819, 0.965927, 21.9387, 34.1536, -29.7151)
-use_collision = true
-size = Vector3(9.5, 2.5, 10.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D54" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0.253472, 0.945972, 1.99003e-08, 0.965926, -0.258819, -0.979342, 0.0523378, 0.195327, 46.7459, 20.9447, -34.1385)
-use_collision = true
-size = Vector3(7.5, 2, 3.85)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D55" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.202218, -0.253472, -0.945971, 1.99003e-08, 0.965926, -0.258819, 0.979342, -0.0523378, -0.195327, 43.1272, 20.5597, -34.8836)
-use_collision = true
-size = Vector3(7.5, 2.5, 5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D60" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0.253472, 0.945972, 1.99003e-08, 0.965926, -0.258819, -0.979342, 0.0523378, 0.195327, 48.0829, 18.9253, -40.9948)
-use_collision = true
-size = Vector3(7.5, 2, 4)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D61" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.202218, -0.253472, -0.945971, 1.99003e-08, 0.965926, -0.258819, 0.979342, -0.0523378, -0.195327, 44.3933, 18.5597, -41.7545)
-use_collision = true
-size = Vector3(7.5, 2.5, 5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D58" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.202218, 0.253472, 0.945972, 1.99003e-08, 0.965926, -0.258819, -0.979342, 0.0523378, 0.195327, 50.3713, 20.9447, -51.4906)
-use_collision = true
-size = Vector3(15, 2, 3.85)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D59" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.202218, -0.253472, -0.945971, 1.99003e-08, 0.965926, -0.258819, 0.979342, -0.0523378, -0.195327, 46.5192, 20.5373, -51.5181)
-use_collision = true
-size = Vector3(13.5, 2.5, 5.17285)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D52" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(0.835489, 0.142223, 0.530786, 7.45058e-09, 0.965926, -0.258819, -0.54951, 0.21624, 0.80702, 35.2402, 19.4421, -24.9653)
-use_collision = true
-size = Vector3(11.4087, 2, 3.43525)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D53" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(-0.835489, -0.142223, -0.530785, 1.99003e-08, 0.965926, -0.258819, 0.549509, -0.21624, -0.80702, 33.2536, 18.9611, -28.0445)
-use_collision = true
-size = Vector3(11.3345, 2.5, 5.36328)
-material = ExtResource("3_cieeo")
-
-[node name="Streets" type="CSGCombiner3D" parent="Greybox/LowWageResidentialBulk1"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0, -2.5)
-operation = 2
-
-[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.835489, 0, 0.54951, 0, 1, 0, -0.54951, 0, 0.835489, 34.161, 11.75, -15.0672)
-use_collision = true
-size = Vector3(48, 25.5, 5.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D53" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.54951, 0, -0.835489, 0, 1, 0, 0.835489, 0, 0.54951, 42.0771, 3.75, -28.0536)
-use_collision = true
-size = Vector3(10, 9.5, 8)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D56" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(-0.0290849, 0, -0.999578, 0, 1, 0, 0.999578, 0, -0.0290849, 39.7994, 2.75, -32.6168)
-visible = false
-use_collision = true
-size = Vector3(7.5, 11.5, 7)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D54" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.989443, 0, 0.144932, 0, 1, 0, -0.144932, 0, 0.989443, 30.9545, 3.75, -39.0773)
-use_collision = true
-size = Vector3(13.5, 9.5, 7)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D55" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.989443, 0, 0.144932, 0, 1, 0, -0.144932, 0, 0.989443, 26.2721, 3.75, -43.4448)
-use_collision = true
-size = Vector3(5.5, 9.5, 17)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.784417, 0, 0.620236, 0, 1, 0, -0.620236, 0, 0.784417, 35.5881, 8.75, -13.6869)
-use_collision = true
-size = Vector3(48, 19.5, 5.5)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D50" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.202218, 0, 0.979342, 0, 1, 0, -0.979342, 0, 0.202218, 55.3445, 9.5, -43.0347)
-use_collision = true
-size = Vector3(31, 21, 4.38184)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D51" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.989443, 0, 0.144932, 0, 1, 0, -0.144932, 0, 0.989443, 41.2789, 14.5, -54.9098)
-use_collision = true
-size = Vector3(34, 31, 3.2052)
-material = ExtResource("3_cieeo")
-
-[node name="CSGBox3D52" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/Streets"]
-transform = Transform3D(0.747027, 0, -0.664797, 0, 1, 0, 0.664797, 0, 0.747027, 17.1015, 8.5, -57.6584)
-use_collision = true
-size = Vector3(16, 19, 4.5)
-material = ExtResource("3_cieeo")

player_controller/Examples/MovementTestbed/LowGravityArea3D.cs

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

player_controller/Examples/MovementTestbed/LowGravityArea3D.cs.uid

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

player_controller/PlayerController.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=35 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=43 format=3 uid="uid://bei4nhkf8lwdo"]
 
 [ext_resource type="Script" uid="uid://bbbrf5ckydfna" path="res://player_controller/Scripts/PlayerController.cs" id="1_poq2x"]
 [ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="3_cresl"]
@@ -7,22 +7,26 @@
 [ext_resource type="Script" uid="uid://dv7v1ywmbvvcd" path="res://player_controller/Scripts/HealthSystem.cs" id="5_umw0l"]
 [ext_resource type="Script" uid="uid://vuq8rjq3vegn" path="res://player_controller/Scripts/Stamina.cs" id="6_lxtc4"]
 [ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://player_controller/Scripts/StairsSystem.cs" id="7_bmt5a"]
-[ext_resource type="Resource" uid="uid://dgfww8118d8gj" path="res://systems/inputs/base_mode/aim.tres" id="7_cresl"]
 [ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/base_mode/aim_release.tres" id="8_lhb11"]
 [ext_resource type="Script" uid="uid://dd1yrt7eiiyf4" path="res://player_controller/Scripts/CapsuleCollider.cs" id="8_lmtjd"]
+[ext_resource type="Resource" uid="uid://c3e0ivgaxrsyb" path="res://systems/inputs/base_mode/aim_down.tres" id="8_obsfv"]
 [ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="8_qu4wy"]
 [ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/base_mode/aim_cancel.tres" id="9_5p2qc"]
-[ext_resource type="Script" uid="uid://bt0xv2q8iv1vn" path="res://player_controller/Scripts/Gravity.cs" id="9_lsueh"]
+[ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="9_nob5r"]
 [ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="10_4u7i3"]
 [ext_resource type="Script" uid="uid://g8idirw62qe0" path="res://player_controller/Scripts/Bobbing.cs" id="10_7wk1w"]
+[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/empower_down.tres" id="10_nodcl"]
 [ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="11_cresl"]
+[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/empower_release.tres" id="11_ruloh"]
 [ext_resource type="PackedScene" uid="uid://0ysqmqphq6mq" path="res://systems/head/head_system.tscn" id="11_rxwoh"]
-[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/drop.tres" id="12_34snm"]
+[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="12_34snm"]
 [ext_resource type="Script" uid="uid://b6k73aj5povgv" path="res://player_controller/Scripts/FieldOfView.cs" id="12_m2mxi"]
+[ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="13_nob5r"]
+[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="13_r7i3q"]
+[ext_resource type="Resource" uid="uid://bw5k2gsv3jqcv" path="res://systems/inputs/base_mode/throw.tres" id="16_nob5r"]
 [ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"]
 [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="17_h6vvl"]
 [ext_resource type="PackedScene" uid="uid://cqduhd4opgwvm" path="res://systems/dash/dash_system.tscn" id="18_q5h8a"]
-[ext_resource type="Script" uid="uid://dyy5njw6pxoh4" path="res://systems/move/MoveSystem.cs" id="20_rxwoh"]
 [ext_resource type="PackedScene" uid="uid://dbe5f0p6lvqtr" path="res://systems/tween_queue/tween_queue_system.tscn" id="22_rpwev"]
 [ext_resource type="PackedScene" uid="uid://bcwkugn6v3oy7" path="res://addons/godot_state_charts/utilities/state_chart_debugger.tscn" id="24_q5h8a"]
 [ext_resource type="Script" uid="uid://couw105c3bde4" path="res://addons/godot_state_charts/state_chart.gd" id="25_wv70j"]
@@ -32,18 +36,42 @@
 [ext_resource type="Script" uid="uid://tjiji63wlom5" path="res://systems/wall_hug/WallHugSystem.cs" id="27_n7qhm"]
 [ext_resource type="Script" uid="uid://cf1nsco3w0mf6" path="res://addons/godot_state_charts/transition.gd" id="28_n7qhm"]
 [ext_resource type="PackedScene" uid="uid://ckm3d6k08a72u" path="res://systems/weapon/weapon.tscn" id="29_wv70j"]
+[ext_resource type="Script" uid="uid://bhuwv2nlcrunt" path="res://player_controller/PlayerUi.cs" id="30_2ghaa"]
+[ext_resource type="Texture2D" uid="uid://bnwj7ltdfximr" path="res://icon.svg" id="30_h23go"]
+[ext_resource type="Texture2D" uid="uid://chvt6g0xn5c2m" path="res://systems/dash/light-ring.jpg" id="32_lgpc8"]
+[ext_resource type="Script" uid="uid://b4dwolbvt8our" path="res://addons/godot_state_charts/history_state.gd" id="41_ruloh"]
 
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_xc2g5"]
 height = 1.7
 
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_wydro"]
+[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2q0ik"]
-height = 1.7
+blend_mode = 1
 
 [node name="Player" type="CharacterBody3D"]
 script = ExtResource("1_poq2x")
-TimeScaleAimInAir = 0.15
+WalkSpeed = 7.5
-MaxJumpBoostAfterDashing = 0.7
+AccelerationAir = 2.0
-MaxNumberOfDashActions = 3
+DecelerationAir = 0.1
+Weight = 5.0
+MantleTime = 0.2
+SimpleJumpStartVelocity = 8.0
+SimpleJumpHangTimeInFrames = 1
+SimpleJumpGravityLesseningFactor = 2.5
+DoubleJumpStartVelocity = 15.0
+DoubleJumpHangTimeInFrames = 3
+DoubleJumpGravityLesseningFactor = 1.5
+MegaJumpStartVelocity = 30.0
+MegaJumpHangTimeInFrames = 12
+MegaJumpGravityLesseningFactor = 1.2
+WallJumpStartVelocity = 8.0
+MaxNumberOfEmpoweredActions = 3
+SimpleDashStrength = 15.0
+PoweredDashStrength = 30.0
+AimedDashTime = 0.2
+PostDashSpeed = 30.0
+WallHugGravityLesseningFactor = 15.0
+WallHugDownwardMaxSpeed = 8.0
+WallHugHorizontalDeceleration = 0.5
 
 [node name="InputController" type="Node3D" parent="."]
 script = ExtResource("16_v31n3")
@@ -51,12 +79,17 @@ base_mode = ExtResource("3_cresl")
 move = ExtResource("17_h6vvl")
 rotate_y = ExtResource("4_rxwoh")
 rotate_floorplane = ExtResource("5_4u7i3")
-aim_pressed = ExtResource("7_cresl")
+aim_down = ExtResource("8_obsfv")
+aim_pressed = ExtResource("9_nob5r")
 aim_released = ExtResource("8_lhb11")
-aim_canceled = ExtResource("9_5p2qc")
 jump = ExtResource("10_4u7i3")
+jump_pressed = ExtResource("13_nob5r")
+empower_down = ExtResource("10_nodcl")
+empower_released = ExtResource("11_ruloh")
+aim_canceled = ExtResource("9_5p2qc")
 hit = ExtResource("11_cresl")
-drop = ExtResource("12_34snm")
+dash = ExtResource("12_34snm")
+throw = ExtResource("16_nob5r")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
@@ -65,7 +98,8 @@ mesh = SubResource("CapsuleMesh_xc2g5")
 
 [node name="CapsuleCollider" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
-shape = SubResource("CapsuleShape3D_wydro")
+shape = ExtResource("13_r7i3q")
+debug_color = Color(0, 0.6, 0.701961, 0.341176)
 script = ExtResource("8_lmtjd")
 CapsuleDefaultHeight = 1.7
 
@@ -118,18 +152,6 @@ target_position = Vector3(0, 1, 0)
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.296, 1.4, 0)
 target_position = Vector3(0, 1, 0)
 
-[node name="MoveSystem" type="Node3D" parent="."]
-script = ExtResource("20_rxwoh")
-WalkSpeed = 7.2
-DecelerationSpeedFactorFloor = 7.0
-ApexHoldTime = 0.1
-
-[node name="Gravity" type="Node3D" parent="."]
-script = ExtResource("9_lsueh")
-Weight = 3.5
-StartVelocity = 0.7
-JumpFromDashSpeedFactor = 4.0
-
 [node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")]
 
 [node name="WallHugSystem" type="Node3D" parent="."]
@@ -153,7 +175,7 @@ target_position = Vector3(-1, 0, 0)
 collision_mask = 2
 
 [node name="DashSystem" parent="." instance=ExtResource("18_q5h8a")]
-DashSpeed = 0.1
+DashSpeed = 0.2
 PostDashSpeed = 30.0
 
 [node name="WeaponRoot" type="Node3D" parent="."]
@@ -163,8 +185,11 @@ transform = Transform3D(1, 0, 0, 0, 0.173648, -0.984808, 0, 0.984808, 0.173648,
 ThrowForce = 15.0
 StraightThrowDuration = 0.05
 
-[node name="CoyoteTime" type="Timer" parent="."]
+[node name="DashCooldown" type="Timer" parent="."]
-wait_time = 0.2
+one_shot = true
+
+[node name="PowerCooldown" type="Timer" parent="."]
+wait_time = 2.0
 one_shot = true
 
 [node name="TimeScaleAimInAir" type="Timer" parent="."]
@@ -172,17 +197,63 @@ wait_time = 2.0
 one_shot = true
 ignore_time_scale = true
 
-[node name="TimeAfterDashing" type="Timer" parent="."]
-wait_time = 0.3
-one_shot = true
-
 [node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")]
-offset_left = 1530.0
+offset_left = 1524.0
 offset_top = 1.0
-offset_right = -2.0
+offset_right = -8.0
 offset_bottom = 1.0
+enabled = false
 initial_node_to_watch = NodePath("../StateChart")
 
+[node name="UI" type="CanvasLayer" parent="."]
+script = ExtResource("30_2ghaa")
+
+[node name="VBoxContainer" type="VBoxContainer" parent="UI"]
+offset_right = 128.0
+offset_bottom = 81.0
+
+[node name="DashesLabel" type="Label" parent="UI/VBoxContainer"]
+layout_mode = 2
+text = "Dashes"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="UI/VBoxContainer"]
+custom_minimum_size = Vector2(0, 30)
+layout_mode = 2
+
+[node name="Dash1" type="TextureRect" parent="UI/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
+
+[node name="Dash2" type="TextureRect" parent="UI/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
+
+[node name="Dash3" type="TextureRect" parent="UI/VBoxContainer/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
+
+[node name="DashCooldownIndicator" type="ColorRect" parent="UI"]
+unique_name_in_owner = true
+offset_left = 910.0
+offset_top = 549.0
+offset_right = 1010.0
+offset_bottom = 559.0
+
+[node name="CenterContainer" type="CenterContainer" parent="UI"]
+custom_minimum_size = Vector2(1920, 1080)
+offset_right = 1919.0
+offset_bottom = 1080.0
+
+[node name="CenterIcon" type="TextureRect" parent="UI/CenterContainer"]
+material = SubResource("CanvasItemMaterial_2q0ik")
+custom_minimum_size = Vector2(5, 5)
+layout_mode = 2
+texture = ExtResource("32_lgpc8")
+expand_mode = 1
+
 [node name="StateChart" type="Node" parent="."]
 script = ExtResource("25_wv70j")
 metadata/_custom_type_script = "uid://couw105c3bde4"
@@ -190,90 +261,148 @@ metadata/_custom_type_script = "uid://couw105c3bde4"
 [node name="Root" type="Node" parent="StateChart"]
 script = ExtResource("27_infe6")
 
-[node name="Actions" type="Node" parent="StateChart/Root"]
+[node name="Aim" type="Node" parent="StateChart/Root"]
 script = ExtResource("26_infe6")
-initial_state = NodePath("WeaponInHand")
+initial_state = NodePath("Off")
-metadata/_custom_type_script = "uid://c1vp0ojjvaby1"
 
-[node name="WeaponInHand" type="Node" parent="StateChart/Root/Actions"]
+[node name="ToOff" type="Node" parent="StateChart/Root/Aim"]
-script = ExtResource("27_34snm")
-
-[node name="ToAiming" type="Node" parent="StateChart/Root/Actions/WeaponInHand"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Aiming")
+to = NodePath("../Off")
-event = &"aim_pressed"
-delay_in_seconds = "0.0"
-
-[node name="Aiming" type="Node" parent="StateChart/Root/Actions"]
-script = ExtResource("27_34snm")
-
-[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/Aiming"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
-event = &"aim_canceled"
-delay_in_seconds = "0.0"
-
-[node name="ToDashing" type="Node" parent="StateChart/Root/Actions/Aiming"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Dashing")
 event = &"aim_released"
 delay_in_seconds = "0.0"
 
-[node name="ToWeaponThrown" type="Node" parent="StateChart/Root/Actions/Aiming"]
+[node name="Off" type="Node" parent="StateChart/Root/Aim"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponThrown")
-event = &"hit_pressed"
-delay_in_seconds = "0.0"
-
-[node name="Dashing" type="Node" parent="StateChart/Root/Actions"]
 script = ExtResource("27_34snm")
 
-[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/Dashing"]
+[node name="ToOn" type="Node" parent="StateChart/Root/Aim/Off"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
+to = NodePath("../../On")
-event = &"dash_ended"
+event = &"aim_down"
 delay_in_seconds = "0.0"
 
-[node name="ToHanging" type="Node" parent="StateChart/Root/Actions/Dashing"]
+[node name="On" type="Node" parent="StateChart/Root/Aim"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Hanging")
-event = &"dash_to_planted"
-delay_in_seconds = "0.0"
-
-[node name="WeaponThrown" type="Node" parent="StateChart/Root/Actions"]
 script = ExtResource("27_34snm")
 
-[node name="OnAim" type="Node" parent="StateChart/Root/Actions/WeaponThrown"]
+[node name="ToCancel" type="Node" parent="StateChart/Root/Aim/On"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Dashing")
+to = NodePath("../../Canceled")
-event = &"aim_pressed"
+event = &"cancel_aim"
 delay_in_seconds = "0.0"
 
-[node name="Hanging" type="Node" parent="StateChart/Root/Actions"]
+[node name="Canceled" type="Node" parent="StateChart/Root/Aim"]
 script = ExtResource("27_34snm")
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Actions/Hanging"]
+[node name="Empower" type="Node" parent="StateChart/Root"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Off")
+
+[node name="Off" type="Node" parent="StateChart/Root/Empower"]
+script = ExtResource("27_34snm")
+
+[node name="ToOn" type="Node" parent="StateChart/Root/Empower/Off"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
+to = NodePath("../../On")
-event = &"jump"
+event = &"empower_down"
 delay_in_seconds = "0.0"
 
-[node name="OnDrop" type="Node" parent="StateChart/Root/Actions/Hanging"]
+[node name="On" type="Node" parent="StateChart/Root/Empower"]
+script = ExtResource("27_34snm")
+
+[node name="ToOff" type="Node" parent="StateChart/Root/Empower/On"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
+to = NodePath("../../Off")
-event = &"drop"
+event = &"empower_released"
 delay_in_seconds = "0.0"
 
-[node name="OnMantle" type="Node" parent="StateChart/Root/Actions/Hanging"]
+[node name="PowerReserve" type="Node" parent="StateChart/Root"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Full")
+
+[node name="ToExpired" type="Node" parent="StateChart/Root/PowerReserve"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
+to = NodePath("../Expired")
-event = &"mantle"
+event = &"expired"
 delay_in_seconds = "0.0"
 
+[node name="Recharge" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../AtLeastOneCharge")
+event = &"recharge"
+delay_in_seconds = "0.0"
+
+[node name="ToFull" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Full")
+event = &"fully_charged"
+delay_in_seconds = "0.0"
+
+[node name="Expired" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("27_34snm")
+
+[node name="AtLeastOneCharge" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("27_34snm")
+
+[node name="Full" type="Node" parent="StateChart/Root/PowerReserve"]
+script = ExtResource("27_34snm")
+
+[node name="PowerUsed" type="Node" parent="StateChart/Root/PowerReserve/Full"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../AtLeastOneCharge")
+event = &"power_used"
+delay_in_seconds = "0.0"
+
+[node name="WeaponState" type="Node" parent="StateChart/Root"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("InHand")
+metadata/_custom_type_script = "uid://c1vp0ojjvaby1"
+
+[node name="ToPlanted" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Planted")
+event = &"plant_weapon"
+delay_in_seconds = "0.0"
+
+[node name="ToHand" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../InHand")
+event = &"recover_weapond"
+delay_in_seconds = "0.0"
+
+[node name="InHand" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("27_34snm")
+
+[node name="ToThrown" type="Node" parent="StateChart/Root/WeaponState/InHand"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Flying")
+event = &"throw"
+delay_in_seconds = "0.0"
+
+[node name="Flying" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("27_34snm")
+
+[node name="ToPlanted" type="Node" parent="StateChart/Root/WeaponState/Flying"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Planted")
+event = &"plant_weapon"
+delay_in_seconds = "0.0"
+
+[node name="Planted" type="Node" parent="StateChart/Root/WeaponState"]
+script = ExtResource("27_34snm")
+
 [node name="Movement" type="Node" parent="StateChart/Root"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("Grounded")
 
+[node name="Reset" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("41_ruloh")
+default_state = NodePath("../Grounded")
+
+[node name="OnFall" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Airborne/Falling")
+event = &"falling"
+delay_in_seconds = "0.0"
+
 [node name="OnMantle" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../Mantling")
@@ -282,86 +411,179 @@ delay_in_seconds = "0.0"
 
 [node name="OnHang" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../Hanging")
+to = NodePath("../OnWall/Hanging")
 event = &"dash_to_planted"
 delay_in_seconds = "0.0"
 
+[node name="OnPoweredDash" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Dashing/PoweredDash")
+event = &"powered_dash"
+delay_in_seconds = "0.0"
+
+[node name="OnAimedDash" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Dashing/AimedDash")
+event = &"aimed_dash"
+delay_in_seconds = "0.0"
+
+[node name="OnWeaponDash" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../Dashing/ToWeaponDash")
+event = &"weapon_dash"
+delay_in_seconds = "0.0"
+
+[node name="ToPlantedWeapon" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../OnWall/Hanging")
+event = &"to_planted"
+delay_in_seconds = "0.0"
+
+[node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("27_34snm")
+
+[node name="OnMantleFinished" type="Node" parent="StateChart/Root/Movement/Mantling"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Grounded")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
+[node name="Jump" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("SimpleJump")
+
+[node name="SimpleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("27_34snm")
+
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../MegaJump")
+event = &"megajump"
+delay_in_seconds = "0.0"
+
+[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/DoubleJumpEnabled")
+event = &"jump_ended"
+delay_in_seconds = "0.0"
+
+[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("27_34snm")
+
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../MegaJump")
+event = &"megajump"
+delay_in_seconds = "0.0"
+
+[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/Falling")
+event = &"jump_ended"
+delay_in_seconds = "0.0"
+
+[node name="MegaJump" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("27_34snm")
+
+[node name="OnJumpEnded" type="Node" parent="StateChart/Root/Movement/Jump/MegaJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/Falling")
+event = &"jump_ended"
+delay_in_seconds = "0.0"
+
+[node name="Dashing" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Dash")
+
+[node name="OnDashEnded" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Airborne/Reset")
+event = &"dash_finished"
+delay_in_seconds = "0.0"
+
+[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Mantling")
+event = &"mantle"
+delay_in_seconds = "0.0"
+
+[node name="Dash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
+[node name="PoweredDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
+[node name="AimedDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
+[node name="ToWeaponDash" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("27_34snm")
+
 [node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("27_34snm")
 
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Dashing/Dash")
+event = &"dash"
+delay_in_seconds = "0.0"
+
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/Jump")
+to = NodePath("../../Jump/SimpleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Jump/MegaJump")
+event = &"megajump"
+delay_in_seconds = "0.0"
+
 [node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Airborne/CoyoteEnabled")
 event = &"start_falling"
 delay_in_seconds = "0.0"
 
-[node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
-script = ExtResource("27_34snm")
-
-[node name="ToGrounded" type="Node" parent="StateChart/Root/Movement/Mantling"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Grounded")
-event = &"to_grounded"
-delay_in_seconds = "0.0"
-
-[node name="Hanging" type="Node" parent="StateChart/Root/Movement"]
-script = ExtResource("27_34snm")
-
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Hanging"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/JumpFromWall")
-event = &"jump"
-delay_in_seconds = "0.0"
-
-[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/Hanging"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/CoyoteEnabled")
-event = &"drop"
-delay_in_seconds = "0.0"
-
 [node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("CoyoteEnabled")
 
+[node name="Reset" type="Node" parent="StateChart/Root/Movement/Airborne"]
+script = ExtResource("41_ruloh")
+default_state = NodePath("../CoyoteEnabled")
+
+[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../OnWall/Hugging")
+event = &"wall_hug"
+delay_in_seconds = "0.0"
+
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Airborne"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Dashing/Dash")
+event = &"dash"
+delay_in_seconds = "0.0"
+
 [node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Grounded")
 event = &"grounded"
 delay_in_seconds = "0.0"
 
-[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../WallHugging")
-event = &"wall_hug"
-delay_in_seconds = "0.0"
-
-[node name="WallHugging" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("27_34snm")
-
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/WallHugging"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../JumpFromWall")
-event = &"jump"
-delay_in_seconds = "0.0"
-
-[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/Airborne/WallHugging"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"start_falling"
-delay_in_seconds = "0.0"
-
 [node name="CoyoteEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("27_34snm")
 
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Jump/MegaJump")
+event = &"megajump"
+delay_in_seconds = "0.0"
+
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Jump")
+to = NodePath("../../../Jump/SimpleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
@@ -371,52 +593,19 @@ to = NodePath("../../DoubleJumpEnabled")
 event = &"coyote_expired"
 delay_in_seconds = "0.0"
 
-[node name="Jump" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("27_34snm")
-
-[node name="ToDoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne/Jump"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../DoubleJumpEnabled")
-event = &"to_double_jump"
-delay_in_seconds = "0.0"
-
-[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/Jump"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"jump_from_dash"
-delay_in_seconds = "0.0"
-
-[node name="JumpFromWall" type="Node" parent="StateChart/Root/Movement/Airborne"]
-script = ExtResource("27_34snm")
-
-[node name="ToDoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../DoubleJumpEnabled")
-event = &"to_double_jump"
-delay_in_seconds = "0.0"
-
-[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
-script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
-event = &"jump_from_dash"
-delay_in_seconds = "0.0"
-
 [node name="DoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("27_34snm")
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../DoubleJump")
+to = NodePath("../../../Jump/MegaJump")
-event = &"jump"
+event = &"megajump"
 delay_in_seconds = "0.0"
 
-[node name="DoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne"]
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
-script = ExtResource("27_34snm")
-
-[node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJump"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Falling")
+to = NodePath("../../../Jump/DoubleJump")
-event = &"to_falling"
+event = &"jump"
 delay_in_seconds = "0.0"
 
 [node name="Falling" type="Node" parent="StateChart/Root/Movement/Airborne"]
@@ -428,12 +617,80 @@ to = NodePath("../../DoubleJumpEnabled")
 event = &"enable_double_jump"
 delay_in_seconds = "0.0"
 
+[node name="OnWall" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Hugging")
+
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Grounded")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Jump/SimpleJump")
+event = &"jump"
+delay_in_seconds = "0.0"
+
+[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Jump/MegaJump")
+event = &"megajump"
+delay_in_seconds = "0.0"
+
+[node name="HugCanceled" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("27_34snm")
+
+[node name="ToHanging" type="Node" parent="StateChart/Root/Movement/OnWall/HugCanceled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Hanging")
+event = &"oh_hit_wall"
+delay_in_seconds = "0.0"
+
+[node name="Hugging" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("27_34snm")
+
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Grounded")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
+[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/CoyoteEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
+[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/OnWall/Hugging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../HugCanceled")
+event = &"dash"
+delay_in_seconds = "0.0"
+
+[node name="Hanging" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("27_34snm")
+
+[node name="OnDrop" type="Node" parent="StateChart/Root/Movement/OnWall/Hanging"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Hugging")
+event = &"dash"
+delay_in_seconds = "0.0"
+
 [connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"]
+[connection signal="input_aim_down" from="InputController" to="." method="OnInputAimDown"]
 [connection signal="input_aim_pressed" from="InputController" to="." method="OnInputAimPressed"]
 [connection signal="input_aim_released" from="InputController" to="." method="OnInputAimReleased"]
-[connection signal="input_drop" from="InputController" to="." method="OnInputDropPressed"]
+[connection signal="input_dash" from="InputController" to="." method="OnInputDashPressed"]
+[connection signal="input_empower_down" from="InputController" to="." method="OnInputEmpowerDown"]
+[connection signal="input_empower_released" from="InputController" to="." method="OnInputEmpowerReleased"]
 [connection signal="input_hit" from="InputController" to="." method="OnInputHitPressed"]
-[connection signal="input_jump" from="InputController" to="." method="OnInputJumpPressed"]
+[connection signal="input_jump_ended" from="InputController" to="." method="OnInputJumpEnded"]
+[connection signal="input_jump_ongoing" from="InputController" to="." method="OnInputJumpOngoing"]
+[connection signal="input_jump_started" from="InputController" to="." method="OnInputJumpStarted"]
 [connection signal="input_move" from="InputController" to="." method="OnInputMove"]
 [connection signal="input_rotate_floorplane" from="InputController" to="." method="OnInputRotateFloorplane"]
 [connection signal="input_rotate_y" from="InputController" to="." method="OnInputRotateY"]
+[connection signal="input_throw" from="InputController" to="." method="OnInputThrowPressed"]
+[connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]

player_controller/PlayerUi.cs

@@ -0,0 +1,26 @@
+using Godot;
+using System;
+
+public partial class PlayerUi : CanvasLayer
+{
+    private TextureRect[] _dashIcons = new TextureRect[3];
+    
+    public override void _Ready()
+    {
+        base._Ready();
+        
+        _dashIcons[0] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash1");
+        _dashIcons[1] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash2");
+        _dashIcons[2] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash3");
+    }
+
+    public void SetNumberOfDashesLeft(int numberOfDashes)
+    {
+        int index = 1;
+        foreach (var dashIcon in _dashIcons)
+        {
+            dashIcon.SetVisible(index <= numberOfDashes);
+            index++;
+        }
+    } 
+}

player_controller/PlayerUi.cs.uid

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

player_controller/Scripts/Gravity.cs

@@ -12,6 +12,8 @@ public partial class Gravity: Node3D
 	public float DoubleJumpSpeedFactor { get; set; } = 2f;
 	[Export(PropertyHint.Range, "0.1,10,0.1,or_greater")]
 	public float JumpFromDashSpeedFactor { get; set; } = 2f;
+	[Export(PropertyHint.Range, "0.1,10,0.1,or_greater")]
+	public float JumpFromWallSpeedFactor { get; set; } = 2f;
 	[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
 	public float AdditionalGravityPower { get; set; } = 1f;
 
@@ -24,6 +26,7 @@ public partial class Gravity: Node3D
 
 	public float CalculateJumpForce() => _gravity * (StartVelocity / AdditionalGravityPower);
 	public float CalculateJumpFromDashForce() => CalculateJumpForce() * JumpFromDashSpeedFactor;
+	public float CalculateJumpFromWallForce() => CalculateJumpForce() * JumpFromWallSpeedFactor;
 	public float CalculateDoubleJumpForce() => CalculateJumpForce() * DoubleJumpSpeedFactor;
 	public float CalculateGravityForce() => _gravity * Weight;
 }

player_controller/Scripts/HealthSystem.cs

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

player_controller/resources/PlayerShape.tres

@@ -0,0 +1,4 @@
+[gd_resource type="CapsuleShape3D" format=3 uid="uid://keseacdcooot"]
+
+[resource]
+height = 1.7

project.godot

@@ -15,8 +15,8 @@ warnings/check_invalid_track_paths=false
 [application]
 
 config/name="Movement tests"
-run/main_scene="uid://dwo50456dv6va"
+run/main_scene="uid://pk8ypa04qy6x"
-config/features=PackedStringArray("4.4", "C#", "Forward Plus")
+config/features=PackedStringArray("4.5", "C#", "Forward Plus")
 config/icon="res://icon.svg"
 
 [autoload]
@@ -29,7 +29,7 @@ ProjectUISoundController="*res://addons/maaacks_game_template/base/scenes/autolo
 
 [display]
 
-window/size/viewport_width=1980
+window/size/viewport_width=1920
 window/size/viewport_height=1080
 
 [dotnet]
@@ -133,3 +133,5 @@ copy_path="res://scenes"
 [rendering]
 
 textures/vram_compression/import_etc2_astc=true
+environment/volumetric_fog/volume_size=192
+environment/volumetric_fog/volume_depth=192

systems/dash/DashSystem.cs

@@ -2,123 +2,131 @@
 
 namespace Movementtests.systems;
 
-public record DashComputationRecord(bool HasHit, Vector3 Location, Vector3 CollisionPoint, Vector3 CollisionNormal);
-
-public record DashResolveRecord(bool EndWithMantle, Vector3 DashLocation, Vector3 MantleLocation);
-
 public partial class DashSystem: Node3D
 {
+    public record DashLocation(bool HasHit, Vector3 TargetLocation, Vector3 CollisionPoint, Vector3 CollisionNormal);
+    
+    
     [Export(PropertyHint.Range, "0,0.2,0.01,or_greater")]
-    public float DashSpeed { get; set; } = 0.05f;
+    public float DashSpeed { get; set; } = 0.1f;
     [Export(PropertyHint.Range, "0,1000,1,or_greater")]
     public float PostDashSpeed { get; set; } = 0f;
     
+    public bool HasHit { get; set; }
+    public Vector3 TargetLocation { get; set; }
+    public Vector3 CollisionPoint { get; set; }
+    public Vector3 CollisionNormal { get; set; }
+    public Vector3 PlannedLocation { get; set; }
+    
+    public bool ShouldMantle { get; set; }
+    public Vector3 PlannedMantleLocation { get; set; }
+        
     private Node3D _head;
     private ShapeCast3D _dashCast3D;
+    private ShapeCast3D _playerCast3D;
     private Camera3D _camera;
     private TweenQueueSystem _tweenQueueSystem;
     private Vector3 _dashDirection = Vector3.Zero;
 
     private MantleSystem _mantleSystem;
     private MeshInstance3D _dashTarget;
+    private CpuParticles3D _dashIndicator;
+    private AnimationPlayer _dashIndicatorAnim;
     
-    public DashResolveRecord DashResolve { get; set; }
+    [Export]
-    public DashComputationRecord DashComputation { get; set; }
+    public PackedScene DashIndicatorScene { get; set; }
-    
 
     [Signal]
     public delegate void DashStartedEventHandler();
     [Signal]
     public delegate void DashEndedEventHandler();
+    [Signal]
+    public delegate void DashProgressEventHandler(float progress);
+    
+    private Vector3 _globalDashPosition = Vector3.Zero;
+
+    private float _playerHeight;
+    private float _playerRadius;
+    
+    public float DashCastRadius { get; set; }
 
     public void Init(Node3D head, Camera3D camera, TweenQueueSystem tweenQueueSystem)
     {
         _dashCast3D = GetNode<ShapeCast3D>("DashCast3D");
+        var dashShape = _dashCast3D.GetShape() as SphereShape3D;
+        DashCastRadius = dashShape!.Radius;
+        
+        _playerCast3D = GetNode<ShapeCast3D>("PlayerShapeCast3D");
+        var playerShape = _playerCast3D.GetShape() as CapsuleShape3D;
+        _playerHeight = playerShape!.Height;
+        _playerRadius = playerShape!.Radius;
+        
         _head = head;
         _camera = camera;
         _tweenQueueSystem = tweenQueueSystem;
         
         _mantleSystem = GetNode<MantleSystem>("MantleSystem");
-        _mantleSystem.Init(this);
+        _mantleSystem.Init();
         
         _dashTarget = GetNode<MeshInstance3D>("DashTarget");
         _dashTarget.SetVisible(false);
+        _dashIndicator = GetNode<CpuParticles3D>("DashIndicator");
+        _dashIndicatorAnim = GetNode<AnimationPlayer>("DashIndicator/AnimationPlayer");
     }
 
-    private DashComputationRecord ComputeDashLocation()
+    private DashLocation ComputeDashLocation()
     {
-        if (!_dashCast3D.IsColliding())
+        var targetLocation = _dashCast3D.ToGlobal(_dashCast3D.TargetPosition);
+        var hasHit = _dashCast3D.IsColliding();
+        if (!hasHit)
         {
-            return new DashComputationRecord(false, _dashCast3D.ToGlobal(_dashCast3D.TargetPosition), Vector3.Zero, Vector3.Zero);
+            return new DashLocation(false, targetLocation, Vector3.Zero, Vector3.Zero);
         }
+
         var collisionPoint = _dashCast3D.GetCollisionPoint(0);
         var collisionNormal = _dashCast3D.GetCollisionNormal(0);
-        var collisionShape = (SphereShape3D) _dashCast3D.GetShape();
+        
-        var centerSphereLocation = collisionPoint + collisionNormal * collisionShape.Radius;
+        var fraction = _dashCast3D.GetClosestCollisionSafeFraction();
-        return new DashComputationRecord(true, centerSphereLocation, collisionPoint, collisionNormal);
+        var globalSweepPath = targetLocation - _dashCast3D.GlobalPosition;
+        var locationAlongPath = _dashCast3D.GlobalPosition + globalSweepPath * fraction;
+        return new DashLocation(true, locationAlongPath, collisionPoint, collisionNormal);
     }
 
     public void PrepareDash()
     {
-        _dashTarget.SetVisible(false);
-        
         _dashCast3D.SetRotation(new Vector3(
             _camera.Rotation.X,
             _head.Rotation.Y,
             _camera.Rotation.Z));
 
-        DashComputation = ComputeDashLocation();
+        (HasHit, PlannedLocation, CollisionPoint, CollisionNormal) = ComputeDashLocation();
-        var (hasHit, location, collisionPoint, collisionNormal) = DashComputation;
+        
-
+        ShouldMantle = false;
-        var shouldMantle = false;
         var mantleLocation = Vector3.Zero;
-        if (hasHit && Mathf.Abs(collisionNormal.Y) < 0.01f)
+        if (HasHit && Mathf.Abs(CollisionNormal.Y) < 0.5f)
         {
-            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(collisionPoint, collisionNormal);
+            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(PlannedLocation, CollisionNormal);
-            shouldMantle = mantleResult.IsSome(out mantleLocation);
+            ShouldMantle = mantleResult.IsSome(out mantleLocation);
         }
+        PlannedMantleLocation = mantleLocation;
         
-        var targetColor = hasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
+        // Setup dash target
-        targetColor = shouldMantle ? new Color(0.2f, 0.2f, 1f) : targetColor;
+        var targetColor = HasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
-        
+        targetColor = ShouldMantle ? new Color(0.2f, 0.2f, 1f) : targetColor;
         var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
         targetMaterial.SetAlbedo(targetColor);
         _dashTarget.SetVisible(true);
-        _dashTarget.SetGlobalPosition(location);
+        var targetLocation = ShouldMantle ? PlannedMantleLocation : PlannedLocation;
-        
+        _dashTarget.SetGlobalPosition(targetLocation);
-        DashResolve = new DashResolveRecord(shouldMantle, location, mantleLocation);
     }
 
-    public void CancelDash()
+    public void StopPreparingDash()
     {
         _dashTarget.SetVisible(false);
     }
 
-    public void DashTweenEnded()
+    public void StartPreparingDash()
     {
-        EmitSignal(SignalName.DashEnded);
+        _dashTarget.SetVisible(true);
-    }
-
-    public void Dash()
-    {
-        EmitSignal(SignalName.DashStarted);
-        _dashTarget.SetVisible(false);
-        var dashTweenInputs = new TweenQueueSystem.TweenInputs(DashResolve.DashLocation, 0.1f);
-        var dashTween = _tweenQueueSystem.TweenToLocation(dashTweenInputs);
-        dashTween.Finished += DashTweenEnded;
-        if (DashResolve.EndWithMantle)
-        {
-            _tweenQueueSystem.QueueTween(DashResolve.MantleLocation, 0.2f);
-        }
-    }
-
-    public void DashToThrownWeapon()
-    {
-        
-    }
-
-    public void DashToPlantedWeapon()
-    {
-        
     }
 }

systems/dash/dash_indicator.tscn

@@ -0,0 +1,79 @@
+[gd_scene load_steps=7 format=3 uid="uid://hd0868f4pb63"]
+
+[ext_resource type="Texture2D" uid="uid://chvt6g0xn5c2m" path="res://systems/dash/light-ring.jpg" id="1_jadbb"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tqt6i"]
+transparency = 1
+blend_mode = 1
+shading_mode = 0
+albedo_texture = ExtResource("1_jadbb")
+billboard_mode = 1
+
+[sub_resource type="PlaneMesh" id="PlaneMesh_jngg2"]
+orientation = 2
+
+[sub_resource type="Animation" id="Animation_fmn25"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:mesh:size")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(2, 2)]
+}
+
+[sub_resource type="Animation" id="Animation_stbcc"]
+resource_name = "start"
+length = 0.2
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath(".:mesh:size")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.2),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector2(2, 2), Vector2(0, 0)]
+}
+tracks/1/type = "method"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath(".")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0.2),
+"transitions": PackedFloat32Array(1),
+"values": [{
+"args": [],
+"method": &"queue_free"
+}]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_3aile"]
+_data = {
+&"RESET": SubResource("Animation_fmn25"),
+&"start": SubResource("Animation_stbcc")
+}
+
+[node name="DashIndicator" type="CPUParticles3D"]
+material_override = SubResource("StandardMaterial3D_tqt6i")
+emitting = false
+amount = 1
+lifetime = 0.5
+one_shot = true
+mesh = SubResource("PlaneMesh_jngg2")
+gravity = Vector3(0, 0, 0)
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+&"": SubResource("AnimationLibrary_3aile")
+}
+autoplay = "start"

systems/dash/dash_system.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=6 format=3 uid="uid://cqduhd4opgwvm"]
+[gd_scene load_steps=8 format=3 uid="uid://cqduhd4opgwvm"]
 
 [ext_resource type="Script" uid="uid://dwoppk8j5fxeg" path="res://systems/dash/DashSystem.cs" id="1_hwig2"]
+[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="2_jngg2"]
 [ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="2_pff7b"]
+[ext_resource type="PackedScene" uid="uid://hd0868f4pb63" path="res://systems/dash/dash_indicator.tscn" id="2_tqt6i"]
 
-[sub_resource type="SphereShape3D" id="SphereShape3D_qu4wy"]
+[sub_resource type="SphereShape3D" id="SphereShape3D_jngg2"]
-radius = 0.1
 
 [sub_resource type="SphereMesh" id="SphereMesh_qu4wy"]
 
@@ -12,10 +13,18 @@ radius = 0.1
 
 [node name="DashSystem" type="Node3D"]
 script = ExtResource("1_hwig2")
+DashIndicatorScene = ExtResource("2_tqt6i")
+
+[node name="PlayerShapeCast3D" type="ShapeCast3D" parent="."]
+visible = false
+shape = ExtResource("2_jngg2")
+target_position = Vector3(0, 0, 0)
+collision_mask = 2
+debug_shape_custom_color = Color(0.863327, 0.636844, 0, 1)
 
 [node name="DashCast3D" type="ShapeCast3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.68, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
-shape = SubResource("SphereShape3D_qu4wy")
+shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -12)
 max_results = 1
 collision_mask = 2
@@ -26,5 +35,8 @@ mesh = SubResource("SphereMesh_qu4wy")
 surface_material_override/0 = SubResource("StandardMaterial3D_v31n3")
 
 [node name="MantleSystem" parent="." instance=ExtResource("2_pff7b")]
-MantleEndLocationDistanceFromWall = 0.3
+MantleEndLocationDistanceFromWall = 0.25
 MantleHeightCastStart = 2.0
+
+[node name="DashIndicator" parent="." instance=ExtResource("2_tqt6i")]
+visible = false

systems/dash/dash_time_dilation.tres

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

systems/dash/light-ring.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://chvt6g0xn5c2m"
+path.s3tc="res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.s3tc.ctex"
+path.etc2="res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://systems/dash/light-ring.jpg"
+dest_files=["res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.s3tc.ctex", "res://.godot/imported/light-ring.jpg-c39549c041934663aceb7b7e60c47efb.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

systems/head/HeadSystem.cs

@@ -29,4 +29,14 @@ public partial class HeadSystem : Node3D
 
         _camera.Rotation = currentCameraRotation;
     }
+
+    public Vector3 GetForwardHorizontalVector()
+    {
+        return GetGlobalTransform().Basis.Z;
+    }
+
+    public void SetHeight(float height)
+    {
+        Position = new Vector3(Position.X, height, Position.Z);
+    }
 }

systems/inputs/base_mode/aim_down.tres

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

systems/inputs/base_mode/aim_pressed.tres

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

systems/inputs/base_mode/base_mode.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=65 format=3 uid="uid://bl5crtu1gkrtr"]
+[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=90 format=3 uid="uid://bl5crtu1gkrtr"]
 
 [ext_resource type="Script" uid="uid://cpplm41b5bt6m" path="res://addons/guide/guide_action_mapping.gd" id="1_qmhk6"]
 [ext_resource type="Resource" uid="uid://htqvokm8mufq" path="res://systems/inputs/base_mode/move.tres" id="2_g6bbx"]
@@ -13,22 +13,25 @@
 [ext_resource type="Script" uid="uid://bjm4myqxg4phm" path="res://addons/guide/modifiers/guide_modifier_scale.gd" id="11_j3axn"]
 [ext_resource type="Script" uid="uid://ckggy40lm0vjc" path="res://addons/guide/modifiers/guide_modifier_negate.gd" id="12_kxb2c"]
 [ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="13_v2ywt"]
-[ext_resource type="Resource" uid="uid://dgfww8118d8gj" path="res://systems/inputs/base_mode/aim.tres" id="14_vtk18"]
+[ext_resource type="Resource" uid="uid://c3e0ivgaxrsyb" path="res://systems/inputs/base_mode/aim_down.tres" id="14_yp12v"]
 [ext_resource type="Script" uid="uid://b52rqq28tuqpg" path="res://addons/guide/triggers/guide_trigger_pressed.gd" id="15_fykw6"]
+[ext_resource type="Script" uid="uid://b4cdrn4paoj3i" path="res://addons/guide/triggers/guide_trigger_down.gd" id="15_g6bbx"]
+[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/empower_down.tres" id="16_0qat1"]
+[ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="16_li5ak"]
 [ext_resource type="Resource" uid="uid://j1o5ud0plk4" path="res://systems/inputs/base_mode/aim_release.tres" id="16_rvpjj"]
 [ext_resource type="Script" uid="uid://biiggjw6tv4uq" path="res://addons/guide/triggers/guide_trigger_released.gd" id="17_s8kjn"]
 [ext_resource type="Resource" uid="uid://7wm8ywvujwf" path="res://systems/inputs/base_mode/aim_cancel.tres" id="18_vibkn"]
+[ext_resource type="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/empower_release.tres" id="19_li5ak"]
 [ext_resource type="Script" uid="uid://rvttn472ix6v" path="res://addons/guide/inputs/guide_input_joy_button.gd" id="19_qkgmj"]
 [ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="21_818lq"]
 [ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="22_2hs2y"]
-[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/drop.tres" id="22_qmhk6"]
+[ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="23_g6bbx"]
 [ext_resource type="Script" uid="uid://dsa1dnifd6w32" path="res://addons/guide/guide_mapping_context.gd" id="23_llfhp"]
+[ext_resource type="Resource" uid="uid://bw5k2gsv3jqcv" path="res://systems/inputs/base_mode/throw.tres" id="24_yp12v"]
+[ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="25_si4d4"]
 
 [sub_resource type="Resource" id="Resource_vkvga"]
 script = ExtResource("4_1rw8g")
-x = 0
-y = 1
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_kb1id"]
 script = ExtResource("6_li5ak")
@@ -37,54 +40,36 @@ order = 2
 [sub_resource type="Resource" id="Resource_rwam6"]
 script = ExtResource("7_si4d4")
 lower_threshold = 0.1
-upper_threshold = 1.0
 
 [sub_resource type="Resource" id="Resource_1igva"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_vkvga")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_kb1id"), SubResource("Resource_rwam6")])
-triggers = Array[ExtResource("8_2tfaw")]([])
 
 [sub_resource type="Resource" id="Resource_88x08"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("2_g6bbx")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1igva")])
-metadata/_guide_input_mappings_collapsed = false
+metadata/_guide_input_mappings_collapsed = true
 
 [sub_resource type="Resource" id="Resource_05q5j"]
 script = ExtResource("10_cvxqo")
 axis = 2
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_tn8ci"]
 script = ExtResource("7_si4d4")
-lower_threshold = 0.2
-upper_threshold = 1.0
 
 [sub_resource type="Resource" id="Resource_1koh7"]
 script = ExtResource("11_j3axn")
 scale = Vector3(0.3, 0.3, 0.3)
-apply_delta_time = false
 
 [sub_resource type="Resource" id="Resource_eep0a"]
 script = ExtResource("12_kxb2c")
-x = true
-y = true
-z = true
 
 [sub_resource type="Resource" id="Resource_dew8i"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_05q5j")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_tn8ci"), SubResource("Resource_1koh7"), SubResource("Resource_eep0a")])
-triggers = Array[ExtResource("8_2tfaw")]([])
 
 [sub_resource type="Resource" id="Resource_tgr2g"]
 script = ExtResource("1_qmhk6")
@@ -95,33 +80,21 @@ metadata/_guide_input_mappings_collapsed = true
 [sub_resource type="Resource" id="Resource_pf0ii"]
 script = ExtResource("10_cvxqo")
 axis = 3
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_nh7x4"]
 script = ExtResource("7_si4d4")
-lower_threshold = 0.2
-upper_threshold = 1.0
 
 [sub_resource type="Resource" id="Resource_04n84"]
 script = ExtResource("11_j3axn")
 scale = Vector3(0.1, 0.1, 0.1)
-apply_delta_time = false
 
 [sub_resource type="Resource" id="Resource_m3aj7"]
 script = ExtResource("12_kxb2c")
-x = true
-y = true
-z = true
 
 [sub_resource type="Resource" id="Resource_qu2wi"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_pf0ii")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_nh7x4"), SubResource("Resource_04n84"), SubResource("Resource_m3aj7")])
-triggers = Array[ExtResource("8_2tfaw")]([])
 
 [sub_resource type="Resource" id="Resource_iarn8"]
 script = ExtResource("1_qmhk6")
@@ -129,73 +102,104 @@ action = ExtResource("13_v2ywt")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qu2wi")])
 metadata/_guide_input_mappings_collapsed = true
 
-[sub_resource type="Resource" id="Resource_ufouq"]
+[sub_resource type="Resource" id="Resource_si4d4"]
+script = ExtResource("10_cvxqo")
+axis = 4
+
+[sub_resource type="Resource" id="Resource_2tfaw"]
+script = ExtResource("15_g6bbx")
+
+[sub_resource type="Resource" id="Resource_q86qg"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_si4d4")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_2tfaw")])
+
+[sub_resource type="Resource" id="Resource_cvxqo"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("14_yp12v")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_q86qg")])
+metadata/_guide_input_mappings_collapsed = false
+
+[sub_resource type="Resource" id="Resource_llfhp"]
 script = ExtResource("10_cvxqo")
 axis = 4
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_ib0yi"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
-[sub_resource type="Resource" id="Resource_qbthx"]
+[sub_resource type="Resource" id="Resource_r6kml"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
+input = SubResource("Resource_llfhp")
-is_remappable = false
-display_name = ""
-display_category = ""
-input = SubResource("Resource_ufouq")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ib0yi")])
 
-[sub_resource type="Resource" id="Resource_0hmrk"]
+[sub_resource type="Resource" id="Resource_tb8ii"]
 script = ExtResource("1_qmhk6")
-action = ExtResource("14_vtk18")
+action = ExtResource("16_li5ak")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qbthx")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_r6kml")])
-metadata/_guide_input_mappings_collapsed = false
 
 [sub_resource type="Resource" id="Resource_cqc4k"]
 script = ExtResource("10_cvxqo")
 axis = 4
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_vanwy"]
 script = ExtResource("17_s8kjn")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_bkx7d"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_cqc4k")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_vanwy")])
 
 [sub_resource type="Resource" id="Resource_iihs4"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("16_rvpjj")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_bkx7d")])
-metadata/_guide_input_mappings_collapsed = true
+metadata/_guide_input_mappings_collapsed = false
+
+[sub_resource type="Resource" id="Resource_fykw6"]
+script = ExtResource("10_cvxqo")
+axis = 5
+
+[sub_resource type="Resource" id="Resource_rvpjj"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_s8kjn"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_fykw6")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rvpjj")])
+metadata/_guide_triggers_collapsed = false
+
+[sub_resource type="Resource" id="Resource_vibkn"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("16_0qat1")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn")])
+
+[sub_resource type="Resource" id="Resource_qkgmj"]
+script = ExtResource("10_cvxqo")
+axis = 5
+
+[sub_resource type="Resource" id="Resource_st2ej"]
+script = ExtResource("17_s8kjn")
+
+[sub_resource type="Resource" id="Resource_818lq"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_qkgmj")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_st2ej")])
+
+[sub_resource type="Resource" id="Resource_2hs2y"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("19_li5ak")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq")])
 
 [sub_resource type="Resource" id="Resource_lfx76"]
 script = ExtResource("19_qkgmj")
 button = 2
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_oruo7"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_4ee3d"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_lfx76")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oruo7")])
 
 [sub_resource type="Resource" id="Resource_0s4kt"]
@@ -203,24 +207,29 @@ script = ExtResource("1_qmhk6")
 action = ExtResource("18_vibkn")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_4ee3d")])
 
+[sub_resource type="Resource" id="Resource_1fkas"]
+script = ExtResource("19_qkgmj")
+
+[sub_resource type="Resource" id="Resource_6pxii"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_jy4f1"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_1fkas")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_6pxii")])
+metadata/_guide_triggers_collapsed = false
+
+[sub_resource type="Resource" id="Resource_d2r0d"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("25_si4d4")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_jy4f1")])
+
 [sub_resource type="Resource" id="Resource_oapce"]
 script = ExtResource("19_qkgmj")
-button = 0
-joy_index = -1
-
-[sub_resource type="Resource" id="Resource_j3mg7"]
-script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_8w5gu"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_oapce")
-modifiers = Array[ExtResource("5_0qat1")]([])
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_j3mg7")])
 metadata/_guide_triggers_collapsed = false
 
 [sub_resource type="Resource" id="Resource_xt1x5"]
@@ -228,23 +237,16 @@ script = ExtResource("1_qmhk6")
 action = ExtResource("21_818lq")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_8w5gu")])
 
-[sub_resource type="Resource" id="Resource_nf3uo"]
+[sub_resource type="Resource" id="Resource_li5ak"]
 script = ExtResource("19_qkgmj")
 button = 10
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_paxxe"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_500v3"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
+input = SubResource("Resource_li5ak")
-is_remappable = false
-display_name = ""
-display_category = ""
-input = SubResource("Resource_nf3uo")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_paxxe")])
 
 [sub_resource type="Resource" id="Resource_ew1hw"]
@@ -255,30 +257,39 @@ input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_500v3")])
 [sub_resource type="Resource" id="Resource_g6bbx"]
 script = ExtResource("19_qkgmj")
 button = 1
-joy_index = -1
 
 [sub_resource type="Resource" id="Resource_yp12v"]
 script = ExtResource("15_fykw6")
-actuation_threshold = 0.5
 
 [sub_resource type="Resource" id="Resource_1rw8g"]
 script = ExtResource("3_yp12v")
-override_action_settings = false
-is_remappable = false
-display_name = ""
-display_category = ""
 input = SubResource("Resource_g6bbx")
-modifiers = Array[ExtResource("5_0qat1")]([])
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_yp12v")])
 
 [sub_resource type="Resource" id="Resource_0qat1"]
 script = ExtResource("1_qmhk6")
-action = ExtResource("22_qmhk6")
+action = ExtResource("23_g6bbx")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1rw8g")])
 metadata/_guide_input_mappings_collapsed = false
 
+[sub_resource type="Resource" id="Resource_j3axn"]
+script = ExtResource("19_qkgmj")
+button = 3
+
+[sub_resource type="Resource" id="Resource_kxb2c"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_v2ywt"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_j3axn")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")])
+
+[sub_resource type="Resource" id="Resource_vtk18"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("24_yp12v")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt")])
+
 [resource]
 script = ExtResource("23_llfhp")
-display_name = ""
+mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_cvxqo"), SubResource("Resource_tb8ii"), SubResource("Resource_iihs4"), SubResource("Resource_vibkn"), SubResource("Resource_2hs2y"), SubResource("Resource_0s4kt"), SubResource("Resource_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18")])
-mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_0hmrk"), SubResource("Resource_iihs4"), SubResource("Resource_0s4kt"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1")])
 metadata/_custom_type_script = "uid://dsa1dnifd6w32"

systems/inputs/base_mode/empower_down.tres

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

systems/inputs/base_mode/empower_release.tres

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

systems/inputs/base_mode/jump_pressed.tres

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

systems/inputs/base_mode/throw.tres

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

systems/inputs/input_system.gd

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

systems/mantle/MantleSystem.cs

@@ -5,50 +5,40 @@ namespace Movementtests.systems;
 
 public partial class MantleSystem: Node3D
 {
-    [Export(PropertyHint.Range, "0,2,0.1,suffix:m,or_greater")]
+    [Export(PropertyHint.Range, "0,2,0.01,suffix:m,or_greater")]
     public float MantleEndLocationDistanceFromWall { get; set; } = 1f;
     [Export(PropertyHint.Range, "0,10,0.1,suffix:m,or_greater")]
     public float MantleHeightCastStart { get; set; } = 2f;
     [Export(PropertyHint.Range, "0,10,0.01,suffix:m,or_greater")]
     public float MaxStepHeight = 0.5f;
     
-    private Node3D _head;
     private ShapeCast3D _wallInFrontCast3D;
     private ShapeCast3D _mantleCast3D;
     private RayCast3D _mantleCheckCast3D;
     
     private Option<Vector3> _mantleLocation;
 
-    public void Init(Node3D head)
+    public void Init()
     {
-        _head = head;
         _wallInFrontCast3D = GetNode<ShapeCast3D>("WallInFrontCast3D");
         _mantleCast3D = GetNode<ShapeCast3D>("MantleCast3D");
     }
 
-    public override void _PhysicsProcess(double delta)
+    public Option<Vector3> FindMantleForHeadRotation(float rotation)
     {
-        base._PhysicsProcess(delta);
-        
         _wallInFrontCast3D.SetRotation(new Vector3(
             _wallInFrontCast3D.Rotation.X,
-            _head.Rotation.Y,
+            rotation,
             _wallInFrontCast3D.Rotation.Z));
 
         if (!_wallInFrontCast3D.IsColliding())
         {
-            _mantleLocation = Option<Vector3>.None;
+            return Option<Vector3>.None;
-            return;
         }
         
         var collisionPoint = _wallInFrontCast3D.GetCollisionPoint(0);
         var collisionNormal = _wallInFrontCast3D.GetCollisionNormal(0);
-        _mantleLocation = FindMantleLocationAtPoint(collisionPoint, collisionNormal);
+        return FindMantleLocationAtPoint(collisionPoint, collisionNormal);
-    }
-
-    public Option<Vector3> FindMantleInFrontOfPlayer()
-    {
-        return _mantleLocation;
     }
 
     public Option<Vector3> FindMantleLocationAtPoint(Vector3 point, Vector3 wallNormal)
@@ -59,8 +49,8 @@ public partial class MantleSystem: Node3D
         _mantleCast3D.SetGlobalPosition(shapeCastStartLocation);
         var targetLocation = Vector3.Down * MantleHeightCastStart + Vector3.Up * MaxStepHeight;
         _mantleCast3D.SetTargetPosition(targetLocation);
-
+        
-        if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y > 0.9f)
+        if (_mantleCast3D.IsColliding() && _mantleCast3D.GetCollisionNormal(0).Y >= 0.1f)
             return Option.Some(_mantleCast3D.GetCollisionPoint(0));
         return Option<Vector3>.None;
     }

systems/mantle/mantle_system.tscn

@@ -5,8 +5,7 @@
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_4coqe"]
 height = 1.7
 
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_qu4wy"]
+[sub_resource type="SphereShape3D" id="SphereShape3D_2oobp"]
-height = 1.3
 
 [node name="MantleSystem" type="Node3D"]
 script = ExtResource("1_2oobp")
@@ -22,7 +21,7 @@ debug_shape_custom_color = Color(1, 0, 0, 1)
 
 [node name="WallInFrontCast3D" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
-shape = SubResource("CapsuleShape3D_qu4wy")
+shape = SubResource("SphereShape3D_2oobp")
 target_position = Vector3(0, 0, -1.5)
 max_results = 1
 collision_mask = 2

systems/move/MoveSystem.cs

@@ -8,9 +8,10 @@ public partial class MoveSystem : Node3D
 {
     public enum JumpTypes
     {
-        SIMPLE_JUMP,
+        SimpleJump,
-        DOUBLE_JUMP,
+        DoubleJump,
-        JUMP_FROM_DASH
+        JumpFromDash,
+        JumpFromWall
     }
     
     public record MoveSystemParameters(
@@ -196,15 +197,18 @@ public partial class MoveSystem : Node3D
         var jumpForce = 0.0f;
         switch (jumpType)
         {
-            case JumpTypes.DOUBLE_JUMP:
+            case JumpTypes.DoubleJump:
                 jumpForce = _gravity.CalculateDoubleJumpForce();
                 break;
-            case JumpTypes.SIMPLE_JUMP:
+            case JumpTypes.SimpleJump:
                 jumpForce = _gravity.CalculateJumpForce();
                 break;
-            case JumpTypes.JUMP_FROM_DASH:
+            case JumpTypes.JumpFromDash:
                 jumpForce = _gravity.CalculateJumpFromDashForce();
                 break;
+            case JumpTypes.JumpFromWall:
+                jumpForce = _gravity.CalculateJumpFromWallForce();
+                break;
             default:
                 jumpForce = _gravity.CalculateJumpForce();
                 break;
@@ -214,22 +218,4 @@ public partial class MoveSystem : Node3D
         var jumpVelocity = jumpForce * effectiveJumpDirection * boost;
         _parent.Velocity = currentHorizontalVelocity + jumpVelocity;
     }
-
-    public bool CanMantle()
-    {
-        var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
-        return mantleLocationResult.IsSome(out _);
-    }
-
-    public Option<Tween> Mantle()
-    {
-        var mantleLocationResult = _mantleSystem.FindMantleInFrontOfPlayer();
-        if (mantleLocationResult.IsSome(out var mantleLocation))
-        {
-            var duration = 0.1f * mantleLocation.DistanceTo(_parent.Position);
-            var tween = _tweenQueueSystem.TweenToLocation(new TweenQueueSystem.TweenInputs(mantleLocation, duration));
-            return tween.Some();
-        }
-        return Option<Tween>.None;
-    }
 }

systems/move/simple_jump.tres

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

systems/tween_queue/TweenQueueSystem.cs

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

systems/wall_hug/WallHugSystem.cs

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

systems/weapon/WeaponSystem.cs

@@ -1,3 +1,4 @@
+using System;
 using Godot;
 using GodotStateCharts;
 
@@ -23,9 +24,8 @@ public partial class WeaponSystem : RigidBody3D
     private Transform3D _startTransform;
 
     private Vector3 _throwDirection;
-    private Vector3 _plantLocation;
+    public Vector3 PlantLocation { get; set; }
-    private Vector3 _plantNormal;
+    public Vector3 PlantNormal { get; set; }
-    public Vector3 PlayerDashLocation { get; set; }
 
     public void Init(Node3D head, Camera3D camera)
     {
@@ -51,10 +51,10 @@ public partial class WeaponSystem : RigidBody3D
         _weaponState.SendEvent("throw");
         
         _throwDirection = (end - GlobalPosition).Normalized();
-        _plantLocation = collisionLocation;
+        PlantLocation = collisionLocation;
-        _plantNormal = collisionNormal;
+        PlantNormal = collisionNormal;
         LookAt(end);
-        
+    
         var tween = _tweenQueueSystem.TweenToLocation(new TweenQueueSystem.TweenInputs(end, StraightThrowDuration));
         if (hasHit)
             tween.Finished += PlantWeaponInWall;
@@ -72,9 +72,13 @@ public partial class WeaponSystem : RigidBody3D
     {
         _weaponState.SendEvent("plant");
         Freeze = true;
-        GlobalPosition = _plantLocation;
+        GlobalPosition = PlantLocation;
-        PlayerDashLocation = _plantLocation + _plantNormal * 0.1f;
+        LookAt(GlobalTransform.Origin + PlantNormal, Vector3.Up, true);
-        LookAt(GlobalTransform.Origin + _plantNormal, Vector3.Up, true);
+    }
+
+    public void OnThrownWeaponReachesGround(Node other)
+    {
+        PlantWeaponInWall();
     }
 
     public void ResetWeapon()
@@ -83,21 +87,25 @@ public partial class WeaponSystem : RigidBody3D
         Transform = _startTransform;
         Freeze = true;
     }
-
+    
     public override void _IntegrateForces(PhysicsDirectBodyState3D state)
     {
         base._IntegrateForces(state);
-        PlayerDashLocation = GlobalPosition;
+        
         if (!Freeze && state.GetContactCount() > 0)
         {
-            _plantLocation = state.GetContactLocalPosition(0);
+            PlantLocation = state.GetContactLocalPosition(0);
-            _plantNormal = state.GetContactLocalNormal(0);
+            PlantNormal = state.GetContactLocalNormal(0);
-            PlayerDashLocation = _plantLocation + _plantNormal * 0.1f;
         }
     }
 
-    public void OnThrownWeaponReachesGround(Node other)
+    public bool IsPlantedUnderPlatform()
     {
-        PlantWeaponInWall();
+        return PlantedState.Active && GlobalRotation.X > 1 && Math.Abs(GlobalRotation.Y) > 1;
+    }
+
+    public bool IsPlantedInWall()
+    {
+        return PlantedState.Active && Math.Abs(GlobalRotation.X) + Math.Abs(GlobalRotation.Z) < 0.3;
     }
 }