moving files around

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

@@ -3,12 +3,12 @@
 [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="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.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"]
+[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/first_enemy/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="Script" uid="uid://do0dic4r3ri0s" path="res://scenes/enemies/flying_enemy/FlyingEnemyInputs.cs" id="6_7m3bq"]
+[ext_resource type="Resource" uid="uid://otfc2snh8umc" path="res://scenes/enemies/first_enemy/first_enemy_damage.tres" id="6_dmw1t"]
+[ext_resource type="Resource" uid="uid://dgo65k2ceqfvy" path="res://scenes/enemies/flying_enemy/flying_enemy_damage.tres" id="9_gp7s3"]
 
 [sub_resource type="Resource" id="Resource_gp7s3"]
 script = ExtResource("2_sysok")
@@ -54,7 +54,7 @@ metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
 
 [sub_resource type="Resource" id="Resource_caohq"]
 script = ExtResource("6_7m3bq")
-Speed = 4.0
+Speed = 0.3
 TargetHeight = 10.0
 metadata/_custom_type_script = "uid://do0dic4r3ri0s"
 

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
-metadata/_custom_type_script = "uid://b6y3ugfydvch0"
-
-[sub_resource type="Resource" id="Resource_cmijs"]
-script = ExtResource("5_q7bng")
-DamageType = 3
+Modifier = 3.0
 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,12 @@ public partial class PlayerController : CharacterBody3D, IDamageable, IKnockback
 	}
 	private BufferedActions _bufferedAction = BufferedActions.None;
 	
+	///////////////////////////
+	// Signals and events //
+	///////////////////////////
+	
+	public event Action<float> DamageTaken;
+	
 	///////////////////////////
 	// Public stuff //
 	///////////////////////////
@@ -64,7 +70,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 +1735,9 @@ public partial class PlayerController : CharacterBody3D, IDamageable, IKnockback
 		}
 	}
 
-	public void TakeDamage(RDamage damage)
+	public float TakeDamage(RDamage damage)
 	{
-		foreach (var damageable in DamageModifiers.ToIDamageables())
-			damageable.TakeDamage(damage);
+		return CDamage.TakeDamage(damage);
 	}
 	
 	///////////////////////////
@@ -1746,7 +1751,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}";
-        GD.Print(message);
-        EmitSignalDamageTaken(finalDamage);
+        return 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

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

@@ -1,10 +1,10 @@
 using Godot;
 using System;
+using System.Linq;
 using Movementtests.interfaces;
 
-
 [GlobalClass]
-public partial class FirstEnemy : CharacterBody3D, IDamageable, IKillable, IKnockbackable, IDamageMaker
+public partial class FirstEnemy : CharacterBody3D, IDamageable, IDamageMaker, IHealthable, IKillable
 {
 	[Export]
 	public Node3D Target { get; set; }
@@ -14,8 +14,14 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IKillable, IKnoc
 
 	[Export]
 	public RDamage GetDamageDealt { get; set; }
+
 	[Export]
-	public RDamageModifier[] DamageModifiers { get; set; }
+	public CHealth CHealth { get; set; }
+	[Export]
+	public CDamageable CDamage { get; set; }
+	
+	[Export]
+	public RDeathEffect[] DeathEffects { get; set; }
 	
 	private RayCast3D _wallInFrontRayCast;
 	private Area3D _damageBox;
@@ -24,9 +30,13 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IKillable, IKnoc
 	{
 		_wallInFrontRayCast = GetNode<RayCast3D>("WallInFrontRayCast");
 		_damageBox = GetNode<Area3D>("DamageBox");
+		
 		_damageBox.BodyEntered += OnDamageBoxTriggered;
+		
+		CDamage.DamageTaken += ReduceHealth;
+		CHealth.Dead += Kill;
 	}
-
+	
 	public override void _PhysicsProcess(double delta)
 	{
 		var target = Target.GlobalPosition;
@@ -53,9 +63,28 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IKillable, IKnoc
 		if(body is IDamageable damageable) damageable.TakeDamage(GetDamageDealt);
 	}
 
-	public void TakeDamage(RDamage damage)
+	public float TakeDamage(RDamage damage)
 	{
-		foreach (var damageable in DamageModifiers.ToIDamageables())
-			damageable.TakeDamage(damage);
+		return CDamage.TakeDamage(damage);
+	}
+
+	public float CurrentHealth 
+	{
+		get => CHealth.CurrentHealth;
+		set => CHealth.CurrentHealth = value;
+	}
+
+	public void ReduceHealth(float amount)
+	{
+		CHealth.ReduceHealth(amount);
+	}
+
+	public void Kill()
+	{
+		foreach (var killable in DeathEffects.ToIKillables())
+		{
+			killable.Kill();
+		}
+		QueueFree();
 	}
 }

scenes/enemies/first_enemy/first_enemy.tscn

@@ -0,0 +1,105 @@
+[gd_scene load_steps=19 format=3 uid="uid://dxt0e2ugmttqq"]
+
+[ext_resource type="Script" uid="uid://bn7sc6id7n166" path="res://scenes/enemies/first_enemy/FirstEnemy.cs" id="1_4yfjf"]
+[ext_resource type="Script" uid="uid://b2vdwkiqauhk3" path="res://scenes/enemies/first_enemy/EnemyInitInputs.cs" id="2_42xu3"]
+[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://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="3_1tw73"]
+[ext_resource type="Script" uid="uid://b4cwruitopcee" path="res://resource_definitions/RDeathEffect.cs" id="3_onjoj"]
+[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"]
+
+[sub_resource type="Resource" id="Resource_66m7n"]
+script = ExtResource("2_42xu3")
+Speed = 2.0
+metadata/_custom_type_script = "uid://b2vdwkiqauhk3"
+
+[sub_resource type="Resource" id="Resource_a6xb8"]
+script = ExtResource("3_1tw73")
+metadata/_custom_type_script = "uid://jitubgv6judn"
+
+[sub_resource type="Resource" id="Resource_7gyf3"]
+script = ExtResource("3_onjoj")
+metadata/_custom_type_script = "uid://b4cwruitopcee"
+
+[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="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")]
+collision_layer = 16
+collision_mask = 273
+script = ExtResource("1_4yfjf")
+Inputs = SubResource("Resource_66m7n")
+GetDamageDealt = SubResource("Resource_a6xb8")
+CHealth = NodePath("CHealth")
+CDamage = NodePath("CDamageable")
+DeathEffects = Array[Object]([SubResource("Resource_7gyf3")])
+
+[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="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/FlyingEnemy.cs

@@ -3,7 +3,7 @@ using System;
 using Movementtests.interfaces;
 
 [GlobalClass]
-public partial class FlyingEnemy : CharacterBody3D, IDamageable, IKillable, IKnockbackable, IDamageMaker
+public partial class FlyingEnemy : CharacterBody3D, IDamageable, IHealthable, IKnockbackable, IDamageMaker
 {
 	[Export]
 	public Node3D Target { get; set; }
@@ -13,9 +13,14 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IKillable, IKno
 
 	[Export]
 	public RDamage GetDamageDealt { get; set; }
-
+	
 	[Export]
-	public RDamageModifier[] DamageModifiers { get; set; }
+	public CHealth CHealth { get; set; }
+	[Export]
+	public CDamageable CDamage { get; set; }
+	
+	[Export]
+	public RDeathEffect[] DeathEffects { get; set; }
 	
 	private RayCast3D _groundDistanceRaycast;
 	private Area3D _damageBox;
@@ -32,6 +37,9 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IKillable, IKno
 		_damageBox.BodyEntered += OnDamageBoxTriggered;
 		
 		_randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
+
+		CDamage.DamageTaken += ReduceHealth;
+		CHealth.Dead += Kill;
 	}
 
 	public override void _PhysicsProcess(double delta)
@@ -84,9 +92,25 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IKillable, IKno
 		if(body is IDamageable damageable) damageable.TakeDamage(GetDamageDealt);
 	}
 
-	public void TakeDamage(RDamage damage)
+	public event Action<float> DamageTaken;
+
+
+	public float TakeDamage(RDamage damage)
 	{
-		foreach (var damageable in DamageModifiers.ToIDamageables())
-			damageable.TakeDamage(damage);
+		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/flying_enemy/flying_enemy.tscn

@@ -0,0 +1,112 @@
+[gd_scene load_steps=20 format=3 uid="uid://cmlud1hwkd6sv"]
+
+[ext_resource type="Script" uid="uid://cmvep0qi7qlvf" path="res://scenes/enemies/flying_enemy/FlyingEnemy.cs" id="1_b46rq"]
+[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://resource_definitions/RDamageModifier.cs" id="2_1bsgx"]
+[ext_resource type="Script" uid="uid://do0dic4r3ri0s" path="res://scenes/enemies/flying_enemy/FlyingEnemyInputs.cs" id="2_aarbi"]
+[ext_resource type="Script" uid="uid://jitubgv6judn" path="res://resource_definitions/RDamage.cs" id="2_irbqc"]
+[ext_resource type="Script" uid="uid://b4cwruitopcee" path="res://resource_definitions/RDeathEffect.cs" id="4_12h4s"]
+[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="Script" uid="uid://b0u23nkpaimyc" path="res://scenes/damage/CDamageable.cs" id="8_uotso"]
+
+[sub_resource type="Resource" id="Resource_7nxyi"]
+script = ExtResource("2_aarbi")
+Speed = 5.0
+TargetHeight = 10.0
+metadata/_custom_type_script = "uid://do0dic4r3ri0s"
+
+[sub_resource type="Resource" id="Resource_o3msb"]
+script = ExtResource("2_irbqc")
+DamageDealt = 2.0
+DamageType = 2
+metadata/_custom_type_script = "uid://jitubgv6judn"
+
+[sub_resource type="Resource" id="Resource_ys4jv"]
+script = ExtResource("4_12h4s")
+metadata/_custom_type_script = "uid://b4cwruitopcee"
+
+[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="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")]
+collision_layer = 16
+collision_mask = 273
+motion_mode = 1
+script = ExtResource("1_b46rq")
+Inputs = SubResource("Resource_7nxyi")
+GetDamageDealt = SubResource("Resource_o3msb")
+CHealth = NodePath("CHealth")
+CDamage = NodePath("CDamageable")
+DeathEffects = Array[Object]([SubResource("Resource_ys4jv")])
+
+[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="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/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")