fixed damage composition issue

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

@@ -70,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")]
@@ -1737,11 +1737,7 @@ public partial class PlayerController : CharacterBody3D, IDamageable, IKnockback
 
 	public float TakeDamage(RDamage damage)
 	{
-		float damageTaken = 0;
-		foreach (var damageable in DamageModifiers.ToIDamageables())
-			damageTaken += damageable.TakeDamage(damage);
-		DamageTaken?.Invoke(damageTaken);
-		return damageTaken;
+		return CDamage.TakeDamage(damage);
 	}
 	
 	///////////////////////////