Reworking and some juice

Reworked note management (again)
Set size 2D arrays for notes, that slot in their beat position.
Queue-like checking for missed notes
Added in game feedback for hit timing quality

Author: LifeHckr

scenes/BattleDirector/BattleDirector.cs

@@ -44,30 +44,20 @@ public struct SongData
     #region Note Handling
     //Assume queue structure for notes in each lane.
     //Can eventually make this its own structure
-    private readonly NoteArrow[][] _laneData = new NoteArrow[][]
-    {
-        Array.Empty<NoteArrow>(),
-        Array.Empty<NoteArrow>(),
-        Array.Empty<NoteArrow>(),
-        Array.Empty<NoteArrow>(),
+    private NoteArrow[][] _laneData;
+    private int[] _laneLastBeat = new int[]
+    { //Temporary (hopefully) measure to bridge from note queue structure to ordered array
+        0,
+        0,
+        0,
+        0,
     };
     private Note[] _notes = Array.Empty<Note>();
 
-    //Cycles lane of dir and returns the, initially, first note
-    private Note CycleNote(NoteArrow.ArrowType dir)
-    {
-        var note = GetFirstNote(dir);
-        _laneData[(int)dir] = _laneData[(int)dir] //Credit: Stackoverflow https://stackoverflow.com/questions/49494535/moving-the-first-array-element-to-end-in-c-sharp
-            .Skip(1)
-            .Concat(_laneData[(int)dir].Take(1))
-            .ToArray();
-        return note;
-    }
-
     //Returns first note of lane without modifying lane data
-    private Note GetFirstNote(NoteArrow.ArrowType dir)
+    private Note GetNoteAt(NoteArrow.ArrowType dir, int beat)
     {
-        return GetNote(_laneData[(int)dir].First());
+        return GetNote(_laneData[(int)dir][beat]);
     }
 
     //Get note of a note arrow
@@ -78,6 +68,7 @@ private Note GetNote(NoteArrow arrow)
 
     private bool AddNoteToLane(Note note, bool isActive = true)
     {
+        note.Beat %= CM.BeatsPerLoop;
         //Don't add dupe notes
         if (_notes.Any(nt => nt.Type == note.Type && nt.Beat == note.Beat))
         {
@@ -87,17 +78,18 @@ private bool AddNoteToLane(Note note, bool isActive = true)
         //Get noteArrow from CM
         var arrow = CM.AddArrowToLane(note, _notes.Length - 1);
         arrow.IsActive = isActive;
-        _laneData[(int)note.Type] = _laneData[(int)note.Type].Append(arrow).ToArray();
+        _laneData[(int)note.Type][note.Beat] = arrow;
         return true;
     }
     #endregion
 
     //Creeate dummy notes
     private void AddExampleNotes()
     {
+        GD.Print(CM.BeatsPerLoop);
         for (int i = 0; i < 1; i++)
         {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Down, i + 5);
+            Note exampleNote = new Note(NoteArrow.ArrowType.Down, i);
             AddNoteToLane(exampleNote);
         }
         for (int i = 0; i < 4; i++)
@@ -107,7 +99,7 @@ private void AddExampleNotes()
         }
         for (int i = 0; i < 1; i++)
         {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Left, i + 21);
+            Note exampleNote = new Note(NoteArrow.ArrowType.Left, CM.BeatsPerLoop);
             AddNoteToLane(exampleNote);
         }
     }
@@ -121,6 +113,13 @@ public override void _Ready()
             NumLoops = 5,
         };
         CM.PrepChart(_curSong);
+        _laneData = new NoteArrow[][]
+        {
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+        };
         AddExampleNotes();
 
         Player = GetNode<HealthBar>("PlayerHP");
@@ -162,65 +161,81 @@ private void OnNoteReleased(NoteArrow.ArrowType arrowType) { }
     //Check all lanes for misses from missed inputs
     private void CheckMiss()
     {
-        double curBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
+        //On current beat, if prev beat is active and not inputted
+        double realBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
         for (int i = 0; i < _laneData.Length; i++)
         {
-            if (_laneData[i].Length <= 0)
-                continue;
-            double beatDif = (curBeat - GetFirstNote((NoteArrow.ArrowType)i).Beat);
-            if (beatDif > 1 && _laneData[i].First().IsActive)
-            {
-                _laneData[i].First().NoteHit();
-                HandleTiming((NoteArrow.ArrowType)i, Math.Abs(beatDif));
+            if (
+                _laneLastBeat[i] < Math.Floor(realBeat)
+                || (_laneLastBeat[i] == CM.BeatsPerLoop - 1 && Math.Floor(realBeat) == 0)
+            )
+            { //If above, a note has been missed
+                //GD.Print("Last beat " + _laneLastBeat[i]);
+                if (
+                    _laneData[i][_laneLastBeat[i]] == null
+                    || !_laneData[i][_laneLastBeat[i]].IsActive
+                )
+                {
+                    _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
+                    continue;
+                }
+                //Note exists and has been missed
+                _laneData[i][_laneLastBeat[i]].NoteHit();
+                HandleTiming((NoteArrow.ArrowType)i, 1);
+                _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
             }
         }
     }
 
     private void CheckNoteTiming(NoteArrow.ArrowType type)
     {
-        double curBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
-        if (_laneData[(int)type].Length == 0)
-        {
-            PlayerAddNote(type, (int)Math.Round(curBeat));
-            return;
-        }
-        double beatDif = Math.Abs(curBeat - GetFirstNote(type).Beat);
-        if (beatDif > 1)
+        double realBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
+        int curBeat = (int)Math.Round(realBeat);
+        GD.Print("Cur beat " + curBeat + "Real: " + realBeat.ToString("#.###"));
+        if (
+            _laneData[(int)type][curBeat % CM.BeatsPerLoop] == null
+            || !_laneData[(int)type][curBeat % CM.BeatsPerLoop].IsActive
+        )
         {
-            PlayerAddNote(type, (int)Math.Round(curBeat));
+            _laneLastBeat[(int)type] = (curBeat) % CM.BeatsPerLoop;
+            PlayerAddNote(type, curBeat);
             return;
         }
-        GD.Print("Note Hit. Dif: " + beatDif);
-        _laneData[(int)type].First().NoteHit();
+        double beatDif = Math.Abs(realBeat - curBeat);
+        _laneData[(int)type][curBeat % CM.BeatsPerLoop].NoteHit();
+        _laneLastBeat[(int)type] = (curBeat) % CM.BeatsPerLoop;
         HandleTiming(type, beatDif);
     }
 
     private void HandleTiming(NoteArrow.ArrowType type, double beatDif)
     {
-        CycleNote(type);
-        if (beatDif < _timingInterval * 2)
+        if (beatDif < _timingInterval * 1)
         {
             GD.Print("Perfect");
             Enemy.TakeDamage(1);
             NotePlacementBar.HitNote();
+            NotePlacementBar.ComboText("Perfect!");
         }
-        else if (beatDif < _timingInterval * 4)
+        else if (beatDif < _timingInterval * 2)
         {
             GD.Print("Good");
             Enemy.TakeDamage(0);
             NotePlacementBar.HitNote();
+            NotePlacementBar.ComboText("Good");
         }
-        else if (beatDif < _timingInterval * 6)
+        else if (beatDif < _timingInterval * 3)
         {
-            GD.Print("Okay");
+            GD.Print("Ok");
             Player.TakeDamage(1);
             NotePlacementBar.HitNote();
+            NotePlacementBar.ComboText("Okay");
         }
         else
         {
             GD.Print("Miss");
             Player.TakeDamage(2);
             NotePlacementBar.MissNote();
+            NotePlacementBar.ComboText("Miss");
         }
     }
     #endregion

scenes/BattleDirector/NotePlacementBar.cs

@@ -3,7 +3,7 @@
 
 public partial class NotePlacementBar : Node
 {
-    const int MaxValue = 50;
+    const int MaxValue = 5;
     int currentBarValue;
     int currentCombo;
     int comboMult;
@@ -25,6 +25,16 @@ public override void _Ready()
         notesToIncreaseCombo = 4;
     }
 
+    public void ComboText(string text)
+    {
+        var feedbackScene = ResourceLoader.Load<PackedScene>(
+            "res://scenes/BattleDirector/TextParticle.tscn"
+        );
+        TextParticle newText = feedbackScene.Instantiate<TextParticle>();
+        AddChild(newText);
+        newText.Text = text + $" {currentCombo}";
+    }
+
     // Hitting a note increases combo, combo mult, and note placement bar
     public void HitNote()
     {
@@ -52,9 +62,7 @@ public void PlacedNote()
 
     public bool CanPlaceNote()
     {
-        if (currentBarValue >= MaxValue)
-            return true;
-        return false;
+        return currentBarValue >= MaxValue;
     }
 
     private void DetermineComboMult()

scenes/BattleDirector/TextParticle.cs

@@ -0,0 +1,22 @@
+using System;
+using Godot;
+
+public partial class TextParticle : Label
+{
+    // Called when the node enters the scene tree for the first time.
+    public override void _Ready()
+    {
+        Tween tween = GetTree().CreateTween();
+        tween.SetTrans(Tween.TransitionType.Quad);
+        tween.SetEase(Tween.EaseType.Out);
+        tween.TweenProperty(this, "position", Position + Vector2.Up * 10, .5f);
+        tween.TweenProperty(this, "position", Position + Vector2.Down * 20, .5f);
+        tween.SetParallel();
+        tween.TweenProperty(this, "modulate:a", 0, 1f);
+        tween.SetParallel(false);
+        tween.TweenCallback(Callable.From(QueueFree));
+    }
+
+    // Called every frame. 'delta' is the elapsed time since the previous frame.
+    public override void _Process(double delta) { }
+}

scenes/BattleDirector/TextParticle.tscn

@@ -0,0 +1,9 @@
+[gd_scene load_steps=2 format=3 uid="uid://bd23wwbv7i4gg"]
+
+[ext_resource type="Script" path="res://scenes/BattleDirector/TextParticle.cs" id="1_j0ufq"]
+
+[node name="Control" type="Label"]
+anchors_preset = -1
+anchor_right = 0.08
+text = "900000"
+script = ExtResource("1_j0ufq")

scenes/BattleDirector/test_battle_scene.tscn

@@ -67,3 +67,5 @@ offset_left = 12.0
 offset_top = 145.0
 offset_right = 12.0
 offset_bottom = 145.0
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]

scenes/ChartViewport/ChartManager.cs

@@ -25,7 +25,7 @@ public partial class ChartManager : SubViewportContainer
     public delegate void NoteReleasedEventHandler(ArrowType arrowType);
 
     //Arbitrary vars, play with these
-    private double ChartLength = 2400; //Might move this to be song specific?
+    private double ChartLength = 5000; //Might move this to be song specific?
     private double _loopLen; //secs
     public int BeatsPerLoop;
 
@@ -113,6 +113,7 @@ private NoteArrow CreateNote(ArrowType arrow, int beat = 0)
 
         _arrowGroup.AddChild(newArrow);
         newArrow.Bounds = (float)((double)beat / BeatsPerLoop * (ChartLength / 2));
+        newArrow.Position += Vector2.Right * newArrow.Bounds; //temporary fix for notes spawning and instantly calling loop from originating at 0,0
         return newArrow;
     }
 }