gd: made wall jump more intuitive and act like a double jump

.gitea/workflows/main.yaml

@@ -50,6 +50,7 @@ jobs:
         uses: https://git.game-dev.space/minimata/checkout-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:

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/ladder/Textures/colormap.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://kyoessd1518w"
+path.s3tc="res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.s3tc.ctex"
+path.etc2="res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/ladder/Textures/colormap.png"
+dest_files=["res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.s3tc.ctex", "res://.godot/imported/colormap.png-0164da4e3e43f54bbcc6c773ee30521d.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/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/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

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,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://dmkw8cmalm5k"]
+[gd_scene load_steps=14 format=3 uid="uid://dmkw8cmalm5k"]
 
 [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
 [ext_resource type="PackedScene" uid="uid://dkr80d2pi0d41" path="res://addons/guide/debugger/guide_debugger.tscn" id="2_uet8a"]
@@ -6,6 +6,10 @@
 [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://fxj0a6p5h6lm" path="res://maps/Components/small_square_tower.tscn" id="5_ruo5i"]
+[ext_resource type="PackedScene" uid="uid://bfriujv0l1yjy" path="res://assets/greybox/human_scale.tscn" id="5_wxle6"]
+[ext_resource type="PackedScene" uid="uid://482s38k0yv35" path="res://maps/Components/stairs.tscn" id="8_pxgdh"]
+[ext_resource type="PackedScene" uid="uid://cmfagvnymc2yr" path="res://assets/ladder/ladder.fbx" id="9_ukfuy"]
+[ext_resource type="PackedScene" uid="uid://bod7boex72igr" path="res://assets/ladder/ladder-top.fbx" id="10_wctvs"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"]
 sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
@@ -19,15 +23,10 @@ background_mode = 2
 sky = SubResource("Sky_h2yge")
 ambient_light_source = 2
 ambient_light_color = Color(0.576076, 0.459788, 0.652401, 1)
-reflected_light_source = 2
 tonemap_mode = 4
-tonemap_exposure = 1.32
+tonemap_exposure = 2.0
 ssao_enabled = true
-ssao_radius = 3.61
 ssil_enabled = true
-ssil_radius = 8.4
-sdfgi_use_occlusion = true
-glow_enabled = true
 
 [node name="Main" type="Node3D"]
 
@@ -56,6 +55,12 @@ collision_mask = 5
 transform = Transform3D(5.65685, -5.65685, -2.47269e-08, 0, -3.49691e-07, 0.8, -5.65685, -5.65685, -2.47269e-08, 141.335, 0, -122.33)
 texture = ExtResource("3_ruo5i")
 
+[node name="CSGBox3D11" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 149.932, -1, -129.284)
+use_collision = true
+size = Vector3(398.5, 1, 288.5)
+material = ExtResource("3_cieeo")
+
 [node name="GuardTower" type="CSGCombiner3D" parent="Greybox"]
 
 [node name="CSGBox3D6" type="CSGBox3D" parent="Greybox/GuardTower"]
@@ -76,24 +81,6 @@ 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
@@ -263,13 +250,439 @@ use_collision = true
 size = Vector3(27.5, 13.5, 30.5)
 material = ExtResource("3_cieeo")
 
-[node name="CSGBox3D11" type="CSGBox3D" parent="Greybox"]
+[node name="LowWageResidentialBulk1" type="CSGCombiner3D" parent="Greybox"]
-transform = Transform3D(-0.707107, 0, -0.707107, 0, 1, 0, 0.707107, 0, -0.707107, 149.932, -1, -129.284)
+
+[node name="GuardBarracks" type="CSGCombiner3D" parent="Greybox/LowWageResidentialBulk1"]
+
+[node name="Base" type="CSGCombiner3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks"]
+
+[node name="CSGBox3D43" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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(398.5, 1, 288.5)
+size = Vector3(9.5, 53.5, 4)
 material = ExtResource("3_cieeo")
 
-[node name="LowWageResidentialBulk1" type="CSGCombiner3D" parent="Greybox"]
+[node name="CSGBox3D11" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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="CSGBox3D29" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.0871559, 0, -0.996195, 0, 1, 0, 0.996195, 0, -0.0871559, 31.1979, 27.7658, -49.8463)
+use_collision = true
+size = Vector3(0.5, 1, 14.0302)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D32" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.0871559, 0, -0.996195, 0, 1, 0, 0.996195, 0, -0.0871559, 24.367, 27.7658, -48.7531)
+use_collision = true
+size = Vector3(3.08231, 1, 0.610819)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D30" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-1, 0, 5.96046e-08, 0, 1, 0, -5.96046e-08, 0, -1, 37.847, 27.7658, -40.0545)
+use_collision = true
+size = Vector3(0.5, 1, 18.1063)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D31" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, -0.5, 32.2181, 27.7658, -27.9732)
+use_collision = true
+size = Vector3(0.5, 1, 13.1352)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D12" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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/LowWageResidentialBulk1/GuardBarracks/Base"]
+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="CSGBox3D40" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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="CSGBox3D44" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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="CSGBox3D71" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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/GuardBarracks/Base"]
+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="CSGBox3D88" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-1, -9.16272e-05, -0.000342578, 1.99003e-08, 0.965926, -0.258819, 0.00035426, -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/GuardBarracks/Base"]
+transform = Transform3D(1, 9.16123e-05, 0.000342488, 1.99003e-08, 0.965926, -0.258819, -0.00035423, 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="CSGBox3D42" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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="CSGBox3D91" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+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/GuardBarracks/Base"]
+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="CSGBox3D93" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 29.1543, 42.5, -31.7809)
+operation = 2
+use_collision = true
+size = Vector3(11.0024, 5, 11.5278)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D45" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 33.5024, 42.5, -38.1959)
+use_collision = true
+size = Vector3(0.205633, 5, 0.347168)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D46" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 34.6033, 42.5, -31.7988)
+use_collision = true
+size = Vector3(0.205633, 5, 0.347168)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D47" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 26.4046, 42.5, -27.1145)
+use_collision = true
+size = Vector3(0.205633, 5, 0.347168)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 24.4772, 42.5, -30.225)
+use_collision = true
+size = Vector3(0.205633, 5, 0.347168)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 23.3757, 42.5, -36.4138)
+use_collision = true
+size = Vector3(0.205633, 5, 0.347168)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D14" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984808, 34.3949, 40.5, -35.0151)
+use_collision = true
+size = Vector3(0.5, 1, 6.37109)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D15" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.984808, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984808, 24.0292, 40.5, -33.5381)
+use_collision = true
+size = Vector3(0.5, 1, 6.37109)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D16" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.866026, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866026, 25.554, 40.5, -28.6674)
+use_collision = true
+size = Vector3(0.5, 1, 3.85986)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D17" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(0.5, 0, -0.866026, 0, 1, 0, 0.866026, 0, 0.5, 30.4417, 40.5, -29.4922)
+use_collision = true
+size = Vector3(0.5, 1, 9.66968)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D26" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(0.0871558, 0, 0.996195, 0, 1, 0, -0.996195, 0, 0.0871558, 31.0881, 27.0217, -48.3002)
+use_collision = true
+size = Vector3(3, 0.5, 14)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D27" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, -0.5, 31.7109, 27.0208, -28.6518)
+use_collision = true
+size = Vector3(2.229, 0.5, 13.125)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D28" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Base"]
+transform = Transform3D(-8.9407e-08, 0, 1, 0, 1, 0, -1, 0, -8.9407e-08, 35.6407, 27.0232, -38.6995)
+use_collision = true
+size = Vector3(15.435, 0.5, 4.556)
+material = ExtResource("3_cieeo")
+
+[node name="Carvings" type="CSGCombiner3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks"]
+operation = 2
+
+[node name="CSGBox3D104" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.0871561, 0, -0.996196, 0, 1, 0, 0.996196, 0, -0.0871561, 29.591, 36.2675, -46.488)
+use_collision = true
+size = Vector3(3, 2, 2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D99" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.996196, 0, 0.0871562, 0, 1, 0, -0.0871562, 0, -0.996196, 27.0596, 28.274, -46.7095)
+use_collision = true
+size = Vector3(1.2, 2, 2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D100" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.996196, 0, 0.0871562, 0, 1, 0, -0.0871562, 0, -0.996196, 32.2649, 28.2909, -46.2541)
+use_collision = true
+size = Vector3(1.2, 2, 2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D101" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(0.0871562, 0, 0.996196, 0, 1, 0, -0.996196, 0, 0.0871562, 34.527, 28.2909, -44.152)
+use_collision = true
+size = Vector3(1.2, 2, 2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D102" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(0.0871562, 0, 0.996196, 0, 1, 0, -0.996196, 0, 0.0871562, 33.9342, 28.2909, -37.3764)
+use_collision = true
+size = Vector3(1.2, 2, 2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D103" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(0.866027, 0, 0.500001, 0, 1, 0, -0.500001, 0, 0.866027, 32.8605, 28.2909, -31.34)
+use_collision = true
+size = Vector3(1.2, 2, 2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D105" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-1, 0, 2.98023e-07, 0, 1, 0, -2.98023e-07, 0, -1, 21.0521, 28.8178, -40.745)
+use_collision = true
+size = Vector3(7.22, 3, 3.016)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D106" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-1, 0, 2.98023e-07, 0, 1, 0, -2.98023e-07, 0, -1, 20.0999, 30.4233, -34.4384)
+use_collision = true
+size = Vector3(5.31517, 6.31152, 19.827)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D107" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-1, 0, 2.98023e-07, 0, 1, 0, -2.98023e-07, 0, -1, 23.5894, 30.4466, -27.4554)
+use_collision = true
+size = Vector3(3.8652, 6.35828, 5.64597)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D94" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.866027, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866027, 31.422, 39.6069, -32.1784)
+use_collision = true
+size = Vector3(2.2, 2.78613, 2.2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D96" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.866027, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866027, 29.5015, 33.2675, -32.5266)
+use_collision = true
+size = Vector3(8.9968, 12, 4.63121)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D97" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.984809, 0, -0.173648, 0, 1, 0, 0.173648, 0, -0.984809, 28.7333, 33.2675, -35.1505)
+use_collision = true
+size = Vector3(9.3, 12, 4)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D98" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.996196, 0, 0.0871562, 0, 1, 0, -0.0871562, 0, -0.996196, 28.9842, 33.2675, -40.9084)
+use_collision = true
+size = Vector3(9.6, 12, 11)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D95" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Carvings"]
+transform = Transform3D(-0.996196, 0, 0.0871562, 0, 1, 0, -0.0871562, 0, -0.996196, 29.1552, 36.2675, -41.507)
+use_collision = true
+size = Vector3(13, 2, 2)
+material = ExtResource("3_cieeo")
+
+[node name="Furniture" type="Node3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks"]
+
+[node name="MeshInstance3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.4558, 41, -45.2548)
+skeleton = NodePath("../../../..")
+
+[node name="MeshInstance3D3" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 24.9722, 36.0849, -41.9434)
+skeleton = NodePath("../../../..")
+
+[node name="MeshInstance3D4" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.3106, 33.0849, -30.6639)
+skeleton = NodePath("../../../..")
+
+[node name="MeshInstance3D5" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.8165, 28.1929, -35.5565)
+skeleton = NodePath("../../../..")
+
+[node name="MeshInstance3D6" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 26.0369, 28.1929, -49.1426)
+skeleton = NodePath("../../../..")
+
+[node name="MeshInstance3D8" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 36.1854, 28.1929, -41.4481)
+skeleton = NodePath("../../../..")
+
+[node name="MeshInstance3D7" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 28.703, 28.1929, -27.2256)
+skeleton = NodePath("../../../..")
+
+[node name="MeshInstance3D2" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("5_wxle6")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 32.5269, 41, -39.598)
+skeleton = NodePath("../../../..")
+
+[node name="stairs" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("8_pxgdh")]
+transform = Transform3D(0.5, 0, -2.07846, 0, 1, 0, 0.866025, 0, 1.2, 26.4125, 31.2573, -31.3114)
+
+[node name="stairs2" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("8_pxgdh")]
+transform = Transform3D(0.5, 0, -2.07846, 0, 1, 0, 0.866025, 0, 1.2, 25.9125, 30.2573, -32.1774)
+
+[node name="stairs3" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("8_pxgdh")]
+transform = Transform3D(0.5, 0, -2.07846, 0, 1, 0, 0.866025, 0, 1.2, 25.4125, 29.2573, -33.0435)
+
+[node name="stairs4" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("8_pxgdh")]
+transform = Transform3D(0.34202, 0, -2.25526, 0, 1, 0, 0.939692, 0, 0.820848, 25.0705, 28.2573, -33.9832)
+
+[node name="stairs5" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("8_pxgdh")]
+transform = Transform3D(0.34202, 0, -2.25526, 0, 1, 0, 0.939692, 0, 0.820848, 24.7285, 27.2573, -34.9229)
+
+[node name="CSGBox3D19" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(0.0871558, 0, 0.996195, 0, 1, 0, -0.996195, 0, 0.0871558, 29.056, 35.0183, -41.6004)
+use_collision = true
+size = Vector3(0.673, 0.5, 9.748)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(0.0871558, 0, 0.996195, 0, 1, 0, -0.996195, 0, 0.0871558, 29.3443, 35.0247, -43.8862)
+use_collision = true
+size = Vector3(5.277, 0.5, 0.729)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(0.0871558, 0, 0.996195, 0, 1, 0, -0.996195, 0, 0.0871558, 29.1673, 34.299, -41.5742)
+use_collision = true
+size = Vector3(0.204956, 1.94421, 0.197428)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(0.0871558, 0, 0.996195, 0, 1, 0, -0.996195, 0, 0.0871558, 29.1641, 33.4089, -41.5785)
+use_collision = true
+size = Vector3(2, 0.1, 2)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(0.0871558, 0, 0.996195, 0, 1, 0, -0.996195, 0, 0.0871558, 29.0344, 28.0842, -39.368)
+use_collision = true
+size = Vector3(6.09673, 0.164001, 2.98718)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D37" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(0.0871558, 0, 0.996195, 0, 1, 0, -0.996195, 0, 0.0871558, 29.0014, 27.678, -39.2663)
+use_collision = true
+size = Vector3(4.13038, 0.976303, 0.325424)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D21" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, -0.5, 26.703, 29.5401, -30.6725)
+use_collision = true
+size = Vector3(0.5, 5.10809, 2.52881)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D22" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.866026, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866026, 27.3289, 29.122, -31.6231)
+use_collision = true
+size = Vector3(0.5, 4.27194, 1.36505)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D23" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.866026, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866026, 26.8289, 28.625, -32.4892)
+use_collision = true
+size = Vector3(0.5, 3.27783, 1.36505)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D24" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.866026, 0, -0.5, 0, 1, 0, 0.5, 0, -0.866026, 26.3289, 28.1162, -33.3552)
+use_collision = true
+size = Vector3(0.5, 2.26025, 1.36505)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D25" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.939693, 0, -0.34202, 0, 1, 0, 0.34202, 0, -0.939693, 26.0065, 27.6185, -34.2048)
+use_collision = true
+size = Vector3(0.5, 1.26477, 1.21268)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D20" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, -0.5, 30.8493, 32.5, -33.0317)
+use_collision = true
+size = Vector3(0.5, 1, 7.00781)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D26" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, -0.5, 33.4444, 35.6629, -33.3736)
+use_collision = true
+size = Vector3(2.50293, 7.32574, 2.17114)
+material = ExtResource("3_cieeo")
+
+[node name="CSGBox3D18" type="CSGBox3D" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture"]
+transform = Transform3D(-0.5, 0, 0.866026, 0, 1, 0, -0.866026, 0, -0.5, 30.0125, 32.113, -31.4695)
+use_collision = true
+size = Vector3(2.34326, 0.226074, 9.09705)
+material = ExtResource("3_cieeo")
+
+[node name="ladder" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 31.9913, -32.4904)
+
+[node name="ladder2" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 32.9913, -32.4904)
+
+[node name="ladder3" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 33.9913, -32.4904)
+
+[node name="ladder4" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 34.9913, -32.4904)
+
+[node name="ladder5" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 35.9913, -32.4904)
+
+[node name="ladder6" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 36.9913, -32.4904)
+
+[node name="ladder7" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 37.9913, -32.4904)
+
+[node name="ladder8" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("9_ukfuy")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.2879, 38.9913, -32.4904)
+
+[node name="ladder-top" parent="Greybox/LowWageResidentialBulk1/GuardBarracks/Furniture" instance=ExtResource("10_wctvs")]
+transform = Transform3D(0.866025, 0, 0.5, 0, 1, 0, -0.5, 0, 0.866025, 32.4123, 39.9775, -32.5648)
 
 [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)
@@ -400,30 +813,6 @@ 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
@@ -688,42 +1077,6 @@ 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
@@ -790,7 +1143,6 @@ 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")

player_controller/PlayerController.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=35 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=36 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"]
@@ -10,6 +10,7 @@
 [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"]
@@ -19,6 +20,7 @@
 [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="Script" uid="uid://b6k73aj5povgv" path="res://player_controller/Scripts/FieldOfView.cs" id="12_m2mxi"]
+[ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="13_r7i3q"]
 [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"]
@@ -36,9 +38,6 @@
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_xc2g5"]
 height = 1.7
 
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_wydro"]
-height = 1.7
-
 [node name="Player" type="CharacterBody3D"]
 script = ExtResource("1_poq2x")
 TimeScaleAimInAir = 0.15
@@ -52,6 +51,7 @@ 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_released = ExtResource("8_lhb11")
 aim_canceled = ExtResource("9_5p2qc")
 jump = ExtResource("10_4u7i3")
@@ -65,7 +65,7 @@ mesh = SubResource("CapsuleMesh_xc2g5")
 
 [node name="CapsuleCollider" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
-shape = SubResource("CapsuleShape3D_wydro")
+shape = ExtResource("13_r7i3q")
 script = ExtResource("8_lmtjd")
 CapsuleDefaultHeight = 1.7
 
@@ -167,6 +167,10 @@ StraightThrowDuration = 0.05
 wait_time = 0.2
 one_shot = true
 
+[node name="DashCooldown" type="Timer" parent="."]
+wait_time = 0.2
+one_shot = true
+
 [node name="TimeScaleAimInAir" type="Timer" parent="."]
 wait_time = 2.0
 one_shot = true
@@ -195,13 +199,22 @@ script = ExtResource("26_infe6")
 initial_state = NodePath("WeaponInHand")
 metadata/_custom_type_script = "uid://c1vp0ojjvaby1"
 
+[node name="AimCanceled" type="Node" parent="StateChart/Root/Actions"]
+script = ExtResource("27_34snm")
+
+[node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/AimCanceled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../WeaponInHand")
+event = &"aim_released"
+delay_in_seconds = "0.0"
+
 [node name="WeaponInHand" type="Node" parent="StateChart/Root/Actions"]
 script = ExtResource("27_34snm")
 
 [node name="ToAiming" type="Node" parent="StateChart/Root/Actions/WeaponInHand"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Aiming")
-event = &"aim_pressed"
+event = &"aim_down"
 delay_in_seconds = "0.0"
 
 [node name="Aiming" type="Node" parent="StateChart/Root/Actions"]
@@ -209,7 +222,7 @@ script = ExtResource("27_34snm")
 
 [node name="ToWeaponInHand" type="Node" parent="StateChart/Root/Actions/Aiming"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../WeaponInHand")
+to = NodePath("../../AimCanceled")
 event = &"aim_canceled"
 delay_in_seconds = "0.0"
 
@@ -261,7 +274,7 @@ delay_in_seconds = "0.0"
 [node name="OnDrop" type="Node" parent="StateChart/Root/Actions/Hanging"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../WeaponInHand")
-event = &"drop"
+event = &"crouch"
 delay_in_seconds = "0.0"
 
 [node name="OnMantle" type="Node" parent="StateChart/Root/Actions/Hanging"]
@@ -287,26 +300,57 @@ event = &"dash_to_planted"
 delay_in_seconds = "0.0"
 
 [node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("Standing")
+
+[node name="Standing" type="Node" parent="StateChart/Root/Movement/Grounded"]
 script = ExtResource("27_34snm")
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/Jump")
+to = NodePath("../../../Airborne/Jump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
-[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/CoyoteEnabled")
+to = NodePath("../../../Airborne/CoyoteEnabled")
 event = &"start_falling"
 delay_in_seconds = "0.0"
 
+[node name="OnCrouch" type="Node" parent="StateChart/Root/Movement/Grounded/Standing"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Crouch")
+event = &"crouch"
+delay_in_seconds = "0.0"
+
+[node name="Crouch" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("27_34snm")
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded/Crouch"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/Jump")
+event = &"jump"
+delay_in_seconds = "0.0"
+
+[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded/Crouch"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/CoyoteEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
+[node name="OnStandUp" type="Node" parent="StateChart/Root/Movement/Grounded/Crouch"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Standing")
+event = &"stand_up"
+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")
+to = NodePath("../../Grounded/Standing")
 event = &"to_grounded"
 delay_in_seconds = "0.0"
 
@@ -322,7 +366,7 @@ 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"
+event = &"crouch"
 delay_in_seconds = "0.0"
 
 [node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
@@ -331,7 +375,7 @@ initial_state = NodePath("CoyoteEnabled")
 
 [node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Grounded")
+to = NodePath("../../Grounded/Standing")
 event = &"grounded"
 delay_in_seconds = "0.0"
 
@@ -389,10 +433,10 @@ 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"]
+[node name="JumpedFromWall" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../DoubleJumpEnabled")
+to = NodePath("../../Falling")
-event = &"to_double_jump"
+event = &"jump_from_wall"
 delay_in_seconds = "0.0"
 
 [node name="ToFalling" type="Node" parent="StateChart/Root/Movement/Airborne/JumpFromWall"]
@@ -429,6 +473,7 @@ event = &"enable_double_jump"
 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"]

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/PlayerController.cs

@@ -39,9 +39,12 @@ public partial class PlayerController : CharacterBody3D
 	private float _inputRotateY;
 	private float _inputRotateFloorplane;
 
+	// Timers
 	private Timer _coyoteTimer;
 	private Timer _timeScaleAimInAirTimer;
 	private Timer _timeAfterDashingTimer;
+	private Timer _dashCooldownTimer;
+	
 	[Export(PropertyHint.Range, "0,1,0.01,or_greater")]
 	public float TimeScaleAimInAir { get; set; } = 0.2f;
 	[Export(PropertyHint.Range, "0,5,0.1,or_greater")]
@@ -52,6 +55,8 @@ public partial class PlayerController : CharacterBody3D
 
 	public int DashActionsLeft { get; set; }
 	
+	private bool _isWallJumpAvailable = true;
+	
 	private StateChart       _playerState;
 	// Actions state
 	private StateChartState  _weaponInHand;
@@ -139,6 +144,7 @@ public partial class PlayerController : CharacterBody3D
 		_falling = StateChartState.Of(GetNode("StateChart/Root/Movement/Airborne/Falling"));
 		// State timers
 		_coyoteTimer = GetNode<Timer>("CoyoteTime");
+		_dashCooldownTimer = GetNode<Timer>("DashCooldown");
 		_timeScaleAimInAirTimer = GetNode<Timer>("TimeScaleAimInAir");
 		_timeAfterDashingTimer = GetNode<Timer>("TimeAfterDashing");
 		
@@ -231,6 +237,10 @@ public partial class PlayerController : CharacterBody3D
 	{
 		_playerState.SendEvent("aim_pressed");
 	}
+	public void OnInputAimDown()
+	{
+		_playerState.SendEvent("aim_down");
+	}
 	public void OnInputAimReleased()
 	{
 		_playerState.SendEvent("aim_released");
@@ -256,7 +266,7 @@ public partial class PlayerController : CharacterBody3D
 	}
 	public void OnInputDropPressed()
 	{
-		_playerState.SendEvent("drop");
+		_playerState.SendEvent("crouch");
 	}
 	
 	///////////////////////////
@@ -267,18 +277,19 @@ public partial class PlayerController : CharacterBody3D
 	public void OnGrounded()
 	{
 		DashActionsLeft = MaxNumberOfDashActions;
-		GD.Print(DashActionsLeft);
+		_isWallJumpAvailable = true;
 	}
 
 	public bool CanPerformDashAction()
 	{
-		return DashActionsLeft > 0;
+		return DashActionsLeft > 0 && _dashCooldownTimer.IsStopped();
 	}
 
 	public void PerformDashAction()
 	{
+		_isWallJumpAvailable  = true;
+		_dashCooldownTimer.Start();
 		DashActionsLeft--;
-		GD.Print(DashActionsLeft);
 	}
 
 	// Jumping
@@ -296,24 +307,30 @@ public partial class PlayerController : CharacterBody3D
 		{
 			_playerState.SendEvent("jump_from_dash");
 			PerformDashAction();
-			PerformJump(MoveSystem.JumpTypes.JUMP_FROM_DASH);
+			PerformJump(MoveSystem.JumpTypes.JumpFromDash);
 			return;
 		}
 		_playerState.SendEvent("to_double_jump");
-		PerformJump(MoveSystem.JumpTypes.SIMPLE_JUMP);
+		PerformJump(MoveSystem.JumpTypes.SimpleJump);
 	}
 	public void JumpFromWall()
 	{
+		if (!_isWallJumpAvailable)
+			return;
+		
+		_isWallJumpAvailable = false;
 		var wallNormal = WallHugSystem.GetWallNormal().UnwrapOr(Vector3.Up);
+		var isLookingTowardsWall = HeadSystem.GetForwardHorizontalVector().Dot(wallNormal) > 0.7;
+		var jumpDirection = isLookingTowardsWall ? Vector3.Up : wallNormal;
 		if (_aiming.Active && CanPerformDashAction())
 		{
 			_playerState.SendEvent("jump_from_dash");
 			PerformDashAction();
-			PerformJump(MoveSystem.JumpTypes.JUMP_FROM_DASH, wallNormal);
+			PerformJump(MoveSystem.JumpTypes.JumpFromDash, jumpDirection);
 			return;
 		}
-		_playerState.SendEvent("to_double_jump");
+		_playerState.SendEvent("jump_from_wall");
-		PerformJump(MoveSystem.JumpTypes.SIMPLE_JUMP, wallNormal);
+		PerformJump(MoveSystem.JumpTypes.JumpFromWall, jumpDirection);
 	}
 	public void DoubleJump()
 	{
@@ -321,10 +338,10 @@ public partial class PlayerController : CharacterBody3D
 		if (_aiming.Active && CanPerformDashAction())
 		{
 			PerformDashAction();
-			PerformJump(MoveSystem.JumpTypes.JUMP_FROM_DASH);
+			PerformJump(MoveSystem.JumpTypes.JumpFromDash);
 			return;
 		}
-		PerformJump(MoveSystem.JumpTypes.DOUBLE_JUMP);
+		PerformJump(MoveSystem.JumpTypes.DoubleJump);
 	}
 	private void PerformJump(MoveSystem.JumpTypes jumpType, Vector3? jumpDirection = null)
 	{
@@ -334,8 +351,8 @@ public partial class PlayerController : CharacterBody3D
 		var proportionOfTimeGone = _timeAfterDashingTimer.TimeLeft / _timeAfterDashingTimer.WaitTime;
 		var actualBoost = 1 + MaxJumpBoostAfterDashing * proportionOfTimeGone;
 		var makeItDouble = actualBoost > 1;
-		if (makeItDouble && jumpType == MoveSystem.JumpTypes.SIMPLE_JUMP)
+		if (makeItDouble && jumpType == MoveSystem.JumpTypes.SimpleJump)
-			jumpType = MoveSystem.JumpTypes.DOUBLE_JUMP;  // convert simple jump to double if done right after a dash
+			jumpType = MoveSystem.JumpTypes.DoubleJump;  // convert simple jump to double if done right after a dash
 		_timeAfterDashingTimer.Stop();
 		
 		bool doesCapsuleHaveCrouchingHeight = CapsuleCollider.IsCrouchingHeight();
@@ -371,14 +388,26 @@ public partial class PlayerController : CharacterBody3D
 		_timeAfterDashingTimer.Start();
 		if (WeaponSystem.FlyingState.Active)
 		{
-			DashSystem.DashResolve = new DashResolveRecord(false, WeaponSystem.GlobalPosition, Vector3.Zero);
+			DashSystem.ShouldMantle = false;
+			DashSystem.PlannedPlayerLocation = WeaponSystem.GlobalPosition;
 		}
 		else if (WeaponSystem.PlantedState.Active)
 		{
-			// Should we try to resolve with mantle?
+			DashSystem.ShouldMantle = false;
-			DashSystem.DashResolve = new DashResolveRecord(false, WeaponSystem.PlayerDashLocation, Vector3.Zero);
+			var dashLocation = WeaponSystem.PlantLocation;
+			if (WeaponSystem.IsPlantedInWall())
+			{
+				dashLocation += WeaponSystem.PlantNormal * 0.5f;  // Player radius
+			}
+
+			if (WeaponSystem.IsPlantedUnderPlatform())
+			{
+				dashLocation += Vector3.Down * 1f;  // Player height
+			}
+			
+			DashSystem.PlannedPlayerLocation = dashLocation;
 		}
-		_dashDirection = (DashSystem.DashResolve.DashLocation - GlobalPosition).Normalized();
+		_dashDirection = (DashSystem.PlannedPlayerLocation - GlobalPosition).Normalized();
 		DashSystem.Dash();
 	}
 	public void OnDashEnded()
@@ -392,8 +421,9 @@ public partial class PlayerController : CharacterBody3D
 		}
 		
 		// Store the weapon state before resetting it
-		var isPlantedOnWall = WeaponSystem.PlantedState.Active 
+		var isPlantedOnWall = WeaponSystem.IsPlantedInWall();
-		                      && (Math.Abs(WeaponSystem.GlobalRotation.X) + Math.Abs(WeaponSystem.GlobalRotation.Z) < 0.3);
+		var isPlantedUnderPlatform = WeaponSystem.IsPlantedUnderPlatform();
+		var shouldDashToHanging = isPlantedOnWall || isPlantedUnderPlatform;
 		var isFlying = WeaponSystem.FlyingState.Active;
 		
 		// Get the weapon back
@@ -410,7 +440,7 @@ public partial class PlayerController : CharacterBody3D
 			return;  // In case states aren't exclusives
 		}
 		
-		if (isPlantedOnWall)
+		if (shouldDashToHanging)
 		{
 			_playerState.SendEvent("dash_to_planted");
 			return;  // In case states aren't exclusives
@@ -424,12 +454,15 @@ public partial class PlayerController : CharacterBody3D
 		RemoveChild(WeaponRoot);
 		GetTree().GetRoot().AddChild(WeaponRoot);
 		WeaponRoot.SetGlobalPosition(GlobalPosition);
-		
-		var (hasHit, location, collisionPoint, collisionNormal) = DashSystem.DashComputation;
-		var (endWithMantle, dashLocation, mantleLocation) = DashSystem.DashResolve;
 
 		DashSystem.CancelDash();
-		WeaponSystem.ThrowWeapon(location, hasHit, collisionPoint, collisionNormal);
+
+		var weaponTargetLocation = DashSystem.HasHit ? DashSystem.CollisionPoint : DashSystem.TargetLocation;
+		WeaponSystem.ThrowWeapon(
+			weaponTargetLocation,
+			DashSystem.HasHit,
+			DashSystem.CollisionPoint,
+			DashSystem.CollisionNormal);
 	}
 	public void OnAimingEntered()
 	{

player_controller/resources/PlayerShape.tres

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

systems/dash/DashSystem.cs

@@ -2,10 +2,6 @@
 
 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
 {
     [Export(PropertyHint.Range, "0,0.2,0.01,or_greater")]
@@ -13,8 +9,18 @@ public partial class DashSystem: Node3D
     [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 PlannedPlayerLocation { 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;
@@ -22,9 +28,6 @@ public partial class DashSystem: Node3D
     private MantleSystem _mantleSystem;
     private MeshInstance3D _dashTarget;
     
-    public DashResolveRecord DashResolve { get; set; }
-    public DashComputationRecord DashComputation { get; set; }
-    
 
     [Signal]
     public delegate void DashStartedEventHandler();
@@ -34,6 +37,8 @@ public partial class DashSystem: Node3D
     public void Init(Node3D head, Camera3D camera, TweenQueueSystem tweenQueueSystem)
     {
         _dashCast3D = GetNode<ShapeCast3D>("DashCast3D");
+        _playerCast3D = GetNode<ShapeCast3D>("PlayerShapeCast3D");
+        
         _head = head;
         _camera = camera;
         _tweenQueueSystem = tweenQueueSystem;
@@ -45,17 +50,27 @@ public partial class DashSystem: Node3D
         _dashTarget.SetVisible(false);
     }
 
-    private DashComputationRecord ComputeDashLocation()
+    private void ComputeDashLocation()
     {
-        if (!_dashCast3D.IsColliding())
+        TargetLocation = _dashCast3D.ToGlobal(_dashCast3D.TargetPosition);
+        HasHit = _dashCast3D.IsColliding();
+        if (!HasHit)
         {
-            return new DashComputationRecord(false, _dashCast3D.ToGlobal(_dashCast3D.TargetPosition), Vector3.Zero, Vector3.Zero);
+            PlannedPlayerLocation = TargetLocation;
+            return;
         }
-        var collisionPoint = _dashCast3D.GetCollisionPoint(0);
+        
-        var collisionNormal = _dashCast3D.GetCollisionNormal(0);
+        CollisionPoint = _dashCast3D.GetCollisionPoint(0);
-        var collisionShape = (SphereShape3D) _dashCast3D.GetShape();
+        CollisionNormal = _dashCast3D.GetCollisionNormal(0);
-        var centerSphereLocation = collisionPoint + collisionNormal * collisionShape.Radius;
+        
-        return new DashComputationRecord(true, centerSphereLocation, collisionPoint, collisionNormal);
+        var fraction = _dashCast3D.GetClosestCollisionSafeFraction();
+        var globalSweepPath = TargetLocation - _dashCast3D.GlobalPosition;
+        var locationAlongPath = _dashCast3D.GlobalPosition + globalSweepPath * fraction;
+
+        var maxPushDownDistance = 0.9f;
+        var correctionProportion = (float) Mathf.Remap(CollisionNormal.Y, -0.5, -1, 0, 1);
+        var proportion = (float) Mathf.Remap(_dashCast3D.GlobalRotation.X, 0, 1.57, 0, 1);
+        PlannedPlayerLocation = locationAlongPath + CollisionNormal * maxPushDownDistance * proportion * correctionProportion;
     }
 
     public void PrepareDash()
@@ -67,26 +82,24 @@ public partial class DashSystem: Node3D
             _head.Rotation.Y,
             _camera.Rotation.Z));
 
-        DashComputation = ComputeDashLocation();
+        ComputeDashLocation();
-        var (hasHit, location, collisionPoint, collisionNormal) = DashComputation;
-
-        var shouldMantle = false;
-        var mantleLocation = Vector3.Zero;
-        if (hasHit && Mathf.Abs(collisionNormal.Y) < 0.01f)
-        {
-            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(collisionPoint, collisionNormal);
-            shouldMantle = mantleResult.IsSome(out mantleLocation);
-        }
         
-        var targetColor = hasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
+        ShouldMantle = false;
-        targetColor = shouldMantle ? new Color(0.2f, 0.2f, 1f) : targetColor;
+        var mantleLocation = Vector3.Zero;
+        if (HasHit && Mathf.Abs(CollisionNormal.Y) < 0.5f)
+        {
+            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(CollisionPoint, CollisionNormal);
+            ShouldMantle = mantleResult.IsSome(out mantleLocation);
+        }
+        PlannedMantleLocation = mantleLocation;
+        
+        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);
+        _dashTarget.SetGlobalPosition(PlannedPlayerLocation);
-        
-        DashResolve = new DashResolveRecord(shouldMantle, location, mantleLocation);
     }
 
     public void CancelDash()
@@ -103,12 +116,12 @@ public partial class DashSystem: Node3D
     {
         EmitSignal(SignalName.DashStarted);
         _dashTarget.SetVisible(false);
-        var dashTweenInputs = new TweenQueueSystem.TweenInputs(DashResolve.DashLocation, 0.1f);
+        var dashTweenInputs = new TweenQueueSystem.TweenInputs(PlannedPlayerLocation, 0.1f);
         var dashTween = _tweenQueueSystem.TweenToLocation(dashTweenInputs);
         dashTween.Finished += DashTweenEnded;
-        if (DashResolve.EndWithMantle)
+        if (ShouldMantle)
         {
-            _tweenQueueSystem.QueueTween(DashResolve.MantleLocation, 0.2f);
+            _tweenQueueSystem.QueueTween(PlannedMantleLocation, 0.2f);
         }
     }
 

systems/dash/dash_system.tscn

@@ -1,11 +1,9 @@
 [gd_scene load_steps=6 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"]
 
-[sub_resource type="SphereShape3D" id="SphereShape3D_qu4wy"]
-radius = 0.1
-
 [sub_resource type="SphereMesh" id="SphereMesh_qu4wy"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_v31n3"]
@@ -13,9 +11,15 @@ radius = 0.1
 [node name="DashSystem" type="Node3D"]
 script = ExtResource("1_hwig2")
 
+[node name="PlayerShapeCast3D" type="ShapeCast3D" parent="."]
+shape = ExtResource("2_jngg2")
+target_position = Vector3(0, 0, 0)
+collision_mask = 2
+debug_shape_custom_color = Color(0.863327, 0.636844, 0, 1)
+
 [node name="DashCast3D" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.68, 0)
-shape = SubResource("SphereShape3D_qu4wy")
+shape = ExtResource("2_jngg2")
 target_position = Vector3(0, 0, -12)
 max_results = 1
 collision_mask = 2

systems/head/HeadSystem.cs

@@ -29,4 +29,9 @@ public partial class HeadSystem : Node3D
 
         _camera.Rotation = currentCameraRotation;
     }
+
+    public Vector3 GetForwardHorizontalVector()
+    {
+        return GetGlobalTransform().Basis.Z;
+    }
 }

systems/inputs/base_mode/aim_down.tres

@@ -0,0 +1,14 @@
+[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_gn1pi"]
+
+[resource]
+script = ExtResource("1_gn1pi")
+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=71 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"]
@@ -14,7 +14,9 @@
 [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://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"]
@@ -53,7 +55,7 @@ triggers = Array[ExtResource("8_2tfaw")]([])
 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")
@@ -134,7 +136,7 @@ script = ExtResource("10_cvxqo")
 axis = 4
 joy_index = -1
 
-[sub_resource type="Resource" id="Resource_ib0yi"]
+[sub_resource type="Resource" id="Resource_li5ak"]
 script = ExtResource("15_fykw6")
 actuation_threshold = 0.5
 
@@ -146,7 +148,8 @@ display_name = ""
 display_category = ""
 input = SubResource("Resource_ufouq")
 modifiers = Array[ExtResource("5_0qat1")]([])
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ib0yi")])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_li5ak")])
+metadata/_guide_triggers_collapsed = false
 
 [sub_resource type="Resource" id="Resource_0hmrk"]
 script = ExtResource("1_qmhk6")
@@ -154,6 +157,30 @@ action = ExtResource("14_vtk18")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qbthx")])
 metadata/_guide_input_mappings_collapsed = false
 
+[sub_resource type="Resource" id="Resource_si4d4"]
+script = ExtResource("10_cvxqo")
+axis = 4
+joy_index = -1
+
+[sub_resource type="Resource" id="Resource_2tfaw"]
+script = ExtResource("15_g6bbx")
+actuation_threshold = 0.5
+
+[sub_resource type="Resource" id="Resource_q86qg"]
+script = ExtResource("3_yp12v")
+override_action_settings = false
+is_remappable = false
+display_name = ""
+display_category = ""
+input = SubResource("Resource_si4d4")
+modifiers = Array[ExtResource("5_0qat1")]([])
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_2tfaw")])
+
+[sub_resource type="Resource" id="Resource_cvxqo"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("14_yp12v")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_q86qg")])
+
 [sub_resource type="Resource" id="Resource_cqc4k"]
 script = ExtResource("10_cvxqo")
 axis = 4
@@ -177,7 +204,7 @@ triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_vanwy")])
 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_lfx76"]
 script = ExtResource("19_qkgmj")
@@ -280,5 +307,5 @@ metadata/_guide_input_mappings_collapsed = false
 [resource]
 script = ExtResource("23_llfhp")
 display_name = ""
-mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_0hmrk"), SubResource("Resource_iihs4"), SubResource("Resource_0s4kt"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1")])
+mappings = Array[ExtResource("1_qmhk6")]([SubResource("Resource_88x08"), SubResource("Resource_tgr2g"), SubResource("Resource_iarn8"), SubResource("Resource_0hmrk"), SubResource("Resource_cvxqo"), SubResource("Resource_iihs4"), SubResource("Resource_0s4kt"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_0qat1")])
 metadata/_custom_type_script = "uid://dsa1dnifd6w32"

systems/inputs/input_system.gd

@@ -11,6 +11,7 @@ class_name InputController
 
 @export_group("Trigger actions")
 @export var aim_pressed:GUIDEAction
+@export var aim_down:GUIDEAction
 @export var aim_released:GUIDEAction
 @export var aim_canceled:GUIDEAction
 @export var jump:GUIDEAction
@@ -22,6 +23,7 @@ signal input_rotate_y(value: float)
 signal input_rotate_floorplane(value: float)
 
 signal input_aim_pressed
+signal input_aim_down
 signal input_aim_released
 signal input_aim_canceled
 signal input_jump
@@ -32,6 +34,7 @@ func _ready() -> void:
 	GUIDE.enable_mapping_context(base_mode)
 	
 	aim_pressed.triggered.connect(on_input_aim_pressed)
+	aim_down.triggered.connect(on_input_aim_down)
 	aim_released.triggered.connect(on_input_aim_released)
 	aim_canceled.triggered.connect(on_input_aim_canceled)
 	jump.triggered.connect(on_input_jump)
@@ -50,6 +53,9 @@ func on_input_jump():
 func on_input_aim_pressed():
 	input_aim_pressed.emit()
 
+func on_input_aim_down():
+	input_aim_down.emit()
+
 func on_input_aim_released():
 	input_aim_released.emit()
 

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;

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,8 +51,8 @@ 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));
@@ -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;
     }
 }