Merge Midi Reading into sprint3

Audio/Song1.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://iq0xxe5cggs8"
+path="res://.godot/imported/Song1.ogg-1d785b9ae3fbaa8393048e39af66ed86.oggvorbisstr"
+
+[deps]
+
+source_file="res://Audio/Song1.ogg"
+dest_files=["res://.godot/imported/Song1.ogg-1d785b9ae3fbaa8393048e39af66ed86.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Audio/Song2.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ckis6k6vuums"
+path="res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"
+
+[deps]
+
+source_file="res://Audio/Song2.ogg"
+dest_files=["res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

Audio/Song3.ogg.import

@@ -0,0 +1,19 @@
+[remap]
+
+importer="oggvorbisstr"
+type="AudioStreamOggVorbis"
+uid="uid://ceyw5mjkem2pi"
+path="res://.godot/imported/Song3.ogg-d4e6a5f1a550561df18989fb495ba591.oggvorbisstr"
+
+[deps]
+
+source_file="res://Audio/Song3.ogg"
+dest_files=["res://.godot/imported/Song3.ogg-d4e6a5f1a550561df18989fb495ba591.oggvorbisstr"]
+
+[params]
+
+loop=false
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

Classes/MidiMaestro/MidiMaestro.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Linq;
+using FunkEngine;
+using Godot;
+using Melanchall.DryWetMidi.Core;
+using Melanchall.DryWetMidi.Interaction;
+using Melanchall.DryWetMidi.Multimedia;
+
+public partial class MidiMaestro : Resource
+{
+    private MidiFile _midiFile;
+
+    //The four note rows that we care about
+    private midiNoteInfo[] _upNotes;
+    private midiNoteInfo[] _downNotes;
+    private midiNoteInfo[] _leftNotes;
+    private midiNoteInfo[] _rightNotes;
+
+    private MidiFile strippedSong;
+
+    private SongData songData;
+
+    //The path relative to the Audio folder. Will change later
+    public MidiMaestro(string filePath)
+    {
+        if (!FileAccess.FileExists(filePath))
+        {
+            GD.PrintErr("ERROR: Unable to load level Midi file: " + filePath);
+        }
+
+        _midiFile = MidiFile.Read(filePath);
+
+        //Strip out the notes from the midi file
+        foreach (var track in _midiFile.GetTrackChunks())
+        {
+            string trackName = track.Events.OfType<SequenceTrackNameEvent>().FirstOrDefault()?.Text;
+            midiNoteInfo[] noteEvents = track
+                .GetNotes()
+                .Select(note => new midiNoteInfo(note, _midiFile.GetTempoMap()))
+                .ToArray();
+
+            switch (trackName)
+            {
+                case "Up":
+                    _upNotes = noteEvents;
+                    break;
+                case "Down":
+                    _downNotes = noteEvents;
+                    break;
+                case "Left":
+                    _leftNotes = noteEvents;
+                    break;
+                case "Right":
+                    _rightNotes = noteEvents;
+                    break;
+            }
+        }
+
+        //Populate the song data
+        songData = new SongData
+        {
+            //TODO: Allow for changes in this data
+            Bpm = 120,
+            //Fudge the numbers a bit if we have a really short song
+            SongLength =
+                _midiFile.GetDuration<MetricTimeSpan>().Seconds < 20
+                    ? 20
+                    : _midiFile.GetDuration<MetricTimeSpan>().Seconds,
+            NumLoops = 1,
+        };
+    }
+
+    public midiNoteInfo[] GetNotes(ArrowType arrowType)
+    {
+        return arrowType switch
+        {
+            ArrowType.Up => _upNotes,
+            ArrowType.Down => _downNotes,
+            ArrowType.Left => _leftNotes,
+            ArrowType.Right => _rightNotes,
+            _ => throw new ArgumentOutOfRangeException(nameof(arrowType), arrowType, null),
+        };
+    }
+
+    public SongData GetSongData()
+    {
+        return songData;
+    }
+}
+
+//A facade to wrap the midi notes. This is a simple class that wraps a Note object from the DryWetMidi library.
+public class midiNoteInfo
+{
+    private readonly Melanchall.DryWetMidi.Interaction.Note _note;
+    private readonly TempoMap _tempoMap;
+
+    public midiNoteInfo(Melanchall.DryWetMidi.Interaction.Note note, TempoMap tempoMap)
+    {
+        _note = note;
+        _tempoMap = tempoMap;
+    }
+
+    public long GetStartTimeTicks() => _note.Time;
+
+    public float GetStartTimeSeconds() =>
+        _note.TimeAs<MetricTimeSpan>(_tempoMap).Milliseconds / 1000f
+        + _note.TimeAs<MetricTimeSpan>(_tempoMap).Seconds;
+
+    public long GetEndTime() => _note.EndTime;
+
+    public long GetDuration() => _note.Length;
+}

Classes/MidiMaestro/SongTemplate.cs

@@ -0,0 +1,25 @@
+namespace FunkEngine.Classes.MidiMaestro;
+
+public partial class SongTemplate
+{
+    public string Name;
+    public string AudioLocation;
+    public string MIDILocation;
+    public string EnemyScenePath;
+    public SongData SongData;
+
+    public SongTemplate(
+        SongData songData,
+        string name = "",
+        string audioLocation = "",
+        string midiLocation = "",
+        string enemyScenePath = ""
+    )
+    {
+        Name = name;
+        AudioLocation = audioLocation;
+        MIDILocation = midiLocation;
+        SongData = songData;
+        EnemyScenePath = enemyScenePath;
+    }
+}

Funk Engine.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Godot.NET.Sdk/4.3.0">
+<Project Sdk="Godot.NET.Sdk/4.3.0">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <TargetFramework Condition=" '$(GodotTargetPlatform)' == 'android' ">net7.0</TargetFramework>
@@ -8,6 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Content Include="SaveData\SaveData.json" />
+    <PackageReference Include="Melanchall.DryWetMidi" Version="7.2.0" />
   </ItemGroup>
   <Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0">
     <Exec Command="dotnet tool restore" StandardOutputImportance="Low" StandardErrorImportance="High" />

Globals/FunkEngineNameSpace.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using FunkEngine.Classes.MidiMaestro;
 using Godot;
 
 namespace FunkEngine;
@@ -40,8 +41,8 @@ public struct BattleConfig
 {
     public Stages RoomType;
     public MapGrid.Room BattleRoom;
-    public int TodoEnemyAndChart;
-    public SongData CurSong;
+    public string EnemyScenePath;
+    public SongTemplate CurSong;
 }
 
 public enum BattleEffectTrigger

Globals/Scribe.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using FunkEngine;
+using FunkEngine.Classes.MidiMaestro;
 using Godot;
 
 /**
@@ -151,7 +152,46 @@ public partial class Scribe : Node
         ),
     };
 
-    //TODO: Item pool(s)
+    public static readonly SongTemplate[] SongDictionary = new[]
+    {
+        new SongTemplate(
+            new SongData
+            {
+                Bpm = 120,
+                SongLength = -1,
+                NumLoops = 5,
+            },
+            "Song1",
+            "Audio/Song1.ogg",
+            "Audio/midi/song1.mid"
+        ),
+        new SongTemplate(
+            new SongData
+            {
+                Bpm = 60,
+                SongLength = -1,
+                NumLoops = 1,
+            },
+            "Song2",
+            "Audio/Song2.ogg",
+            "Audio/midi/Song2.mid",
+            "res://scenes/Puppets/Enemies/Parasifly/Parasifly.tscn"
+        ),
+        new SongTemplate(
+            new SongData
+            {
+                Bpm = 120,
+                SongLength = -1,
+                NumLoops = 1,
+            },
+            "Song3",
+            "Audio/Song3.ogg",
+            "Audio/midi/Song3.mid",
+            "res://scenes/Puppets/Enemies/TheGWS/GWS.tscn"
+        ),
+    };
+
+        //TODO: Item pool(s)
 
     public static RelicTemplate[] GetRandomRelics(RelicTemplate[] ownedRelics, int count)
     {
@@ -171,7 +211,7 @@ public static RelicTemplate[] GetRandomRelics(RelicTemplate[] ownedRelics, int c
         }
         return availableRelics;
     }
-
+    
     public static Note[] GetRandomRewardNotes(int count)
     {
         var availableNotes = Scribe

Globals/StageProducer.cs

@@ -28,6 +28,7 @@ public partial class StageProducer : Node
     public void StartGame()
     {
         Map.InitMapGrid(MapSize.X, MapSize.Y, 3);
+        GlobalRng.Randomize();
         _seed = GlobalRng.Seed;
         _lastRngState = GlobalRng.State;
         PlayerStats = new PlayerStats();
@@ -59,6 +60,10 @@ public void TransitionStage(Stages nextStage, int nextRoomIdx = -1)
                 Config = MakeConfig(nextStage, nextRoomIdx);
                 GetTree().ChangeSceneToFile("res://scenes/BattleDirector/test_battle_scene.tscn");
                 break;
+            case Stages.Boss:
+                Config = MakeConfig(nextStage, nextRoomIdx);
+                GetTree().ChangeSceneToFile("res://scenes/BattleDirector/test_battle_scene.tscn");
+                break;
             case Stages.Controls:
                 GetTree().ChangeSceneToFile("res://scenes/Remapping/Remap.tscn");
                 break;
@@ -90,14 +95,17 @@ private BattleConfig MakeConfig(Stages nextRoom, int nextRoomIdx)
         BattleConfig result = new BattleConfig();
         result.BattleRoom = Map.GetRooms()[nextRoomIdx];
         result.RoomType = nextRoom;
-        if (nextRoom is Stages.Battle or Stages.Boss)
+        switch (nextRoom)
         {
-            result.CurSong = new SongData
-            {
-                Bpm = 120,
-                SongLength = -1,
-                NumLoops = 5,
-            };
+            case Stages.Battle:
+                int songIdx = GlobalRng.RandiRange(1, 2);
+                result.CurSong = Scribe.SongDictionary[songIdx];
+                result.EnemyScenePath = Scribe.SongDictionary[songIdx].EnemyScenePath;
+                break;
+            case Stages.Boss:
+                result.EnemyScenePath = "res://scenes/Puppets/Enemies/BossBlood/Boss1.tscn";
+                result.CurSong = Scribe.SongDictionary[0];
+                break;
         }
 
         return result;