Refactor HP Bars

Enforced signal up call down.
Removed signals from BattleDirector to HP bars.

Author: LifeHckr

scenes/ChartViewport/BattleDirector.cs

@@ -16,6 +16,9 @@ public partial class BattleDirector : Node2D
     [Export]
     public NoteManager NM;
 
+    private Player Player;
+    private Enemy Enemy;
+
     private double _timingInterval = .1; //secs
 
     [Signal]
@@ -44,8 +47,11 @@ public struct SongData
     public override void _Ready()
     {
         AddExampleNote();
-
         CM.PrepChart(_curSong, _notes);
+
+        Player = GetNode<Player>("PlayerObject");
+        Enemy = GetNode<Enemy>("EnemyObject");
+
         //TODO: Hook up signals
         CM.Connect(nameof(NoteManager.NotePressed), new Callable(this, nameof(OnNotePressed)));
         CM.Connect(nameof(NoteManager.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
@@ -67,6 +73,7 @@ public override void _Process(double delta)
                     //Cycle note queue
                     _laneNotes[i].First().Beat += CM._beatsPerLoop;
                     _laneNotes[i] = _laneNotes[i].Skip(1).Concat(_laneNotes[i].Take(1)).ToArray(); //TODO: No stackoverflow code
+                    Player.PlayerTakeDamage(10);
                     CM.HandleNote((NoteArrow.ArrowType)i);
                 }
             }
@@ -134,22 +141,22 @@ private void CheckNoteTiming(NoteArrow.ArrowType type)
         if (beatDif < _timingInterval * 2)
         {
             GD.Print("Perfect");
-            EmitSignal(nameof(EnemyDamage), 10);
+            Enemy.EnemyTakeDamage(10);
         }
         else if (beatDif < _timingInterval * 4)
         {
             GD.Print("Good");
-            EmitSignal(nameof(EnemyDamage), 5);
+            Enemy.EnemyTakeDamage(5);
         }
         else if (beatDif < _timingInterval * 6)
         {
             GD.Print("Okay");
-            EmitSignal(nameof(EnemyDamage), 1);
+            Enemy.EnemyTakeDamage(1);
         }
         else
         {
             GD.Print("Miss");
-            EmitSignal(nameof(PlayerDamage), 10);
+            Player.PlayerTakeDamage(10);
         }
     }
 }

scenes/ChartViewport/Enemy.cs

@@ -6,9 +6,6 @@ public partial class Enemy : Node2D
     [Export]
     public HealthBar EnemyHealthBar;
 
-    [Export]
-    public BattleDirector BattleDirectorInstance;
-
     private int _enemyMaxHealth = 100;
 
     public override void _Ready()
@@ -17,17 +14,9 @@ public override void _Ready()
         {
             EnemyHealthBar.SetHealth(_enemyMaxHealth, _enemyMaxHealth);
         }
-
-        if (BattleDirectorInstance != null)
-        {
-            BattleDirectorInstance.Connect(
-                (nameof(BattleDirectorInstance.EnemyDamage)),
-                new Callable(this, nameof(EnemyTakeDamage))
-            );
-        }
     }
 
-    private void EnemyTakeDamage(int damage)
+    public void EnemyTakeDamage(int damage)
     {
         EnemyHealthBar.TakeDamage(damage);
         GD.Print("Enemy takes damage:" + damage);

scenes/ChartViewport/Player.cs

@@ -6,8 +6,6 @@ public partial class Player : Node2D
     [Export]
     public HealthBar PlayerHealthBar;
 
-    [Export]
-    public BattleDirector BattleDirectorInstance;
     private int _playerHealthMax = 100;
     private int _playerHealth = 100;
 
@@ -17,17 +15,9 @@ public override void _Ready()
         {
             PlayerHealthBar.SetHealth(_playerHealthMax, _playerHealth);
         }
-
-        if (BattleDirectorInstance != null)
-        {
-            BattleDirectorInstance.Connect(
-                (nameof(BattleDirectorInstance.PlayerDamage)),
-                new Callable(this, nameof(PlayerTakeDamage))
-            );
-        }
     }
 
-    private void PlayerTakeDamage(int damage)
+    public void PlayerTakeDamage(int damage)
     {
         GD.Print("Player taking damage: " + damage);
         PlayerHealthBar.TakeDamage(damage);