Merge pull request #105 from Project-Funk-Engine/Sprint-4

Finish sprint 4!

Author: collectioncard

.gitignore

@@ -11,4 +11,5 @@
 .idea/.idea.Funk Engine/.idea/
 
 *.DotSettings.user
-export_presets.cfg
+export_presets.cfg
+*.translation

Audio/Song1.ogg

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://iq0xxe5cggs8"
+uid="uid://be5ial13ynf3o"
 path="res://.godot/imported/Song1.ogg-1d785b9ae3fbaa8393048e39af66ed86.oggvorbisstr"
 
 [deps]

Audio/Song1.ogg.import

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://ckis6k6vuums"
+uid="uid://dxp7blovqh1ba"
 path="res://.godot/imported/Song2.ogg-b95c04f3512de6fa42e0f9c35aba831f.oggvorbisstr"
 
 [deps]

Audio/Song2.ogg

@@ -2,7 +2,7 @@
 
 importer="oggvorbisstr"
 type="AudioStreamOggVorbis"
-uid="uid://ceyw5mjkem2pi"
+uid="uid://d4nmixdl8xoic"
 path="res://.godot/imported/Song3.ogg-d4e6a5f1a550561df18989fb495ba591.oggvorbisstr"
 
 [deps]

Audio/Song2.ogg.import

@@ -10,6 +10,9 @@ public partial class MidiMaestro : Resource
 {
     private MidiFile _midiFile;
 
+    public static TempoMap TempoMap;
+    public static TimeSignature TimeSignature;
+
     //The four note rows that we care about
     private midiNoteInfo[] _upNotes;
     private midiNoteInfo[] _downNotes;
@@ -18,8 +21,6 @@ public partial class MidiMaestro : Resource
 
     //private MidiFile strippedSong;
 
-    private SongData songData;
-
     //The path relative to the Audio folder. Will change later
     public MidiMaestro(string filePath)
     {
@@ -30,18 +31,20 @@ public MidiMaestro(string filePath)
 
         if (!FileAccess.FileExists(filePath))
         {
-            GD.PrintErr("ERROR: Unable to load level Midi file: " + filePath);
+            GD.PushError("ERROR: Unable to load level Midi file: " + filePath);
         }
 
         _midiFile = MidiFile.Read(filePath);
+        TempoMap = _midiFile.GetTempoMap();
+        TimeSignature = TempoMap.GetTimeSignatureAtTime(new MidiTimeSpan());
 
         //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()))
+                .Select(note => new midiNoteInfo(note))
                 .ToArray();
 
             switch (trackName)
@@ -60,19 +63,6 @@ public MidiMaestro(string filePath)
                     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)
@@ -86,30 +76,29 @@ public midiNoteInfo[] GetNotes(ArrowType arrowType)
             _ => 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)
+    public midiNoteInfo(Melanchall.DryWetMidi.Interaction.Note note)
     {
         _note = note;
-        _tempoMap = tempoMap;
+    }
+
+    public long GetStartTimeBeat()
+    {
+        var beatsBar = _note.TimeAs<BarBeatTicksTimeSpan>(MidiMaestro.TempoMap);
+        return beatsBar.Bars * MidiMaestro.TimeSignature.Numerator + beatsBar.Beats;
     }
 
     public long GetStartTimeTicks() => _note.Time;
 
     public float GetStartTimeSeconds() =>
-        _note.TimeAs<MetricTimeSpan>(_tempoMap).Milliseconds / 1000f
-        + _note.TimeAs<MetricTimeSpan>(_tempoMap).Seconds;
+        _note.TimeAs<MetricTimeSpan>(MidiMaestro.TempoMap).Milliseconds / 1000f
+        + _note.TimeAs<MetricTimeSpan>(MidiMaestro.TempoMap).Seconds;
 
     public long GetEndTime() => _note.EndTime;
 

Audio/Song3.ogg

@@ -9,15 +9,17 @@
 public partial class Note : Resource, IDisplayable
 {
     public PuppetTemplate Owner;
+    public int Id;
     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.
+    private Action<BattleDirector, Note, Timing> NoteEffect;
 
     public string Tooltip { get; set; }
     public Texture2D Texture { get; set; }
 
     public Note(
+        int id,
         string name,
         string tooltip,
         Texture2D texture = null,
@@ -27,14 +29,15 @@ public Note(
         float costModifier = 1.0f
     )
     {
+        Id = id;
         Name = name;
         Owner = owner;
         NoteEffect =
             noteEffect
             ?? (
                 (BD, source, Timing) =>
                 {
-                    BD.GetTarget(this).TakeDamage(source._baseVal);
+                    BD.GetTarget(this).TakeDamage((int)Timing * source._baseVal);
                 }
             );
         _baseVal = baseVal;
@@ -52,7 +55,21 @@ 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, CostModifier);
+        Note newNote = new Note(
+            Id,
+            Name,
+            Tooltip,
+            Texture,
+            Owner,
+            _baseVal,
+            NoteEffect,
+            CostModifier
+        );
         return newNote;
     }
+
+    public int GetBaseVal()
+    {
+        return _baseVal;
+    }
 }