better spawning

.gitea/workflows/main.yaml

@@ -54,27 +54,12 @@ jobs:
       - name: Import resources and build solution
         run: |
           godot --headless --editor --build-solutions --quit --import --path $PWD          
+          
       - name: Build Windows
         run: |
           mkdir -v -p build/windows
           godot --headless --verbose --build-solutions --export-release "Windows Desktop" build/windows/${{ env.GAME_NAME }}.exe
           zip -r Windows.zip build/windows
-      - name: Build Windows ARM
-        run: |
-          mkdir -v -p build/windowsArm
-          godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
-          zip -r WindowsArm.zip build/windowsArm
-#      - name: Linux Build
-#        run: |
-#          mkdir -v -p build/linux
-#          godot --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64
-#          zip -r Linux.zip build/linux
-#      - name: Mac Build
-#        run: |
-#          mkdir -v -p build/mac
-#          godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
-#          zip -r Mac.zip build/mac     
-          
       - name: Upload to Itch
         uses: KikimoraGames/itch-publish@v0.0.3
         with:
@@ -84,6 +69,12 @@ jobs:
           buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
           gameData: Windows.zip
           buildChannel: windows
+          
+      - name: Build Windows ARM
+        run: |
+          mkdir -v -p build/windowsArm
+          godot --headless --verbose --build-solutions --export-release "Windows ARM" build/windowsArm/${{ env.GAME_NAME }}.exe
+          zip -r WindowsArm.zip build/windowsArm
       - name: Upload to Itch
         uses: KikimoraGames/itch-publish@v0.0.3
         with:
@@ -93,21 +84,33 @@ jobs:
           buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
           gameData: WindowsArm.zip
           buildChannel: windows-arm
-#      - name: Upload to Itch
-#        uses: KikimoraGames/itch-publish@v0.0.3
-#        with:
-#          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
-#          itchUsername: ${{ env.ITCHIO_USERNAME }}
-#          itchGameId: ${{ env.ITCHIO_GAMEID }}
-#          buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
-#          gameData: Linux.zip
-#          buildChannel: linux  
-#      - name: Upload to Itch
-#        uses: KikimoraGames/itch-publish@v0.0.3
-#        with:
-#          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
-#          itchUsername: ${{ env.ITCHIO_USERNAME }}
-#          itchGameId: ${{ env.ITCHIO_GAMEID }}
-#          buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
-#          gameData: Mac.zip
-#          buildChannel: mac
+          
+      - name: Linux Build
+        run: |
+          mkdir -v -p build/linux
+          godot --headless --verbose --export-release "Linux/X11" build/linux/${{ env.GAME_NAME }}.x86_64
+          zip -r Linux.zip build/linux
+      - name: Upload to Itch
+        uses: KikimoraGames/itch-publish@v0.0.3
+        with:
+          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
+          itchUsername: ${{ env.ITCHIO_USERNAME }}
+          itchGameId: ${{ env.ITCHIO_GAMEID }}
+          buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
+          gameData: Linux.zip
+          buildChannel: linux
+          
+      - name: Mac Build
+        run: |
+          mkdir -v -p build/mac
+          godot --headless --verbose --export-release "macOS" build/mac/${{ env.GAME_NAME }}.zip
+          zip -r Mac.zip build/mac     
+      - name: Upload to Itch
+        uses: KikimoraGames/itch-publish@v0.0.3
+        with:
+          butlerApiKey: ${{ secrets.BUTLER_TOKEN }}
+          itchUsername: ${{ env.ITCHIO_USERNAME }}
+          itchGameId: ${{ env.ITCHIO_GAMEID }}
+          buildNumber: ${{ needs.BumpTag.outputs.tag_name }}
+          gameData: Mac.zip
+          buildChannel: mac

.gitignore

@@ -10,6 +10,7 @@
 .import/
 
 /builds
+/communication
 
 # Imported translations (automatically generated from CSV files)
 *.translation

Movement tests.sln.DotSettings.user

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAction_00601_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F7c0f83388bfc4d2c9d09befcec9dd79bc90908_003Fb8_003F4d300c4d_003FAction_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANode_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fdf73a4db74df89d59655c5fb6326406f47fbfa9af1fa81518fe0a07c49d34133_003FNode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ASceneTree_002Ecs_002Fl_003AC_0021_003FUsers_003FMinimata_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003F8d6960554e939a669841b1ece03d27df4ab42f92bb80be3767eaec8cdaccf84b_003FSceneTree_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=floorplane/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

addons/maaacks_game_template/base/scenes/menus/main_menu/main_menu.gd

@@ -6,11 +6,15 @@ extends Control
 @export var options_packed_scene : PackedScene
 @export var credits_packed_scene : PackedScene
 
+@export var menu_context : GUIDEMappingContext
+@export var back_action : GUIDEAction
+
 var options_scene
 var credits_scene
 var sub_menu
 
 func load_game_scene() -> void:
+	GUIDE.disable_mapping_context(menu_context)
 	SceneLoader.load_scene(game_scene_path)
 
 func new_game() -> void:
@@ -73,7 +77,12 @@ func _ready() -> void:
 	_add_or_hide_options()
 	_add_or_hide_credits()
 	_hide_new_game_if_unset()
-
+	_setup_inputs()
+	
+func _setup_inputs() -> void:
+	GUIDE.enable_mapping_context(menu_context)
+	back_action.triggered.connect(_on_back_button_pressed)
+	
 func _on_new_game_button_pressed() -> void:
 	new_game()
 

addons/maaacks_game_template/base/scenes/overlaid_menu/menus/pause_menu.gd

@@ -9,16 +9,19 @@ extends OverlaidMenu
 var popup_open : Node
 var previous_mapping_contexts : Array
 
-func on_enter_tree() -> void:
-	pass
-	#previous_mapping_contexts = GUIDE.get_enabled_mapping_contexts()
-	#GUIDE.enable_mapping_context(menu_context)
+var is_listening_to_inputs = true
+
+func _enter_tree() -> void:
+	super._enter_tree()
+	previous_mapping_contexts = GUIDE.get_enabled_mapping_contexts()
+	for previous_context in previous_mapping_contexts:
+		GUIDE.disable_mapping_context(previous_context)
+	GUIDE.enable_mapping_context(menu_context)
 	
-func on_exit_tree() -> void:
-	pass
-	#GUIDE.disable_mapping_context(menu_context)
-	#for previous_context in previous_mapping_contexts:
-		#GUIDE.enable_mapping_context(previous_context)
+func _exit_tree() -> void:
+	GUIDE.disable_mapping_context(menu_context)
+	for previous_context in previous_mapping_contexts:
+		GUIDE.enable_mapping_context(previous_context)
 
 func close_popup() -> void:
 	if popup_open != null:
@@ -43,10 +46,15 @@ func open_options_menu() -> void:
 	var options_scene := options_packed_scene.instantiate()
 	add_child(options_scene)
 	_disable_focus.call_deferred()
+	is_listening_to_inputs = false
 	await options_scene.tree_exiting
+	is_listening_to_inputs = true
 	_enable_focus.call_deferred()
 
 func _handle_cancel_input() -> void:
+	if not is_listening_to_inputs:
+		return
+		
 	if popup_open != null:
 		close_popup()
 	else:
@@ -68,6 +76,8 @@ func _ready() -> void:
 	_hide_exit_for_web()
 	_hide_options_if_unset()
 	_hide_main_menu_if_unset()
+	
+	back_action.triggered.connect(_handle_cancel_input)
 
 func _on_restart_button_pressed() -> void:
 	%ConfirmRestart.popup_centered()
@@ -93,3 +103,5 @@ func _on_confirm_main_menu_confirmed() -> void:
 
 func _on_confirm_exit_confirmed() -> void:
 	get_tree().quit()
+	
+	

addons/maaacks_game_template/base/scenes/overlaid_menu/overlaid_menu.gd

@@ -11,6 +11,10 @@ extends Control
 			process_mode = PROCESS_MODE_INHERIT
 @export var makes_mouse_visible : bool = true
 
+@export var back_action : GUIDEAction
+
+signal menu_closing
+
 var _initial_pause_state : bool = false
 var _initial_focus_mode : FocusMode = FOCUS_ALL
 var _initial_mouse_mode : Input.MouseMode
@@ -18,6 +22,7 @@ var _initial_focus_control
 var _scene_tree : SceneTree 
 
 func close() -> void:
+	menu_closing.emit()
 	_scene_tree.paused = _initial_pause_state
 	Input.set_mouse_mode(_initial_mouse_mode)
 	if is_instance_valid(_initial_focus_control) and _initial_focus_control.is_inside_tree():
@@ -29,13 +34,14 @@ func _handle_cancel_input() -> void:
 	close()
 
 func _unhandled_input(event : InputEvent) -> void:
+	return
 	if event.is_action_pressed("ui_cancel"):
 		_handle_cancel_input()
 		get_viewport().set_input_as_handled()
 
 func _on_close_button_pressed() -> void:
 	close()
-
+	
 func _enter_tree() -> void:
 	_scene_tree = get_tree()
 	_initial_pause_state = _scene_tree.paused

addons/maaacks_game_template/base/scenes/overlaid_menu/overlaid_menu_container.gd

@@ -12,3 +12,11 @@ extends OverlaidMenu
 			if menu_scene:
 				var _instance = menu_scene.instantiate()
 				%MenuContainer.add_child(_instance)
+
+func blocking_close() -> void:
+	get_viewport().set_input_as_handled()
+	super.close()
+
+func _ready() -> void:
+	back_action.triggered.connect(blocking_close)
+	

addons/maaacks_game_template/base/scripts/pause_menu_controller.gd

@@ -4,26 +4,30 @@ extends Node
 ## Node for opening a pause menu when detecting a 'ui_cancel' event.
 @export var pause_menu_packed : PackedScene
 @export var focused_viewport : Viewport
+@export var player : CharacterBody3D
 
 @export_group("Inputs")
-@export var base_mode:GUIDEMappingContext
 @export var pause:GUIDEAction
 
+var menu_already_open = false
+
 func _ready() -> void:
-	# GUIDE.enable_mapping_context(base_mode)
-	
 	pause.triggered.connect(on_input_pause)
 	
 func on_input_pause():
+	if menu_already_open:
+		return
+		
+	menu_already_open = true
 	if not focused_viewport:
 		focused_viewport = get_viewport()
 	var _initial_focus_control = focused_viewport.gui_get_focus_owner()
 	var current_menu = pause_menu_packed.instantiate()
+	
+	current_menu.menu_closing.connect(player.LoadSettings)
+	
 	get_tree().current_scene.call_deferred("add_child", current_menu)
 	await current_menu.tree_exited
+	menu_already_open = false
 	if is_inside_tree() and _initial_focus_control:
 		_initial_focus_control.grab_focus()
-
-func _unhandled_input(event : InputEvent) -> void:
-	if event.is_action_pressed("ui_cancel"):
-		pass

assets/lift/lift.gd

@@ -7,18 +7,32 @@ var lift_already_used : bool = false
 
 @onready var button: MeshInstance3D = $Cylinder_001
 
+var player : CharacterBody3D
+
+func finished_climbing() -> void:
+	player.SetAllowedInputsAll()
+
 func start_climbing() -> void:
-		var elevator_tween = get_tree().create_tween()
-		elevator_tween.set_ease(Tween.EASE_IN_OUT)
-		elevator_tween.set_trans(Tween.TRANS_CUBIC)
-		elevator_tween.tween_property(self, "global_position", end_location, lift_time)
-		
+	var player_start_location = player.global_position
+	var height_difference = end_location - global_position
+	
+	var elevator_tween = get_tree().create_tween()
+	elevator_tween.set_parallel(true)
+	elevator_tween.set_ease(Tween.EASE_IN_OUT)
+	elevator_tween.set_trans(Tween.TRANS_CUBIC)
+	elevator_tween.tween_property(self, "global_position", end_location, lift_time)
+	elevator_tween.tween_property(player, "global_position", player_start_location + height_difference, lift_time)
+	elevator_tween.tween_callback(finished_climbing)
+	
 
 func _on_area_3d_body_entered(body: Node3D) -> void:
 	if lift_already_used:
 		return
 		
 	if is_instance_of(body, CharacterBody3D):
+		player = body
+		player.SetAllowedInputsMoveCamera()
+		
 		lift_already_used = true
 		
 		var button_tween = get_tree().create_tween()

assets/lift/lift.tscn

@@ -20,6 +20,8 @@ script = ExtResource("2_5i7wx")
 material_override = ExtResource("3_u2uhe")
 
 [node name="StaticBody3D" type="StaticBody3D" parent="Cube_279" index="0"]
+collision_layer = 256
+collision_mask = 65553
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cube_279/StaticBody3D" index="0"]
 shape = SubResource("ConcavePolygonShape3D_5i7wx")
@@ -28,12 +30,15 @@ shape = SubResource("ConcavePolygonShape3D_5i7wx")
 material_override = ExtResource("4_jmnc2")
 
 [node name="StaticBody3D" type="StaticBody3D" parent="Cylinder_001" index="0"]
+collision_layer = 256
+collision_mask = 65553
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Cylinder_001/StaticBody3D" index="0"]
 shape = SubResource("ConcavePolygonShape3D_wai75")
 
 [node name="Area3D" type="Area3D" parent="." index="2"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -36.343, 0)
+collision_layer = 0
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"]
 shape = SubResource("CylinderShape3D_wai75")

assets/materials/walls/roof.tres

@@ -27,7 +27,7 @@ shader_parameter/floorRoughnessMap = ExtResource("4_rir86")
 shader_parameter/floorNormalMap = ExtResource("3_f1b6h")
 shader_parameter/floorHeightMap = ExtResource("2_0e3id")
 shader_parameter/floorUvScale = 0.5
-shader_parameter/enablePom = true
+shader_parameter/enablePom = false
 shader_parameter/heightMinLayers = 8
 shader_parameter/heightMaxLayers = 64
 shader_parameter/heightScale = 0.08

assets/materials/walls/walls.gdshader

@@ -28,6 +28,7 @@ uniform float heightScale = 1.0;
 
 varying vec3 worldPos;
 varying vec3 worldNormal;
+varying vec3 diffuse;
 
 
 void vertex() {
@@ -177,12 +178,14 @@ void fragment() {
     // sample and output
     SPECULAR = specular;
     ALBEDO = triplanarSample(texCoordX, texCoordY, texCoordZ, blend, yDot).rgb;
+	diffuse = ALBEDO;
     ROUGHNESS = triplanarRoughness(texCoordX, texCoordY, texCoordZ, blend, yDot).r;
     NORMAL = mix(worldNormal, triplanarNormal(yDot, texCoordX, texCoordY, texCoordZ, blend), normalMapStrength);
     NORMAL = normalize((VIEW_MATRIX * vec4(NORMAL, 0.0)).xyz);
 }
 
-//void light() {
-//	// Called for every pixel for every light affecting the material.
-//	// Uncomment to replace the default light processing function with this one.
-//}
+void light() {
+ 	float lambert = clamp(dot(NORMAL, LIGHT), 0.0, 1.0);
+ 	float halfLambert = pow(lambert*0.5 + 0.5, 5);
+	DIFFUSE_LIGHT += halfLambert * ATTENUATION * LIGHT_COLOR / PI;
+}

assets/materials/walls/walls_and_ground.tres

@@ -31,7 +31,7 @@ shader_parameter/floorRoughnessMap = ExtResource("4_4vhk1")
 shader_parameter/floorNormalMap = ExtResource("3_ytvoj")
 shader_parameter/floorHeightMap = ExtResource("2_4vhk1")
 shader_parameter/floorUvScale = 0.5
-shader_parameter/enablePom = true
+shader_parameter/enablePom = false
 shader_parameter/heightMinLayers = 8
 shader_parameter/heightMaxLayers = 64
 shader_parameter/heightScale = 0.2

assets/materials/walls/wood_platform.tres

@@ -27,7 +27,7 @@ shader_parameter/floorRoughnessMap = ExtResource("4_ob11h")
 shader_parameter/floorNormalMap = ExtResource("3_ff2cr")
 shader_parameter/floorHeightMap = ExtResource("2_roy1o")
 shader_parameter/floorUvScale = 0.5
-shader_parameter/enablePom = true
+shader_parameter/enablePom = false
 shader_parameter/heightMinLayers = 8
 shader_parameter/heightMaxLayers = 64
 shader_parameter/heightScale = 1.0

interfaces/IDamageMaker.cs

@@ -0,0 +1,9 @@
+using Godot;
+
+namespace Movementtests.interfaces;
+
+public interface IDamageMaker
+{
+    [Export]
+    RDamage RDamage { get; set; }
+}

interfaces/IDamageMaker.cs.uid

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

interfaces/IDamageable.cs

@@ -0,0 +1,9 @@
+using System;
+
+namespace Movementtests.interfaces;
+
+public interface IDamageable
+{
+    event Action<IDamageable, float> DamageTaken;
+    float TakeDamage(RDamage damage);
+}

interfaces/IDamageable.cs.uid

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

interfaces/IHealthable.cs

@@ -0,0 +1,16 @@
+using System;
+using Godot;
+
+namespace Movementtests.interfaces;
+
+public interface IHealthable
+{
+    event Action<IHealthable, float> HealthChanged;
+    event Action<IHealthable> HealthDepleted;
+    
+    [Export] RHealth RHealth { get; set; }
+    
+    float CurrentHealth { get; set; }
+    
+    void ReduceHealth(IDamageable source, float amount);
+}

interfaces/IHealthable.cs.uid

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

interfaces/IKillable.cs

@@ -0,0 +1,6 @@
+namespace Movementtests.interfaces;
+
+public interface IKillable
+{
+    void Kill(IHealthable source);
+}

interfaces/IKillable.cs.uid

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

interfaces/IKnockbackable.cs

@@ -0,0 +1,6 @@
+namespace Movementtests.interfaces;
+
+public interface IKnockbackable
+{
+    
+}

interfaces/IKnockbackable.cs.uid

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

interfaces/IMoveable.cs

@@ -0,0 +1,16 @@
+using Godot;
+
+namespace Movementtests.interfaces;
+
+public record MovementInputs(
+    Vector3 Velocity = default,
+    Vector3 TargetLocation = default,
+    bool isOnFloor = false,
+    Vector3 gravity = default,
+    double delta = 0);
+
+public interface IMoveable
+{
+    [Export] RMovement RMovement { get; set; }
+    Vector3 ComputeVelocity(MovementInputs inputs);
+}

interfaces/IMoveable.cs.uid

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

interfaces/ISpawnable.cs

@@ -0,0 +1,7 @@
+using Godot;
+
+
+interface ISpawnable
+{
+    void Initialize();
+}

interfaces/ISpawnable.cs.uid

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

interfaces/NodeExtensions.cs

@@ -0,0 +1,16 @@
+using Godot;
+using System.Linq;
+
+namespace Movementtests.interfaces;
+
+public static class NodeExtensions
+{
+    public static IDamageable[] ToIDamageables(this GodotObject[] nodes)
+    {
+        return nodes == null ? System.Array.Empty<IDamageable>() : nodes.OfType<IDamageable>().ToArray();
+    }
+    public static IKillable[] ToIKillables(this GodotObject[] nodes)
+    {
+        return nodes == null ? System.Array.Empty<IKillable>() : nodes.OfType<IKillable>().ToArray();
+    }
+}

interfaces/NodeExtensions.cs.uid

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

maps/GYMs/enemies.tscn

@@ -0,0 +1,155 @@
+[gd_scene load_steps=20 format=3 uid="uid://q7uc1h2jpbd2"]
+
+[ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_62kkh"]
+[ext_resource type="Material" uid="uid://31aulub2nqov" path="res://assets/greybox/m_greybox.tres" id="2_3uydm"]
+[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="2_sysok"]
+[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/grounded_enemy/grounded_enemy.tscn" id="3_3uydm"]
+[ext_resource type="Script" uid="uid://b4cwruitopcee" path="res://resource_definitions/RDeathEffect.cs" id="5_7m3bq"]
+[ext_resource type="PackedScene" uid="uid://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy/flying_enemy.tscn" id="5_8fd2t"]
+[ext_resource type="PackedScene" uid="uid://c305mfrtumcyq" path="res://scenes/spawners/spawner.tscn" id="6_7m3bq"]
+[ext_resource type="Resource" uid="uid://bqq6uukbdfysr" path="res://scenes/enemies/grounded_enemy/grounded_enemy_movement.tres" id="7_caohq"]
+[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="9_2e4ci"]
+[ext_resource type="Resource" uid="uid://otfc2snh8umc" path="res://scenes/enemies/grounded_enemy/grounded_enemy_damage.tres" id="9_dmw1t"]
+[ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy/flying_enemy_damage.tres" id="9_gp7s3"]
+[ext_resource type="Resource" uid="uid://bwqjaom4k7rc3" path="res://scenes/enemies/flying_enemy/flying_enemy_movement.tres" id="10_spw1u"]
+[ext_resource type="Resource" uid="uid://dg1xbjhyhgnnk" path="res://scenes/enemies/flying_enemy/flying_enemy_health.tres" id="11_2e4ci"]
+
+[sub_resource type="Resource" id="Resource_2e4ci"]
+script = ExtResource("2_sysok")
+DamageDealt = 10.0
+metadata/_custom_type_script = "uid://jitubgv6judn"
+
+[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_0xm2m"]
+sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
+ground_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
+
+[sub_resource type="Sky" id="Sky_h2yge"]
+sky_material = SubResource("ProceduralSkyMaterial_0xm2m")
+
+[sub_resource type="Environment" id="Environment_1bvp3"]
+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
+ssao_enabled = true
+ssao_radius = 3.61
+ssil_enabled = true
+ssil_radius = 8.4
+sdfgi_use_occlusion = true
+glow_enabled = true
+
+[sub_resource type="Resource" id="Resource_sysok"]
+script = ExtResource("5_7m3bq")
+metadata/_custom_type_script = "uid://b4cwruitopcee"
+
+[sub_resource type="Resource" id="Resource_ybosk"]
+script = ExtResource("9_2e4ci")
+StartingHealth = 1.0
+metadata/_custom_type_script = "uid://baiapod3csndf"
+
+[node name="Main" type="Node3D"]
+
+[node name="Player" parent="." instance=ExtResource("1_62kkh")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 7.5)
+TutorialDone = true
+RDamage = SubResource("Resource_2e4ci")
+
+[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)
+shadow_enabled = true
+
+[node name="Greybox" type="CSGCombiner3D" parent="."]
+use_collision = true
+collision_layer = 256
+collision_mask = 65553
+
+[node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.096, -0.5, -46.329)
+use_collision = true
+size = Vector3(100, 1, 190.741)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D2" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.346, 4.5, 2.7915)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D6" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(0.70710677, 0, -0.70710677, 0, 1, 0, 0.70710677, 0, 0.70710677, -15.846001, 2.75, 2.0415)
+use_collision = true
+size = Vector3(6.5, 7.5, 11)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D7" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.346001, 1, 1.0415001)
+use_collision = true
+size = Vector3(6.5, 4, 17)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D8" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(0.81915206, 0, 0.57357645, 0, 1, 0, -0.57357645, 0, 0.81915206, -7.3460007, 0, -3.9585)
+use_collision = true
+size = Vector3(6.5, 4, 17)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D3" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.154, 4.5, 2.7915)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D4" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18.154, 4.5, -14.2085)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="CSGBox3D5" type="CSGBox3D" parent="Greybox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.8460007, 4.5, 17.7915)
+use_collision = true
+size = Vector3(6.5, 11, 5.5)
+material = ExtResource("2_3uydm")
+
+[node name="Enemy" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("3_3uydm")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -16.83681)
+Target = NodePath("../Player")
+DeathEffects = Array[Object]([SubResource("Resource_sysok")])
+
+[node name="Enemy2" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("3_3uydm")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3, 0, -16.83681)
+Target = NodePath("../Player")
+
+[node name="Enemy3" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("3_3uydm")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.5, 0, -16.83681)
+Target = NodePath("../Player")
+
+[node name="FlyingEnemy" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("5_8fd2t")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 7, -16)
+Target = NodePath("../Player")
+
+[node name="FlyingEnemy2" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("5_8fd2t")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 7, -16)
+Target = NodePath("../Player")
+
+[node name="GroundedSpawner" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("6_7m3bq")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12, 2.5, -15)
+EnemyToSpawn = ExtResource("3_3uydm")
+MovementInputs = ExtResource("7_caohq")
+HealthInputs = SubResource("Resource_ybosk")
+DamageInputs = ExtResource("9_dmw1t")
+Target = NodePath("../Player")
+
+[node name="FlyingSpawner" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("6_7m3bq")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 18, 11, -14)
+EnemyToSpawn = ExtResource("5_8fd2t")
+MovementInputs = ExtResource("10_spw1u")
+HealthInputs = ExtResource("11_2e4ci")
+DamageInputs = ExtResource("9_gp7s3")
+Target = NodePath("../Player")

maps/GYMs/main.tscn

@@ -30,6 +30,7 @@ glow_enabled = true
 
 [node name="Player" parent="." instance=ExtResource("1_ig7tw")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.7981, 1.6118, 39.3006)
+TutorialDone = true
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_1bvp3")

maps/GYMs/metrics.tscn

@@ -30,6 +30,7 @@ glow_enabled = true
 
 [node name="Player" parent="." instance=ExtResource("1_1s2y7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 1, 1.5)
+TutorialDone = true
 
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource("Environment_1bvp3")
@@ -45,11 +46,11 @@ visible = false
 
 [node name="Greybox" type="CSGCombiner3D" parent="."]
 use_collision = true
-collision_layer = 3
-collision_mask = 5
+collision_layer = 256
+collision_mask = 65553
 
 [node name="CSGBox3D" type="CSGBox3D" parent="Greybox"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09619, -0.472656, -46.3293)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.096, -0.5, -46.329)
 use_collision = true
 size = Vector3(100, 1, 190.741)
 material = ExtResource("3_vvhq3")
@@ -132,6 +133,21 @@ material = ExtResource("3_vvhq3")
 transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 1, 0.1, -9.5)
 text = "10m"
 
+[node name="Label3D6" type="Label3D" parent="Greybox/RunningTrack"]
+transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 27.5, 0.1, 1)
+text = "10deg
+"
+
+[node name="Label3D7" type="Label3D" parent="Greybox/RunningTrack"]
+transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 30.5, 0.1, 1)
+text = "20deg
+"
+
+[node name="Label3D8" type="Label3D" parent="Greybox/RunningTrack"]
+transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 33.5, 0.1, 1)
+text = "30deg
+"
+
 [node name="Label3D2" type="Label3D" parent="Greybox/RunningTrack"]
 transform = Transform3D(5, 0, 0, 0, -2.18557e-07, 5, 0, -5, -2.18557e-07, 1, 0.1, -19.5)
 text = "20m"
@@ -158,6 +174,38 @@ text = "0.5m"
 transform = Transform3D(-2.18557e-07, -5, -2.18557e-07, 0, -2.18557e-07, 5, -5, 2.18557e-07, 9.55343e-15, -7, 0.1, -6.5)
 text = "1m"
 
+[node name="Label3D22" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, 1)
+text = "1.5m"
+
+[node name="Label3D23" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, -11)
+text = "2m"
+
+[node name="Label3D24" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, -21.5)
+text = "3m"
+
+[node name="Label3D25" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, -31)
+text = "4m"
+
+[node name="Label3D26" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, -41.5)
+text = "5m"
+
+[node name="Label3D27" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, -51.5)
+text = "6m"
+
+[node name="Label3D28" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, -61)
+text = "7m"
+
+[node name="Label3D29" type="Label3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(-2.1855689e-07, 5, 2.18557e-07, 0, -2.18557e-07, 5, 5, 2.1855689e-07, 9.55343e-15, -28.5, 0.1, -74.5)
+text = "8m"
+
 [node name="Label3D8" type="Label3D" parent="Greybox/JumpHeights"]
 transform = Transform3D(-2.18557e-07, -5, -2.18557e-07, 0, -2.18557e-07, 5, -5, 2.18557e-07, 9.55343e-15, -7, 0.1, -11.5)
 text = "1.5m"
@@ -323,9 +371,111 @@ size = Vector3(5, 17.5, 5)
 material = ExtResource("3_vvhq3")
 
 [node name="CSGBox3D29" type="CSGBox3D" parent="Greybox/JumpHeights"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.5, 10, -76.5)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30.25, 10, -40)
 use_collision = true
-size = Vector3(5, 20, 5)
+size = Vector3(0.5, 20, 80)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.75, 10, -5)
+use_collision = true
+size = Vector3(7.5, 20, 10)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D41" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 22.75, 5, -1.5)
+use_collision = true
+size = Vector3(12.5, 10, 3)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D47" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 0.9848078, 0.17364816, 0, -0.17364816, 0.9848078, 22.75, 0.03095889, -30.695885)
+use_collision = true
+size = Vector3(12.5, 10, 58)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 0.9396926, 0.34202012, 0, -0.34202012, 0.9396926, 30.5, 1.5878377, -16.713436)
+use_collision = true
+size = Vector3(3, 6.5, 31.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 0.86602545, 0.5, 0, -0.5, 0.86602545, 33.5, 2.5053406, -10.524445)
+use_collision = true
+size = Vector3(3, 5.5, 20.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D42" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.5, 5, -1.5)
+use_collision = true
+size = Vector3(3, 10, 3)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D43" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 33.5, 5, -1.5)
+use_collision = true
+size = Vector3(3, 10, 3)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D44" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 36.5, 5, -1.5)
+use_collision = true
+size = Vector3(3, 10, 3)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D45" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 39.5, 5, -1.5)
+use_collision = true
+size = Vector3(3, 10, 3)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D46" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 42.5, 5, -1.5)
+use_collision = true
+size = Vector3(3, 10, 3)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.5, 10, -15)
+use_collision = true
+size = Vector3(7, 20, 10)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24, 10, -25)
+use_collision = true
+size = Vector3(6, 20, 10)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23.5, 10, -35)
+use_collision = true
+size = Vector3(5, 20, 10)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D37" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 10, -45)
+use_collision = true
+size = Vector3(4, 20, 10)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D38" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.5, 10, -55)
+use_collision = true
+size = Vector3(3, 20, 10)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D39" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22, 10, -65)
+use_collision = true
+size = Vector3(2, 20, 10)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D40" type="CSGBox3D" parent="Greybox/JumpHeights"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.5, 10, -75)
+use_collision = true
+size = Vector3(1, 20, 10)
 material = ExtResource("3_vvhq3")
 
 [node name="Passageways" type="CSGCombiner3D" parent="Greybox"]
@@ -356,6 +506,162 @@ use_collision = true
 size = Vector3(5, 3, 2)
 material = ExtResource("3_vvhq3")
 
+[node name="CSGBox3D38" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 21.5, 2.25, 22.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D39" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 21.25, 0.5, 22.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D40" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 28.5, 2.25, 22.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D41" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 28.25, 0.25, 22.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 2.5, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D42" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 35.5, 2.25, 22.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D43" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 35.25, -0.5, 22.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D44" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 42.5, 2.25, 22.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D45" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, 42.25, -1, 22.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D46" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 21.5, 2.25, 31.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D47" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 21.25, 0.5, 31.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 28.5, 2.25, 31.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 28.25, 0.25, 31.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 2.5, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D50" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 35.5, 2.25, 31.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D51" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 35.25, -0.5, 31.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D52" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 42.5, 2.25, 31.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D53" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-2.6226834e-08, 0, -1, 0, 1, 0, 0.6, 0, -4.371139e-08, 42.25, -1, 31.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D54" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 21.5, 2.25, 39.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D55" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 21.25, 0.5, 39.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D56" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 28.5, 2.25, 39.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D57" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 28.25, 0.25, 39.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 2.5, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D58" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 35.5, 2.25, 39.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D59" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 35.25, -0.5, 39.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D60" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 42.5, 2.25, 39.5)
+use_collision = true
+size = Vector3(5, 5, 5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D61" type="CSGBox3D" parent="Greybox/Passageways"]
+transform = Transform3D(-7.86805e-09, 0, -1, 0, 1, 0, 0.18, 0, -4.371139e-08, 42.25, -1, 39.5)
+operation = 2
+use_collision = true
+size = Vector3(5, 3, 1.5)
+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
@@ -399,3 +705,211 @@ 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")
+
+[node name="Mantles" type="CSGCombiner3D" parent="Greybox"]
+
+[node name="Label3D22" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -5.5, 0.1, 11)
+text = "0.5m"
+
+[node name="Label3D35" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -8.5, 0.1, 11)
+text = "0.25m"
+
+[node name="Label3D23" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -2, 0.1, 11)
+text = "1m"
+
+[node name="Label3D27" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 12.5)
+text = "1m"
+
+[node name="Label3D28" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 12.5)
+text = "1m"
+
+[node name="Label3D29" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 21)
+text = "2m"
+
+[node name="Label3D30" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 28.5)
+text = "3m"
+
+[node name="Label3D31" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 21)
+text = "2m"
+
+[node name="Label3D32" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 28.5)
+text = "3m"
+
+[node name="Label3D24" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 2, 0.1, 11)
+text = "1.5m"
+
+[node name="Label3D25" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 6, 0.1, 11)
+text = "2m"
+
+[node name="Label3D26" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 10, 0.1, 11)
+text = "4m"
+
+[node name="CSGBox3D33" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 0.5, 12.5)
+use_collision = true
+size = Vector3(4, 1, 1)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D34" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 0.5, 12.25)
+use_collision = true
+size = Vector3(3, 1, 0.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D35" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 0.5, 12.75)
+use_collision = true
+size = Vector3(4, 1, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D36" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0.5, 13)
+use_collision = true
+size = Vector3(4, 1, 2)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D37" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0.5, 14)
+use_collision = true
+size = Vector3(4, 1, 4)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D38" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1, 20.5)
+use_collision = true
+size = Vector3(4, 2, 1)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D39" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 1, 20.25)
+use_collision = true
+size = Vector3(3, 2, 0.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D40" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1, 20.75)
+use_collision = true
+size = Vector3(4, 2, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D41" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 1, 21)
+use_collision = true
+size = Vector3(4, 2, 2)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D42" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 1, 22)
+use_collision = true
+size = Vector3(4, 2, 4)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D43" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 1.5, 28.5)
+use_collision = true
+size = Vector3(4, 3, 1)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D44" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 1.5, 28.25)
+use_collision = true
+size = Vector3(3, 3, 0.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D45" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 1.5, 28.75)
+use_collision = true
+size = Vector3(4, 3, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D46" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 1.5, 29)
+use_collision = true
+size = Vector3(4, 3, 2)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D47" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 1.5, 30)
+use_collision = true
+size = Vector3(4, 3, 4)
+material = ExtResource("3_vvhq3")
+
+[node name="Label3D33" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, 13, 0.1, 36.5)
+text = "4m"
+
+[node name="Label3D34" type="Label3D" parent="Greybox/Mantles"]
+transform = Transform3D(-5, 4.3711395e-07, 1.9106861e-14, 0, -2.18557e-07, 5, 4.3711395e-07, 5, 2.18557e-07, -11, 0.1, 36.5)
+text = "4m"
+
+[node name="CSGBox3D48" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 36.5)
+use_collision = true
+size = Vector3(4, 4, 1)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D49" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.5, 2, 36.25)
+use_collision = true
+size = Vector3(3, 4, 0.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D53" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 0.5, 12.125)
+use_collision = true
+size = Vector3(3, 1, 0.25)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D57" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -13, 3.5, -21.629175)
+use_collision = true
+size = Vector3(5, 1, 0.25)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D54" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 1, 20.125)
+use_collision = true
+size = Vector3(3, 2, 0.25)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D55" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 1.5, 28.125)
+use_collision = true
+size = Vector3(3, 3, 0.25)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D56" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.5, 2, 36.125)
+use_collision = true
+size = Vector3(3, 4, 0.25)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D50" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 2, 36.75)
+use_collision = true
+size = Vector3(4, 4, 1.5)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D51" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 2, 37)
+use_collision = true
+size = Vector3(4, 4, 2)
+material = ExtResource("3_vvhq3")
+
+[node name="CSGBox3D52" type="CSGBox3D" parent="Greybox/Mantles"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 2, 38)
+use_collision = true
+size = Vector3(4, 4, 4)
+material = ExtResource("3_vvhq3")

maps/city.tscn

@@ -1,12 +1,11 @@
-[gd_scene load_steps=37 format=3 uid="uid://dmkw8cmalm5k"]
+[gd_scene load_steps=45 format=3 uid="uid://dmkw8cmalm5k"]
 
 [ext_resource type="PackedScene" uid="uid://bei4nhkf8lwdo" path="res://player_controller/PlayerController.tscn" id="1_2vsi6"]
+[ext_resource type="Script" uid="uid://blenis2y55fmg" path="res://tools/city_helpers.gd" id="1_qwuk2"]
 [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="Texture2D" uid="uid://7kcmi16gedd0" path="res://assets/LD-0001.png" id="3_ruo5i"]
 [ext_resource type="Script" uid="uid://cyh0d64pfygbl" path="res://addons/maaacks_game_template/base/scripts/pause_menu_controller.gd" id="7_ukfuy"]
 [ext_resource type="PackedScene" uid="uid://ccqajqchiw4xu" path="res://menus/scenes/overlaid_menus/pause_menu.tscn" id="8_wctvs"]
-[ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="9_eca4n"]
 [ext_resource type="PackedScene" uid="uid://bkcsjsk2ciff" path="res://addons/maaacks_game_template/base/scenes/music_players/background_music_player.tscn" id="9_i2xii"]
 [ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="10_0ari0"]
 [ext_resource type="AudioStream" uid="uid://f8cvr5s041ej" path="res://assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav" id="10_eca4n"]
@@ -18,11 +17,52 @@
 [ext_resource type="Texture2D" uid="uid://dl73t0kxkaxp0" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_a_outline.svg" id="16_2k3fr"]
 [ext_resource type="Texture2D" uid="uid://blfc13splpcld" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_stick_l.svg" id="16_crf87"]
 [ext_resource type="Script" uid="uid://dvieq1o7ci70y" path="res://systems/ui/tutorial_controller.gd" id="16_efsse"]
+[ext_resource type="PackedScene" uid="uid://b8aet6m4m2i83" path="res://scenes/tuto_trigger/TutoTrigger.tscn" id="16_qwuk2"]
 [ext_resource type="Texture2D" uid="uid://com0lpfuol6vk" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_stick_r.svg" id="17_rmfv1"]
 [ext_resource type="PackedScene" uid="uid://kktuyhbd5xgc" path="res://menus/scenes/overlaid_menus/tuto_got_sword.tscn" id="17_t0d86"]
 [ext_resource type="Texture2D" uid="uid://cjh5cnvdbq5ku" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_button_b_outline.svg" id="19_efsse"]
 [ext_resource type="Texture2D" uid="uid://nrhxjdpuje3f" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_lt_outline.svg" id="20_crf87"]
-[ext_resource type="Texture2D" uid="uid://bfkj4neu0m0rm" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rt_outline.svg" id="21_rmfv1"]
+[ext_resource type="Texture2D" uid="uid://dyjvbsvbriii4" path="res://assets/ui/input-prompts/Xbox Series/Vector/xbox_rb_outline.svg" id="23_p287n"]
+[ext_resource type="PackedScene" uid="uid://c305mfrtumcyq" path="res://scenes/spawners/spawner.tscn" id="24_qwuk2"]
+[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/grounded_enemy/grounded_enemy.tscn" id="25_nrosh"]
+[ext_resource type="PackedScene" uid="uid://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy/flying_enemy.tscn" id="25_x7fl1"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="26_lu3yt"]
+
+[sub_resource type="LabelSettings" id="LabelSettings_2k3fr"]
+font_size = 30
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_t0d86"]
+size = Vector3(14, 15.5, 26)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_p287n"]
+size = Vector3(8.5, 16.5, 11.5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_5hbxb"]
+size = Vector3(8, 13.5, 10)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_6gj1x"]
+size = Vector3(8, 13.5, 11.5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_x7fl1"]
+size = Vector3(8.5, 38.5, 46.5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_3wccx"]
+size = Vector3(12, 11.5, 5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_hmdts"]
+size = Vector3(12, 13, 7)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_lnjrw"]
+size = Vector3(14, 10, 13.5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_3w3wd"]
+size = Vector3(13, 16.5, 11.5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_lu3yt"]
+size = Vector3(11.5, 9, 4.5)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_pxspk"]
+size = Vector3(11.5, 9, 4.5)
 
 [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_feb1n"]
 panorama = ExtResource("2_ruo5i")
@@ -40,6 +80,7 @@ ssao_enabled = true
 ssil_enabled = true
 sdfgi_enabled = true
 sdfgi_use_occlusion = true
+glow_enabled = true
 fog_enabled = true
 fog_light_color = Color(0.9955967, 0.83634025, 0.69151855, 1)
 fog_sun_scatter = 0.5
@@ -48,189 +89,37 @@ fog_sky_affect = 0.184
 volumetric_fog_density = 0.004
 volumetric_fog_emission = Color(1, 1, 1, 1)
 volumetric_fog_anisotropy = 0.6
+adjustment_enabled = true
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_t0d86"]
-size = Vector3(14, 15.5, 26)
+[sub_resource type="BoxMesh" id="BoxMesh_p287n"]
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_p287n"]
-size = Vector3(8.5, 16.5, 11.5)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_qwuk2"]
-size = Vector3(8.5, 16.5, 8)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_efsse"]
-size = Vector3(12, 18, 8)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_x7fl1"]
-size = Vector3(8.5, 38.5, 46.5)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_3wccx"]
-size = Vector3(12, 11.5, 5)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_nrosh"]
-size = Vector3(8, 16.5, 25.5)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_lu3yt"]
-size = Vector3(11.5, 9, 4.5)
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_pxspk"]
-size = Vector3(11.5, 9, 4.5)
-
-[sub_resource type="LabelSettings" id="LabelSettings_2k3fr"]
-font_size = 30
+[sub_resource type="Resource" id="Resource_pxspk"]
+script = ExtResource("26_lu3yt")
+Speed = 7.0
+TargetHeight = 15.0
+metadata/_custom_type_script = "uid://dtpxijlnb2c5"
 
 [node name="Main" type="Node3D"]
-
-[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
-transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -1.2857323, -132.74933, 116.15933)
-collision_layer = 17
-TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
-environment = SubResource("Environment_1bvp3")
-
-[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-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.99999934, 0.76777613, 0.6549227, 1)
-light_energy = 2.0
-light_volumetric_fog_energy = 2.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="Map" type="Sprite3D" parent="."]
-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)
-visible = false
-texture = ExtResource("3_ruo5i")
-
-[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="Water" parent="." instance=ExtResource("12_i2xii")]
-transform = Transform3D(10000, 0, 0, 0, 1, 0, 0, 0, 10000, 0, 4.03932, -186.25941)
-
-[node name="PauseMenuController" type="Node" parent="."]
-script = ExtResource("7_ukfuy")
-pause_menu_packed = ExtResource("8_wctvs")
-base_mode = ExtResource("9_eca4n")
-pause = ExtResource("10_0ari0")
+script = ExtResource("1_qwuk2")
 
 [node name="BackgroundMusicPlayer" parent="." instance=ExtResource("9_i2xii")]
 stream = ExtResource("10_eca4n")
 
-[node name="Lift" parent="." instance=ExtResource("13_eca4n")]
-transform = Transform3D(0.9961947, 0, -0.08715573, 0, 1, 0, 0.08715573, 0, 0.9961947, -4.593, 1.618, 0.583)
-end_location = Vector3(-4.593, 116.11, 0.583)
-lift_time = 15.0
-
-[node name="PlacedTutorialWeapon" type="MeshInstance3D" parent="."]
-transform = Transform3D(-2, 3.019916e-07, 0, -3.019916e-07, -2, 0, 0, 0, 2, -17.904, -79.265, 145.317)
-mesh = ExtResource("14_0ari0")
-script = ExtResource("15_165wb")
-
-[node name="SpotLight3D" type="SpotLight3D" parent="PlacedTutorialWeapon"]
-transform = Transform3D(1, -1.509958e-07, 6.600236e-15, 0, -4.371139e-08, -1, 1.509958e-07, 1, -4.371139e-08, 0, -2.3931274, 0)
-spot_range = 9.85
-spot_attenuation = 0.46
-spot_angle = 15.0
-
-[node name="WeaponLocationTarget" type="Marker3D" parent="PlacedTutorialWeapon"]
-
-[node name="TutoTriggers" type="Node3D" parent="."]
-transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -0.78573227, -132.74933, 116.65933)
-
-[node name="TriggerTutoMove" type="Area3D" parent="TutoTriggers"]
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoMove"]
-transform = Transform3D(0.9961947, 0, -0.087155946, 0, 1, 0, 0.087155946, 0, 0.9961947, 1.1144943, 6.5, 1.6032357)
-shape = SubResource("BoxShape3D_t0d86")
-
-[node name="TriggerTutoMantle" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, -10.4557495, 0, -28.61254)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoMantle"]
-transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, 0.19611359, 7, -2.241436)
-shape = SubResource("BoxShape3D_p287n")
-
-[node name="TriggerTutoJump" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 3.1977234, 0, -49.399136)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoJump"]
-transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, -0.90906525, 6.5, -1.0833435)
-shape = SubResource("BoxShape3D_qwuk2")
-
-[node name="TriggerTutoDoubleJump" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 23.476433, 0, -44.786793)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoDoubleJump"]
-transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, -2.0671844, 5.75, -2.1884613)
-shape = SubResource("BoxShape3D_efsse")
-
-[node name="TriggerTutoWallJump" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 38.60766, 0, -28.437609)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoWallJump"]
-transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, -1.9546509, 20.75, 10.8709755)
-shape = SubResource("BoxShape3D_x7fl1")
-
-[node name="TriggerTutoWallJump2" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 15.983452, 0, 37.426994)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoWallJump2"]
-transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, 2.3256226, 21.75, 4.9715767)
-shape = SubResource("BoxShape3D_3wccx")
-
-[node name="TriggerTutoDash" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 28.393105, 27.5, 21.07917)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoDash"]
-transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, 1.0587616, 7.5, 5.1117268)
-shape = SubResource("BoxShape3D_nrosh")
-
-[node name="TutorialDoneArea" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.14133324, 0, 0.98996216, 0, 1, 0, -0.98996216, 0, 0.14133324, 7.9436035, 53.74933, 16.672102)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TutorialDoneArea"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695)
-shape = SubResource("BoxShape3D_lu3yt")
-
-[node name="WeaponRetrieved" type="Area3D" parent="TutoTriggers"]
-transform = Transform3D(0.14133324, 0, 0.98996216, 0, 1, 0, -0.98996216, 0, 0.14133324, 27.3601, 53.74933, 18.733648)
-collision_layer = 0
-collision_mask = 16
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/WeaponRetrieved"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695)
-shape = SubResource("BoxShape3D_pxspk")
+[node name="PauseMenuController" type="Node" parent="." node_paths=PackedStringArray("player")]
+script = ExtResource("7_ukfuy")
+pause_menu_packed = ExtResource("8_wctvs")
+player = NodePath("../Player")
+pause = ExtResource("10_0ari0")
 
 [node name="TutorialController" type="Control" parent="."]
+visible = false
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+mouse_filter = 1
 script = ExtResource("16_efsse")
 tuto_got_sword_packed = ExtResource("17_t0d86")
 
@@ -305,49 +194,6 @@ layout_mode = 2
 text = "Mantle up"
 label_settings = SubResource("LabelSettings_2k3fr")
 
-[node name="TutoJump" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-theme_override_constants/separation = 15
-
-[node name="TextureRect" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoJump"]
-layout_mode = 2
-texture = ExtResource("16_2k3fr")
-
-[node name="Label" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoJump"]
-layout_mode = 2
-text = "Jump"
-label_settings = SubResource("LabelSettings_2k3fr")
-
-[node name="TutoDoubleJump" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-theme_override_constants/separation = 15
-
-[node name="HBoxContainer" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer/TutoDoubleJump"]
-layout_mode = 2
-theme_override_constants/separation = 0
-
-[node name="TextureRect" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoDoubleJump/HBoxContainer"]
-layout_mode = 2
-texture = ExtResource("16_2k3fr")
-
-[node name="Label2" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoDoubleJump/HBoxContainer"]
-layout_mode = 2
-text = "+"
-label_settings = SubResource("LabelSettings_2k3fr")
-
-[node name="TextureRect2" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoDoubleJump/HBoxContainer"]
-layout_mode = 2
-texture = ExtResource("16_2k3fr")
-
-[node name="Label3" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoDoubleJump"]
-layout_mode = 2
-text = "Double jump"
-label_settings = SubResource("LabelSettings_2k3fr")
-
 [node name="TutoWallJump" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
 unique_name_in_owner = true
 visible = false
@@ -372,21 +218,6 @@ layout_mode = 2
 text = "Wall jump"
 label_settings = SubResource("LabelSettings_2k3fr")
 
-[node name="TutoDash" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
-unique_name_in_owner = true
-visible = false
-layout_mode = 2
-theme_override_constants/separation = 15
-
-[node name="TextureRect" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoDash"]
-layout_mode = 2
-texture = ExtResource("19_efsse")
-
-[node name="Label" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoDash"]
-layout_mode = 2
-text = "Dash (both in air and on ground)"
-label_settings = SubResource("LabelSettings_2k3fr")
-
 [node name="TutoDashWeapon" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
 unique_name_in_owner = true
 visible = false
@@ -402,78 +233,244 @@ layout_mode = 2
 text = "Dash towards sword"
 label_settings = SubResource("LabelSettings_2k3fr")
 
-[node name="TutoEmpoweredDash" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
+[node name="TutoWeaponThrow" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
+unique_name_in_owner = true
+visible = false
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="HBoxContainer" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer/TutoWeaponThrow"]
+layout_mode = 2
+theme_override_constants/separation = 0
+
+[node name="TextureRect" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoWeaponThrow/HBoxContainer"]
+layout_mode = 2
+texture = ExtResource("23_p287n")
+
+[node name="Label2" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoWeaponThrow/HBoxContainer"]
+layout_mode = 2
+text = "while aiming"
+label_settings = SubResource("LabelSettings_2k3fr")
+
+[node name="Label3" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoWeaponThrow"]
+layout_mode = 2
+text = "Throw weapon"
+label_settings = SubResource("LabelSettings_2k3fr")
+
+[node name="TutoEnjoy" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
 unique_name_in_owner = true
 visible = false
 layout_mode = 2
 theme_override_constants/separation = 15
 
-[node name="HBoxContainer" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredDash"]
+[node name="label" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoEnjoy"]
 layout_mode = 2
-theme_override_constants/separation = 0
-
-[node name="TextureRect" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredDash/HBoxContainer"]
-layout_mode = 2
-texture = ExtResource("21_rmfv1")
-
-[node name="Label2" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredDash/HBoxContainer"]
-layout_mode = 2
-text = "+"
+text = "Enjoy this little playground!"
 label_settings = SubResource("LabelSettings_2k3fr")
 
-[node name="TextureRect2" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredDash/HBoxContainer"]
-layout_mode = 2
-texture = ExtResource("19_efsse")
+[node name="TutoTriggers" type="Node3D" parent="."]
+transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -0.78573227, -132.74933, 116.65933)
 
-[node name="Label3" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredDash"]
-layout_mode = 2
-text = "Empowered dash"
-label_settings = SubResource("LabelSettings_2k3fr")
+[node name="TriggerTutoMove" type="Area3D" parent="TutoTriggers"]
+collision_layer = 0
+collision_mask = 16
 
-[node name="TutoEmpoweredJump" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer"]
-unique_name_in_owner = true
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoMove"]
+transform = Transform3D(0.9961947, 0, -0.087155946, 0, 1, 0, 0.087155946, 0, 0.9961947, 1.1144943, 6.5, 1.6032357)
+shape = SubResource("BoxShape3D_t0d86")
+
+[node name="TriggerTutoMantle" type="Area3D" parent="TutoTriggers"]
+transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, -10.4557495, 0, -28.61254)
+collision_layer = 0
+collision_mask = 16
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoMantle"]
+transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, 0.19611359, 7, -2.241436)
+shape = SubResource("BoxShape3D_p287n")
+
+[node name="TutoJump" parent="TutoTriggers" instance=ExtResource("16_qwuk2")]
+transform = Transform3D(0.14133328, 0, 0.98996216, 0, 1, 0, -0.98996216, 0, 0.14133328, -0.32653046, 1.2493286, -50.374645)
+first_input_texture = ExtResource("16_2k3fr")
+second_input_texture = ExtResource("16_2k3fr")
+tuto_text = "Double jump"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TutoJump"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.49998856, 6.25, 3.499977)
+shape = SubResource("BoxShape3D_5hbxb")
+
+[node name="TutoDash" parent="TutoTriggers" instance=ExtResource("16_qwuk2")]
+transform = Transform3D(0.14133328, 0, 0.98996216, 0, 1, 0, -0.98996216, 0, 0.14133328, 19.967693, 1.2493286, -47.47731)
+first_input_texture = ExtResource("16_crf87")
+second_input_texture = ExtResource("19_efsse")
+tuto_text = "Dash"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TutoDash"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.49999237, 6.25, 4.2500153)
+shape = SubResource("BoxShape3D_6gj1x")
+
+[node name="TriggerTutoWallJump" type="Area3D" parent="TutoTriggers"]
+transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 38.60766, 0, -28.437609)
+collision_layer = 0
+collision_mask = 16
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoWallJump"]
+transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, -1.9546509, 20.75, 10.8709755)
+shape = SubResource("BoxShape3D_x7fl1")
+
+[node name="TriggerTutoWallJump2" type="Area3D" parent="TutoTriggers"]
+transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 15.983452, 0, 37.426994)
+collision_layer = 0
+collision_mask = 16
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoWallJump2"]
+transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, 2.3256226, 21.75, 4.9715767)
+shape = SubResource("BoxShape3D_3wccx")
+
+[node name="TutoDash2" parent="TutoTriggers" instance=ExtResource("16_qwuk2")]
+transform = Transform3D(0.14133325, 0, 0.98996216, 0, 1, 0, -0.98996216, 0, 0.14133325, 28.885735, 27.749329, 25.360323)
+first_input_texture = ExtResource("19_efsse")
+complex_input_text = "against wall"
+tuto_text = "Wall run"
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TutoDash2"]
+transform = Transform3D(1.0000031, 0, -4.917383e-07, 0, 1, 0, 4.917383e-07, 0, 1.0000031, 5.500023, 5, 0)
+shape = SubResource("BoxShape3D_hmdts")
+
+[node name="TriggerTutoWeaponThrow" type="Area3D" parent="TutoTriggers"]
+transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, 4.428787, 58, 19.770819)
+collision_layer = 0
+collision_mask = 16
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoWeaponThrow"]
+transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, 4.4208603, 9.75, -4.632329)
+shape = SubResource("BoxShape3D_lnjrw")
+
+[node name="TriggerTutoEnjoy" type="Area3D" parent="TutoTriggers"]
+transform = Transform3D(0.9961947, 0, -0.087155744, 0, 1, 0, 0.087155744, 0, 0.9961947, -120.81145, 214.5, 2.417603)
+collision_layer = 0
+collision_mask = 16
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TriggerTutoEnjoy"]
+transform = Transform3D(0.9961947, 0, -0.08715595, 0, 1, 0, 0.08715595, 0, 0.9961947, 3.9663503, 5.5, -5.174009)
+shape = SubResource("BoxShape3D_3w3wd")
+
+[node name="TutorialDoneArea" type="Area3D" parent="TutoTriggers"]
+transform = Transform3D(0.14133324, 0, 0.98996216, 0, 1, 0, -0.98996216, 0, 0.14133324, 7.9436035, 53.74933, 16.672102)
+collision_layer = 0
+collision_mask = 16
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/TutorialDoneArea"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695)
+shape = SubResource("BoxShape3D_lu3yt")
+
+[node name="WeaponRetrieved" type="Area3D" parent="TutoTriggers"]
+transform = Transform3D(0.14133324, 0, 0.98996216, 0, 1, 0, -0.98996216, 0, 0.14133324, 27.3601, 53.74933, 18.733648)
+collision_layer = 0
+collision_mask = 16
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="TutoTriggers/WeaponRetrieved"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.7500105, 4, 0.7499695)
+shape = SubResource("BoxShape3D_pxspk")
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_1bvp3")
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(-0.7804346, 0.15240021, 0.60637945, 0.1767362, -0.87651366, 0.4477591, 0.5997384, 0.4566159, 0.6571269, 0, 0, 0)
+light_color = Color(0.99999934, 0.76777613, 0.6549227, 1)
+light_energy = 2.0
+light_volumetric_fog_energy = 2.0
+shadow_enabled = true
+shadow_opacity = 0.95
+shadow_blur = 2.435
+
+[node name="Player" parent="." node_paths=PackedStringArray("TutorialWeaponTarget") instance=ExtResource("1_2vsi6")]
+transform = Transform3D(0.054514527, 0, -0.9985129, 0, 1, 0, 0.9985129, 0, 0.054514527, -6, 75.5, -13.5)
+collision_layer = 17
+TutorialWeaponTarget = NodePath("../PlacedTutorialWeapon/WeaponLocationTarget")
+TutorialDone = true
+AccelerationAir = 1.5
+
+[node name="DebugLayer" type="CanvasLayer" parent="."]
+
+[node name="GuideDebugger" parent="DebugLayer" instance=ExtResource("2_uet8a")]
 visible = false
-layout_mode = 2
-theme_override_constants/separation = 15
 
-[node name="HBoxContainer" type="HBoxContainer" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredJump"]
-layout_mode = 2
-theme_override_constants/separation = 0
+[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="TextureRect" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredJump/HBoxContainer"]
-layout_mode = 2
-texture = ExtResource("21_rmfv1")
+[node name="Water" parent="." instance=ExtResource("12_i2xii")]
+transform = Transform3D(10000, 0, 0, 0, 1, 0, 0, 0, 10000, 0, 4.03932, -186.25941)
 
-[node name="Label2" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredJump/HBoxContainer"]
-layout_mode = 2
-text = "+"
-label_settings = SubResource("LabelSettings_2k3fr")
+[node name="Lift" parent="." instance=ExtResource("13_eca4n")]
+transform = Transform3D(0.9961947, 0, -0.08715573, 0, 1, 0, 0.08715573, 0, 0.9961947, -4.593, 1.618, 0.583)
+end_location = Vector3(-4.593, 116.11, 0.583)
+lift_time = 8.0
 
-[node name="TextureRect2" type="TextureRect" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredJump/HBoxContainer"]
-layout_mode = 2
-texture = ExtResource("16_2k3fr")
+[node name="PlacedTutorialWeapon" type="MeshInstance3D" parent="."]
+transform = Transform3D(-2, 3.019916e-07, 0, -3.019916e-07, -2, 0, 0, 0, 2, -17.904, -79.265, 145.317)
+mesh = ExtResource("14_0ari0")
+script = ExtResource("15_165wb")
 
-[node name="Label3" type="Label" parent="TutorialController/PanelContainer/MarginContainer/TutoEmpoweredJump"]
-layout_mode = 2
-text = "Empowered jump"
-label_settings = SubResource("LabelSettings_2k3fr")
+[node name="SpotLight3D" type="SpotLight3D" parent="PlacedTutorialWeapon"]
+transform = Transform3D(1, -1.509958e-07, 6.600236e-15, 0, -4.371139e-08, -1, 1.509958e-07, 1, -4.371139e-08, 0, -2.3931274, 0)
+spot_range = 9.85
+spot_attenuation = 0.46
+spot_angle = 15.0
 
+[node name="WeaponLocationTarget" type="Marker3D" parent="PlacedTutorialWeapon"]
+
+[node name="LightLeakBlockers" type="Node3D" parent="."]
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="LightLeakBlockers"]
+transform = Transform3D(200, 0, 0, 0, 200, 0, 0, 0, 10, 0, -116, 178.82)
+mesh = SubResource("BoxMesh_p287n")
+skeleton = NodePath("../..")
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="LightLeakBlockers"]
+transform = Transform3D(34.729645, 0, 9.848078, 0, 200, 0, -196.96153, 0, 1.7364821, 57.5, -119, 178.82)
+mesh = SubResource("BoxMesh_p287n")
+skeleton = NodePath("../..")
+
+[node name="MeshInstance3D3" type="MeshInstance3D" parent="LightLeakBlockers"]
+transform = Transform3D(5.00679e-06, -200.00002, -2.3841858e-07, 0, -5.635115e-06, 10.000002, -200, 9.936228e-07, 2.3841858e-07, 1.5, -17, 114.82001)
+mesh = SubResource("BoxMesh_p287n")
+skeleton = NodePath("../..")
+
+[node name="TutoLights" type="Node3D" parent="."]
+
+[node name="SpotLight3D" type="SpotLight3D" parent="TutoLights"]
+transform = Transform3D(1, 9.942504e-09, -4.395368e-08, 4.4703484e-08, -0.3420201, 0.9396927, -5.690144e-09, -0.9396927, -0.3420201, -11.5, -70.5, 106.5)
+light_energy = 500.0
+spot_range = 47.233
+spot_angle = 18.85
+spot_angle_attenuation = 10.556052
+
+[node name="Spawner" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("24_qwuk2")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 19, 43, -111.5)
+EnemyToSpawn = ExtResource("25_x7fl1")
+MovementInputs = SubResource("Resource_pxspk")
+Target = NodePath("../Player")
+
+[node name="Spawner2" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("24_qwuk2")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 31, 7.5, -88)
+EnemyToSpawn = ExtResource("25_nrosh")
+Target = NodePath("../Player")
+
+[connection signal="timeout" from="TutorialController/WaitToShowBlockingTuto" to="TutorialController" method="_show_weapon_tutorial"]
 [connection signal="body_exited" from="TutoTriggers/TriggerTutoMove" to="TutorialController" method="hide_tutorials"]
 [connection signal="body_entered" from="TutoTriggers/TriggerTutoMantle" to="TutorialController" method="_on_tuto_mantle_body_entered"]
 [connection signal="body_exited" from="TutoTriggers/TriggerTutoMantle" to="TutorialController" method="hide_tutorials"]
-[connection signal="body_entered" from="TutoTriggers/TriggerTutoJump" to="TutorialController" method="_on_tuto_jump_body_entered"]
-[connection signal="body_exited" from="TutoTriggers/TriggerTutoJump" to="TutorialController" method="hide_tutorials"]
-[connection signal="body_entered" from="TutoTriggers/TriggerTutoDoubleJump" to="TutorialController" method="_on_tuto_double_jump_body_entered"]
-[connection signal="body_exited" from="TutoTriggers/TriggerTutoDoubleJump" to="TutorialController" method="hide_tutorials"]
 [connection signal="body_entered" from="TutoTriggers/TriggerTutoWallJump" to="TutorialController" method="_on_tuto_wall_jump_body_entered"]
 [connection signal="body_exited" from="TutoTriggers/TriggerTutoWallJump" to="TutorialController" method="hide_tutorials"]
 [connection signal="body_entered" from="TutoTriggers/TriggerTutoWallJump2" to="TutorialController" method="_on_tuto_wall_jump_body_entered"]
 [connection signal="body_exited" from="TutoTriggers/TriggerTutoWallJump2" to="TutorialController" method="hide_tutorials"]
-[connection signal="body_entered" from="TutoTriggers/TriggerTutoDash" to="TutorialController" method="_on_tuto_dash_body_entered"]
-[connection signal="body_exited" from="TutoTriggers/TriggerTutoDash" to="TutorialController" method="hide_tutorials"]
-[connection signal="body_entered" from="TutoTriggers/TutorialDoneArea" to="Player" method="OnTutorialDone"]
+[connection signal="body_entered" from="TutoTriggers/TriggerTutoWeaponThrow" to="TutorialController" method="_on_tuto_weapon_throw_body_entered"]
+[connection signal="body_exited" from="TutoTriggers/TriggerTutoWeaponThrow" to="TutorialController" method="hide_tutorials"]
+[connection signal="body_entered" from="TutoTriggers/TriggerTutoEnjoy" to="TutorialController" method="_on_tuto_enjoy_body_entered"]
+[connection signal="body_exited" from="TutoTriggers/TriggerTutoEnjoy" to="TutorialController" method="hide_tutorials"]
 [connection signal="body_entered" from="TutoTriggers/TutorialDoneArea" to="TutorialController" method="_on_tuto_done_area_body_entered"]
+[connection signal="body_entered" from="TutoTriggers/TutorialDoneArea" to="Player" method="OnTutorialDone"]
 [connection signal="body_exited" from="TutoTriggers/TutorialDoneArea" to="TutorialController" method="hide_tutorials"]
-[connection signal="body_entered" from="TutoTriggers/WeaponRetrieved" to="PlacedTutorialWeapon" method="_on_weapon_retrieved_body_entered"]
 [connection signal="body_entered" from="TutoTriggers/WeaponRetrieved" to="TutorialController" method="_on_weapon_retrieved_body_entered"]
-[connection signal="timeout" from="TutorialController/WaitToShowBlockingTuto" to="TutorialController" method="_show_weapon_tutorial"]
+[connection signal="body_entered" from="TutoTriggers/WeaponRetrieved" to="PlacedTutorialWeapon" method="_on_weapon_retrieved_body_entered"]

menus/scenes/menus/main_menu/main_menu_with_animations.tscn

@@ -1,8 +1,10 @@
-[gd_scene load_steps=17 format=3 uid="uid://vm22i5sv3p3s"]
+[gd_scene load_steps=19 format=3 uid="uid://vm22i5sv3p3s"]
 
 [ext_resource type="PackedScene" uid="uid://c6k5nnpbypshi" path="res://addons/maaacks_game_template/base/scenes/menus/main_menu/main_menu.tscn" id="1_my8ii"]
 [ext_resource type="Script" uid="uid://c0ntfmiuw4ttg" path="res://menus/scenes/menus/main_menu/main_menu_with_animations.gd" id="2_nyjay"]
 [ext_resource type="AudioStream" uid="uid://f8cvr5s041ej" path="res://assets/audio/ambiance/637083__nox_sound__ambiance_nature_night_cricket_calm_loop_stereo.wav" id="3_tvvjd"]
+[ext_resource type="Resource" uid="uid://c2hpxkcujyc13" path="res://systems/inputs/menu_mode/menu_mode.tres" id="3_ytpwg"]
+[ext_resource type="Resource" uid="uid://ck43v3q5ype3f" path="res://systems/inputs/menu_mode/back.tres" id="4_8i6b8"]
 
 [sub_resource type="Animation" id="1"]
 resource_name = "Intro"
@@ -352,6 +354,8 @@ graph_offset = Vector2(-180.277, 49)
 script = ExtResource("2_nyjay")
 level_select_packed_scene = null
 game_scene_path = "uid://dmkw8cmalm5k"
+menu_context = ExtResource("3_ytpwg")
+back_action = ExtResource("4_8i6b8")
 
 [node name="MenuAnimationPlayer" type="AnimationPlayer" parent="." index="1"]
 libraries = {

menus/scenes/menus/options_menu/input/input_extras_menu.tscn

@@ -33,20 +33,38 @@ alignment = 1
 
 [node name="LookSensitivityControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
 layout_mode = 2
-option_name = "Look Sensitivity"
+option_name = "Joystick Sensitivity"
 option_section = 1
 key = "LookSensitivity"
 section = "InputSettings"
 
 [node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl" index="0"]
-text = "Look Sensitivity :"
+text = "Joystick Sensitivity :"
 
 [node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl" index="1"]
 min_value = 0.2
 max_value = 2.0
 step = 0.2
+value = 2.0
 tick_count = 10
 
+[node name="MouseSensitivityControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
+layout_mode = 2
+option_name = "Mouse Sensitivity"
+option_section = 1
+key = "MouseSensitivity"
+section = "InputSettings"
+
+[node name="OptionLabel" parent="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl" index="0"]
+text = "Mouse Sensitivity :"
+
+[node name="HSlider" parent="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl" index="1"]
+min_value = 1.0
+max_value = 20.0
+step = 1.0
+value = 5.0
+tick_count = 20
+
 [node name="HeadBobbingControl" parent="VBoxContainer/MarginContainer/VBoxContainer" instance=ExtResource("2_iyvrj")]
 layout_mode = 2
 option_name = "Head Bobbing while walking"
@@ -76,5 +94,6 @@ step = 0.1
 tick_count = 10
 
 [editable path="VBoxContainer/MarginContainer/VBoxContainer/LookSensitivityControl"]
+[editable path="VBoxContainer/MarginContainer/VBoxContainer/MouseSensitivityControl"]
 [editable path="VBoxContainer/MarginContainer/VBoxContainer/HeadBobbingControl"]
 [editable path="VBoxContainer/MarginContainer/VBoxContainer/FOVChangeControl"]

menus/scenes/menus/options_menu/mini_options_menu_with_reset.tscn

@@ -1,13 +1,17 @@
-[gd_scene load_steps=4 format=3 uid="uid://foajscu2dqkk"]
+[gd_scene load_steps=5 format=3 uid="uid://foajscu2dqkk"]
 
 [ext_resource type="PackedScene" uid="uid://vh1ucj2rfbby" path="res://addons/maaacks_game_template/base/scenes/menus/options_menu/mini_options_menu.tscn" id="1_gcivb"]
 [ext_resource type="Script" uid="uid://ceg0gjjapg77k" path="res://menus/scenes/menus/options_menu/mini_options_menu_with_reset.gd" id="2_oof6u"]
 [ext_resource type="PackedScene" uid="uid://dfjkn4yl3q1am" path="res://menus/scenes/menus/options_menu/game/reset_game_control/reset_game_control.tscn" id="3_gss4d"]
+[ext_resource type="PackedScene" uid="uid://ceehkbh6emrdm" path="res://menus/scenes/menus/options_menu/input/input_extras_menu.tscn" id="4_grbel"]
 
 [node name="MiniOptionsMenu" instance=ExtResource("1_gcivb")]
 script = ExtResource("2_oof6u")
 
-[node name="ResetGameControl" parent="." index="3" instance=ExtResource("3_gss4d")]
+[node name="Inputs" parent="." index="0" instance=ExtResource("4_grbel")]
+layout_mode = 2
+
+[node name="ResetGameControl" parent="." index="4" instance=ExtResource("3_gss4d")]
 layout_mode = 2
 
 [connection signal="reset_confirmed" from="ResetGameControl" to="." method="_on_reset_game_control_reset_confirmed"]

menus/scenes/overlaid_menus/mini_options_overlaid_menu.tscn

@@ -1,7 +1,9 @@
-[gd_scene load_steps=3 format=3 uid="uid://dim045la3mijk"]
+[gd_scene load_steps=4 format=3 uid="uid://dim045la3mijk"]
 
 [ext_resource type="PackedScene" uid="uid://cikf3o5omnunl" path="res://addons/maaacks_game_template/base/scenes/overlaid_menu/menus/mini_options_overlaid_menu.tscn" id="1_5piya"]
 [ext_resource type="PackedScene" uid="uid://foajscu2dqkk" path="res://menus/scenes/menus/options_menu/mini_options_menu_with_reset.tscn" id="2_3u5po"]
+[ext_resource type="Resource" uid="uid://ck43v3q5ype3f" path="res://systems/inputs/menu_mode/back.tres" id="3_i7tty"]
 
 [node name="MiniOptionsOverlaidMenu" instance=ExtResource("1_5piya")]
 menu_scene = ExtResource("2_3u5po")
+back_action = ExtResource("3_i7tty")

menus/scenes/overlaid_menus/pause_menu.tscn

@@ -1,15 +1,18 @@
-[gd_scene load_steps=5 format=3 uid="uid://ccqajqchiw4xu"]
+[gd_scene load_steps=6 format=3 uid="uid://ccqajqchiw4xu"]
 
 [ext_resource type="PackedScene" uid="uid://b5cd6sa8qq4vc" path="res://addons/maaacks_game_template/base/scenes/overlaid_menu/menus/pause_menu.tscn" id="1_0paax"]
 [ext_resource type="Script" uid="uid://bwvomv4eww4fg" path="res://menus/scenes/overlaid_menus/pause_menu.gd" id="2_ek1hy"]
 [ext_resource type="PackedScene" uid="uid://dim045la3mijk" path="res://menus/scenes/overlaid_menus/mini_options_overlaid_menu.tscn" id="3_e0t2r"]
 [ext_resource type="Resource" uid="uid://c2hpxkcujyc13" path="res://systems/inputs/menu_mode/menu_mode.tres" id="4_nfx08"]
+[ext_resource type="Resource" uid="uid://ck43v3q5ype3f" path="res://systems/inputs/menu_mode/back.tres" id="5_su1bt"]
 
 [node name="PauseMenu" instance=ExtResource("1_0paax")]
+top_level = true
 script = ExtResource("2_ek1hy")
 options_packed_scene = ExtResource("3_e0t2r")
 main_menu_scene = "res://menus/scenes/menus/main_menu/main_menu_with_animations.tscn"
 menu_context = ExtResource("4_nfx08")
+back_action = ExtResource("5_su1bt")
 
 [connection signal="tree_entered" from="." to="." method="on_enter_tree"]
 [connection signal="tree_exited" from="." to="." method="on_exit_tree"]

menus/scripts/game_state.gd

@@ -20,7 +20,6 @@ static func get_level_state(level_state_key : String) -> LevelState:
 		return new_level_state
 
 static func has_game_state() -> bool:
-	return false
 	return GlobalState.has_state(STATE_NAME)
 
 static func get_game_state() -> GameState:

player_controller/PlayerController.tscn

@@ -1,32 +1,36 @@
-[gd_scene load_steps=45 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=54 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="PackedScene" uid="uid://cf3rrgr1imvv4" path="res://scenes/path/path.tscn" id="2_6lejt"]
 [ext_resource type="Resource" uid="uid://bl5crtu1gkrtr" path="res://systems/inputs/base_mode/base_mode.tres" id="3_cresl"]
+[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="4_q7bng"]
 [ext_resource type="Resource" uid="uid://cpdaw41ah5gic" path="res://systems/inputs/base_mode/rotate_y.tres" id="4_rxwoh"]
 [ext_resource type="Resource" uid="uid://ccrb5xsnphc8" path="res://systems/inputs/base_mode/rotate_floorplane.tres" id="5_4u7i3"]
-[ext_resource type="Script" uid="uid://dv7v1ywmbvvcd" path="res://player_controller/Scripts/HealthSystem.cs" id="5_umw0l"]
-[ext_resource type="Script" uid="uid://vuq8rjq3vegn" path="res://player_controller/Scripts/Stamina.cs" id="6_lxtc4"]
+[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="5_q7bng"]
+[ext_resource type="Resource" uid="uid://f3vs6l4m623s" path="res://systems/inputs/base_mode/move_left.tres" id="5_q14ux"]
+[ext_resource type="Resource" uid="uid://t612lts1wi1s" path="res://systems/inputs/base_mode/move_right.tres" id="6_q7bng"]
 [ext_resource type="Script" uid="uid://cwbvxlfvmocc1" path="res://player_controller/Scripts/StairsSystem.cs" id="7_bmt5a"]
+[ext_resource type="Resource" uid="uid://brswsknpgwal2" path="res://systems/inputs/base_mode/move_front.tres" id="7_m8gvy"]
+[ext_resource type="Resource" uid="uid://s1l0n1iitc6m" path="res://systems/inputs/base_mode/move_back.tres" id="8_jb43f"]
 [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="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/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://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_released.tres" id="17_6lejt"]
 [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="Resource" uid="uid://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="18_q14ux"]
+[ext_resource type="Resource" uid="uid://spo3pbqjx0eb" path="res://systems/inputs/base_mode/parry.tres" id="18_ruloh"]
+[ext_resource type="Resource" uid="uid://dxy0071ic1wdj" path="res://systems/inputs/base_mode/slam.tres" id="20_nob5r"]
 [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"]
@@ -41,9 +45,20 @@
 [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="Resource" id="Resource_jb43f"]
+script = ExtResource("5_q7bng")
+Modifier = 3.0
+metadata/_custom_type_script = "uid://b6y3ugfydvch0"
+
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_xc2g5"]
 height = 1.7
 
+[sub_resource type="SphereShape3D" id="SphereShape3D_6lejt"]
+radius = 0.45
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_q14ux"]
+radius = 1.0
+
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_nodcl"]
 transparency = 1
 albedo_color = Color(0, 0.627451, 0.6313726, 0.49019608)
@@ -54,73 +69,127 @@ top_radius = 0.2
 bottom_radius = 0.2
 height = 1.0
 
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_6lejt"]
+radius = 1.0
+height = 3.5
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_nob5r"]
+radius = 0.4
+
 [sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_2q0ik"]
 blend_mode = 1
 
-[node name="Player" type="CharacterBody3D"]
+[node name="Player" type="CharacterBody3D" node_paths=PackedStringArray("CDamage")]
+collision_mask = 272
 script = ExtResource("1_poq2x")
+CDamage = NodePath("CDamageable")
 WalkSpeed = 7.5
-AccelerationAir = 2.0
-DecelerationAir = 0.1
-Weight = 5.0
-MantleTime = 0.2
-SimpleJumpStartVelocity = 8.0
+AccelerationFloor = 4.0
+DecelerationFloor = 3.0
+AccelerationAir = 0.8
+DecelerationAir = 0.02
+Weight = 4.0
+MantlePath = ExtResource("2_6lejt")
+MantleDashStrength = 25.0
+MantleJumpStartVelocity = 15.0
+CoyoteTime = 0.3
+InputBufferFrames = 5
+SimpleJumpStartVelocity = 6.0
 SimpleJumpHangTimeInFrames = 1
-SimpleJumpGravityLesseningFactor = 2.5
-DoubleJumpStartVelocity = 15.0
+SimpleJumpGravityLesseningFactor = 2.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
+SimpleDashStrength = 18.0
+SimpleDashTime = 0.2
 AimedDashTime = 0.2
 PostDashSpeed = 30.0
+SlamSpeed = 80.0
+FlatGroundSlideSpeedLossRate = 0.996
+GroundSlideJumpMultiplier = 0.1
+GroundSlideJumpSpeedFactor = 0.1
+GroundSlideDownSlopeAcceleration = 0.2
+GroundSlideDownSlopeMaxSpeed = 30.0
+AirGlideVSpeed = 4.0
+AccelerationAirGlide = 0.4
+AirGlideVerticalAcceleration = 8.0
+AirGlideJumpMultiplier = 0.1
+AirGlideJumpSpeedFactor = 0.05
 WallHugGravityLesseningFactor = 15.0
-WallHugDownwardMaxSpeed = 8.0
-WallHugHorizontalDeceleration = 0.5
+WallHugDownwardMaxSpeed = 4.0
+WallHugHorizontalDeceleration = 1.0
+
+[node name="CDamageable" type="Node" parent="."]
+script = ExtResource("4_q7bng")
+DamageModifiers = Array[Object]([SubResource("Resource_jb43f")])
+metadata/_custom_type_script = "uid://b0u23nkpaimyc"
+
+[node name="WallRunSnapper" type="RayCast3D" parent="."]
+unique_name_in_owner = true
+transform = Transform3D(0.99999994, 0, 0, 0, 1, 0, 0, 0, 0.99999994, 0, 0, 0)
+target_position = Vector3(0, 0, -5)
+collision_mask = 256
 
 [node name="InputController" type="Node3D" parent="."]
 script = ExtResource("16_v31n3")
 base_mode = ExtResource("3_cresl")
 move = ExtResource("17_h6vvl")
-rotate_y = ExtResource("4_rxwoh")
+move_left = ExtResource("5_q14ux")
+move_right = ExtResource("6_q7bng")
+move_front = ExtResource("7_m8gvy")
+move_back = ExtResource("8_jb43f")
+rotate_vertical = ExtResource("4_rxwoh")
 rotate_floorplane = ExtResource("5_4u7i3")
 aim_down = ExtResource("8_obsfv")
 aim_pressed = ExtResource("9_nob5r")
 aim_released = ExtResource("8_lhb11")
 jump = ExtResource("10_4u7i3")
 jump_pressed = ExtResource("13_nob5r")
-empower_down = ExtResource("10_nodcl")
-empower_released = ExtResource("11_ruloh")
-aim_canceled = ExtResource("9_5p2qc")
+slide_pressed = ExtResource("18_q14ux")
+slide_released = ExtResource("17_6lejt")
 hit = ExtResource("11_cresl")
+parry = ExtResource("18_ruloh")
 dash = ExtResource("12_34snm")
-throw = ExtResource("16_nob5r")
+slam = ExtResource("20_nob5r")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
 visible = false
 mesh = SubResource("CapsuleMesh_xc2g5")
 
-[node name="CapsuleCollider" type="CollisionShape3D" parent="."]
+[node name="StandingCollider" type="CollisionShape3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.85, 0)
 shape = ExtResource("13_r7i3q")
 debug_color = Color(0, 0.6, 0.701961, 0.341176)
-script = ExtResource("8_lmtjd")
-CapsuleDefaultHeight = 1.7
+
+[node name="SlideCollider" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.45, 0)
+shape = SubResource("SphereShape3D_6lejt")
+disabled = true
+debug_color = Color(0, 0.6, 0.701961, 0.341176)
 
 [node name="HeadSystem" parent="." instance=ExtResource("11_rxwoh")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
+CameraInclineAcceleration = 20.0
+GroundedCameraIncline = 3.0
+SlidingJitterAmplitude = 0.2
 
-[node name="HealthSystem" type="Node3D" parent="."]
-script = ExtResource("5_umw0l")
+[node name="MantleSystem" parent="HeadSystem" instance=ExtResource("8_qu4wy")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.6, 0)
+MantleEndLocationDistanceFromWall = 0.3
+MantleHeightCastStart = 2.5
 
-[node name="Stamina" type="Node3D" parent="."]
-script = ExtResource("6_lxtc4")
+[node name="WeaponHitbox" type="Area3D" parent="HeadSystem"]
+unique_name_in_owner = true
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.6, 0)
+collision_layer = 0
+collision_mask = 16
+monitorable = false
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="HeadSystem/WeaponHitbox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -1.5)
+shape = SubResource("SphereShape3D_q14ux")
 
 [node name="StairsSystem" type="Node3D" parent="."]
 script = ExtResource("7_bmt5a")
@@ -128,13 +197,11 @@ script = ExtResource("7_bmt5a")
 [node name="StairsAheadRayCast3D" type="RayCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, -0.828)
 target_position = Vector3(0, -0.55, 0)
+collision_mask = 256
 
 [node name="StairsBelowRayCast3D" type="RayCast3D" parent="."]
 target_position = Vector3(0, -0.75, 0)
-
-[node name="MantleSystem" parent="." instance=ExtResource("8_qu4wy")]
-MantleEndLocationDistanceFromWall = 0.3
-MantleHeightCastStart = 2.0
+collision_mask = 256
 
 [node name="Bobbing" type="Node3D" parent="."]
 script = ExtResource("10_7wk1w")
@@ -143,44 +210,68 @@ script = ExtResource("10_7wk1w")
 script = ExtResource("12_m2mxi")
 
 [node name="HeadCollisionDetectors" type="Node3D" parent="."]
+visible = false
 
 [node name="HeadCollisionDetector0" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, -0.210707)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="HeadCollisionDetector1" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.4, 0.23061)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="HeadCollisionDetector2" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.296, 1.4, 0)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="HeadCollisionDetector3" type="RayCast3D" parent="HeadCollisionDetectors"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.296, 1.4, 0)
 target_position = Vector3(0, 1, 0)
+collision_mask = 256
 
 [node name="TweenQueueSystem" parent="." instance=ExtResource("22_rpwev")]
 
 [node name="WallHugSystem" type="Node3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 script = ExtResource("27_n7qhm")
 
 [node name="back" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(0, 0, 1)
-collision_mask = 2
+collision_mask = 256
+
+[node name="back2" type="RayCast3D" parent="WallHugSystem"]
+transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
+target_position = Vector3(0, 0, 1)
+collision_mask = 256
 
 [node name="front" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(0, 0, -1)
-collision_mask = 2
+collision_mask = 256
+
+[node name="front2" type="RayCast3D" parent="WallHugSystem"]
+transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
+target_position = Vector3(0, 0, -1)
+collision_mask = 256
 
 [node name="right" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(1, 0, 0)
-collision_mask = 2
+collision_mask = 256
+
+[node name="right2" type="RayCast3D" parent="WallHugSystem"]
+transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
+target_position = Vector3(1, 0, 0)
+collision_mask = 256
 
 [node name="left" type="RayCast3D" parent="WallHugSystem"]
 target_position = Vector3(-1, 0, 0)
-collision_mask = 2
+collision_mask = 256
+
+[node name="left2" type="RayCast3D" parent="WallHugSystem"]
+transform = Transform3D(0.70710677, 0, 0.70710677, 0, 1, 0, -0.70710677, 0, 0.70710677, 0, 0, 0)
+target_position = Vector3(-1, 0, 0)
+collision_mask = 256
 
 [node name="DashSystem" parent="." instance=ExtResource("18_q5h8a")]
 DashSpeed = 0.2
@@ -194,12 +285,33 @@ ThrowForce = 15.0
 StraightThrowDuration = 0.05
 
 [node name="DashIndicator" type="Node3D" parent="."]
+visible = false
 
 [node name="DashIndicatorMesh" type="MeshInstance3D" parent="DashIndicator"]
 transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 0, -1)
 mesh = SubResource("CylinderMesh_nodcl")
 
+[node name="GroundDetector" type="ShapeCast3D" parent="."]
+shape = SubResource("CapsuleShape3D_6lejt")
+collision_mask = 256
+
+[node name="CeilingDetector" type="ShapeCast3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.9, 0)
+enabled = false
+shape = SubResource("SphereShape3D_nob5r")
+target_position = Vector3(0, 0.4, 0)
+collision_mask = 256
+
+[node name="DirectGroundDetector" type="RayCast3D" parent="."]
+target_position = Vector3(0, -2, 0)
+collision_mask = 256
+
 [node name="DashCooldown" type="Timer" parent="."]
+wait_time = 0.8
+one_shot = true
+
+[node name="AirborneDashCooldown" type="Timer" parent="."]
+wait_time = 0.5
 one_shot = true
 
 [node name="PowerCooldown" type="Timer" parent="."]
@@ -212,7 +324,6 @@ one_shot = true
 ignore_time_scale = true
 
 [node name="StateChartDebugger" parent="." instance=ExtResource("24_q5h8a")]
-visible = false
 offset_left = 1524.0
 offset_top = 1.0
 offset_right = -8.0
@@ -220,56 +331,71 @@ 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
+[node name="UI" type="Control" parent="."]
+visible = false
+layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = 910.0
-offset_top = 549.0
-offset_right = -910.0
-offset_bottom = -521.0
 grow_horizontal = 2
 grow_vertical = 2
+mouse_filter = 1
+script = ExtResource("30_2ghaa")
+
+[node name="MarginContainer" type="MarginContainer" parent="UI"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+theme_override_constants/margin_left = 50
+theme_override_constants/margin_top = 50
+theme_override_constants/margin_right = 50
+theme_override_constants/margin_bottom = 50
+
+[node name="VBoxContainer" type="VBoxContainer" parent="UI/MarginContainer"]
+layout_mode = 2
+size_flags_horizontal = 0
+size_flags_vertical = 0
+
+[node name="DashesLabel" type="Label" parent="UI/MarginContainer/VBoxContainer"]
+layout_mode = 2
+text = "Empowered actions"
+
+[node name="HBoxContainer" type="HBoxContainer" parent="UI/MarginContainer/VBoxContainer"]
+custom_minimum_size = Vector2(0, 30)
+layout_mode = 2
+
+[node name="Dash1" type="TextureRect" parent="UI/MarginContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
+
+[node name="Dash2" type="TextureRect" parent="UI/MarginContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
+
+[node name="Dash3" type="TextureRect" parent="UI/MarginContainer/VBoxContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+texture = ExtResource("30_h23go")
+expand_mode = 2
 
 [node name="CenterContainer" type="CenterContainer" parent="UI"]
 custom_minimum_size = Vector2(1920, 1080)
+layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_right = -1.0
 grow_horizontal = 2
 grow_vertical = 2
+mouse_filter = 2
 
 [node name="CenterIcon" type="TextureRect" parent="UI/CenterContainer"]
 material = SubResource("CanvasItemMaterial_2q0ik")
@@ -278,6 +404,24 @@ layout_mode = 2
 texture = ExtResource("32_lgpc8")
 expand_mode = 1
 
+[node name="CenterContainer2" type="CenterContainer" parent="UI"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+mouse_filter = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="UI/CenterContainer2"]
+layout_mode = 2
+theme_override_constants/margin_top = 50
+
+[node name="DashCooldownIndicator" type="ColorRect" parent="UI/CenterContainer2/MarginContainer"]
+unique_name_in_owner = true
+custom_minimum_size = Vector2(100, 10)
+layout_mode = 2
+
 [node name="StateChart" type="Node" parent="."]
 script = ExtResource("25_wv70j")
 metadata/_custom_type_script = "uid://couw105c3bde4"
@@ -316,28 +460,6 @@ delay_in_seconds = "0.0"
 [node name="Canceled" type="Node" parent="StateChart/Root/Aim"]
 script = ExtResource("27_34snm")
 
-[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("../../On")
-event = &"empower_down"
-delay_in_seconds = "0.0"
-
-[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("../../Off")
-event = &"empower_released"
-delay_in_seconds = "0.0"
-
 [node name="PowerReserve" type="Node" parent="StateChart/Root"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("Full")
@@ -425,6 +547,33 @@ to = NodePath("../OnWall/Hanging")
 event = &"to_planted"
 delay_in_seconds = "0.0"
 
+[node name="Grounded" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("27_34snm")
+
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Dashing/Dash")
+event = &"dash"
+delay_in_seconds = "0.0"
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Jump/SimpleJump")
+event = &"jump"
+delay_in_seconds = "0.0"
+
+[node name="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="OnSlide" type="Node" parent="StateChart/Root/Movement/Grounded"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Sliding/GroundSlide")
+event = &"slide"
+delay_in_seconds = "0.0"
+
 [node name="Mantling" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("27_34snm")
 
@@ -434,53 +583,77 @@ to = NodePath("../../Grounded")
 event = &"grounded"
 delay_in_seconds = "0.0"
 
+[node name="OnMantleOtherSide" type="Node" parent="StateChart/Root/Movement/Mantling"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../OnWall/Hugging")
+event = &"on_wall"
+delay_in_seconds = "0.0"
+
+[node name="Slamming" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("27_34snm")
+
+[node name="OnSlamEnded" type="Node" parent="StateChart/Root/Movement/Slamming"]
+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="OnDash" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Dashing/Dash")
+event = &"dash"
+delay_in_seconds = "0.0"
+
+[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Jump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Mantling")
+event = &"mantle"
+delay_in_seconds = "0.0"
+
 [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="OnSlide" type="Node" parent="StateChart/Root/Movement/Jump/SimpleJump"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Sliding/AirGlideDoubleJumpEnabled")
+event = &"slide"
+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"]
+[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Jump/DoubleJump"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../Airborne/Falling")
-event = &"jump_ended"
+to = NodePath("../../../Sliding/AirGlide")
+event = &"slide"
 delay_in_seconds = "0.0"
 
 [node name="Dashing" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("Dash")
 
+[node name="OnDashEndedGrounded" type="Node" parent="StateChart/Root/Movement/Dashing"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Grounded")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
 [node name="OnDashEnded" type="Node" parent="StateChart/Root/Movement/Dashing"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Airborne/Reset")
@@ -505,33 +678,112 @@ 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="Sliding" type="Node" parent="StateChart/Root/Movement"]
+script = ExtResource("26_infe6")
+initial_state = NodePath("GroundSlide")
 
-[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Sliding"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../Dashing/Dash")
-event = &"dash"
+event = &"actually_no_dash"
 delay_in_seconds = "0.0"
 
-[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/Sliding"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Jump/SimpleJump")
+to = NodePath("../../Mantling")
+event = &"mantle"
+delay_in_seconds = "0.0"
+
+[node name="GroundSlide" type="Node" parent="StateChart/Root/Movement/Sliding"]
+script = ExtResource("27_34snm")
+
+[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Grounded")
+event = &"slide_released"
+delay_in_seconds = "0.0"
+
+[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../AirGlideDoubleJumpEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Jump/SimpleJump")
 event = &"jump"
 delay_in_seconds = "0.0"
 
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="OnCancel" type="Node" parent="StateChart/Root/Movement/Sliding/GroundSlide"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Jump/MegaJump")
-event = &"megajump"
+to = NodePath("../../SlideCanceled")
+event = &"slide_canceled"
 delay_in_seconds = "0.0"
 
-[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Grounded"]
+[node name="AirGlideDoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Sliding"]
+script = ExtResource("27_34snm")
+
+[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Airborne/CoyoteEnabled")
+to = NodePath("../../../Airborne/Reset")
+event = &"slide_released"
+delay_in_seconds = "0.0"
+
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../GroundSlide")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Jump/DoubleJump")
+event = &"jump"
+delay_in_seconds = "0.0"
+
+[node name="AirGlide" type="Node" parent="StateChart/Root/Movement/Sliding"]
+script = ExtResource("27_34snm")
+
+[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlide"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/Reset")
+event = &"slide_released"
+delay_in_seconds = "0.0"
+
+[node name="OnGrounded" type="Node" parent="StateChart/Root/Movement/Sliding/AirGlide"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../GroundSlide")
+event = &"grounded"
+delay_in_seconds = "0.0"
+
+[node name="SlideCanceled" type="Node" parent="StateChart/Root/Movement/Sliding"]
+script = ExtResource("27_34snm")
+
+[node name="OnAirborne" type="Node" parent="StateChart/Root/Movement/Sliding/SlideCanceled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/CoyoteEnabled")
 event = &"start_falling"
 delay_in_seconds = "0.0"
 
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/Sliding/SlideCanceled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Dashing/Dash")
+event = &"dash"
+delay_in_seconds = "0.0"
+
+[node name="OnJump" type="Node" parent="StateChart/Root/Movement/Sliding/SlideCanceled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Jump/SimpleJump")
+event = &"jump"
+delay_in_seconds = "0.0"
+
+[node name="OnSlideReleased" type="Node" parent="StateChart/Root/Movement/Sliding/SlideCanceled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Grounded")
+event = &"slide_released"
+delay_in_seconds = "0.0"
+
 [node name="Airborne" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("CoyoteEnabled")
@@ -540,10 +792,10 @@ initial_state = NodePath("CoyoteEnabled")
 script = ExtResource("41_ruloh")
 default_state = NodePath("../CoyoteEnabled")
 
-[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne"]
+[node name="OnWallRun" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../OnWall/Hugging")
-event = &"wall_hug"
+to = NodePath("../../OnWall/Running")
+event = &"wall_run"
 delay_in_seconds = "0.0"
 
 [node name="OnDash" type="Node" parent="StateChart/Root/Movement/Airborne"]
@@ -558,13 +810,19 @@ to = NodePath("../../Grounded")
 event = &"grounded"
 delay_in_seconds = "0.0"
 
+[node name="OnSlam" type="Node" parent="StateChart/Root/Movement/Airborne"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Slamming")
+event = &"slam"
+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"]
+[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../Jump/MegaJump")
-event = &"megajump"
+to = NodePath("../../../Sliding/AirGlideDoubleJumpEnabled")
+event = &"slide"
 delay_in_seconds = "0.0"
 
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/CoyoteEnabled"]
@@ -582,10 +840,16 @@ delay_in_seconds = "0.0"
 [node name="DoubleJumpEnabled" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("27_34snm")
 
-[node name="OnMegajump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
+[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../../Jump/MegaJump")
-event = &"megajump"
+to = NodePath("../../../Sliding/AirGlideDoubleJumpEnabled")
+event = &"slide"
+delay_in_seconds = "0.0"
+
+[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../OnWall/Hugging")
+event = &"wall_hug"
 delay_in_seconds = "0.0"
 
 [node name="OnJump" type="Node" parent="StateChart/Root/Movement/Airborne/DoubleJumpEnabled"]
@@ -597,12 +861,30 @@ delay_in_seconds = "0.0"
 [node name="Falling" type="Node" parent="StateChart/Root/Movement/Airborne"]
 script = ExtResource("27_34snm")
 
+[node name="OnSlide" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Sliding/AirGlide")
+event = &"slide"
+delay_in_seconds = "0.0"
+
+[node name="OnWallHug" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../OnWall/Hugging")
+event = &"wall_hug"
+delay_in_seconds = "0.0"
+
 [node name="ToDoubleJump" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
 script = ExtResource("28_n7qhm")
 to = NodePath("../../DoubleJumpEnabled")
 event = &"enable_double_jump"
 delay_in_seconds = "0.0"
 
+[node name="OnWallJump" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Jump/DoubleJump")
+event = &"wall_jump"
+delay_in_seconds = "0.0"
+
 [node name="OnWall" type="Node" parent="StateChart/Root/Movement"]
 script = ExtResource("26_infe6")
 initial_state = NodePath("Hugging")
@@ -613,70 +895,66 @@ to = NodePath("../../Grounded")
 event = &"grounded"
 delay_in_seconds = "0.0"
 
+[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Airborne/Reset")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
+[node name="OnMantle" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../Mantling")
+event = &"mantle"
+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"]
+[node name="OnDash" 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")
+to = NodePath("../../../Dashing/Dash")
 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"]
+[node name="OnDash" type="Node" parent="StateChart/Root/Movement/OnWall/Hanging"]
 script = ExtResource("28_n7qhm")
-to = NodePath("../../Hugging")
+to = NodePath("../../../Dashing/Dash")
 event = &"dash"
 delay_in_seconds = "0.0"
 
-[connection signal="input_aim_canceled" from="InputController" to="." method="OnInputAimCanceled"]
+[node name="Running" type="Node" parent="StateChart/Root/Movement/OnWall"]
+script = ExtResource("27_34snm")
+
+[node name="OnLeaveWall" type="Node" parent="StateChart/Root/Movement/OnWall/Running"]
+script = ExtResource("28_n7qhm")
+to = NodePath("../../../Airborne/CoyoteEnabled")
+event = &"start_falling"
+delay_in_seconds = "0.0"
+
 [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_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_device_changed" from="InputController" to="." method="InputDeviceChanged"]
 [connection signal="input_hit" from="InputController" to="." method="OnInputHitPressed"]
 [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_move_keyboard" from="InputController" to="." method="OnInputMoveKeyboard"]
+[connection signal="input_parry" from="InputController" to="." method="OnInputParryPressed"]
 [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="input_slam" from="InputController" to="." method="OnInputSlamPressed"]
+[connection signal="input_slide_ended" from="InputController" to="." method="OnInputSlideEnded"]
+[connection signal="input_slide_started" from="InputController" to="." method="OnInputSlideStarted"]
 [connection signal="WallDetected" from="WallHugSystem" to="." method="OnWallDetected"]

player_controller/PlayerUi.cs

@@ -1,7 +1,7 @@
 using Godot;
 using System;
 
-public partial class PlayerUi : CanvasLayer
+public partial class PlayerUi : Control
 {
     private TextureRect[] _dashIcons = new TextureRect[3];
     
@@ -9,9 +9,9 @@ public partial class PlayerUi : CanvasLayer
     {
         base._Ready();
         
-        _dashIcons[0] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash1");
-        _dashIcons[1] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash2");
-        _dashIcons[2] = GetNode<TextureRect>("VBoxContainer/HBoxContainer/Dash3");
+        _dashIcons[0] = GetNode<TextureRect>("%Dash1");
+        _dashIcons[1] = GetNode<TextureRect>("%Dash2");
+        _dashIcons[2] = GetNode<TextureRect>("%Dash3");
     }
 
     public void SetNumberOfDashesLeft(int numberOfDashes)

player_controller/Scripts/CapsuleCollider.cs

@@ -40,17 +40,13 @@ public partial class CapsuleCollider : CollisionShape3D
         return Mathf.IsEqualApprox(_shape.Height, CapsuleCrouchHeight);
     }
 
-    public void Crouch(float delta, float crouchTransitionSpeed)
+    public void Crouch()
     {
-        _shape.Height -= delta * crouchTransitionSpeed;
-        
-        _shape.Height = Mathf.Clamp(_shape.Height, CapsuleCrouchHeight, CapsuleDefaultHeight);
+        _shape.Height = CapsuleCrouchHeight;
     }
 
-    public void UndoCrouching(float delta, float crouchTransitionSpeed)
+    public void Uncrouch()
     {
-        _shape.Height += delta * crouchTransitionSpeed;
-        
-        _shape.Height = Mathf.Clamp(_shape.Height, CapsuleCrouchHeight, CapsuleDefaultHeight);
+        _shape.Height = CapsuleDefaultHeight;
     }
 }

player_controller/Scripts/HealthSystem.cs

@@ -146,9 +146,6 @@ public partial class HealthSystem : Node3D
 		public CharacterBody3D Parent;
 		public Camera3D Camera;
 		public Node3D Head;
-		public ColorRect VignetteRect;
-		public ColorRect DistortionRect;
-		public ColorRect BlurRect;
 	}
 	
 	public void Init(HealthSystemInitParams initParams)
@@ -162,10 +159,6 @@ public partial class HealthSystem : Node3D
 		_camera = initParams.Camera;
 		
 		_head = initParams.Head;
-
-		_vignetteMaterial = initParams.VignetteRect.Material as ShaderMaterial;
-		_distortionMaterial = initParams.DistortionRect.Material as ShaderMaterial;
-		_blurMaterial = initParams.BlurRect.Material as ShaderMaterial;
 		
 		// Resetting shaders' parameters
 		

project.godot

@@ -146,6 +146,16 @@ aim_dash={
 
 locale/translations=PackedStringArray("res://addons/maaacks_game_template/base/translations/menus_translations.en.translation", "res://addons/maaacks_game_template/base/translations/menus_translations.fr.translation")
 
+[layer_names]
+
+3d_physics/layer_1="Player"
+3d_physics/layer_2="2"
+3d_physics/layer_3="3"
+3d_physics/layer_4="4"
+3d_physics/layer_5="enemies"
+3d_physics/layer_9="terrain"
+3d_physics/layer_17="weapon"
+
 [maaacks_game_template]
 
 disable_update_check=false
@@ -154,6 +164,7 @@ copy_path="res://scenes"
 
 [physics]
 
+3d/run_on_separate_thread=true
 common/physics_jitter_fix=0.0
 3d/physics_engine="Jolt Physics"
 common/physics_interpolation=true
@@ -161,5 +172,6 @@ common/physics_interpolation=true
 [rendering]
 
 textures/vram_compression/import_etc2_astc=true
+lights_and_shadows/directional_shadow/soft_shadow_filter_quality=5
 environment/volumetric_fog/volume_size=256
 environment/volumetric_fog/volume_depth=256

resource_definitions/RDamage.cs

@@ -0,0 +1,24 @@
+using Godot;
+using System;
+using Movementtests.systems.damage;
+
+[GlobalClass]
+public partial class RDamage : Resource
+{
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float DamageDealt = 1.0f;
+    
+    [Export]
+    public EDamageTypes DamageType = EDamageTypes.Normal;
+    
+    public RDamage()
+    {
+        DamageDealt = 1.0f;
+        DamageType = EDamageTypes.Normal;
+    }
+    public RDamage(float damageDealt, EDamageTypes damageType)
+    {
+        DamageDealt = damageDealt;
+        DamageType = damageType;
+    }
+}

resource_definitions/RDamage.cs.uid

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

resource_definitions/RDamageModifier.cs

@@ -0,0 +1,34 @@
+using Godot;
+using System;
+using Movementtests.interfaces;
+using Movementtests.systems.damage;
+
+[GlobalClass]
+public partial class RDamageModifier : Resource, IDamageable
+{
+    public event Action<IDamageable, float> DamageTaken;
+    
+    [Export]
+    public EDamageTypes DamageType = EDamageTypes.Normal;
+    [Export]
+    public float Modifier = 1.0f;
+    
+    public RDamageModifier()
+    {
+        Modifier = 1.0f;
+        DamageType = EDamageTypes.Normal;
+    }
+    public RDamageModifier(EDamageTypes damageType, float modifier)
+    {
+        Modifier = modifier;
+        DamageType = damageType;
+    }
+
+    public float TakeDamage(RDamage damage)
+    {
+        if (damage.DamageType != DamageType) return 0;
+        var finalDamage = damage.DamageDealt * Modifier;
+        DamageTaken?.Invoke(this, finalDamage);
+        return finalDamage;
+    }
+}

resource_definitions/RDamageModifier.cs.uid

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

resource_definitions/RDeathEffect.cs

@@ -0,0 +1,12 @@
+using Godot;
+using System;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class RDeathEffect : Resource, IKillable
+{
+    public void Kill(IHealthable source)
+    {
+        GD.Print($"Death Effect triggered on {source}");
+    }
+}

resource_definitions/RDeathEffect.cs.uid

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

resource_definitions/RHealth.cs

@@ -0,0 +1,20 @@
+using Godot;
+using System;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class RHealth : Resource
+{
+    [Export]
+    public float StartingHealth = 100.0f;
+    
+    public RHealth()
+    {
+        StartingHealth = 100.0f;
+    }
+    
+    public RHealth(float startingHealth)
+    {
+        StartingHealth = startingHealth;
+    }
+}

resource_definitions/RHealth.cs.uid

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

resource_definitions/RMovement.cs

@@ -0,0 +1,23 @@
+using Godot;
+using System;
+
+[GlobalClass]
+public partial class RMovement : Resource
+{
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float Speed;
+    
+    [Export(PropertyHint.Range, "0,20,1,or_greater")]
+    public float TargetHeight;
+
+    public RMovement()
+    {
+        Speed = 3.0f;
+        TargetHeight = 10.0f;
+    }
+    public RMovement(float speed, float targetHeight)
+    {
+        Speed = speed;
+        TargetHeight = targetHeight;
+    }
+}

resource_definitions/RMovement.cs.uid

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

scenes/damage/CDamageable.cs

@@ -0,0 +1,22 @@
+using Godot;
+using System;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class CDamageable : Node, IDamageable
+{
+    public event Action<IDamageable, float> DamageTaken;
+    
+    [Export]
+    public RDamageModifier[] DamageModifiers { get; set; }
+
+
+    public float TakeDamage(RDamage damage)
+    {
+        var finalDamage = 0f;
+        foreach (var damageable in DamageModifiers.ToIDamageables())
+            finalDamage += damageable.TakeDamage(damage);
+        DamageTaken?.Invoke(this, finalDamage);
+        return finalDamage;
+    }
+}

scenes/damage/CDamageable.cs.uid

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

scenes/damage/CDamageable.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://hpsg4fqwrx1u"]
+
+[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="1_qp8bd"]
+
+[node name="CDamageable" type="Node"]
+script = ExtResource("1_qp8bd")

scenes/enemies/Enemy.cs

@@ -0,0 +1,117 @@
+using System;
+using Godot;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class Enemy : CharacterBody3D, IDamageable, IDamageMaker, IHealthable, IKillable, IMoveable, ISpawnable
+{
+	public event Action<IDamageable, float> DamageTaken;
+	public event Action<IHealthable, float> HealthChanged;
+	public event Action<IHealthable> HealthDepleted;
+
+	[Export]
+	public Node3D Target { get; set; }
+	
+	[Export]
+	public Node CHealth { get; set; }
+	[Export]
+	public RHealth RHealth { get; set; }
+    
+	public float CurrentHealth { get; set; }
+	
+	[Export]
+	public Node CDamage { get; set; }
+
+	[Export]
+	public RDamage RDamage { get; set; }
+	
+	[Export]
+	public Node CMovement { get; set; }
+	[Export]
+	public RMovement RMovement { get; set; }
+
+
+	[Export]
+	public RDeathEffect[] DeathEffects { get; set; }
+	
+	private Area3D _damageBox;
+	
+	public override void _Ready()
+	{
+		Initialize();
+		SetupSignals();
+	}
+
+	public void Initialize()
+	{
+		_damageBox = GetNode<Area3D>("DamageBox");
+		
+		if (CMovement is IMoveable moveable && RMovement != null) moveable.RMovement = RMovement;
+		if (CHealth is IHealthable healthable && RHealth != null)
+		{
+			healthable.RHealth = RHealth;
+			healthable.CurrentHealth = RHealth.StartingHealth;
+		}
+	}
+
+	public void SetupSignals()
+	{
+		_damageBox.BodyEntered += OnDamageBoxTriggered;
+		if (CDamage is IDamageable damageable) damageable.DamageTaken += ReduceHealth;
+		if (CHealth is IHealthable healthable) healthable.HealthDepleted += Kill;
+	}
+	
+	public override void _PhysicsProcess(double delta)
+	{
+		var targetPlanar = new Vector3(Target.GlobalPosition.X, GlobalPosition.Y, Target.GlobalPosition.Z);
+		LookAt(targetPlanar);
+		
+		var inputs = new MovementInputs(
+			Velocity: Velocity,
+			TargetLocation: Target.GlobalPosition,
+			isOnFloor: IsOnFloor(),
+			gravity: GetGravity(),
+			delta: delta
+		);
+		Velocity = ComputeVelocity(inputs);
+		MoveAndSlide();
+	}
+	
+	public Vector3 ComputeVelocity(MovementInputs inputs)
+	{
+		if (CMovement is not IMoveable movement) return Vector3.Zero;
+		return movement!.ComputeVelocity(inputs);
+	}
+
+	public void OnDamageBoxTriggered(Node3D body)
+	{
+		GD.Print("Take this!");
+		if (body is not IDamageable damageable) return;
+		damageable.TakeDamage(RDamage);
+	}
+
+	public float TakeDamage(RDamage damage)
+	{
+		GD.Print("Ouch!");
+		if (CDamage is not IDamageable damageable) return 0;
+		
+		var finalDamage = damageable.TakeDamage(damage);
+		DamageTaken?.Invoke(this, damage.DamageDealt);
+		return finalDamage;
+	}
+
+	public void ReduceHealth(IDamageable source, float amount)
+	{
+		if (CHealth is not IHealthable healthable) return;
+		healthable.ReduceHealth(source, amount);
+	}
+
+	public void Kill(IHealthable source)
+	{
+		foreach (var killable in DeathEffects.ToIKillables())
+		{
+			killable.Kill(source);
+		}
+		QueueFree();
+	}
+}

scenes/enemies/Enemy.cs.uid

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

scenes/enemies/flying_enemy/flying_enemy.tscn

@@ -0,0 +1,104 @@
+[gd_scene load_steps=18 format=3 uid="uid://cmlud1hwkd6sv"]
+
+[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/Enemy.cs" id="1_q8l7o"]
+[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_1bsgx"]
+[ext_resource type="Resource" uid="uid://dg1xbjhyhgnnk" path="res://scenes/enemies/flying_enemy/flying_enemy_health.tres" id="2_ma2bq"]
+[ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy/flying_enemy_damage.tres" id="2_on7rt"]
+[ext_resource type="Resource" uid="uid://bwqjaom4k7rc3" path="res://scenes/enemies/flying_enemy/flying_enemy_movement.tres" id="4_dejyg"]
+[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="4_ys4jv"]
+[ext_resource type="PackedScene" uid="uid://dmw5ibwrb483f" path="res://scenes/movement/CFlyingMovement.tscn" id="7_vaeds"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="8_on7rt"]
+[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="8_uotso"]
+
+[sub_resource type="Resource" id="Resource_jnv07"]
+script = ExtResource("2_1bsgx")
+metadata/_custom_type_script = "uid://b6y3ugfydvch0"
+
+[sub_resource type="Resource" id="Resource_53j1c"]
+script = ExtResource("2_1bsgx")
+DamageType = 1
+metadata/_custom_type_script = "uid://b6y3ugfydvch0"
+
+[sub_resource type="Resource" id="Resource_on7rt"]
+script = ExtResource("8_on7rt")
+Speed = 3.0
+TargetHeight = 10.0
+metadata/_custom_type_script = "uid://dtpxijlnb2c5"
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_b46rq"]
+
+[sub_resource type="SphereMesh" id="SphereMesh_1bsgx"]
+
+[sub_resource type="SphereMesh" id="SphereMesh_4yfjf"]
+radius = 0.05
+height = 0.1
+radial_segments = 4
+rings = 4
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4yfjf"]
+albedo_color = Color(0.06469653, 0.06469653, 0.06469653, 1)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_4yfjf"]
+size = Vector3(1, 1, 1.5)
+
+[node name="FlyingEnemy" type="CharacterBody3D" node_paths=PackedStringArray("CHealth", "CDamage", "CMovement")]
+collision_layer = 16
+collision_mask = 273
+motion_mode = 1
+script = ExtResource("1_q8l7o")
+CHealth = NodePath("CHealth")
+RHealth = ExtResource("2_ma2bq")
+CDamage = NodePath("CDamageable")
+RDamage = ExtResource("2_on7rt")
+CMovement = NodePath("CFlyingMovement")
+RMovement = ExtResource("4_dejyg")
+DeathEffects = Array[Object]([])
+
+[node name="CHealth" type="Node" parent="."]
+script = ExtResource("4_ys4jv")
+RHealth = ExtResource("2_ma2bq")
+metadata/_custom_type_script = "uid://bjwrpv3jpsc1e"
+
+[node name="CDamageable" type="Node" parent="."]
+script = ExtResource("8_uotso")
+DamageModifiers = Array[Object]([SubResource("Resource_jnv07"), SubResource("Resource_53j1c")])
+metadata/_custom_type_script = "uid://b0u23nkpaimyc"
+
+[node name="CFlyingMovement" parent="." instance=ExtResource("7_vaeds")]
+RMovement = SubResource("Resource_on7rt")
+TerrainCollision = 256
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("SphereShape3D_b46rq")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+layers = 33
+mesh = SubResource("SphereMesh_1bsgx")
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, -0.5)
+layers = 33
+cast_shadow = 0
+ignore_occlusion_culling = true
+mesh = SubResource("SphereMesh_4yfjf")
+surface_material_override/0 = SubResource("StandardMaterial3D_4yfjf")
+
+[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 0, -0.5)
+layers = 33
+cast_shadow = 0
+ignore_occlusion_culling = true
+mesh = SubResource("SphereMesh_4yfjf")
+surface_material_override/0 = SubResource("StandardMaterial3D_4yfjf")
+
+[node name="GroundDistance" type="RayCast3D" parent="."]
+target_position = Vector3(0, 0, 0)
+collision_mask = 272
+
+[node name="DamageBox" type="Area3D" parent="."]
+collision_layer = 0
+monitorable = false
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="DamageBox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.75)
+shape = SubResource("BoxShape3D_4yfjf")

scenes/enemies/flying_enemy/flying_enemy_damage.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="RDamage" load_steps=2 format=3 uid="uid://dgo65k2ceqfvy"]
+
+[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="1_h6law"]
+
+[resource]
+script = ExtResource("1_h6law")
+DamageType = 3
+metadata/_custom_type_script = "uid://jitubgv6judn"

scenes/enemies/flying_enemy/flying_enemy_health.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="RHealth" load_steps=2 format=3 uid="uid://dg1xbjhyhgnnk"]
+
+[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="1_jht15"]
+
+[resource]
+script = ExtResource("1_jht15")
+StartingHealth = 50.0
+metadata/_custom_type_script = "uid://baiapod3csndf"

scenes/enemies/flying_enemy/flying_enemy_movement.tres

@@ -0,0 +1,9 @@
+[gd_resource type="Resource" script_class="RMovement" load_steps=2 format=3 uid="uid://bwqjaom4k7rc3"]
+
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="1_3yq0a"]
+
+[resource]
+script = ExtResource("1_3yq0a")
+Speed = 3.0
+TargetHeight = 10.0
+metadata/_custom_type_script = "uid://dtpxijlnb2c5"

scenes/enemies/grounded_enemy/grounded_enemy.tscn

@@ -0,0 +1,100 @@
+[gd_scene load_steps=17 format=3 uid="uid://dxt0e2ugmttqq"]
+
+[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/Enemy.cs" id="1_r6506"]
+[ext_resource type="Resource" uid="uid://otfc2snh8umc" path="res://scenes/enemies/grounded_enemy/grounded_enemy_damage.tres" id="2_bn56u"]
+[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="2_gsmti"]
+[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_r3cnf"]
+[ext_resource type="Resource" uid="uid://bohbojc68j7y1" path="res://scenes/enemies/grounded_enemy/grounded_enemy_health.tres" id="2_w4lm8"]
+[ext_resource type="Resource" uid="uid://bqq6uukbdfysr" path="res://scenes/enemies/grounded_enemy/grounded_enemy_movement.tres" id="4_na24f"]
+[ext_resource type="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="7_1tw73"]
+[ext_resource type="PackedScene" uid="uid://dbr7ioio158ew" path="res://scenes/movement/CGroundedMovement.tscn" id="7_qyswd"]
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="8_6d4gl"]
+
+[sub_resource type="Resource" id="Resource_qj0ob"]
+script = ExtResource("2_r3cnf")
+metadata/_custom_type_script = "uid://b6y3ugfydvch0"
+
+[sub_resource type="Resource" id="Resource_6d4gl"]
+script = ExtResource("8_6d4gl")
+Speed = 5.0
+metadata/_custom_type_script = "uid://dtpxijlnb2c5"
+
+[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_62kkh"]
+
+[sub_resource type="CapsuleMesh" id="CapsuleMesh_3uydm"]
+
+[sub_resource type="SphereMesh" id="SphereMesh_4yfjf"]
+radius = 0.05
+height = 0.1
+radial_segments = 4
+rings = 4
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_4yfjf"]
+albedo_color = Color(0.06469653, 0.06469653, 0.06469653, 1)
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_4yfjf"]
+size = Vector3(1, 2, 2)
+
+[node name="GroundedEnemy" type="CharacterBody3D" node_paths=PackedStringArray("CHealth", "CDamage", "CMovement")]
+collision_layer = 16
+collision_mask = 273
+script = ExtResource("1_r6506")
+CHealth = NodePath("CHealth")
+RHealth = ExtResource("2_w4lm8")
+CDamage = NodePath("CDamageable")
+RDamage = ExtResource("2_bn56u")
+CMovement = NodePath("CGroundedMovement")
+RMovement = ExtResource("4_na24f")
+DeathEffects = Array[Object]([])
+
+[node name="CHealth" type="Node" parent="."]
+script = ExtResource("2_gsmti")
+RHealth = ExtResource("2_w4lm8")
+metadata/_custom_type_script = "uid://bjwrpv3jpsc1e"
+
+[node name="CDamageable" type="Node" parent="."]
+script = ExtResource("7_1tw73")
+DamageModifiers = Array[Object]([SubResource("Resource_qj0ob")])
+metadata/_custom_type_script = "uid://b0u23nkpaimyc"
+
+[node name="CGroundedMovement" parent="." node_paths=PackedStringArray("WallInFrontRayCast") instance=ExtResource("7_qyswd")]
+RMovement = SubResource("Resource_6d4gl")
+WallInFrontRayCast = NodePath("../WallInFrontRayCast")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
+shape = SubResource("CapsuleShape3D_62kkh")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
+layers = 33
+mesh = SubResource("CapsuleMesh_3uydm")
+
+[node name="MeshInstance3D2" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 1.5, -0.5)
+layers = 33
+cast_shadow = 0
+ignore_occlusion_culling = true
+mesh = SubResource("SphereMesh_4yfjf")
+surface_material_override/0 = SubResource("StandardMaterial3D_4yfjf")
+
+[node name="MeshInstance3D3" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.2, 1.5, -0.5)
+layers = 33
+cast_shadow = 0
+ignore_occlusion_culling = true
+mesh = SubResource("SphereMesh_4yfjf")
+surface_material_override/0 = SubResource("StandardMaterial3D_4yfjf")
+
+[node name="WallInFrontRayCast" type="RayCast3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0)
+target_position = Vector3(0, 0, -1.5)
+collision_mask = 272
+
+[node name="DamageBox" type="Area3D" parent="."]
+collision_layer = 0
+monitorable = false
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="DamageBox"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -0.5)
+shape = SubResource("BoxShape3D_4yfjf")

scenes/enemies/grounded_enemy/grounded_enemy_damage.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="RDamage" load_steps=2 format=3 uid="uid://otfc2snh8umc"]
+
+[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="1_y415a"]
+
+[resource]
+script = ExtResource("1_y415a")
+DamageDealt = 2.0
+metadata/_custom_type_script = "uid://jitubgv6judn"

scenes/enemies/grounded_enemy/grounded_enemy_health.tres

@@ -0,0 +1,7 @@
+[gd_resource type="Resource" script_class="RHealth" load_steps=2 format=3 uid="uid://bohbojc68j7y1"]
+
+[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="1_h6jgd"]
+
+[resource]
+script = ExtResource("1_h6jgd")
+metadata/_custom_type_script = "uid://baiapod3csndf"

scenes/enemies/grounded_enemy/grounded_enemy_movement.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="RMovement" load_steps=2 format=3 uid="uid://bqq6uukbdfysr"]
+
+[ext_resource type="Script" uid="uid://dtpxijlnb2c5" path="res://resource_definitions/RMovement.cs" id="1_hsy8g"]
+
+[resource]
+script = ExtResource("1_hsy8g")
+Speed = 5.0
+metadata/_custom_type_script = "uid://dtpxijlnb2c5"

scenes/health/CHealth.cs

@@ -0,0 +1,33 @@
+using Godot;
+using System;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class CHealth : Node, IHealthable
+{
+    public event Action<IHealthable, float> HealthChanged;
+    public event Action<IHealthable> HealthDepleted;
+    
+    [Export]
+    public RHealth RHealth { get; set; }
+    
+    public float CurrentHealth { get; set; }
+
+    public override void _Ready()
+    {
+        CurrentHealth = RHealth.StartingHealth;
+    }
+
+    public void ReduceHealth(IDamageable source, float amount)
+    {
+        GD.Print(CurrentHealth);
+        CurrentHealth -= amount;
+        HealthChanged?.Invoke(this, CurrentHealth);
+
+        if (CurrentHealth <= 0)
+        {
+            CurrentHealth = 0;
+            HealthDepleted?.Invoke(this);
+        }
+    }
+}

scenes/health/CHealth.cs.uid

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

scenes/health/CHealth.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://c4ikbhojckpnc"]
+
+[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="1_75uyt"]
+
+[node name="CHealth" type="Node"]
+script = ExtResource("1_75uyt")

scenes/movement/CFlyingMovement.cs

@@ -0,0 +1,61 @@
+using Godot;
+using Movementtests.interfaces;
+
+namespace Movementtests.scenes.movement;
+
+public partial class CFlyingMovement : Node3D, IMoveable
+{
+    [Export] public RMovement RMovement { get; set; }
+
+    [Export(PropertyHint.Layers3DPhysics)]
+    public uint TerrainCollision { get; set; } = 1;
+    
+    private bool _movingToDesiredHeight = true;
+    private Vector3 _randomDirection;
+
+    public override void _Ready()
+    {
+        _randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
+    }
+
+    public Vector3 ComputeVelocity(MovementInputs inputs)
+    {
+        var velocity = inputs.Velocity;
+        var spaceState = GetWorld3D().DirectSpaceState;
+        var target = inputs.TargetLocation;
+        var direction = (target - GlobalPosition).Normalized();
+        // Check if we have a direct line of sight to the player
+        if (!_movingToDesiredHeight)
+        {
+            velocity = direction * RMovement.Speed;
+			
+            var query = PhysicsRayQueryParameters3D.Create(GlobalPosition, target, TerrainCollision);
+            var result = spaceState.IntersectRay(query);
+            if (result.Count > 0)
+            {
+                _movingToDesiredHeight = true;
+                _randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
+            }
+        }
+        else
+        {
+            velocity = _randomDirection * RMovement.Speed;
+			
+            var groundQuery = PhysicsRayQueryParameters3D.Create(GlobalPosition, GlobalPosition+Vector3.Down*RMovement.TargetHeight, TerrainCollision);
+            var groundResult = spaceState.IntersectRay(groundQuery);
+            if (groundResult.Count == 0)
+            {
+                velocity.Y = 0;
+			
+                var query = PhysicsRayQueryParameters3D.Create(GlobalPosition, target, TerrainCollision);
+                var result = spaceState.IntersectRay(query);
+                if (result.Count == 0)
+                {
+                    _movingToDesiredHeight = false;
+                }
+            }
+        }
+
+        return velocity;
+    }
+}

scenes/movement/CFlyingMovement.cs.uid

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

scenes/movement/CFlyingMovement.tscn

@@ -0,0 +1,7 @@
+[gd_scene load_steps=2 format=3 uid="uid://dmw5ibwrb483f"]
+
+[ext_resource type="Script" uid="uid://cps1rbkxs3nvq" path="res://scenes/movement/CFlyingMovement.cs" id="1_i26q2"]
+
+[node name="CFlyingMovement" type="Node3D"]
+script = ExtResource("1_i26q2")
+CollisionMask = 256

scenes/movement/CGroundedMovement.cs

@@ -0,0 +1,33 @@
+using Godot;
+using Movementtests.interfaces;
+
+namespace Movementtests.scenes.movement;
+
+public partial class CGroundedMovement : Node3D, IMoveable
+{
+    [Export] public RMovement RMovement { get; set; }
+
+    [Export]
+    public RayCast3D WallInFrontRayCast { get; set; }
+    
+    
+    public Vector3 ComputeVelocity(MovementInputs inputs)
+    {
+        var velocity = inputs.Velocity;
+        var target = inputs.TargetLocation;
+        var direction = (target - GlobalPosition).Normalized();
+
+        var targetPlane = new Vector3(target.X, GlobalPosition.Y, target.Z);
+        LookAt(targetPlane);
+		
+        velocity.X = direction.X * RMovement.Speed;
+        velocity.Z = direction.Z * RMovement.Speed;
+
+        if (WallInFrontRayCast.IsColliding())
+            velocity.Y = RMovement.Speed;
+        else if (!inputs.isOnFloor)
+            velocity += inputs.gravity * (float)inputs.delta;
+
+        return velocity;
+    }
+}

scenes/movement/CGroundedMovement.cs.uid

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

scenes/movement/CGroundedMovement.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://dbr7ioio158ew"]
+
+[ext_resource type="Script" uid="uid://bdag2eeixw2lt" path="res://scenes/movement/CGroundedMovement.cs" id="1_e0agf"]
+
+[node name="CGroundedMovement" type="Node3D"]
+script = ExtResource("1_e0agf")

scenes/path/Path.cs

@@ -0,0 +1,25 @@
+using Godot;
+
+public partial class Path : Path3D
+{
+    public PathFollow3D PathFollow { get; private set; }
+    public Marker3D Target { get; private set; }
+
+    public override void _Ready()
+    {
+        PathFollow = GetNode<PathFollow3D>("PathFollow");
+        Target = GetNode<Marker3D>("PathFollow/Target");
+    }
+
+    public void Setup(Transform3D globalTransform, Curve3D curve)
+    {
+        SetGlobalTransform(globalTransform);
+        SetCurve(curve);
+        PathFollow.ProgressRatio = 0;
+    }
+    
+    public void Teardown()
+    {
+        if (!IsQueuedForDeletion()) QueueFree();
+    }
+}

scenes/path/Path.cs.uid

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

scenes/path/path.tscn

@@ -0,0 +1,13 @@
+[gd_scene load_steps=3 format=3 uid="uid://cf3rrgr1imvv4"]
+
+[ext_resource type="Script" uid="uid://djdr5bvfc8f0x" path="res://scenes/path/Path.cs" id="1_kmlhi"]
+
+[sub_resource type="Curve3D" id="Curve3D_u4rfr"]
+
+[node name="Path" type="Path3D"]
+curve = SubResource("Curve3D_u4rfr")
+script = ExtResource("1_kmlhi")
+
+[node name="PathFollow" type="PathFollow3D" parent="."]
+
+[node name="Target" type="Marker3D" parent="PathFollow"]

scenes/spawners/Spawner.cs

@@ -0,0 +1,69 @@
+using Godot;
+using System;
+
+public partial class Spawner : Node3D
+{
+	[Export(PropertyHint.NodeType)]
+	public PackedScene EnemyToSpawn { get; set; }
+	
+	[Export]
+	public RMovement MovementInputs { get; set; }
+	[Export]
+	public RHealth HealthInputs { get; set; }
+	[Export]
+	public RDamage DamageInputs { get; set; }
+	
+	[Export]
+	public Node3D Target { get; set; }
+	
+	[Export(PropertyHint.Range, "0.1, 100, 0.1, or_greater")]
+	public float SpawnInterval { get; set; } = 1.0f;
+	[Export]
+	public bool IsActiveOnStart { get; set; } = true;
+	
+	private float _spawnTimer;
+	private bool _isActive;
+	
+	public override void _Ready()
+	{
+		_isActive = IsActiveOnStart;
+		_spawnTimer = SpawnInterval;
+	}
+
+	public override void _Process(double delta)
+	{
+		if (!_isActive) return;
+		
+		_spawnTimer -= (float) delta;
+		if (_spawnTimer <= 0) Spawn(); 
+	}
+
+	public void Spawn()
+	{
+		if (EnemyToSpawn == null || !EnemyToSpawn.CanInstantiate()) return;
+
+		if (EnemyToSpawn.Instantiate() is not Enemy spawnedInstance) return;
+
+		spawnedInstance.Target = Target;
+		spawnedInstance.RMovement = MovementInputs;
+		spawnedInstance.RDamage = DamageInputs;
+		spawnedInstance.RHealth = HealthInputs;
+		spawnedInstance.Initialize();
+
+		GetTree().GetCurrentScene().AddChild(spawnedInstance);
+		spawnedInstance.GlobalPosition = GlobalPosition;
+		
+		_spawnTimer = SpawnInterval;
+	}
+	
+	public void StartSpawning()
+	{
+		_isActive = true;
+		_spawnTimer = SpawnInterval;
+	}
+	
+	public void StopSpawning()
+	{
+		_isActive = false;
+	}
+}

scenes/spawners/Spawner.cs.uid

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

scenes/spawners/spawner.tscn

@@ -0,0 +1,10 @@
+[gd_scene load_steps=3 format=3 uid="uid://c305mfrtumcyq"]
+
+[ext_resource type="Script" uid="uid://djyspwixi01j5" path="res://scenes/spawners/Spawner.cs" id="1_2otbo"]
+[ext_resource type="PackedScene" uid="uid://dxt0e2ugmttqq" path="res://scenes/enemies/grounded_enemy/grounded_enemy.tscn" id="2_2otbo"]
+
+[node name="Spawner" type="Node3D"]
+script = ExtResource("1_2otbo")
+SceneToSpawn = ExtResource("2_2otbo")
+
+[node name="Marker3D" type="Marker3D" parent="."]

scenes/tuto_trigger/TutoTrigger.tscn

@@ -0,0 +1,69 @@
+[gd_scene load_steps=4 format=3 uid="uid://b8aet6m4m2i83"]
+
+[ext_resource type="Script" uid="uid://bnqhh6b5iusam" path="res://scenes/tuto_trigger/tuto_trigger.gd" id="1_w8mpv"]
+
+[sub_resource type="LabelSettings" id="LabelSettings_4vbx1"]
+font_size = 30
+
+[sub_resource type="LabelSettings" id="LabelSettings_g04tr"]
+font_size = 30
+
+[node name="TutoTrigger" type="Area3D"]
+collision_layer = 0
+script = ExtResource("1_w8mpv")
+
+[node name="Control" type="Control" parent="."]
+visible = false
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="PanelContainer" type="PanelContainer" parent="Control"]
+layout_mode = 1
+anchors_preset = -1
+anchor_left = 0.5
+anchor_top = 0.7
+anchor_right = 0.5
+anchor_bottom = 0.7
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="MarginContainer" type="MarginContainer" parent="Control/PanelContainer"]
+layout_mode = 2
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="HBoxContainer" type="HBoxContainer" parent="Control/PanelContainer/MarginContainer"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="MultipleInputsContainer" type="HBoxContainer" parent="Control/PanelContainer/MarginContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+theme_override_constants/separation = 0
+
+[node name="FirstInput" type="TextureRect" parent="Control/PanelContainer/MarginContainer/HBoxContainer/MultipleInputsContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="ComplexInputLabel" type="Label" parent="Control/PanelContainer/MarginContainer/HBoxContainer/MultipleInputsContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+label_settings = SubResource("LabelSettings_4vbx1")
+
+[node name="SecondInput" type="TextureRect" parent="Control/PanelContainer/MarginContainer/HBoxContainer/MultipleInputsContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+
+[node name="TutoText" type="Label" parent="Control/PanelContainer/MarginContainer/HBoxContainer"]
+unique_name_in_owner = true
+layout_mode = 2
+label_settings = SubResource("LabelSettings_g04tr")
+
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]
+[connection signal="body_exited" from="." to="." method="_on_body_exited"]

scenes/tuto_trigger/tuto_trigger.gd

@@ -0,0 +1,37 @@
+extends Area3D
+
+@onready var control: Control = $Control
+
+@onready var multiple_inputs_container: HBoxContainer = %MultipleInputsContainer
+@onready var first_input: TextureRect = %FirstInput
+@onready var complex_input_label: Label = %ComplexInputLabel
+@onready var second_input: TextureRect = %SecondInput
+@onready var tuto_label: Label = %TutoText
+
+
+@export var first_input_texture: CompressedTexture2D
+@export var second_input_texture: CompressedTexture2D
+@export var complex_input_text: String
+@export var tuto_text: String
+
+
+func _ready() -> void:
+	tuto_label.text = tuto_text
+	first_input.texture = first_input_texture
+	second_input.texture = second_input_texture
+	complex_input_label.text = complex_input_text
+	
+	if second_input_texture != null:
+		complex_input_label.text = "+"
+	
+	if second_input_texture == null and complex_input_text.is_empty():
+		complex_input_label.visible = false
+		second_input.visible = false
+
+
+func _on_body_entered(body: Node3D) -> void:
+	control.visible = true
+
+
+func _on_body_exited(body: Node3D) -> void:
+	control.visible = false

scenes/tuto_trigger/tuto_trigger.gd.uid

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

systems/damage/EDamageTypes.cs

@@ -0,0 +1,9 @@
+namespace Movementtests.systems.damage;
+
+public enum EDamageTypes
+{
+    Normal,
+    Fire,
+    Ice,
+    Explosion,
+}

systems/damage/EDamageTypes.cs.uid

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

systems/dash/DashSystem.cs

@@ -20,19 +20,17 @@ public partial class DashSystem: Node3D
     
     public bool ShouldMantle { get; set; }
     public Vector3 PlannedMantleLocation { get; set; }
+    public MantleSystem MantleSystem { get; set; }
         
     private Node3D _head;
     private ShapeCast3D _dashCast3D;
-    private ShapeCast3D _playerCast3D;
     private Camera3D _camera;
-    private TweenQueueSystem _tweenQueueSystem;
     private Vector3 _dashDirection = Vector3.Zero;
     
     private ShapeCast3D _dashCastDrop;
     private MeshInstance3D _dashDropIndicator;
     private MeshInstance3D _dashDropLocationIndicator;
 
-    private MantleSystem _mantleSystem;
     private MeshInstance3D _dashTarget;
     private CpuParticles3D _dashIndicator;
     private AnimationPlayer _dashIndicatorAnim;
@@ -48,13 +46,10 @@ public partial class DashSystem: Node3D
     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)
+    public void Init(Node3D head, Camera3D camera)
     {
         _dashCast3D = GetNode<ShapeCast3D>("DashCast3D");
         var dashShape = _dashCast3D.GetShape() as SphereShape3D;
@@ -66,17 +61,11 @@ public partial class DashSystem: Node3D
         _dashDropLocationIndicator = GetNode<MeshInstance3D>("DashDropLocationIndicator");
         _dashDropLocationIndicator.Visible = false;
         
-        _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();
+        MantleSystem = GetNode<MantleSystem>("MantleSystem");
+        MantleSystem.Init();
         
         _dashTarget = GetNode<MeshInstance3D>("DashTarget");
         _dashTarget.SetVisible(false);
@@ -111,14 +100,15 @@ public partial class DashSystem: Node3D
 
         (HasHit, PlannedLocation, CollisionPoint, CollisionNormal) = ComputeDashLocation();
         
-        ShouldMantle = false;
-        var mantleLocation = Vector3.Zero;
-        if (HasHit && Mathf.Abs(CollisionNormal.Y) < 0.5f)
-        {
-            var mantleResult = _mantleSystem.FindMantleLocationAtPoint(PlannedLocation, CollisionNormal);
-            ShouldMantle = mantleResult.IsSome(out mantleLocation);
-        }
-        PlannedMantleLocation = mantleLocation;
+        // TODO: Position mantle system to planned location, aligned with ground planned and facing the same way as the dash
+        // Then query it being careful when dashing underneath a platform and such
+        MantleSystem.SetGlobalPosition(PlannedLocation);
+        MantleSystem.SetRotation(new Vector3(
+            MantleSystem.Rotation.X,
+            _head.Rotation.Y,   
+            MantleSystem.Rotation.Z));
+        MantleSystem.ProcessMantle(false);
+        ShouldMantle = MantleSystem.IsMantlePossible;
         
         // Setup dash target
         var targetColor = HasHit ? new Color(1f, 0.2f, 0.2f) : new Color(1f, 1f, 1f);
@@ -126,7 +116,7 @@ public partial class DashSystem: Node3D
         var targetMaterial = (StandardMaterial3D) _dashTarget.GetSurfaceOverrideMaterial(0);
         targetMaterial.SetAlbedo(targetColor);
         _dashTarget.SetVisible(true);
-        var targetLocation = ShouldMantle ? PlannedMantleLocation : PlannedLocation;
+        var targetLocation = ShouldMantle ? MantleSystem.FirstMantleProfilePoint : PlannedLocation;
         _dashTarget.SetGlobalPosition(targetLocation);
         
         var shouldShowDropIndicator = !HasHit && !ShouldMantle;
@@ -162,6 +152,5 @@ public partial class DashSystem: Node3D
     public void StartPreparingDash()
     {
         _dashTarget.SetVisible(true);
-        
     }
 }

systems/dash/dash_system.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=10 format=3 uid="uid://cqduhd4opgwvm"]
+[gd_scene load_steps=9 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"]
 
@@ -24,19 +23,12 @@ outer_radius = 0.5
 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.6, 0)
 shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -12)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
 
 [node name="DashCastDrop" type="ShapeCast3D" parent="."]
@@ -44,7 +36,7 @@ transform = Transform3D(1, 0, 0, 0, -4.371139e-08, 1, 0, -1, -4.371139e-08, 0, 1
 shape = SubResource("SphereShape3D_jngg2")
 target_position = Vector3(0, 0, -50)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
 
 [node name="DashTarget" type="MeshInstance3D" parent="."]

systems/head/HeadSystem.cs

@@ -1,5 +1,6 @@
 using System;
 using Godot;
+using RustyOptions;
 
 namespace Movementtests.systems;
 
@@ -7,18 +8,48 @@ public partial class HeadSystem : Node3D
 {
     private Camera3D _camera;
     private Marker3D _cameraAnchor;
+    private AnimationPlayer _animationPlayer;
 	
     [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
     public float LookSensitivity { get; set; } = 1f;
+	
+    [Export(PropertyHint.Range, "0.1,50,0.1,or_greater")]
+    public double CameraInclineAcceleration { get; set; } = 10f;
+	
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float WallRunCameraIncline { get; set; } = 5f;
+	
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float GroundedCameraIncline { get; set; } = 5f;
+    
+    [Export(PropertyHint.Range, "0,2,0.1,or_greater")]
+    public float SlidingCameraHeightOffset { get; set; } = 1.0f;
+    
+    [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
+    public float SlidingJitterFrequency { get; set; } = 0.01f;
+    
+    [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
+    public float SlidingJitterAmplitude { get; set; } = 0.1f;
+    
+    private FastNoiseLite _slidingNoise = new FastNoiseLite();
     
     public void Init()
     {
         Input.SetMouseMode(Input.MouseModeEnum.Captured);
         _camera = GetNode<Camera3D>("CameraSmooth/Camera3D");
         _cameraAnchor = GetNode<Marker3D>("CameraAnchor");
+        _animationPlayer = GetNode<AnimationPlayer>("AnimationPlayer");
+
+        _slidingNoise.NoiseType = FastNoiseLite.NoiseTypeEnum.Perlin;
+        _slidingNoise.SetFrequency(SlidingJitterFrequency);
     }
 
-    public void LookAround(Vector2 lookDir, float sensitivitMultiplier = 1f)
+    public void OnMantle()
+    {
+        _animationPlayer.Play("mantle");
+    }
+
+    public void LookAround(double delta, Vector2 lookDir, Vector3 playerInput, Vector3 playerVelocity, Vector3? wallContactPoint = null, float sensitivitMultiplier = 1f, bool isSliding = false)
     {
         // Horizontal movement of head
         float angleForHorizontalRotation = lookDir.X * LookSensitivity * sensitivitMultiplier;
@@ -28,11 +59,46 @@ public partial class HeadSystem : Node3D
         Vector3 currentCameraRotation = _cameraAnchor.Rotation;
         currentCameraRotation.X += Convert.ToSingle(lookDir.Y * LookSensitivity * sensitivitMultiplier);
         currentCameraRotation.X = Mathf.Clamp(currentCameraRotation.X, Mathf.DegToRad(-90f), Mathf.DegToRad(90f));
+        
+        // Camera incline on Wall and more
+        var isWallRunning = wallContactPoint.HasValue && wallContactPoint.Value.Length() > Mathf.Epsilon;
+        float cameraIncline;
+        if (isWallRunning)
+        {
+            var directionToWall = (wallContactPoint.Value - GlobalPosition).Normalized();
+            var cameraInclineFactor = ComputeCameraInclineFactor(directionToWall);
+            cameraIncline = Mathf.DegToRad(WallRunCameraIncline * cameraInclineFactor);
+        }
+        else
+        {
+            var cameraInclineFactor = ComputeCameraInclineFactor(playerInput);
+            cameraIncline = Mathf.DegToRad(GroundedCameraIncline * cameraInclineFactor * -1.0f);
+        }
+        currentCameraRotation.Z = (float) Mathf.Lerp(currentCameraRotation.Z, cameraIncline, delta * CameraInclineAcceleration);
         _cameraAnchor.Rotation = currentCameraRotation;
+
+        if (isSliding)
+        {
+            _cameraAnchor.Position = Vector3.Down*SlidingCameraHeightOffset;
+            float noise1D = _slidingNoise.GetNoise1D(Time.GetTicksMsec());
+            float noiseAmplitude = SlidingJitterAmplitude*Mathf.Clamp(playerVelocity.Length(), 0f, 1f);
+            _cameraAnchor.Position += Vector3.Up*noise1D*noiseAmplitude;
+        }
+        else
+        {
+            _cameraAnchor.Position = Vector3.Zero;
+        }
         
         _camera.GlobalTransform = _cameraAnchor.GetGlobalTransformInterpolated();
     }
 
+    public float ComputeCameraInclineFactor(Vector3 direction)
+    {
+        var forward = GetForwardHorizontalVector().Normalized();
+        var crossProduct = forward.Cross(direction);
+        return crossProduct.Length()*Mathf.Sign(crossProduct.Y);
+    }
+
     public Vector3 GetForwardHorizontalVector()
     {
         return GetGlobalTransform().Basis.Z;

systems/head/head_system.tscn

@@ -1,14 +1,63 @@
-[gd_scene load_steps=6 format=3 uid="uid://0ysqmqphq6mq"]
+[gd_scene load_steps=5 format=3 uid="uid://0ysqmqphq6mq"]
 
 [ext_resource type="Script" uid="uid://dtkdrnsmlwm67" path="res://systems/head/HeadSystem.cs" id="1_8abgy"]
-[ext_resource type="Material" uid="uid://dtq8i1ka1f2pn" path="res://player_controller/Assets/Materials/Health/CameraVignette.tres" id="2_urko7"]
-[ext_resource type="Material" uid="uid://nyh5tn1yoxeu" path="res://player_controller/Assets/Materials/Health/CameraDistortion.tres" id="3_0hyrq"]
-[ext_resource type="Shader" uid="uid://btw6vsb6sa7sn" path="res://player_controller/Shaders/Blur.gdshader" id="4_ubhf8"]
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_o1np4"]
-shader = ExtResource("4_ubhf8")
-shader_parameter/limit = 0.0
-shader_parameter/blur = 0.0
+[sub_resource type="Animation" id="Animation_urko7"]
+length = 0.001
+tracks/0/type = "bezier"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("..:rotation:x")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"handle_modes": PackedInt32Array(0),
+"points": PackedFloat32Array(0, -0.15, 0, 0.15, 0),
+"times": PackedFloat32Array(0)
+}
+tracks/1/type = "bezier"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("..:rotation:z")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"handle_modes": PackedInt32Array(0),
+"points": PackedFloat32Array(0, -0.15, 0, 0.15, 0),
+"times": PackedFloat32Array(0)
+}
+
+[sub_resource type="Animation" id="Animation_8abgy"]
+resource_name = "mantle"
+length = 0.3
+tracks/0/type = "bezier"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("..:rotation:x")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"handle_modes": PackedInt32Array(2, 2, 2),
+"points": PackedFloat32Array(0, 0, 0, 0.050000004, 0, -0.17453292, -0.050000004, 0, 0.050000004, 0, 0, -0.050000004, 0, 0, 0),
+"times": PackedFloat32Array(0, 0.15, 0.3)
+}
+tracks/1/type = "bezier"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("..:rotation:z")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"handle_modes": PackedInt32Array(2, 2, 2, 2),
+"points": PackedFloat32Array(0.00011616433, 0, 0, 0.033333335, 0, -0.05235988, -0.033333335, 0, 0.033333335, 0, 0.05235988, -0.033333335, 0, 0.03333334, 0, 0, -0.03333334, 0, 0, 0),
+"times": PackedFloat32Array(0, 0.1, 0.2, 0.3)
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_0hyrq"]
+_data = {
+&"RESET": SubResource("Animation_urko7"),
+&"mantle": SubResource("Animation_8abgy")
+}
 
 [node name="HeadSystem" type="Node3D"]
 script = ExtResource("1_8abgy")
@@ -16,46 +65,14 @@ script = ExtResource("1_8abgy")
 [node name="CameraSmooth" type="Node3D" parent="."]
 
 [node name="Camera3D" type="Camera3D" parent="CameraSmooth"]
+transform = Transform3D(1, 0, 0, 0, 0.99999994, 0, 0, 0, 0.99999994, 0, 0, 0)
 current = true
 fov = 90.0
 
-[node name="CLVignette(Layer_1)" type="CanvasLayer" parent="CameraSmooth/Camera3D"]
-
-[node name="HealthVignetteRect" type="ColorRect" parent="CameraSmooth/Camera3D/CLVignette(Layer_1)"]
-material = ExtResource("2_urko7")
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-
-[node name="CLDistortion(Layer_2)" type="CanvasLayer" parent="CameraSmooth/Camera3D"]
-layer = 2
-
-[node name="HealthDistortionRect" type="ColorRect" parent="CameraSmooth/Camera3D/CLDistortion(Layer_2)"]
-material = ExtResource("3_0hyrq")
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-
-[node name="CLBlur(Layer_2)" type="CanvasLayer" parent="CameraSmooth/Camera3D"]
-layer = 2
-
-[node name="BlurRect" type="ColorRect" parent="CameraSmooth/Camera3D/CLBlur(Layer_2)"]
-material = SubResource("ShaderMaterial_o1np4")
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-mouse_filter = 2
-
-[node name="RayCast3D" type="RayCast3D" parent="CameraSmooth/Camera3D"]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, -0.64723)
-visible = false
-
 [node name="CameraAnchor" type="Marker3D" parent="."]
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+root_node = NodePath("../CameraSmooth/Camera3D")
+libraries = {
+&"": SubResource("AnimationLibrary_0hyrq")
+}

systems/inputs/base_mode/aim_cancel.tres

@@ -1,14 +0,0 @@
-[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://7wm8ywvujwf"]
-
-[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_36r6u"]
-
-[resource]
-script = ExtResource("1_36r6u")
-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=102 format=3 uid="uid://bl5crtu1gkrtr"]
+[gd_resource type="Resource" script_class="GUIDEMappingContext" load_steps=161 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"]
@@ -12,25 +12,32 @@
 [ext_resource type="Script" uid="uid://bbhoxsiqwo07l" path="res://addons/guide/inputs/guide_input_joy_axis_1d.gd" id="10_cvxqo"]
 [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="Script" uid="uid://b6bwb7ie85kl1" path="res://addons/guide/inputs/guide_input_mouse_axis_1d.gd" id="13_j3axn"]
 [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://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="Script" uid="uid://cgy4anjdob2tp" path="res://addons/guide/modifiers/guide_modifier_window_relative.gd" id="15_rvpjj"]
 [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://vgjlx6p007lp" path="res://addons/guide/inputs/guide_input_mouse_button.gd" id="17_kxb2c"]
 [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/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://bbce5wfwxpns1" path="res://systems/inputs/base_mode/slide_pressed.tres" id="23_rvpjj"]
+[ext_resource type="Resource" uid="uid://b334rau1yxmm7" path="res://systems/inputs/base_mode/slide_released.tres" id="25_rvpjj"]
 [ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="25_si4d4"]
 [ext_resource type="Resource" uid="uid://dgluj0ql5vth7" path="res://systems/inputs/base_mode/pause.tres" id="29_q86qg"]
 [ext_resource type="Script" uid="uid://cw71o87tvdx3q" path="res://addons/guide/inputs/guide_input_key.gd" id="30_cvxqo"]
+[ext_resource type="Resource" uid="uid://spo3pbqjx0eb" path="res://systems/inputs/base_mode/parry.tres" id="30_rvpjj"]
+[ext_resource type="Resource" uid="uid://dxy0071ic1wdj" path="res://systems/inputs/base_mode/slam.tres" id="32_s8kjn"]
+[ext_resource type="Resource" uid="uid://s1l0n1iitc6m" path="res://systems/inputs/base_mode/move_back.tres" id="33_fykw6"]
+[ext_resource type="Resource" uid="uid://brswsknpgwal2" path="res://systems/inputs/base_mode/move_front.tres" id="34_rvpjj"]
+[ext_resource type="Resource" uid="uid://f3vs6l4m623s" path="res://systems/inputs/base_mode/move_left.tres" id="35_s8kjn"]
+[ext_resource type="Resource" uid="uid://t612lts1wi1s" path="res://systems/inputs/base_mode/move_right.tres" id="36_vibkn"]
 
 [sub_resource type="Resource" id="Resource_vkvga"]
 script = ExtResource("4_1rw8g")
@@ -73,10 +80,24 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_05q5j")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_tn8ci"), SubResource("Resource_1koh7"), SubResource("Resource_eep0a")])
 
+[sub_resource type="Resource" id="Resource_mfl87"]
+script = ExtResource("13_j3axn")
+
+[sub_resource type="Resource" id="Resource_1n4k0"]
+script = ExtResource("15_rvpjj")
+
+[sub_resource type="Resource" id="Resource_ukc1w"]
+script = ExtResource("12_kxb2c")
+
+[sub_resource type="Resource" id="Resource_4pf65"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_mfl87")
+modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_1n4k0"), SubResource("Resource_ukc1w")])
+
 [sub_resource type="Resource" id="Resource_tgr2g"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("9_q86qg")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_dew8i")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_dew8i"), SubResource("Resource_4pf65")])
 metadata/_guide_input_mappings_collapsed = false
 
 [sub_resource type="Resource" id="Resource_pf0ii"]
@@ -98,10 +119,25 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_pf0ii")
 modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_nh7x4"), SubResource("Resource_04n84"), SubResource("Resource_m3aj7")])
 
+[sub_resource type="Resource" id="Resource_2ioub"]
+script = ExtResource("13_j3axn")
+axis = 1
+
+[sub_resource type="Resource" id="Resource_fvpbi"]
+script = ExtResource("12_kxb2c")
+
+[sub_resource type="Resource" id="Resource_7l3h2"]
+script = ExtResource("15_rvpjj")
+
+[sub_resource type="Resource" id="Resource_fyd0i"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_2ioub")
+modifiers = Array[ExtResource("5_0qat1")]([SubResource("Resource_fvpbi"), SubResource("Resource_7l3h2")])
+
 [sub_resource type="Resource" id="Resource_iarn8"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("13_v2ywt")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qu2wi")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_qu2wi"), SubResource("Resource_fyd0i")])
 metadata/_guide_input_mappings_collapsed = false
 
 [sub_resource type="Resource" id="Resource_si4d4"]
@@ -116,10 +152,22 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_si4d4")
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_2tfaw")])
 
+[sub_resource type="Resource" id="Resource_o031f"]
+script = ExtResource("17_kxb2c")
+button = 2
+
+[sub_resource type="Resource" id="Resource_3s858"]
+script = ExtResource("15_g6bbx")
+
+[sub_resource type="Resource" id="Resource_wh232"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_o031f")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_3s858")])
+
 [sub_resource type="Resource" id="Resource_cvxqo"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("14_yp12v")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_q86qg")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_q86qg"), SubResource("Resource_wh232")])
 metadata/_guide_input_mappings_collapsed = false
 
 [sub_resource type="Resource" id="Resource_llfhp"]
@@ -134,10 +182,22 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_llfhp")
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ib0yi")])
 
+[sub_resource type="Resource" id="Resource_xh105"]
+script = ExtResource("17_kxb2c")
+button = 2
+
+[sub_resource type="Resource" id="Resource_30oue"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_2supu"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_xh105")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_30oue")])
+
 [sub_resource type="Resource" id="Resource_tb8ii"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("16_li5ak")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_r6kml")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_r6kml"), SubResource("Resource_2supu")])
 
 [sub_resource type="Resource" id="Resource_cqc4k"]
 script = ExtResource("10_cvxqo")
@@ -151,63 +211,83 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_cqc4k")
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_vanwy")])
 
+[sub_resource type="Resource" id="Resource_omo75"]
+script = ExtResource("17_kxb2c")
+button = 2
+
+[sub_resource type="Resource" id="Resource_npyga"]
+script = ExtResource("17_s8kjn")
+
+[sub_resource type="Resource" id="Resource_yxj6r"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_omo75")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_npyga")])
+
 [sub_resource type="Resource" id="Resource_iihs4"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("16_rvpjj")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_bkx7d")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_bkx7d"), SubResource("Resource_yxj6r")])
 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("15_g6bbx")
+
+[sub_resource type="Resource" id="Resource_s8kjn"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_qkgmj")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_st2ej")])
+metadata/_guide_triggers_collapsed = false
+
+[sub_resource type="Resource" id="Resource_wcvib"]
+script = ExtResource("30_cvxqo")
+key = 4194326
+
+[sub_resource type="Resource" id="Resource_8ifoc"]
+script = ExtResource("15_g6bbx")
+
+[sub_resource type="Resource" id="Resource_imjft"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_wcvib")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_8ifoc")])
+metadata/_guide_triggers_collapsed = false
+
+[sub_resource type="Resource" id="Resource_vibkn"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("23_rvpjj")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_s8kjn"), SubResource("Resource_imjft")])
+
+[sub_resource type="Resource" id="Resource_f3pn5"]
+script = ExtResource("10_cvxqo")
+axis = 5
+
+[sub_resource type="Resource" id="Resource_rvpjj"]
 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")])
+input = SubResource("Resource_f3pn5")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rvpjj")])
+
+[sub_resource type="Resource" id="Resource_qksfw"]
+script = ExtResource("30_cvxqo")
+key = 4194326
+
+[sub_resource type="Resource" id="Resource_bhf7o"]
+script = ExtResource("17_s8kjn")
+
+[sub_resource type="Resource" id="Resource_woy8j"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_qksfw")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_bhf7o")])
 
 [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
-
-[sub_resource type="Resource" id="Resource_oruo7"]
-script = ExtResource("15_fykw6")
-
-[sub_resource type="Resource" id="Resource_4ee3d"]
-script = ExtResource("3_yp12v")
-input = SubResource("Resource_lfx76")
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oruo7")])
-
-[sub_resource type="Resource" id="Resource_0s4kt"]
-script = ExtResource("1_qmhk6")
-action = ExtResource("18_vibkn")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_4ee3d")])
+action = ExtResource("25_rvpjj")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_818lq"), SubResource("Resource_woy8j")])
 
 [sub_resource type="Resource" id="Resource_1fkas"]
 script = ExtResource("19_qkgmj")
@@ -221,10 +301,22 @@ input = SubResource("Resource_1fkas")
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_6pxii")])
 metadata/_guide_triggers_collapsed = false
 
+[sub_resource type="Resource" id="Resource_pv160"]
+script = ExtResource("30_cvxqo")
+key = 32
+
+[sub_resource type="Resource" id="Resource_ra6lx"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_q44n6"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_pv160")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_ra6lx")])
+
 [sub_resource type="Resource" id="Resource_d2r0d"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("25_si4d4")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_jy4f1")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_jy4f1"), SubResource("Resource_q44n6")])
 
 [sub_resource type="Resource" id="Resource_oapce"]
 script = ExtResource("19_qkgmj")
@@ -234,10 +326,18 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_oapce")
 metadata/_guide_triggers_collapsed = false
 
+[sub_resource type="Resource" id="Resource_assli"]
+script = ExtResource("30_cvxqo")
+key = 32
+
+[sub_resource type="Resource" id="Resource_x5v0d"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_assli")
+
 [sub_resource type="Resource" id="Resource_xt1x5"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("21_818lq")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_8w5gu")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_8w5gu"), SubResource("Resource_x5v0d")])
 
 [sub_resource type="Resource" id="Resource_li5ak"]
 script = ExtResource("19_qkgmj")
@@ -251,10 +351,50 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_li5ak")
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_paxxe")])
 
+[sub_resource type="Resource" id="Resource_pdblu"]
+script = ExtResource("17_kxb2c")
+
+[sub_resource type="Resource" id="Resource_q0e5d"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_a8sqk"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_pdblu")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_q0e5d")])
+
 [sub_resource type="Resource" id="Resource_ew1hw"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("22_2hs2y")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_500v3")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_500v3"), SubResource("Resource_a8sqk")])
+
+[sub_resource type="Resource" id="Resource_kx31q"]
+script = ExtResource("19_qkgmj")
+button = 9
+
+[sub_resource type="Resource" id="Resource_oux88"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_b7w5s"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_kx31q")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_oux88")])
+
+[sub_resource type="Resource" id="Resource_jk2g8"]
+script = ExtResource("30_cvxqo")
+key = 70
+
+[sub_resource type="Resource" id="Resource_y7p41"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_3uxou"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_jk2g8")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_y7p41")])
+
+[sub_resource type="Resource" id="Resource_3frwi"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("30_rvpjj")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_b7w5s"), SubResource("Resource_3uxou")])
 
 [sub_resource type="Resource" id="Resource_g6bbx"]
 script = ExtResource("19_qkgmj")
@@ -268,28 +408,52 @@ script = ExtResource("3_yp12v")
 input = SubResource("Resource_g6bbx")
 triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_yp12v")])
 
+[sub_resource type="Resource" id="Resource_xbeov"]
+script = ExtResource("30_cvxqo")
+key = 4194325
+
+[sub_resource type="Resource" id="Resource_rt8uw"]
+script = ExtResource("15_fykw6")
+
+[sub_resource type="Resource" id="Resource_hj46p"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_xbeov")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_rt8uw")])
+
 [sub_resource type="Resource" id="Resource_0qat1"]
 script = ExtResource("1_qmhk6")
 action = ExtResource("23_g6bbx")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1rw8g")])
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_1rw8g"), SubResource("Resource_hj46p")])
 metadata/_guide_input_mappings_collapsed = false
 
-[sub_resource type="Resource" id="Resource_j3axn"]
+[sub_resource type="Resource" id="Resource_o5yys"]
 script = ExtResource("19_qkgmj")
-button = 3
+button = 2
 
-[sub_resource type="Resource" id="Resource_kxb2c"]
-script = ExtResource("15_fykw6")
+[sub_resource type="Resource" id="Resource_06f1o"]
+script = ExtResource("15_g6bbx")
 
 [sub_resource type="Resource" id="Resource_v2ywt"]
 script = ExtResource("3_yp12v")
-input = SubResource("Resource_j3axn")
-triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_kxb2c")])
+input = SubResource("Resource_o5yys")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_06f1o")])
+
+[sub_resource type="Resource" id="Resource_qpgnj"]
+script = ExtResource("30_cvxqo")
+key = 69
+
+[sub_resource type="Resource" id="Resource_g5tel"]
+script = ExtResource("15_g6bbx")
+
+[sub_resource type="Resource" id="Resource_s6d3g"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_qpgnj")
+triggers = Array[ExtResource("8_2tfaw")]([SubResource("Resource_g5tel")])
 
 [sub_resource type="Resource" id="Resource_vtk18"]
 script = ExtResource("1_qmhk6")
-action = ExtResource("24_yp12v")
-input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt")])
+action = ExtResource("32_s8kjn")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_v2ywt"), SubResource("Resource_s6d3g")])
 
 [sub_resource type="Resource" id="Resource_s4bc4"]
 script = ExtResource("30_cvxqo")
@@ -333,7 +497,59 @@ action = ExtResource("29_q86qg")
 input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_ai85f"), SubResource("Resource_1ycft"), SubResource("Resource_k8i2y")])
 metadata/_guide_input_mappings_collapsed = false
 
+[sub_resource type="Resource" id="Resource_kcylj"]
+script = ExtResource("30_cvxqo")
+key = 83
+
+[sub_resource type="Resource" id="Resource_yq6lj"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_kcylj")
+
+[sub_resource type="Resource" id="Resource_fjku4"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("33_fykw6")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_yq6lj")])
+
+[sub_resource type="Resource" id="Resource_wt677"]
+script = ExtResource("30_cvxqo")
+key = 87
+
+[sub_resource type="Resource" id="Resource_ly2iy"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_wt677")
+
+[sub_resource type="Resource" id="Resource_odnhd"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("34_rvpjj")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_ly2iy")])
+
+[sub_resource type="Resource" id="Resource_i62p1"]
+script = ExtResource("30_cvxqo")
+key = 65
+
+[sub_resource type="Resource" id="Resource_3d0gd"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_i62p1")
+
+[sub_resource type="Resource" id="Resource_0eff7"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("35_s8kjn")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_3d0gd")])
+
+[sub_resource type="Resource" id="Resource_uqqnm"]
+script = ExtResource("30_cvxqo")
+key = 68
+
+[sub_resource type="Resource" id="Resource_7io5e"]
+script = ExtResource("3_yp12v")
+input = SubResource("Resource_uqqnm")
+
+[sub_resource type="Resource" id="Resource_gt77e"]
+script = ExtResource("1_qmhk6")
+action = ExtResource("36_vibkn")
+input_mappings = Array[ExtResource("3_yp12v")]([SubResource("Resource_7io5e")])
+
 [resource]
 script = ExtResource("23_llfhp")
-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"), SubResource("Resource_weyro")])
+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_d2r0d"), SubResource("Resource_xt1x5"), SubResource("Resource_ew1hw"), SubResource("Resource_3frwi"), SubResource("Resource_0qat1"), SubResource("Resource_vtk18"), SubResource("Resource_weyro"), SubResource("Resource_fjku4"), SubResource("Resource_odnhd"), SubResource("Resource_0eff7"), SubResource("Resource_gt77e")])
 metadata/_custom_type_script = "uid://dsa1dnifd6w32"

systems/inputs/base_mode/move_back.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" script_class="GUIDEAction" load_steps=2 format=3 uid="uid://s1l0n1iitc6m"]
+
+[ext_resource type="Script" uid="uid://cluhc11vixkf1" path="res://addons/guide/guide_action.gd" id="1_7ljxs"]
+
+[resource]
+script = ExtResource("1_7ljxs")
+action_value_type = 1
+metadata/_custom_type_script = "uid://cluhc11vixkf1"