death now cancels effects
This commit is contained in:
parent
9be6a3a169
commit
5c33aacf7f
5 changed files with 66 additions and 34 deletions
|
|
@ -13,12 +13,14 @@ public partial class Entity : Node2D
|
|||
[Export]public float HP;
|
||||
[Signal] public delegate void OnHPChangedEventHandler(EntitySignalContext context);
|
||||
[Signal] public delegate void OnDamagedEventHandler();
|
||||
[Signal] public delegate void HasBeenKilledEventHandler(Entity who);
|
||||
|
||||
|
||||
public virtual void TakeDamage(float amount, Node origin)
|
||||
{
|
||||
if(amount > 0)
|
||||
if (amount > 0)
|
||||
EmitSignal(SignalName.OnDamaged);
|
||||
|
||||
|
||||
var context = new EntitySignalContext()
|
||||
{
|
||||
target = this,
|
||||
|
|
@ -62,8 +64,13 @@ public partial class Entity : Node2D
|
|||
}
|
||||
}
|
||||
|
||||
public bool Killed = false;
|
||||
public virtual void KillByDamage()
|
||||
{
|
||||
if (Killed) return;
|
||||
Killed = true;
|
||||
EmitSignal(SignalName.HasBeenKilled,this);
|
||||
ClearEffects();
|
||||
Kill();
|
||||
}
|
||||
|
||||
|
|
@ -116,6 +123,7 @@ public partial class Entity : Node2D
|
|||
|
||||
public virtual void GiveEffect(Effect what)
|
||||
{
|
||||
if (Killed) return;
|
||||
if (_effectImmunities.Contains(what) || completeInvulnerability)
|
||||
{
|
||||
return;
|
||||
|
|
@ -166,8 +174,21 @@ public partial class Entity : Node2D
|
|||
EndEffectAtSlot(what.Slot);
|
||||
}
|
||||
|
||||
protected void ClearEffects()
|
||||
{
|
||||
foreach (var slot in _activeEffectSlots.Keys)
|
||||
{
|
||||
if (_activeEffectSlots[slot] != null)
|
||||
{
|
||||
_activeEffectSlots[slot].Exit(this);
|
||||
_activeEffectSlots[slot] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void ProcessEffects()
|
||||
{
|
||||
if (Killed) return;
|
||||
foreach (string key in _activeEffectSlots.Keys)
|
||||
_activeEffectSlots[key]?.Process(this);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue