fixed damage composition issue

This commit is contained in:
2026-01-17 17:47:14 +01:00
parent 4ccdbc0ee6
commit 0dcf4a3f99
12 changed files with 92 additions and 93 deletions

View File

@@ -13,12 +13,12 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IHealthable, IK
[Export]
public RDamage GetDamageDealt { get; set; }
[Export]
public RDamageModifier[] DamageModifiers { get; set; }
[Export]
public CHealth Health { get; set; }
public CHealth CHealth { get; set; }
[Export]
public CDamageable CDamage { get; set; }
[Export]
public RDeathEffect[] DeathEffects { get; set; }
@@ -38,9 +38,8 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IHealthable, IK
_randomDirection = new Vector3(GD.RandRange(-1, 1), 1, GD.RandRange(-1, 1)).Normalized();
foreach (var damageable in DamageModifiers)
damageable.DamageTaken += ReduceHealth;
Health.Dead += Kill;
CDamage.DamageTaken += ReduceHealth;
CHealth.Dead += Kill;
}
public override void _PhysicsProcess(double delta)
@@ -95,19 +94,15 @@ public partial class FlyingEnemy : CharacterBody3D, IDamageable, IHealthable, IK
public event Action<float> DamageTaken;
public float TakeDamage(RDamage damage)
{
var finalDamage = 0f;
foreach (var damageable in DamageModifiers.ToIDamageables())
finalDamage += damageable.TakeDamage(damage);
DamageTaken?.Invoke(finalDamage);
return finalDamage;
return CDamage.TakeDamage(damage);
}
public void ReduceHealth(float amount)
{
GD.Print("Reducing health by " + amount);
Health.ReduceHealth(amount);
CHealth.ReduceHealth(amount);
}
public void Kill()