added loading notes from JSON file

SaveData.json can store all our game's save data (unless we want to split the save data amongst different files). NoteQueue now pulls notes from the SaveData.

Author: cornerloan

Funk Engine.csproj

@@ -6,6 +6,9 @@
     <EnableDynamicLoading>true</EnableDynamicLoading>
     <RootNamespace>FunkEngine</RootNamespace>
   </PropertyGroup>
+  <ItemGroup>
+    <Content Include="SaveData\SaveData.json" />
+  </ItemGroup>
   <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
     <Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" />
     <Exec Command="dotnet husky install" StandardOutputImportance="Low" StandardErrorImportance="High" WorkingDirectory="." />

Globals/Scribe.cs

@@ -30,10 +30,12 @@ public partial class Scribe : Node
         new Note(
             "PlayerDouble",
             null,
-            2,
+            1,
             (director, note, timing) =>
             {
-                director.Enemy.TakeDamage((int)timing);
+                // can change later, but I want it like this instead of changing base
+                // in case we have some relic that messes with timing
+                director.Enemy.TakeDamage(2 * (int)timing);
             }
         ),
     };

SaveData/SaveData.json

@@ -0,0 +1,9 @@
+{
+  "AccountName": null,
+  "Notes": {
+    "PlayerBase": 2,
+    "PlayerDouble": 1
+  },
+  "Relics": {},
+  "Settings": {}
+}

SaveData/SaveSystem.cs

@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using Godot;
+
+// TODO: implement saving
+
+public static class SaveSystem
+{
+    private static string SavePath => "res://SaveData/SaveData.json"; // Update if needed
+
+    // Loads only the notes section
+    public static Dictionary<string, int> LoadNotes()
+    {
+        var saveData = LoadSaveData();
+        if (saveData != null && saveData.Notes != null)
+        {
+            return saveData.Notes;
+        }
+        else
+        {
+            return new Dictionary<string, int>();
+        }
+    }
+
+    // This method loads the entire save data
+    public static SaveData LoadSaveData()
+    {
+        string path = ProjectSettings.GlobalizePath(SavePath);
+        if (!File.Exists(path))
+        {
+            GD.PrintErr("Can't load save game");
+            return null;
+        }
+
+        string json = File.ReadAllText(path);
+        SaveData data = JsonSerializer.Deserialize<SaveData>(json);
+        return data;
+    }
+}
+
+public class SaveData
+{
+    public string AccountName { get; set; }
+    public Dictionary<string, int> Notes { get; set; } = new Dictionary<string, int>();
+    public Dictionary<string, object> Relics { get; set; } = new Dictionary<string, object>();
+    public Dictionary<string, float> Settings { get; set; } = new Dictionary<string, float>();
+}

scenes/BattleDirector/test_battle_scene.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=8 format=3 uid="uid://b0mrgr7h0ty1y"]
+[gd_scene load_steps=9 format=3 uid="uid://b0mrgr7h0ty1y"]
 
 [ext_resource type="Script" path="res://scenes/BattleDirector/scripts/BattleDirector.cs" id="1_cwqqr"]
 [ext_resource type="PackedScene" uid="uid://dfevfib11kou1" path="res://scenes/ChartViewport/ChartViewport.tscn" id="2_cupb3"]
 [ext_resource type="Script" path="res://scenes/BattleDirector/scripts/Conductor.cs" id="2_pcp76"]
 [ext_resource type="Texture2D" uid="uid://ci0g72j8q4ec2" path="res://scenes/BattleDirector/assets/CoolBG.jpg" id="4_13o87"]
 [ext_resource type="PackedScene" uid="uid://duhiilcv4tat3" path="res://scenes/BattleDirector/NotePlacementBar.tscn" id="7_3ko4g"]
+[ext_resource type="PackedScene" uid="uid://bvhpon5liybd1" path="res://scenes/CustomNotes/NoteQueue.tscn" id="8_7wwxo"]
 [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"]
 
@@ -62,3 +63,14 @@ offset_right = 613.0
 offset_bottom = 188.0
 theme_override_font_sizes/font_size = 10
 text = "Relics:"
+
+[node name="NoteQueue" parent="." instance=ExtResource("8_7wwxo")]
+anchors_preset = 0
+anchor_right = 0.0
+anchor_bottom = 0.0
+offset_left = 100.0
+offset_top = 140.0
+offset_right = 100.0
+offset_bottom = 140.0
+grow_horizontal = 1
+grow_vertical = 1

scenes/CustomNotes/NoteQueue.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using FunkEngine;
 using Godot;
 
 public partial class NoteQueue : Node
@@ -23,15 +22,56 @@ public override void _Ready()
             "res://scenes/CustomNotes/assets/double_note.png"
         );
 
+        LoadQueueFromSave();
+        ScrambleQueue();
         UpdateQueue();
     }
 
-    public void LoadQueue(PlayerPuppet player)
+    // Loads the notes from SaveData.json, and adds them to the queue
+    public void LoadQueueFromSave()
     {
-        for (int i = 0; i < player.Stats.CurNotes.Length; i++)
+        Dictionary<string, int> savedNotes = SaveSystem.LoadNotes();
+        foreach (var noteEntry in savedNotes)
         {
-            AddNoteToQueue(player.Stats.CurNotes[i]);
+            string noteName = noteEntry.Key;
+            int numNotes = noteEntry.Value;
+
+            for (int i = 0; i < numNotes; i++)
+            {
+                AddNoteToQueue(CreateNoteFromName(noteName));
+            }
+        }
+    }
+
+    // Creates a note from a string of the note's name.
+    private Note CreateNoteFromName(string noteName)
+    {
+        if (noteName == "PlayerBase")
+        {
+            return new Note(
+                "PlayerBase",
+                null,
+                1,
+                (director, note, timing) =>
+                {
+                    director.Enemy.TakeDamage((int)timing);
+                }
+            );
+        }
+        if (noteName == "PlayerDouble")
+        {
+            return new Note(
+                "PlayerDouble",
+                null,
+                1,
+                (director, note, timing) =>
+                {
+                    director.Enemy.TakeDamage(2 * (int)timing);
+                }
+            );
         }
+
+        return null;
     }
 
     public void AddNoteToQueue(Note noteType)
@@ -40,7 +80,7 @@ public void AddNoteToQueue(Note noteType)
         UpdateQueue();
     }
 
-    //returns current note, and removes it from the queue
+    // Returns current note, and removes it from the queue
     public Note GetCurrentNote()
     {
         if (_noteQueue.Count > 0)
@@ -52,6 +92,7 @@ public Note GetCurrentNote()
         return null;
     }
 
+    // Updates the queue's graphics
     private void UpdateQueue()
     {
         if (_noteQueue.Count > 0 && _noteSprites.ContainsKey(_noteQueue.Peek().Name))
@@ -73,7 +114,7 @@ private void UpdateQueue()
         }
     }
 
-    //Fisher-Yates shuffle from: https://stackoverflow.com/a/1262619
+    // Fisher-Yates shuffle from: https://stackoverflow.com/a/1262619
     public void ScrambleQueue()
     {
         List<Note> tempList = new List<Note>(_noteQueue);

scenes/CustomNotes/NoteQueue.tscn

@@ -5,14 +5,16 @@
 [ext_resource type="Texture2D" uid="uid://c3chrsxrulapd" path="res://scenes/CustomNotes/assets/single_note.png" id="3_ewo1s"]
 [ext_resource type="Texture2D" uid="uid://caw70lr5e1yiq" path="res://scenes/CustomNotes/assets/double_note.png" id="4_7sgy6"]
 
-[node name="NoteQueue" type="Control"]
+[node name="NoteQueue" type="Control" node_paths=PackedStringArray("_currentNote", "_nextNote")]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_jeqam")
+_currentNote = NodePath("CurrentNote")
+_nextNote = NodePath("NextNote")
 
 [node name="NoteQueueSprite" type="Sprite2D" parent="."]
 texture = ExtResource("2_0p21a")