temporary changes, will fix later

Author: cornerloan

Globals/Scribe.cs

@@ -27,6 +27,15 @@ public partial class Scribe : Node
                 director.Enemy.TakeDamage((int)timing);
             }
         ),
+        new Note(
+            "PlayerDouble",
+            null,
+            2,
+            (director, note, timing) =>
+            {
+                director.Enemy.TakeDamage((int)timing);
+            }
+        ),
     };
 
     public static readonly RelicTemplate[] RelicDictionary = new[]

scenes/CustomNotes/NoteQueue.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using FunkEngine;
 using Godot;
 
 public partial class NoteQueue : Node
@@ -10,51 +11,59 @@ public partial class NoteQueue : Node
     [Export]
     private Sprite2D _nextNote;
 
-    private Queue<string> _noteQueue = new Queue<string>();
+    private Queue<Note> _noteQueue = new Queue<Note>();
     private Dictionary<string, Texture2D> _noteSprites = new Dictionary<string, Texture2D>();
 
     public override void _Ready()
     {
-        _noteSprites["single"] = GD.Load<Texture2D>(
+        _noteSprites["PlayerBase"] = GD.Load<Texture2D>(
             "res://scenes/CustomNotes/assets/single_note.png"
         );
-        _noteSprites["double"] = GD.Load<Texture2D>(
+        _noteSprites["PlayerDouble"] = GD.Load<Texture2D>(
             "res://scenes/CustomNotes/assets/double_note.png"
         );
 
         UpdateQueue();
     }
 
-    public void AddNoteToQueue(string noteType)
+    public void LoadQueue(PlayerPuppet player)
+    {
+        for (int i = 0; i < player.Stats.CurNotes.Length; i++)
+        {
+            AddNoteToQueue(player.Stats.CurNotes[i]);
+        }
+    }
+
+    public void AddNoteToQueue(Note noteType)
     {
         _noteQueue.Enqueue(noteType);
         UpdateQueue();
     }
 
     //returns current note, and removes it from the queue
-    public string GetCurrentNote()
+    public Note GetCurrentNote()
     {
         if (_noteQueue.Count > 0)
         {
-            string currentNoteName = _noteQueue.Dequeue();
+            Note currentNote = _noteQueue.Dequeue();
             UpdateQueue();
-            return currentNoteName;
+            return currentNote;
         }
         return null;
     }
 
     private void UpdateQueue()
     {
-        if (_noteQueue.Count > 0 && _noteSprites.ContainsKey(_noteQueue.Peek()))
-            _currentNote.Texture = _noteSprites[_noteQueue.Peek()];
+        if (_noteQueue.Count > 0 && _noteSprites.ContainsKey(_noteQueue.Peek().Name))
+            _currentNote.Texture = _noteSprites[_noteQueue.Peek().Name];
         else
             _currentNote.Texture = null;
 
         if (_noteQueue.Count > 1)
         {
-            string[] notes = _noteQueue.ToArray();
-            if (_noteSprites.ContainsKey(notes[1]))
-                _nextNote.Texture = _noteSprites[notes[1]];
+            Note[] notes = _noteQueue.ToArray();
+            if (_noteSprites.ContainsKey(notes[1].Name))
+                _nextNote.Texture = _noteSprites[notes[1].Name];
             else
                 _nextNote.Texture = null;
         }
@@ -67,7 +76,7 @@ private void UpdateQueue()
     //Fisher-Yates shuffle from: https://stackoverflow.com/a/1262619
     public void ScrambleQueue()
     {
-        List<string> tempList = new List<string>(_noteQueue);
+        List<Note> tempList = new List<Note>(_noteQueue);
         Random rng = new Random();
 
         int n = tempList.Count;
@@ -78,7 +87,7 @@ public void ScrambleQueue()
             (tempList[k], tempList[n]) = (tempList[n], tempList[k]);
         }
 
-        _noteQueue = new Queue<string>(tempList);
+        _noteQueue = new Queue<Note>(tempList);
     }
 
     //TODO: should work, in order to run in game use