minimata/MovementTests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed damage composition issue

Browse Source
This commit is contained in:
Alexandre Serex
2026-01-17 17:47:14 +01:00
parent 4ccdbc0ee6
commit 0dcf4a3f99
12 changed files with 92 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
player_controller/Scripts/PlayerController.cs
View File

@@ -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);
}
///////////////////////////