Fix Effect Application

Effects aren't placed at <= 0 hp
Battle Director effectively handles false status application
Battle director creates instances of status effects for each enemy, if multiple
Renamed GetInstance for clarity

Author: LifeHckr

Classes/StatusEffects/StatusEffect.cs

@@ -116,7 +116,7 @@ public StatusEffect InitStatus(
         return this;
     }
 
-    public StatusEffect GetInstance(int count = 1)
+    public StatusEffect CreateInstance(int count = 1)
     {
         StatusEffect result = GD.Load<PackedScene>(LoadPath).Instantiate<StatusEffect>();
         result.SetCount(count);

Globals/Scribe.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FunkEngine;
@@ -96,7 +97,7 @@ public partial class Scribe : Node
             {
                 if (timing == Timing.Miss)
                     return;
-                director.AddStatus(Targetting.Player, StatusEffect.Block.GetInstance()); //todo: should scale with timing????
+                director.AddStatus(Targetting.Player, StatusEffect.Block.CreateInstance()); //todo: should scale with timing????
             }
         ),
         new Note(
@@ -135,7 +136,7 @@ public partial class Scribe : Node
             {
                 if (timing == Timing.Miss)
                     return;
-                director.AddStatus(Targetting.First, StatusEffect.Poison.GetInstance((int)timing));
+                director.AddStatus(Targetting.First, StatusEffect.Poison, (int)timing);
             }
         ),
         new Note(
@@ -178,6 +179,17 @@ public partial class Scribe : Node
                 );
             }
         ),
+        new Note(
+            13,
+            "Parasifly",
+            GD.Load<Texture2D>("res://Classes/Notes/Assets/Note_Parasifly.png"),
+            1,
+            (director, note, timing) =>
+            {
+                int amt = Math.Max((3 - (int)timing) * note.GetBaseVal(), 0);
+                director.AddStatus(Targetting.All, StatusEffect.Block, amt);
+            }
+        ),
     };
 
     public static readonly RelicTemplate[] RelicDictionary = new[]
@@ -395,7 +407,7 @@ public partial class Scribe : Node
                             e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
                             && dmgArgs.Dmg.Target == e.BD.Player
                             && dmgArgs.Dmg.Damage > 0
-                            && e.BD.Player.HasStatus(StatusEffect.Block.GetInstance())
+                            && e.BD.Player.HasStatus(StatusEffect.Block.CreateInstance())
                         )
                         {
                             e.BD.DealDamage(Targetting.First, val, null);

Scenes/BattleDirector/Scripts/BattleDirector.cs

@@ -371,16 +371,19 @@ public void DealDamage(Targetting targetting, int damage, PuppetTemplate source)
         }
     }
 
-    public void AddStatus(Targetting targetting, StatusEffect status)
+    public void AddStatus(Targetting targetting, StatusEffect status, int amount = 1)
     {
+        if (amount == 0)
+            return;
         PuppetTemplate[] targets = GetTargets(targetting);
         foreach (PuppetTemplate target in targets)
         {
-            target.AddStatusEffect(status);
+            StatusEffect eff = status.CreateInstance(amount);
+            if (!target.AddStatusEffect(eff))
+                continue;
+            eff.StatusEnd += RemoveStatus; //If new status, add effect events
+            AddEvent(eff);
         }
-
-        status.StatusEnd += RemoveStatus;
-        AddEvent(status);
     }
 
     public void RemoveStatus(StatusEffect status)

Scenes/Puppets/Scripts/PuppetTemplate.cs

@@ -170,6 +170,8 @@ public int GetCurrentHealth()
     /// <returns></returns>
     public bool AddStatusEffect(StatusEffect effect)
     {
+        if (CurrentHealth <= 0)
+            return false;
         int index = StatusEffects.FindIndex(sEff => sEff.StatusName == effect.StatusName);
         if (index != -1) //If status of same name -> stack -> return false
         {