Sprint 3

.gitignore

@@ -9,3 +9,6 @@
 
 
 .idea/.idea.Funk Engine/.idea/
+
+*.DotSettings.user
+export_presets.cfg

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=true
+loop_offset=0.0
+bpm=0.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=true
+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=true
+loop_offset=0.0
+bpm=0.0
+beat_count=0
+bar_beats=4

Classes/MidiMaestro/MidiMaestro.cs

@@ -0,0 +1,117 @@
+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 (!OS.HasFeature("editor"))
+        {
+            filePath = OS.GetExecutablePath().GetBaseDir() + "/" + 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;
+    }
+}

Classes/Notes/Note.cs

@@ -6,23 +6,25 @@
  * @class Note
  * @brief Data structure class for holding data and methods for a battle time note. WIP
  */
-public partial class Note : Resource
+public partial class Note : Resource, IDisplayable
 {
     public PuppetTemplate Owner;
-    public string Name;
+    public string Name { get; set; }
     private int _baseVal;
+    public float CostModifier { get; private set; }
     private Action<BattleDirector, Note, Timing> NoteEffect; //TODO: Where/How to deal with timing.
 
-    public string Tooltip;
-    public Texture2D Texture;
+    public string Tooltip { get; set; }
+    public Texture2D Texture { get; set; }
 
     public Note(
         string name,
         string tooltip,
         Texture2D texture = null,
         PuppetTemplate owner = null,
         int baseVal = 1,
-        Action<BattleDirector, Note, Timing> noteEffect = null
+        Action<BattleDirector, Note, Timing> noteEffect = null,
+        float costModifier = 1.0f
     )
     {
         Name = name;
@@ -38,6 +40,7 @@ public Note(
         _baseVal = baseVal;
         Texture = texture;
         Tooltip = tooltip;
+        CostModifier = costModifier;
     }
 
     public void OnHit(BattleDirector BD, Timing timing)
@@ -49,7 +52,7 @@ public Note Clone()
     {
         //Eventually could look into something more robust, but for now shallow copy is preferable.
         //We only would want val and name to be copied by value
-        Note newNote = new Note(Name, Tooltip, Texture, Owner, _baseVal, NoteEffect);
+        Note newNote = new Note(Name, Tooltip, Texture, Owner, _baseVal, NoteEffect, CostModifier);
         return newNote;
     }
 }

Classes/Notes/assets/heal_note.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cdf3g3174du4r"
+path="res://.godot/imported/heal_note.png-09ca289a296eee82d33c64101a4e593a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Notes/assets/heal_note.png"
+dest_files=["res://.godot/imported/heal_note.png-09ca289a296eee82d33c64101a4e593a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Classes/Notes/assets/quarter_note.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://uksjoqp7p0gq"
+path="res://.godot/imported/quarter_note.png-2b4c9985d99038807abfd63e553c2d6a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Notes/assets/quarter_note.png"
+dest_files=["res://.godot/imported/quarter_note.png-2b4c9985d99038807abfd63e553c2d6a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

Classes/Notes/assets/vampire_note.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dg0lmu0pip4lr"
+path="res://.godot/imported/vampire_note.png-4331f817a6feee1f1066a9e9f95934c8.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Classes/Notes/assets/vampire_note.png"
+dest_files=["res://.godot/imported/vampire_note.png-4331f817a6feee1f1066a9e9f95934c8.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1