note placement bar implemented and working - placed notes are uninteractable

Author: cornerloan

scenes/BattleDirector/BattleDirector.cs

@@ -19,6 +19,8 @@ public partial class BattleDirector : Node2D
     private HealthBar Player;
     private HealthBar Enemy;
 
+    private NotePlacementBar NotePlacementBar;
+
     private double _timingInterval = .1; //secs
 
     [Signal]
@@ -53,6 +55,7 @@ public override void _Ready()
 
         Player = GetNode<HealthBar>("PlayerHP");
         Enemy = GetNode<HealthBar>("EnemyHP");
+        NotePlacementBar = GetNode<NotePlacementBar>("NotePlacementBar");
 
         CM.Connect(nameof(NoteManager.NotePressed), new Callable(this, nameof(OnNotePressed)));
         CM.Connect(nameof(NoteManager.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
@@ -122,21 +125,25 @@ private void handleTiming(NoteArrow.ArrowType type, double beatDif)
         {
             GD.Print("Perfect");
             Enemy.TakeDamage(10);
+            NotePlacementBar.HitNote();
         }
         else if (beatDif < _timingInterval * 4)
         {
             GD.Print("Good");
             Enemy.TakeDamage(5);
+            NotePlacementBar.HitNote();
         }
         else if (beatDif < _timingInterval * 6)
         {
             GD.Print("Okay");
             Enemy.TakeDamage(1);
+            NotePlacementBar.HitNote();
         }
         else
         {
             GD.Print("Miss");
             Player.TakeDamage(10);
+            NotePlacementBar.MissNote();
         }
     }
 
@@ -145,27 +152,37 @@ private void CheckNoteTiming(NoteArrow.ArrowType type)
         double curBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm);
         if (_laneNotes[(int)type].Length == 0)
         {
-            PlayerAddNote(type, (int)curBeat, 100); // 100 is temp, replace with current combo
+            PlayerAddNote(type, (int)curBeat);
             return;
         }
         double beatDif = Math.Abs(curBeat - _laneNotes[(int)type].First().Beat);
         if (beatDif > 1)
         {
-            PlayerAddNote(type, (int)curBeat, 100); // 100 is temp, replace with current combo
+            PlayerAddNote(type, (int)curBeat);
             return;
         }
         GD.Print("Note Hit. Dif: " + beatDif);
         CM.HandleNote(type);
         handleTiming(type, beatDif);
     }
 
-    private void PlayerAddNote(NoteArrow.ArrowType type, int beat, int currentCombo)
+    private void PlayerAddNote(NoteArrow.ArrowType type, int beat)
     {
+        //TODO: notes currently can only be placed in first loop.
+        // placed notes are also non-interactable
+
         // can also add some sort of keybind here to also have pressed
         // in case the user just presses the note too early and spawns a note
-        if (currentCombo >= 100)
+        GD.Print(
+            $"Player trying to place {type} typed note at beat: "
+                + beat
+                + " Verdict: "
+                + NotePlacementBar.CanPlaceNote()
+        );
+        if (NotePlacementBar.CanPlaceNote())
         {
             CM.CreateNote(type, beat);
+            NotePlacementBar.PlacedNote();
         }
     }
 }

scenes/BattleDirector/NotePlacementBar.cs

@@ -0,0 +1,75 @@
+using System;
+using Godot;
+
+public partial class NotePlacementBar : Node
+{
+    const int MaxValue = 100;
+    int currentBarValue;
+    int currentCombo;
+    int comboMult;
+    int notesToIncreaseCombo;
+
+    [Export]
+    ProgressBar notePlacementBar;
+
+    [Export]
+    TextEdit currentComboMultText;
+
+    // Called when the node enters the scene tree for the first time.
+    public override void _Ready()
+    {
+        currentBarValue = 0;
+        currentCombo = 0;
+        comboMult = 1;
+        notesToIncreaseCombo = 4;
+    }
+
+    // Hitting a note increases combo, combo mult, and note placement bar
+    public void HitNote()
+    {
+        currentCombo++;
+        DetermineComboMult();
+        currentBarValue += comboMult;
+        UpdateNotePlacementBar(currentBarValue);
+        UpdateComboMultText();
+    }
+
+    // Missing a note resets combo
+    public void MissNote()
+    {
+        currentCombo = 0;
+        DetermineComboMult();
+        UpdateComboMultText();
+    }
+
+    // Placing a note resets the note placement bar
+    public void PlacedNote()
+    {
+        currentBarValue = 0;
+        UpdateNotePlacementBar(currentBarValue);
+    }
+
+    public bool CanPlaceNote()
+    {
+        if (currentBarValue >= MaxValue)
+            return true;
+        return false;
+    }
+
+    private void DetermineComboMult()
+    {
+        comboMult = currentCombo / notesToIncreaseCombo;
+        if (comboMult == 0)
+            comboMult = 1;
+    }
+
+    public void UpdateNotePlacementBar(int newValue)
+    {
+        notePlacementBar.Value = newValue;
+    }
+
+    public void UpdateComboMultText()
+    {
+        currentComboMultText.Text = $"x{comboMult.ToString()}";
+    }
+}

scenes/BattleDirector/NotePlacementBar.tscn

@@ -0,0 +1,29 @@
+[gd_scene load_steps=2 format=3 uid="uid://duhiilcv4tat3"]
+
+[ext_resource type="Script" path="res://scenes/BattleDirector/NotePlacementBar.cs" id="1_456es"]
+
+[node name="NotePlacementBar" type="Control" node_paths=PackedStringArray("notePlacementBar", "currentComboMultText")]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_456es")
+notePlacementBar = NodePath("ProgressBar")
+currentComboMultText = NodePath("TextEdit")
+
+[node name="ProgressBar" type="ProgressBar" parent="."]
+layout_mode = 0
+offset_left = 29.0
+offset_top = 50.0
+offset_right = 229.0
+offset_bottom = 85.0
+
+[node name="TextEdit" type="TextEdit" parent="."]
+layout_mode = 0
+offset_left = 240.0
+offset_top = 50.0
+offset_right = 290.0
+offset_bottom = 85.0
+text = "x1"

scenes/BattleDirector/test_battle_scene.tscn

@@ -1,8 +1,9 @@
-[gd_scene load_steps=4 format=3 uid="uid://b0mrgr7h0ty1y"]
+[gd_scene load_steps=5 format=3 uid="uid://b0mrgr7h0ty1y"]
 
 [ext_resource type="Script" path="res://scenes/BattleDirector/BattleDirector.cs" id="1_cwqqr"]
 [ext_resource type="PackedScene" uid="uid://dfevfib11kou1" path="res://scenes/ChartViewport/ChartViewport.tscn" id="2_cupb3"]
 [ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://scenes/BattleDirector/HealthBar.tscn" id="3_pp0u0"]
+[ext_resource type="PackedScene" uid="uid://duhiilcv4tat3" path="res://scenes/BattleDirector/NotePlacementBar.tscn" id="4_y2yh3"]
 
 [node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "NM")]
 script = ExtResource("1_cwqqr")
@@ -30,3 +31,5 @@ offset_left = 403.0
 offset_top = -4.0
 offset_right = 443.0
 offset_bottom = 36.0
+
+[node name="NotePlacementBar" parent="." instance=ExtResource("4_y2yh3")]

scenes/ChartViewport/ChartManager.cs

@@ -101,6 +101,9 @@ private NoteArrow CreateNote(NoteManager.ArrowData arrowData, int beat)
                 .ToArray();
         }
         ChartLoopables.AddChild(note);
+        GD.Print(
+            $"Adding note: {arrowData.Type}, Current count: {_currentArrows[(int)arrowData.Type].Length}"
+        );
         return note;
     }