Simplified health bars

Enemy and Player consolidated to HealthBar

Author: LifeHckr

scenes/ChartViewport/BattleDirector.cs

@@ -16,8 +16,8 @@ public partial class BattleDirector : Node2D
     [Export]
     public NoteManager NM;
 
-    private Player Player;
-    private Enemy Enemy;
+    private HealthBar Player;
+    private HealthBar Enemy;
 
     private double _timingInterval = .1; //secs
 
@@ -49,8 +49,8 @@ public override void _Ready()
         AddExampleNote();
         CM.PrepChart(_curSong, _notes);
 
-        Player = GetNode<Player>("PlayerObject");
-        Enemy = GetNode<Enemy>("EnemyObject");
+        Player = GetNode<HealthBar>("PlayerHP");
+        Enemy = GetNode<HealthBar>("EnemyHP");
 
         //TODO: Hook up signals
         CM.Connect(nameof(NoteManager.NotePressed), new Callable(this, nameof(OnNotePressed)));
@@ -73,7 +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);
+                    Player.TakeDamage(10);
                     CM.HandleNote((NoteArrow.ArrowType)i);
                 }
             }
@@ -141,22 +141,22 @@ private void CheckNoteTiming(NoteArrow.ArrowType type)
         if (beatDif < _timingInterval * 2)
         {
             GD.Print("Perfect");
-            Enemy.EnemyTakeDamage(10);
+            Enemy.TakeDamage(10);
         }
         else if (beatDif < _timingInterval * 4)
         {
             GD.Print("Good");
-            Enemy.EnemyTakeDamage(5);
+            Enemy.TakeDamage(5);
         }
         else if (beatDif < _timingInterval * 6)
         {
             GD.Print("Okay");
-            Enemy.EnemyTakeDamage(1);
+            Enemy.TakeDamage(1);
         }
         else
         {
             GD.Print("Miss");
-            Player.PlayerTakeDamage(10);
+            Player.TakeDamage(10);
         }
     }
 }

scenes/ChartViewport/Enemy.cs

@@ -1,10 +1,8 @@
-[gd_scene load_steps=6 format=3 uid="uid://b0mrgr7h0ty1y"]
+[gd_scene load_steps=4 format=3 uid="uid://b0mrgr7h0ty1y"]
 
 [ext_resource type="PackedScene" uid="uid://dfevfib11kou1" path="res://scenes/ChartViewport/ChartViewport.tscn" id="1_1vh1u"]
 [ext_resource type="Script" path="res://scenes/ChartViewport/BattleDirector.cs" id="1_jbxt1"]
 [ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://scenes/HealthBar.tscn" id="2_1t4a4"]
-[ext_resource type="Script" path="res://scenes/ChartViewport/Player.cs" id="3_gtvac"]
-[ext_resource type="Script" path="res://scenes/ChartViewport/Enemy.cs" id="5_nkoeo"]
 
 [node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "NM")]
 script = ExtResource("1_jbxt1")
@@ -25,19 +23,9 @@ offset_right = 673.0
 offset_bottom = 393.0
 color = Color(0.147672, 0.147672, 0.147672, 1)
 
-[node name="PlayerObject" type="Node2D" parent="." node_paths=PackedStringArray("PlayerHealthBar", "BattleDirectorInstance")]
-script = ExtResource("3_gtvac")
-PlayerHealthBar = NodePath("HP")
-BattleDirectorInstance = NodePath("..")
+[node name="PlayerHP" parent="." instance=ExtResource("2_1t4a4")]
 
-[node name="HP" parent="PlayerObject" instance=ExtResource("2_1t4a4")]
-
-[node name="EnemyObject" type="Node2D" parent="." node_paths=PackedStringArray("EnemyHealthBar", "BattleDirectorInstance")]
-script = ExtResource("5_nkoeo")
-EnemyHealthBar = NodePath("EHP")
-BattleDirectorInstance = NodePath("..")
-
-[node name="EHP" parent="EnemyObject" instance=ExtResource("2_1t4a4")]
+[node name="EnemyHP" parent="." instance=ExtResource("2_1t4a4")]
 offset_left = 403.0
 offset_top = -4.0
 offset_right = 443.0

scenes/ChartViewport/Player.cs

@@ -17,16 +17,15 @@ public override void _Ready()
     {
         if (PlayerHealthBar != null)
         {
-            GD.Print("Player Health Bar");
-            PlayerHealthBar.MaxValue = MaxHealth;
+            SetHealth(MaxHealth, MaxHealth);
         }
-        //Connect(nameof(BattleDirector.PlayerDamage), new Callable(this ,nameof(PlayerDamage)));
     }
 
     public void SetHealth(int max, int current)
     {
         PlayerHealthBar.MaxValue = max;
         PlayerHealthBar.Value = current;
+        _updateHealthBar();
     }
 
     private void _updateHealthBar()
@@ -37,18 +36,10 @@ private void _updateHealthBar()
     public void TakeDamage(int damage)
     {
         _health -= damage;
-        GD.Print("Health: " + _health);
         if (_health <= 0)
         {
             GD.Print("You are dead");
         }
         _updateHealthBar();
     }
-
-    /*public override void _Input(InputEvent @event)
-    {
-        if(@event.IsActionPressed("ui_accept"))
-                _takeDamage(10);
-          
-    }*/
 }