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

@@ -14,11 +14,11 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IDamageMaker, IH
[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; }
@@ -33,19 +33,12 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IDamageMaker, IH
_damageBox.BodyEntered += OnDamageBoxTriggered;
foreach (var damageable in DamageModifiers)
damageable.DamageTaken += ReduceHealth;
Health.Dead += Kill;
CDamage.DamageTaken += ReduceHealth;
CHealth.Dead += Kill;
}
public override void _PhysicsProcess(double delta)
{
if (Engine.IsEditorHint())
{
return;
}
var target = Target.GlobalPosition;
var direction = (target - GlobalPosition).Normalized();
@@ -70,26 +63,20 @@ public partial class FirstEnemy : CharacterBody3D, IDamageable, IDamageMaker, IH
if(body is IDamageable damageable) damageable.TakeDamage(GetDamageDealt);
}
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 float CurrentHealth
{
get => Health.CurrentHealth;
set => Health.CurrentHealth = value;
get => CHealth.CurrentHealth;
set => CHealth.CurrentHealth = value;
}
public void ReduceHealth(float amount)
{
Health.ReduceHealth(amount);
CHealth.ReduceHealth(amount);
}
public void Kill()