Adding notes fixes

Made added notes tween to the same rhythm
Fixed issues when adding notes being considered active at wrong times

Author: LifeHckr

scenes/BattleDirector/BattleDirector.cs

@@ -76,7 +76,7 @@ private Note GetNote(NoteArrow arrow)
         return _notes[arrow.NoteIdx];
     }
 
-    private bool AddNoteToLane(Note note)
+    private bool AddNoteToLane(Note note, bool isActive = true)
     {
         //Don't add dupe notes
         if (_notes.Any(nt => nt.Type == note.Type && nt.Beat == note.Beat))
@@ -86,6 +86,7 @@ private bool AddNoteToLane(Note note)
         _notes = _notes.Append(note).ToArray();
         //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();
         return true;
     }
@@ -167,7 +168,7 @@ private void CheckMiss()
             if (_laneData[i].Length <= 0)
                 continue;
             double beatDif = (curBeat - GetFirstNote((NoteArrow.ArrowType)i).Beat);
-            if (beatDif > 1 && _laneData[i].First().Visible) //Can change, currently using visible as a stand in for already activated.
+            if (beatDif > 1 && _laneData[i].First().IsActive)
             {
                 _laneData[i].First().NoteHit();
                 HandleTiming((NoteArrow.ArrowType)i, Math.Abs(beatDif));
@@ -179,7 +180,10 @@ 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)
         {
@@ -225,7 +229,6 @@ private void PlayerAddNote(NoteArrow.ArrowType type, int beat)
     {
         // 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
-        //TODO: Sync new notes animations with the rest.
         GD.Print(
             $"Player trying to place {type} typed note at beat: "
                 + beat
@@ -235,7 +238,7 @@ private void PlayerAddNote(NoteArrow.ArrowType type, int beat)
         if (NotePlacementBar.CanPlaceNote())
         {
             Note exampleNote = new Note(type, beat % CM.BeatsPerLoop);
-            if (AddNoteToLane(exampleNote))
+            if (AddNoteToLane(exampleNote, false))
                 NotePlacementBar.PlacedNote();
         }
     }

scenes/BattleDirector/NotePlacementBar.cs

@@ -3,7 +3,7 @@
 
 public partial class NotePlacementBar : Node
 {
-    const int MaxValue = 100;
+    const int MaxValue = 50;
     int currentBarValue;
     int currentCombo;
     int comboMult;
@@ -59,9 +59,7 @@ public bool CanPlaceNote()
 
     private void DetermineComboMult()
     {
-        comboMult = currentCombo / notesToIncreaseCombo;
-        if (comboMult == 0)
-            comboMult = 1;
+        comboMult = currentCombo / notesToIncreaseCombo + 1;
     }
 
     public void UpdateNotePlacementBar(int newValue)

scenes/ChartViewport/ChartManager.cs

@@ -16,6 +16,8 @@ public partial class ChartManager : SubViewportContainer
     [Export]
     public CanvasGroup ChartLoopables;
 
+    private Node _arrowGroup;
+
     [Signal]
     public delegate void NotePressedEventHandler(ArrowType arrowType);
 
@@ -47,9 +49,29 @@ public void PrepChart(BattleDirector.SongData songData)
         TimeKeeper.Bpm = songData.Bpm;
 
         InitBackgrounds();
+        _arrowGroup = ChartLoopables.GetNode<Node>("ArrowGroup");
 
         IH.Connect(nameof(InputHandler.NotePressed), new Callable(this, nameof(OnNotePressed)));
         IH.Connect(nameof(InputHandler.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
+
+        //This could be good as a function to call on something, to have many things animated to the beat.
+        var tween = GetTree().CreateTween();
+        tween
+            .TweenMethod(
+                Callable.From((Vector2 scale) => TweenArrows(scale)),
+                new Vector2(0.07f, 0.07f),
+                new Vector2(0.07f, 0.07f) * 1.25f,
+                60f / TimeKeeper.Bpm / 2
+            )
+            .SetEase(Tween.EaseType.Out)
+            .SetTrans(Tween.TransitionType.Elastic);
+        tween.TweenMethod(
+            Callable.From((Vector2 scale) => TweenArrows(scale)),
+            new Vector2(0.07f, 0.07f) * 1.25f,
+            new Vector2(0.07f, 0.07f),
+            60f / TimeKeeper.Bpm / 2
+        );
+        tween.SetLoops().Play();
     }
 
     private void InitBackgrounds()
@@ -66,6 +88,15 @@ private void InitBackgrounds()
         }
     }
 
+    private void TweenArrows(Vector2 scale)
+    {
+        foreach (var node in _arrowGroup.GetChildren())
+        {
+            NoteArrow arrow = (NoteArrow)node;
+            arrow.Scale = scale;
+        }
+    }
+
     public NoteArrow AddArrowToLane(Note note, int noteIdx)
     {
         var newNote = CreateNote(note.Type, note.Beat);
@@ -80,7 +111,7 @@ private NoteArrow CreateNote(ArrowType arrow, int beat = 0)
         NoteArrow newArrow = noteScene.Instantiate<NoteArrow>();
         newArrow.Init(IH.Arrows[(int)arrow]);
 
-        ChartLoopables.AddChild(newArrow);
+        _arrowGroup.AddChild(newArrow);
         newArrow.Bounds = (float)((double)beat / BeatsPerLoop * (ChartLength / 2));
         return newArrow;
     }

scenes/ChartViewport/ChartViewport.tscn

@@ -31,14 +31,16 @@ anchor_mode = 0
 [node name="ChartLoopables" type="CanvasGroup" parent="SubViewport"]
 unique_name_in_owner = true
 
-[node name="ChartBG1" type="TextureRect" parent="SubViewport/ChartLoopables"]
+[node name="ArrowGroup" type="Node" parent="SubViewport/ChartLoopables"]
+
+[node name="ChartBG2" type="TextureRect" parent="SubViewport/ChartLoopables"]
 modulate = Color(2, 2, 2, 1)
 offset_right = 701.0
 offset_bottom = 300.0
 texture = ExtResource("1_0wnka")
 script = ExtResource("3_5u57h")
 
-[node name="ChartBG2" type="TextureRect" parent="SubViewport/ChartLoopables"]
+[node name="ChartBG1" type="TextureRect" parent="SubViewport/ChartLoopables"]
 modulate = Color(2, 2, 2, 1)
 offset_right = 701.0
 offset_bottom = 300.0

scenes/NoteManager/scripts/NoteArrow.cs

@@ -16,6 +16,7 @@ public enum ArrowType
 
     public int NoteIdx;
     public float Bounds;
+    public bool IsActive;
 
     public void Init(InputHandler.ArrowData parentArrowData)
     {
@@ -24,15 +25,6 @@ public void Init(InputHandler.ArrowData parentArrowData)
         SelfModulate = parentArrowData.Color;
         Position += Vector2.Down * (parentArrowData.Node.GlobalPosition.Y);
         RotationDegrees = parentArrowData.Node.RotationDegrees;
-
-        //This could be good as a function to call on something, to have many things animated to the beat.
-        var tween = CreateTween();
-        tween.TweenProperty(this, "scale", Scale, 60f / TimeKeeper.Bpm / 2);
-        tween.SetEase(Tween.EaseType.In);
-        tween.SetTrans(Tween.TransitionType.Elastic);
-        tween.TweenProperty(this, "scale", Scale * 1.25f, 60f / TimeKeeper.Bpm / 2);
-        tween.SetLoops();
-        tween.Play();
     }
 
     public override void _Process(double delta)
@@ -54,10 +46,12 @@ public override void _Process(double delta)
     public void OnLoop()
     {
         Visible = true;
+        IsActive = true;
     }
 
     public void NoteHit()
     {
         Visible = false;
+        IsActive = false;
     }
 }