Added a reference to the Note in NoteArrow

NoteArrow has been given a variable of type Note to represent what special note is held in there. Notes created by the chart or enemy are assigned the type enemy, while notes placed by the player are assigned based on the noteQueue. Also, the queue doesn't "loop" so when the player runs out, they can no longer place notes.

Author: cornerloan

scenes/BattleDirector/scripts/BattleDirector.cs

@@ -48,14 +48,15 @@ private void PlayerAddNote(ArrowType type, int beat)
             return;
         }
 
-        GD.Print($"Player trying to place {type} typed note at beat: " + beat);
+        GD.Print($"Player trying to place {note.Name}:{type} typed note at beat: " + beat);
         if (!NotePlacementBar.CanPlaceNote())
             return;
-        if (CD.AddNoteToLane(type, beat % CM.BeatsPerLoop, false))
+        if (CD.AddNoteToLane(type, beat % CM.BeatsPerLoop, note, false))
         {
             NotePlacementBar.PlacedNote();
             NotePlaced?.Invoke(this);
             GD.Print("Note Placed.");
+            NQ.DequeueNote();
         }
     }
 

scenes/BattleDirector/scripts/Conductor.cs

@@ -42,7 +42,7 @@ private bool IsNoteActive(ArrowType type, int beat)
         return _laneData[(int)type][beat] != null && _laneData[(int)type][beat].IsActive;
     }
 
-    public bool AddNoteToLane(ArrowType type, int beat, bool isActive = true)
+    public bool AddNoteToLane(ArrowType type, int beat, Note note, bool isActive = true)
     {
         beat %= CM.BeatsPerLoop;
         //Don't add dupe notes //Beat at 0 is too messy.
@@ -54,12 +54,18 @@ public bool AddNoteToLane(ArrowType type, int beat, bool isActive = true)
         NoteArrow arrow;
         if (isActive)
         {
-            arrow = CM.AddArrowToLane(type, beat, Notes.Length - 1);
+            arrow = CM.AddArrowToLane(type, beat, Notes.Length - 1, note);
             arrow.NoteIdx = 1;
         }
         else
         {
-            arrow = CM.AddArrowToLane(type, beat, Notes.Length - 1, new Color(1, 0.43f, 0.26f));
+            arrow = CM.AddArrowToLane(
+                type,
+                beat,
+                Notes.Length - 1,
+                note,
+                new Color(1, 0.43f, 0.26f)
+            );
             arrow.NoteIdx = 0;
         }
 
@@ -85,22 +91,22 @@ private void AddExampleNotes()
         GD.Print(CM.BeatsPerLoop);
         for (int i = 1; i < 15; i++)
         {
-            AddNoteToLane(ArrowType.Up, i * 4);
+            AddNoteToLane(ArrowType.Up, i * 4, Scribe.NoteDictionary[0]);
         }
 
         for (int i = 1; i < 15; i++)
         {
-            AddNoteToLane(ArrowType.Left, 4 * i + 1);
+            AddNoteToLane(ArrowType.Left, 4 * i + 1, Scribe.NoteDictionary[0]);
         }
 
         for (int i = 0; i < 10; i++)
         {
-            AddNoteToLane(ArrowType.Right, 3 * i + 32);
+            AddNoteToLane(ArrowType.Right, 3 * i + 32, Scribe.NoteDictionary[0]);
         }
 
         for (int i = 0; i < 3; i++)
         {
-            AddNoteToLane(ArrowType.Down, 8 * i + 16);
+            AddNoteToLane(ArrowType.Down, 8 * i + 16, Scribe.NoteDictionary[0]);
         }
     }
 

scenes/BattleDirector/test_battle_scene.tscn

@@ -9,12 +9,13 @@
 [ext_resource type="AudioStream" uid="uid://cv6lqjj6lu36h" path="res://Audio/335571__magntron__gamemusic_120bpm.mp3" id="8_caqms"]
 [ext_resource type="Script" path="res://scenes/SceneTransitions/scripts/SceneChange.cs" id="9_bxa6e"]
 
-[node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "NotePlacementBar", "CD", "Audio")]
+[node name="ProtoBattleDirector" type="Node2D" node_paths=PackedStringArray("CM", "NotePlacementBar", "CD", "Audio", "NQ")]
 script = ExtResource("1_cwqqr")
 CM = NodePath("SubViewport")
 NotePlacementBar = NodePath("NotePlacementBar")
 CD = NodePath("Conductor")
 Audio = NodePath("AudioStreamPlayer")
+NQ = NodePath("NoteQueue")
 
 [node name="Conductor" type="Node" parent="." node_paths=PackedStringArray("CM")]
 script = ExtResource("2_pcp76")

scenes/ChartViewport/ChartManager.cs

@@ -102,11 +102,12 @@ public NoteArrow AddArrowToLane(
         ArrowType type,
         int beat,
         int noteIdx,
+        Note note,
         Color colorOverride = default
     )
     {
-        var newNote = CreateNote(type, beat);
-        var loopArrow = CreateNote(type, beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
+        var newNote = CreateNote(type, note, beat);
+        var loopArrow = CreateNote(type, note, beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
         if (colorOverride != default)
         {
             newNote.Modulate = colorOverride;
@@ -116,11 +117,11 @@ public NoteArrow AddArrowToLane(
         return newNote;
     }
 
-    private NoteArrow CreateNote(ArrowType arrow, int beat = 0)
+    private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0)
     {
         var noteScene = ResourceLoader.Load<PackedScene>("res://scenes/NoteManager/note.tscn");
         NoteArrow newArrow = noteScene.Instantiate<NoteArrow>();
-        newArrow.Init(IH.Arrows[(int)arrow], beat);
+        newArrow.Init(IH.Arrows[(int)arrow], beat, note);
 
         _arrowGroup.AddChild(newArrow);
         newArrow.Bounds = (float)((double)beat / BeatsPerLoop * (ChartLength / 2));

scenes/CustomNotes/NoteQueue.cs

@@ -38,6 +38,7 @@ public void LoadQueueFromSave()
 
             for (int i = 0; i < numNotes; i++)
             {
+                GD.Print($"Creating note from noteName: {noteName}");
                 AddNoteToQueue(CreateNoteFromName(noteName));
             }
         }
@@ -47,30 +48,12 @@ public void LoadQueueFromSave()
     private Note CreateNoteFromName(string noteName)
     {
         if (noteName == "PlayerBase")
-        {
-            return new Note(
-                "PlayerBase",
-                null,
-                1,
-                (director, note, timing) =>
-                {
-                    director.Enemy.TakeDamage((int)timing);
-                }
-            );
-        }
+            return Scribe.NoteDictionary[1];
+
         if (noteName == "PlayerDouble")
-        {
-            return new Note(
-                "PlayerDouble",
-                null,
-                1,
-                (director, note, timing) =>
-                {
-                    director.Enemy.TakeDamage(2 * (int)timing);
-                }
-            );
-        }
+            return Scribe.NoteDictionary[2];
 
+        GD.Print($"Failed to create not from noteName: {noteName}");
         return null;
     }
 

scenes/NoteManager/scripts/NoteArrow.cs

@@ -12,8 +12,9 @@ public partial class NoteArrow : Sprite2D
     public int Beat;
     public float Bounds;
     public bool IsActive;
+    public Note NoteRef;
 
-    public void Init(ArrowData parentArrowData, int beat)
+    public void Init(ArrowData parentArrowData, int beat, Note note)
     {
         ZIndex = 1;