ok so this should be the way to go

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>

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")

interfaces/IDamageMaker.cs

@@ -0,0 +1,9 @@
+using Godot;
+
+namespace Movementtests.interfaces;
+
+public interface IDamageMaker
+{
+    [Export]
+    RDamage GetDamageDealt { 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,11 @@
+using System;
+
+namespace Movementtests.interfaces;
+
+public interface IHealthable
+{
+    event Action<IHealthable, float> HealthChanged;
+    event Action<IHealthable> HealthDepleted;
+    
+    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,15 @@
+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
+{
+    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 TestMethod();
+}

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,127 @@
+[gd_scene load_steps=12 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/first_enemy/first_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"]
+
+[sub_resource type="Resource" id="Resource_gp7s3"]
+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"
+
+[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
+GetDamageDealt = SubResource("Resource_gp7s3")
+
+[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")

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

@@ -46,8 +46,8 @@ 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.096, -0.5, -46.329)

player_controller/PlayerController.tscn

@@ -1,10 +1,13 @@
-[gd_scene load_steps=50 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=56 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="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="2_q14ux"]
 [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://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"]
@@ -43,12 +46,25 @@
 [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_m8gvy"]
+script = ExtResource("2_q14ux")
+DamageDealt = 3.0
+metadata/_custom_type_script = "uid://jitubgv6judn"
+
+[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)
@@ -69,8 +85,11 @@ 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")
+GetDamageDealt = SubResource("Resource_m8gvy")
+CDamage = NodePath("CDamageable")
 WalkSpeed = 7.5
 AccelerationFloor = 4.0
 DecelerationFloor = 3.0
@@ -108,11 +127,16 @@ WallHugGravityLesseningFactor = 15.0
 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 = 2
+collision_mask = 256
 
 [node name="InputController" type="Node3D" parent="."]
 script = ExtResource("16_v31n3")
@@ -163,15 +187,28 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.6, 0)
 MantleEndLocationDistanceFromWall = 0.3
 MantleHeightCastStart = 2.5
 
+[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")
 
 [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)
+collision_mask = 256
 
 [node name="Bobbing" type="Node3D" parent="."]
 script = ExtResource("10_7wk1w")
@@ -185,18 +222,22 @@ 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")]
 
@@ -205,39 +246,39 @@ 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 = 2
+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 = 2
+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 = 2
+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 = 2
+collision_mask = 256
 
 [node name="DashSystem" parent="." instance=ExtResource("18_q5h8a")]
 DashSpeed = 0.2
@@ -259,18 +300,18 @@ mesh = SubResource("CylinderMesh_nodcl")
 
 [node name="GroundDetector" type="ShapeCast3D" parent="."]
 shape = SubResource("CapsuleShape3D_6lejt")
-collision_mask = 2
+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 = 2
+collision_mask = 256
 
 [node name="DirectGroundDetector" type="RayCast3D" parent="."]
 target_position = Vector3(0, -2, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="DashCooldown" type="Timer" parent="."]
 wait_time = 0.8

player_controller/Scripts/PlayerController.cs

@@ -2,11 +2,12 @@ using System;
 using Godot;
 using GodotStateCharts;
 using Movementtests.addons.godot_state_charts.csharp;
+using Movementtests.interfaces;
 using Movementtests.systems;
 using Movementtests.player_controller.Scripts;
 using RustyOptions;
 
-public partial class PlayerController : CharacterBody3D
+public partial class PlayerController : CharacterBody3D, IDamageable, IKnockbackable, IDamageMaker
 {
 	// Enums
 	public enum AllowedInputs
@@ -28,6 +29,12 @@ public partial class PlayerController : CharacterBody3D
 	}
 	private BufferedActions _bufferedAction = BufferedActions.None;
 	
+	///////////////////////////
+	// Signals and events //
+	///////////////////////////
+
+	public event Action<IDamageable, float> DamageTaken;
+	
 	///////////////////////////
 	// Public stuff //
 	///////////////////////////
@@ -52,11 +59,19 @@ public partial class PlayerController : CharacterBody3D
 	public ShapeCast3D      GroundDetector;
 	public ShapeCast3D      CeilingDetector;
 	public RayCast3D        DirectGroundDetector;
+	public Area3D           WeaponHitbox;
 
 	// Inspector stuff
 	[Export] public Marker3D TutorialWeaponTarget;
 	[Export] public bool TutorialDone { get; set; }
 	
+	[ExportCategory("Combat")]
+	[ExportGroup("Damage")]
+	[Export]
+	public RDamage GetDamageDealt { get; set; }
+	[Export]
+	public CDamageable CDamage { get; set; }
+	
 	[ExportCategory("Movement")]
 	[ExportGroup("Ground")]
 	[Export(PropertyHint.Range, "0,20,0.1,or_greater")]
@@ -353,6 +368,8 @@ public partial class PlayerController : CharacterBody3D
 		var playerShape = StandingCollider.GetShape() as CapsuleShape3D;
 		_playerHeight = playerShape!.Height;
 		_playerRadius = playerShape.Radius;
+
+		WeaponHitbox = GetNode<Area3D>("%WeaponHitbox");
 		
 		// State management
 		_playerState = StateChart.Of(GetNode("StateChart"));
@@ -1551,7 +1568,8 @@ public partial class PlayerController : CharacterBody3D
 	}
 	public void HandleAiming(float delta)
 	{
-		RotateWeaponWithPlayer();
+		if (WeaponSystem.InHandState.Active)
+			RotateWeaponWithPlayer();
 		
 		DashIndicatorMeshCylinder.Height = DashSystem.PlannedLocation.DistanceTo(GlobalPosition);
 		DashIndicatorNode.LookAt(DashSystem.PlannedLocation);
@@ -1566,17 +1584,6 @@ public partial class PlayerController : CharacterBody3D
 		DashIndicatorMesh.Visible = false;
 	}
 	
-	///////////////////////////
-	// Hit Management ///////
-	///////////////////////////
-	public void OnInputHitPressed()
-	{
-		if (_aiming.Active)
-		{
-			ThrowWeapon();
-		}
-	}
-	
 	///////////////////////////
 	// Parry Management ///////
 	///////////////////////////
@@ -1727,4 +1734,30 @@ public partial class PlayerController : CharacterBody3D
 			DashIndicatorNode.LookAt(WeaponSystem.GlobalPosition);
 		}
 	}
+
+	public float TakeDamage(RDamage damage)
+	{
+		var finalDamage = CDamage.TakeDamage(damage);
+		DamageTaken?.Invoke(this, finalDamage);
+		return finalDamage;
+	}
+	
+	///////////////////////////
+	// Hit Management ///////
+	///////////////////////////
+	public void OnInputHitPressed()
+	{
+		if (_aiming.Active && WeaponSystem.InHandState.Active)
+		{
+			ThrowWeapon();
+		}
+
+		if (!WeaponSystem.InHandState.Active) return;
+		var bodies = WeaponHitbox.GetOverlappingBodies();
+		foreach (var body in bodies)
+		{
+			if(body is IDamageable spawnable) 
+				spawnable.TakeDamage(GetDamageDealt);
+		}
+	}
 }

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

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,91 @@
+using System;
+using Godot;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class Enemy : CharacterBody3D, IDamageable, IDamageMaker, IHealthable, IKillable
+{
+	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 RDamage GetDamageDealt { get; set; }
+	
+	[Export]
+	public Node CHealth { get; set; }
+	
+	[Export]
+	public Node CDamage { get; set; }
+	
+	[Export]
+	public Node CMovement { get; set; }
+	
+	[Export]
+	public RDeathEffect[] DeathEffects { get; set; }
+	
+	private Area3D _damageBox;
+	
+	public override void _Ready()
+	{
+		_damageBox = GetNode<Area3D>("DamageBox");
+		
+		_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);
+
+		if (CMovement is not IMoveable movement) return;
+		
+		var inputs = new MovementInputs(
+			Velocity: Velocity,
+			TargetLocation: Target.GlobalPosition,
+			isOnFloor: IsOnFloor(),
+			gravity: GetGravity(),
+			delta: delta
+		);
+		Velocity = movement!.ComputeVelocity(inputs);
+		MoveAndSlide();
+	}
+
+	public void OnDamageBoxTriggered(Node3D body)
+	{
+		GD.Print("Take this!");
+		if (body is not IDamageable damageable) return;
+		damageable.TakeDamage(GetDamageDealt);
+	}
+
+	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/first_enemy/first_enemy.tscn

@@ -0,0 +1,101 @@
+[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/first_enemy/first_enemy_damage.tres" id="2_6d4gl"]
+[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="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="3_pvbr4"]
+[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_r3cnf"]
+script = ExtResource("3_pvbr4")
+metadata/_custom_type_script = "uid://baiapod3csndf"
+
+[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="FirstEnemy" type="CharacterBody3D" node_paths=PackedStringArray("CHealth", "CDamage", "CMovement")]
+collision_layer = 16
+collision_mask = 273
+script = ExtResource("1_r6506")
+GetDamageDealt = ExtResource("2_6d4gl")
+CHealth = NodePath("CHealth")
+CDamage = NodePath("CDamageable")
+CMovement = NodePath("CGroundedMovement")
+DeathEffects = Array[Object]([])
+
+[node name="CHealth" type="Node" parent="."]
+script = ExtResource("2_gsmti")
+HealthResource = SubResource("Resource_r3cnf")
+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/first_enemy/first_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/first_enemy/first_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/flying_enemy/flying_enemy.tscn

@@ -0,0 +1,106 @@
+[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://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy/flying_enemy_damage.tres" id="2_on7rt"]
+[ext_resource type="Script" uid="uid://bjwrpv3jpsc1e" path="res://scenes/health/CHealth.cs" id="4_ys4jv"]
+[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://resource_definitions/RHealth.cs" id="5_irbqc"]
+[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_aarbi"]
+script = ExtResource("5_irbqc")
+StartingHealth = 50.0
+metadata/_custom_type_script = "uid://baiapod3csndf"
+
+[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")
+GetDamageDealt = ExtResource("2_on7rt")
+CHealth = NodePath("CHealth")
+CDamage = NodePath("CDamageable")
+CMovement = NodePath("CFlyingMovement")
+DeathEffects = Array[Object]([])
+
+[node name="CHealth" type="Node" parent="."]
+script = ExtResource("4_ys4jv")
+HealthResource = SubResource("Resource_aarbi")
+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/health/CHealth.cs

@@ -0,0 +1,32 @@
+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 HealthResource;
+    
+    public float CurrentHealth { get; set; }
+
+    public override void _Ready()
+    {
+        CurrentHealth = HealthResource.StartingHealth;
+    }
+
+    public void ReduceHealth(IDamageable source, float amount)
+    {
+        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,62 @@
+using Godot;
+using Movementtests.interfaces;
+
+namespace Movementtests.scenes.movement;
+
+public partial class CFlyingMovement : Node3D, IMoveable
+{
+    [Export] public RMovement RMovement;
+
+    [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;
+
+    [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/spawners/Spawner.cs

@@ -0,0 +1,61 @@
+using Godot;
+using System;
+
+public partial class Spawner : Node3D
+{
+	[Export(PropertyHint.NodeType)]
+	public PackedScene SceneToSpawn { get; set; }
+	
+	[Export]
+	public Resource Inputs;
+	[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 (SceneToSpawn == null || !SceneToSpawn.CanInstantiate()) return;
+		
+		var spawnedInstance = SceneToSpawn.Instantiate() as Enemy;
+		if (spawnedInstance == null) return;
+		
+		// spawnedInstance.Inputs = Inputs as EnemyInitInputs;
+		spawnedInstance.Target = Target;
+		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/first_enemy/first_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

@@ -10,7 +10,6 @@ font_size = 30
 
 [node name="TutoTrigger" type="Area3D"]
 collision_layer = 0
-collision_mask = 16
 script = ExtResource("1_w8mpv")
 
 [node name="Control" type="Control" parent="."]

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/dash_system.tscn

@@ -28,7 +28,7 @@ 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="."]
@@ -36,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/head_system.tscn

@@ -69,10 +69,6 @@ transform = Transform3D(1, 0, 0, 0, 0.99999994, 0, 0, 0, 0.99999994, 0, 0, 0)
 current = true
 fov = 90.0
 
-[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="."]

systems/mantle/mantle_system.tscn

@@ -28,7 +28,7 @@ visible = false
 shape = SubResource("CapsuleShape3D_4coqe")
 target_position = Vector3(0, 0, 0)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(1, 0, 0, 1)
 
 [node name="WallInFrontCast3D" type="ShapeCast3D" parent="."]
@@ -37,20 +37,20 @@ visible = false
 shape = SubResource("SphereShape3D_2oobp")
 target_position = Vector3(0, 0, -1.5)
 max_results = 1
-collision_mask = 2
+collision_mask = 256
 debug_shape_custom_color = Color(0.911631, 0.11884, 0.656218, 1)
 
 [node name="InAirWallDetect" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.01, 0)
 shape = SubResource("CapsuleShape3D_2oobp")
 target_position = Vector3(0, 0, -2)
-collision_mask = 2
+collision_mask = 256
 
 [node name="GroundedWallDetect" type="ShapeCast3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.26, 0)
 shape = SubResource("CapsuleShape3D_i32qj")
 target_position = Vector3(0, 0, -2)
-collision_mask = 2
+collision_mask = 256
 
 [node name="WallProfileShapeCasts" type="Node3D" parent="."]
 
@@ -59,46 +59,46 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.5)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast2" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -0.75)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast3" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast4" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.25)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast5" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.5)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast6" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -1.75)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256
 
 [node name="ShapeCast7" type="ShapeCast3D" parent="WallProfileShapeCasts"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.5, -2)
 enabled = false
 shape = SubResource("SphereShape3D_i32qj")
 target_position = Vector3(0, -2.125, 0)
-collision_mask = 2
+collision_mask = 256

systems/weapon/weapon.tscn

@@ -37,8 +37,8 @@ stencil_outline_thickness = 0.1
 material = SubResource("StandardMaterial3D_m0v1h")
 
 [node name="Weapon" type="RigidBody3D"]
-collision_layer = 4
-collision_mask = 2
+collision_layer = 65536
+collision_mask = 256
 continuous_cd = true
 contact_monitor = true
 max_contacts_reported = 1