Add damage effects

Simple animations on damage and heal
Small fixes to ordering of control flow for damage and heal
Standardized tweens to be on node not tree

Author: LifeHckr

scenes/BattleDirector/scripts/NotePlacementBar.cs

@@ -37,7 +37,7 @@ public partial class NotePlacementBar : Node
     //Juice - https://www.youtube.com/watch?v=LGt-jjVf-ZU
     private int _limiter;
     private Vector2 _barInitPosition;
-    private float _randomStrength = 1f;
+    private float _baseShake = 1f;
     private float _shakeFade = 10f;
     private RandomNumberGenerator _rng = new();
     private float _shakeStrength;
@@ -49,7 +49,7 @@ private void ProcessShake(double delta)
             return;
         if (_currentBarValue >= MaxValue)
         {
-            _shakeStrength = _randomStrength;
+            _shakeStrength = _baseShake;
         }
         if (_shakeStrength > 0)
         {

scenes/BattleDirector/scripts/TextParticle.cs

@@ -6,7 +6,7 @@ public partial class TextParticle : Label
     // Called when the node enters the scene tree for the first time.
     public override void _Ready()
     {
-        Tween tween = GetTree().CreateTween();
+        Tween tween = CreateTween();
         ZIndex = 2;
         Position += Vector2.Left * (GD.Randf() * 40 - 20);
         tween.SetTrans(Tween.TransitionType.Elastic);

scenes/ChartViewport/scripts/ChartManager.cs

@@ -60,7 +60,7 @@ public void PrepChart(SongData songData)
     public void BeginTweens()
     {
         //This could be good as a function to call on something, to have many things animated to the beat.
-        var tween = GetTree().CreateTween();
+        var tween = CreateTween();
         tween
             .TweenMethod(
                 Callable.From((Vector2 scale) => TweenArrows(scale)),
@@ -129,12 +129,4 @@ public void ComboText(string text, ArrowType arrow, int currentCombo)
         IH.FeedbackEffect(arrow, text);
         newText.Text = text + $" {currentCombo}";
     }
-
-    public override void _ExitTree()
-    {
-        foreach (var tween in GetTree().GetProcessedTweens())
-        {
-            tween.Stop();
-        }
-    }
 }

scenes/Puppets/scripts/PuppetTemplate.cs

@@ -43,25 +43,83 @@ public override void _Ready()
         }
     }
 
+    public override void _Process(double delta)
+    {
+        ProcessShake(delta);
+    }
+
     public void Init(Texture2D texture, string name)
     {
         Sprite.Texture = texture;
         UniqName = name;
     }
 
+    //Juice - https://www.youtube.com/watch?v=LGt-jjVf-ZU
+    private int _limiter;
+    private const float BaseShake = 100f;
+    private float _shakeFade = 10f;
+    private float _shakeStrength;
+    private float _baseAnimDuration = 0.1f;
+
+    private void ProcessShake(double delta)
+    {
+        _limiter = (_limiter + 1) % 3;
+        if (_limiter != 1)
+            return;
+
+        if (_shakeStrength > 0)
+        {
+            _shakeStrength = (float)Mathf.Lerp(_shakeStrength, 0, _shakeFade * delta);
+        }
+        Position =
+            StartPos
+            + new Vector2(
+                (float)GD.RandRange(-_shakeStrength, _shakeStrength),
+                (float)GD.RandRange(-_shakeStrength, _shakeStrength)
+            );
+    }
+
+    protected virtual void DamageAnimate(int amount)
+    { //TODO: Make animate in time with bpm
+        float damageAnimDir = (GetViewportRect().Size / 2 - Position).Normalized().X;
+        float scalar = (float)amount / _maxHealth;
+        _shakeStrength = (scalar * BaseShake);
+
+        Color flashColor = Colors.White * 99; //White = neutral modulate, very white is higher contrast white
+        if (amount < 0) //If healing
+        {
+            flashColor = Colors.Green;
+            damageAnimDir = 0;
+            _shakeStrength = 0;
+        }
+
+        var tween = CreateTween();
+        tween.SetTrans(Tween.TransitionType.Spring);
+        tween.TweenProperty(this, "modulate", flashColor, _baseAnimDuration);
+        tween.Chain().TweenProperty(this, "modulate", Colors.White, _baseAnimDuration);
+        tween.Parallel();
+        tween
+            .TweenProperty(
+                this,
+                "position:x",
+                -(damageAnimDir * 2) * (2 + scalar),
+                _baseAnimDuration
+            )
+            .AsRelative();
+        tween.Chain().TweenProperty(this, "position", StartPos, 2 * _baseAnimDuration);
+    }
+
     public virtual void TakeDamage(int amount)
     {
-        if (_currentHealth <= 0)
-            return; //TEMP Only fire once.
         amount = Math.Max(0, amount); //Should not be able to heal from damage.
+        if (_currentHealth <= 0 || amount == 0)
+            return; //TEMP Only fire once.
         _currentHealth = _healthBar.ChangeHP(-amount);
+        DamageAnimate(amount);
         if (_currentHealth <= 0)
         {
             Defeated?.Invoke(this);
         }
-
-        if (amount == 0)
-            return;
         TextParticle newText = new TextParticle();
         newText.Modulate = Colors.Red;
         Sprite.AddChild(newText);
@@ -71,9 +129,10 @@ public virtual void TakeDamage(int amount)
     public virtual void Heal(int amount)
     {
         _currentHealth = _healthBar.ChangeHP(amount);
-
+        amount = Math.Max(0, amount); //Should not be able to damage from heal.
         if (amount == 0)
             return;
+        DamageAnimate(-amount);
         TextParticle newText = new TextParticle();
         newText.Modulate = Colors.Green;
         Sprite.AddChild(newText);