Merge branch 'milestone-2' into NewRelics

Author: LifeHckr

Scenes/Puppets/Enemies/Effigy/P_Effigy.cs

@@ -27,7 +27,8 @@ public override void _Ready()
                     if (dArgs.Dmg.Target != this)
                         return;
                     dArgs.Dmg.ModifyDamage(-dArgs.Dmg.Damage + 1);
-                    dArgs.Dmg.Source.TakeDamage(new DamageInstance(1, null, dArgs.Dmg.Source));
+                    if (dArgs.Dmg.Source != null)
+                        dArgs.Dmg.Source.TakeDamage(new DamageInstance(1, null, dArgs.Dmg.Source));
                 }
             ),
             new EnemyEffect(
@@ -55,13 +56,14 @@ public override void _Ready()
                 2,
                 (e, eff, val) =>
                 {
-                    if (e is not BattleDirector.Harbinger.OnDamageInstanceArgs dArgs)
+                    if (e is not BattleDirector.Harbinger.OnDamageInstanceArgs dArgs || val != 2)
                         return;
                     if (
                         dArgs.Dmg.Target == dArgs.BD.Player
                         && dArgs.Dmg.Target.GetCurrentHealth() <= dArgs.Dmg.Damage
                     )
                     {
+                        eff.Value = -1;
                         _tutorialInstance.FromBoss = true;
                         _tutorialInstance.OnPlaceDialogue3();
                     }