removing broken ABC and refactoring enemy movement

Movement tests.csproj

@@ -123,7 +123,6 @@
     <Content Include="menus\scripts\level_state.gd.uid" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="ABCs\" />
     <Folder Include="addons\" />
   </ItemGroup>
   <ItemGroup>

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>

interfaces/IDamageable.cs

@@ -1,8 +1,8 @@
-using Godot;
+using System;
 
 namespace Movementtests.interfaces;
 
 public interface IDamageable
 {
-    void TakeDamage(RDamage damage);
+    float TakeDamage(RDamage damage);
 }

interfaces/IHealthable.cs

@@ -0,0 +1,6 @@
+namespace Movementtests.interfaces;
+
+public interface IHealthable
+{
+    void ReduceHealth(float amount);
+}

interfaces/IHealthable.cs.uid

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

interfaces/IKillable.cs

@@ -2,5 +2,5 @@ namespace Movementtests.interfaces;
 
 public interface IKillable
 {
-    
+    void Kill();
 }

interfaces/IKillable.cs.uid

@@ -1 +1 @@
-uid://bea2kvnu3kuhu
+uid://dqpjr2d01sk1a

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

@@ -9,4 +9,8 @@ public static class NodeExtensions
     {
         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();
+    }
 }

maps/GYMs/enemies.tscn

@@ -1,14 +1,10 @@
-[gd_scene load_steps=19 format=3 uid="uid://q7uc1h2jpbd2"]
+[gd_scene load_steps=10 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.tscn" id="3_3uydm"]
+[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://b2vdwkiqauhk3" path="res://scenes/enemies/EnemyInitInputs.cs" id="4_nd7vd"]
+[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://cmlud1hwkd6sv" path="res://scenes/enemies/flying_enemy.tscn" id="5_8fd2t"]
-[ext_resource type="Script" uid="uid://do0dic4r3ri0s" path="res://scenes/enemies/FlyingEnemyInputs.cs" id="6_7m3bq"]
-[ext_resource type="Resource" uid="uid://otfc2snh8umc" path="res://scenes/enemies/first_enemy_damage.tres" id="6_dmw1t"]
-[ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy_damage.tres" id="9_gp7s3"]
 
 [sub_resource type="Resource" id="Resource_gp7s3"]
 script = ExtResource("2_sysok")
@@ -37,33 +33,6 @@ ssil_radius = 8.4
 sdfgi_use_occlusion = true
 glow_enabled = true
 
-[sub_resource type="Resource" id="Resource_8fd2t"]
-script = ExtResource("4_nd7vd")
-Speed = 1.2
-metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
-
-[sub_resource type="Resource" id="Resource_7m3bq"]
-script = ExtResource("4_nd7vd")
-Speed = 2.7
-metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
-
-[sub_resource type="Resource" id="Resource_sysok"]
-script = ExtResource("4_nd7vd")
-Speed = 4.0
-metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
-
-[sub_resource type="Resource" id="Resource_caohq"]
-script = ExtResource("6_7m3bq")
-Speed = 4.0
-TargetHeight = 10.0
-metadata/_custom_type_script = "uid://do0dic4r3ri0s"
-
-[sub_resource type="Resource" id="Resource_dmw1t"]
-script = ExtResource("6_7m3bq")
-Speed = 6.0
-TargetHeight = 15.0
-metadata/_custom_type_script = "uid://do0dic4r3ri0s"
-
 [node name="Main" type="Node3D"]
 
 [node name="Player" parent="." instance=ExtResource("1_62kkh")]
@@ -134,29 +103,19 @@ 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")
-Inputs = SubResource("Resource_8fd2t")
-GetDamageDealt = ExtResource("6_dmw1t")
 
 [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")
-Inputs = SubResource("Resource_7m3bq")
-GetDamageDealt = ExtResource("6_dmw1t")
 
 [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")
-Inputs = SubResource("Resource_sysok")
-GetDamageDealt = ExtResource("6_dmw1t")
 
 [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")
-Inputs = SubResource("Resource_caohq")
-GetDamageDealt = ExtResource("9_gp7s3")
 
 [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")
-Inputs = SubResource("Resource_dmw1t")
-GetDamageDealt = ExtResource("9_gp7s3")

player_controller/PlayerController.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=58 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"]
@@ -50,23 +51,9 @@ script = ExtResource("2_q14ux")
 DamageDealt = 3.0
 metadata/_custom_type_script = "uid://jitubgv6judn"
 
-[sub_resource type="Resource" id="Resource_q14ux"]
-script = ExtResource("5_q7bng")
-metadata/_custom_type_script = "uid://b6y3ugfydvch0"
-
-[sub_resource type="Resource" id="Resource_q7bng"]
-script = ExtResource("5_q7bng")
-DamageType = 1
-metadata/_custom_type_script = "uid://b6y3ugfydvch0"
-
 [sub_resource type="Resource" id="Resource_jb43f"]
 script = ExtResource("5_q7bng")
-DamageType = 2
+Modifier = 3.0
-metadata/_custom_type_script = "uid://b6y3ugfydvch0"
-
-[sub_resource type="Resource" id="Resource_cmijs"]
-script = ExtResource("5_q7bng")
-DamageType = 3
 metadata/_custom_type_script = "uid://b6y3ugfydvch0"
 
 [sub_resource type="CapsuleMesh" id="CapsuleMesh_xc2g5"]
@@ -98,11 +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")
-DamageModifiers = Array[Object]([SubResource("Resource_q14ux"), SubResource("Resource_q7bng"), SubResource("Resource_jb43f"), SubResource("Resource_cmijs")])
+CDamage = NodePath("CDamageable")
 WalkSpeed = 7.5
 AccelerationFloor = 4.0
 DecelerationFloor = 3.0
@@ -140,6 +127,11 @@ 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)

player_controller/Scripts/PlayerController.cs

@@ -29,6 +29,10 @@ public partial class PlayerController : CharacterBody3D, IDamageable, IKnockback
 	}
 	private BufferedActions _bufferedAction = BufferedActions.None;
 	
+	///////////////////////////
+	// Signals and events //
+	///////////////////////////
+	
 	///////////////////////////
 	// Public stuff //
 	///////////////////////////
@@ -64,7 +68,7 @@ public partial class PlayerController : CharacterBody3D, IDamageable, IKnockback
 	[Export]
 	public RDamage GetDamageDealt { get; set; }
 	[Export]
-	public RDamageModifier[] DamageModifiers { get; set; }
+	public CDamageable CDamage { get; set; }
 	
 	[ExportCategory("Movement")]
 	[ExportGroup("Ground")]
@@ -1729,10 +1733,9 @@ public partial class PlayerController : CharacterBody3D, IDamageable, IKnockback
 		}
 	}
 
-	public void TakeDamage(RDamage damage)
+	public float TakeDamage(RDamage damage)
 	{
-		foreach (var damageable in DamageModifiers.ToIDamageables())
+		return CDamage.TakeDamage(damage);
-			damageable.TakeDamage(damage);
 	}
 	
 	///////////////////////////
@@ -1746,7 +1749,6 @@ public partial class PlayerController : CharacterBody3D, IDamageable, IKnockback
 		}
 
 		if (!WeaponSystem.InHandState.Active) return;
-		
 		var bodies = WeaponHitbox.GetOverlappingBodies();
 		foreach (var body in bodies)
 		{

resource_definitions/RDamageModifier.cs

@@ -6,9 +6,6 @@ using Movementtests.systems.damage;
 [GlobalClass]
 public partial class RDamageModifier : Resource, IDamageable
 {
-    [Signal]
-    delegate void DamageTakenEventHandler(float damage);
-    
     [Export]
     public EDamageTypes DamageType = EDamageTypes.Normal;
     [Export]
@@ -24,14 +21,11 @@ public partial class RDamageModifier : Resource, IDamageable
         Modifier = modifier;
         DamageType = damageType;
     }
-    
+
-    public void TakeDamage(RDamage damage)
+    public float TakeDamage(RDamage damage)
     {
-        if (damage.DamageType != DamageType) return;
+        if (damage.DamageType != DamageType) return 0;
-        
         var finalDamage = damage.DamageDealt * Modifier;
-        var message = $"Damage of type {DamageType} taken: {finalDamage}";
+        return finalDamage;
-        GD.Print(message);
-        EmitSignalDamageTaken(finalDamage);
     }
 }

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()
+    {
+        GD.Print("Death Effect triggered");
+    }
+}

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
+{
+    [Signal]
+    public delegate void DamageTakenEventHandler(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);
+        EmitSignalDamageTaken(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,79 @@
+using Godot;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class Enemy : CharacterBody3D, IDamageable, IDamageMaker, IHealthable, IKillable
+{
+	[Export]
+	public Node3D Target { get; set; }
+
+	[Export]
+	public RDamage GetDamageDealt { get; set; }
+	
+	[Export]
+	public CHealth CHealth { get; set; }
+	
+	[Export]
+	public CDamageable 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;
+		CDamage.DamageTaken += ReduceHealth;
+		CHealth.Dead += 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 IDamageable damageable) damageable.TakeDamage(GetDamageDealt);
+	}
+
+	public float TakeDamage(RDamage damage)
+	{
+		GD.Print("Ouch!");
+		return CDamage.TakeDamage(damage);
+	}
+
+	public void ReduceHealth(float amount)
+	{
+		CHealth.ReduceHealth(amount);
+	}
+
+	public void Kill()
+	{
+		foreach (var killable in DeathEffects.ToIKillables())
+		{
+			killable.Kill();
+		}
+		QueueFree();
+	}
+}

scenes/enemies/EnemyInitInputs.cs

@@ -1,18 +0,0 @@
-using Godot;
-using System;
-
-[GlobalClass]
-public partial class EnemyInitInputs : Resource
-{
-    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
-    public float Speed;
-
-    public EnemyInitInputs()
-    {
-        Speed = 5.0f;
-    }
-    public EnemyInitInputs(float speed)
-    {
-        Speed = speed;
-    }
-}

scenes/enemies/EnemyInitInputs.cs.uid

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

scenes/enemies/FirstEnemy.cs

@@ -1,61 +0,0 @@
-using Godot;
-using System;
-using Movementtests.interfaces;
-
-
-[GlobalClass]
-public partial class FirstEnemy : CharacterBody3D, IDamageable, IKillable, IKnockbackable, IDamageMaker
-{
-	[Export]
-	public Node3D Target { get; set; }
-	
-	[Export]
-	public EnemyInitInputs Inputs;
-
-	[Export]
-	public RDamage GetDamageDealt { get; set; }
-	[Export]
-	public RDamageModifier[] DamageModifiers { get; set; }
-	
-	private RayCast3D _wallInFrontRayCast;
-	private Area3D _damageBox;
-	
-	public override void _Ready()
-	{
-		_wallInFrontRayCast = GetNode<RayCast3D>("WallInFrontRayCast");
-		_damageBox = GetNode<Area3D>("DamageBox");
-		_damageBox.BodyEntered += OnDamageBoxTriggered;
-	}
-
-	public override void _PhysicsProcess(double delta)
-	{
-		var target = Target.GlobalPosition;
-		var direction = (target - GlobalPosition).Normalized();
-
-		var targetPlane = new Vector3(target.X, GlobalPosition.Y, target.Z);
-		LookAt(targetPlane);
-		
-		var velocity = Velocity;
-		velocity.X = direction.X * Inputs.Speed;
-		velocity.Z = direction.Z * Inputs.Speed;
-
-		if (_wallInFrontRayCast.IsColliding())
-			velocity.Y = Inputs.Speed;
-		else if (!IsOnFloor())
-			velocity += GetGravity() * (float)delta;
-		
-		Velocity = velocity;
-		MoveAndSlide();
-	}
-
-	public void OnDamageBoxTriggered(Node3D body)
-	{
-		if(body is IDamageable damageable) damageable.TakeDamage(GetDamageDealt);
-	}
-
-	public void TakeDamage(RDamage damage)
-	{
-		foreach (var damageable in DamageModifiers.ToIDamageables())
-			damageable.TakeDamage(damage);
-	}
-}

scenes/enemies/FlyingEnemy.cs

@@ -1,92 +0,0 @@
-using Godot;
-using System;
-using Movementtests.interfaces;
-
-[GlobalClass]
-public partial class FlyingEnemy : CharacterBody3D, IDamageable, IKillable, IKnockbackable, IDamageMaker
-{
-	[Export]
-	public Node3D Target { get; set; }
-	
-	[Export]
-	public FlyingEnemyInputs Inputs { get; set; }
-
-	[Export]
-	public RDamage GetDamageDealt { get; set; }
-
-	[Export]
-	public RDamageModifier[] DamageModifiers { get; set; }
-	
-	private RayCast3D _groundDistanceRaycast;
-	private Area3D _damageBox;
-	
-	private bool _movingToDesiredHeight = true;
-	private Vector3 _randomDirection;
-	
-	public override void _Ready()
-	{
-		_groundDistanceRaycast = GetNode<RayCast3D>("GroundDistance");
-		_groundDistanceRaycast.TargetPosition = new Vector3(0, 0, 0);
-		
-		_damageBox = GetNode<Area3D>("DamageBox");
-		_damageBox.BodyEntered += OnDamageBoxTriggered;
-		
-		_randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
-	}
-
-	public override void _PhysicsProcess(double delta)
-	{
-		var spaceState = GetWorld3D().DirectSpaceState;
-		var target = Target.GlobalPosition;
-		var direction = (target - GlobalPosition).Normalized();
-		Vector3 velocity = Velocity;
-		
-		LookAt(target);
-		
-		// Check if we have a direct line of sight to the player
-		if (!_movingToDesiredHeight)
-		{
-			velocity = direction * Inputs.Speed;
-			
-			var query = PhysicsRayQueryParameters3D.Create(GlobalPosition, target, _groundDistanceRaycast.CollisionMask);
-			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 * Inputs.Speed;
-			
-			var groundQuery = PhysicsRayQueryParameters3D.Create(GlobalPosition, GlobalPosition+Vector3.Down*Inputs.TargetHeight, _groundDistanceRaycast.CollisionMask);
-			var groundResult = spaceState.IntersectRay(groundQuery);
-			if (groundResult.Count == 0)
-			{
-				velocity.Y = 0;
-			
-				var query = PhysicsRayQueryParameters3D.Create(GlobalPosition, target, _groundDistanceRaycast.CollisionMask);
-				var result = spaceState.IntersectRay(query);
-				if (result.Count == 0)
-				{
-					_movingToDesiredHeight = false;
-				}
-			}
-		}
-		
-		Velocity = velocity;
-		MoveAndSlide();
-	}
-
-	public void OnDamageBoxTriggered(Node3D body)
-	{
-		if(body is IDamageable damageable) damageable.TakeDamage(GetDamageDealt);
-	}
-
-	public void TakeDamage(RDamage damage)
-	{
-		foreach (var damageable in DamageModifiers.ToIDamageables())
-			damageable.TakeDamage(damage);
-	}
-}

scenes/enemies/FlyingEnemy.cs.uid

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

scenes/enemies/FlyingEnemyInputs.cs

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

scenes/enemies/FlyingEnemyInputs.cs.uid

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

scenes/enemies/first_enemy.tscn

@@ -1,68 +0,0 @@
-[gd_scene load_steps=9 format=3 uid="uid://dxt0e2ugmttqq"]
-
-[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/FirstEnemy.cs" id="1_4yfjf"]
-[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_ylcc3"]
-
-[sub_resource type="Resource" id="Resource_gsmti"]
-script = ExtResource("2_ylcc3")
-metadata/_custom_type_script = "uid://b6y3ugfydvch0"
-
-[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"]
-collision_layer = 16
-collision_mask = 273
-script = ExtResource("1_4yfjf")
-DamageModifiers = Array[Object]([SubResource("Resource_gsmti")])
-
-[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.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_s01ng"]
+script = ExtResource("8_6d4gl")
+Speed = 3.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_s01ng")
+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_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.tscn

@@ -1,72 +0,0 @@
-[gd_scene load_steps=10 format=3 uid="uid://cmlud1hwkd6sv"]
-
-[ext_resource type="Script" uid="uid://cmvep0qi7qlvf" path="res://scenes/enemies/FlyingEnemy.cs" id="1_b46rq"]
-[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_1bsgx"]
-
-[sub_resource type="Resource" id="Resource_2pnje"]
-script = ExtResource("2_1bsgx")
-metadata/_custom_type_script = "uid://b6y3ugfydvch0"
-
-[sub_resource type="Resource" id="Resource_1bsgx"]
-script = ExtResource("2_1bsgx")
-DamageType = 1
-Modifier = 2.0
-metadata/_custom_type_script = "uid://b6y3ugfydvch0"
-
-[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"]
-collision_layer = 16
-collision_mask = 273
-motion_mode = 1
-script = ExtResource("1_b46rq")
-DamageModifiers = Array[Object]([SubResource("Resource_2pnje"), SubResource("Resource_1bsgx")])
-
-[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.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_ma2bq"]
+script = ExtResource("8_on7rt")
+Speed = 2.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_ma2bq")
+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_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,34 @@
+using Godot;
+using System;
+using Movementtests.interfaces;
+
+[GlobalClass]
+public partial class CHealth : Node, IHealthable
+{
+    [Signal]
+    public delegate void HealthChangedEventHandler(float health);
+    [Signal]
+    public delegate void DeadEventHandler();
+    
+    [Export]
+    public RHealth HealthResource;
+    
+    public float CurrentHealth { get; set; }
+
+    public override void _Ready()
+    {
+        CurrentHealth = HealthResource.StartingHealth;
+    }
+
+    public void ReduceHealth(float amount)
+    {
+        CurrentHealth -= amount;
+        EmitSignalHealthChanged(CurrentHealth);
+
+        if (CurrentHealth <= 0)
+        {
+            CurrentHealth = 0;
+            EmitSignalDead();
+        }
+    }
+}

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 new 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 new 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

@@ -37,10 +37,10 @@ public partial class Spawner : Node3D
 	{
 		if (SceneToSpawn == null || !SceneToSpawn.CanInstantiate()) return;
 		
-		var spawnedInstance = SceneToSpawn.Instantiate() as FirstEnemy;
+		var spawnedInstance = SceneToSpawn.Instantiate() as Enemy;
 		if (spawnedInstance == null) return;
 		
-		spawnedInstance.Inputs = Inputs as EnemyInitInputs;
+		// spawnedInstance.Inputs = Inputs as EnemyInitInputs;
 		spawnedInstance.Target = Target;
 		GetTree().GetCurrentScene().AddChild(spawnedInstance);
 		spawnedInstance.GlobalPosition = GlobalPosition;

scenes/spawners/spawner.tscn

@@ -1,7 +1,7 @@
 [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.tscn" id="2_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")