More effectively handle looping

Notes no longer loop with increased beat

Author: LifeHckr

scenes/BattleDirector/BattleDirector.cs

@@ -20,6 +20,7 @@ public partial class BattleDirector : Node2D
     [Export]
     public InputHandler IH;
 
+    [Export]
     private NotePlacementBar NotePlacementBar;
 
     private double _timingInterval = .1; //secs
@@ -118,7 +119,6 @@ public override void _Ready()
 
         Player = GetNode<HealthBar>("PlayerHP");
         Enemy = GetNode<HealthBar>("EnemyHP");
-        NotePlacementBar = GetNode<NotePlacementBar>("NotePlacementBar");
 
         CM.Connect(nameof(InputHandler.NotePressed), new Callable(this, nameof(OnNotePressed)));
         CM.Connect(nameof(InputHandler.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
@@ -130,8 +130,7 @@ public override void _Process(double delta)
         CheckMiss();
     }
 
-    #region Input
-
+    #region Input&Timing
     private void OnNotePressed(NoteArrow.ArrowType type)
     {
         CheckNoteTiming(type);
@@ -142,22 +141,23 @@ 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);
+        double curBeat = 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)
+            if (beatDif > 1 && _laneData[i].First().Visible) //Can change, currently using visible as a stand in for already activated.
             {
+                _laneData[i].First().NoteHit();
                 HandleTiming((NoteArrow.ArrowType)i, Math.Abs(beatDif));
             }
         }
     }
 
     private void CheckNoteTiming(NoteArrow.ArrowType type)
     {
-        double curBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm);
+        double curBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
         if (_laneData[(int)type].Length == 0)
             return;
         double beatDif = Math.Abs(curBeat - GetFirstNote(type).Beat);
@@ -170,9 +170,7 @@ private void CheckNoteTiming(NoteArrow.ArrowType type)
 
     private void HandleTiming(NoteArrow.ArrowType type, double beatDif)
     {
-        //Cycle note queue
-        CycleNote(type).Beat += CM.BeatsPerLoop;
-        //Do timing stuff
+        CycleNote(type);
         if (beatDif < _timingInterval * 2)
         {
             GD.Print("Perfect");

scenes/BattleDirector/test_battle_scene.tscn

@@ -5,10 +5,11 @@
 [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", "IH")]
+[node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "IH", "NotePlacementBar")]
 script = ExtResource("1_cwqqr")
 CM = NodePath("SubViewport")
 IH = NodePath("SubViewport/SubViewport/noteManager")
+NotePlacementBar = NodePath("NotePlacementBar")
 
 [node name="SubViewport" parent="." instance=ExtResource("2_cupb3")]
 offset_left = 80.0

scenes/NoteManager/scripts/NoteArrow.cs

@@ -37,11 +37,16 @@ public override void _Process(double delta)
             ) + Bounds;
         if (newPos.X > Position.X)
         {
-            Visible = true;
+            OnLoop();
         }
         Position = newPos;
     }
 
+    public void OnLoop()
+    {
+        Visible = true;
+    }
+
     public void NoteHit()
     {
         Visible = false;