Merge pull request #99 from Project-Funk-Engine/loop-fix-attempts

Loop fix

Author: LifeHckr

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

@@ -18,8 +18,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)
     {
@@ -60,19 +58,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,11 +71,6 @@ 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.

Audio/Song3.ogg

@@ -18,7 +18,9 @@ Current team members include:
 #### Attributions:
 Music:
 - Title Screen: [Crystal Cave - Cynicmusic](https://opengameart.org/content/crystal-cave-song18)
-- Battle Song 1: [gameMusic - Magntron](https://freesound.org/people/Magntron/sounds/335571/)
+- Boss Song 1: [gameMusic - Magntron](https://freesound.org/people/Magntron/sounds/335571/)
+- Battle Song 1: [Piano loops 181 - josefpres](https://freesound.org/people/josefpres/sounds/789998/)
+- Battle Song 2: [Dark loops 220 - josefpres](https://freesound.org/people/josefpres/sounds/620230/)
 
 Images:
 - Input Buttons: [inputKeys - Nicolae (Xelu) Berbece](https://thoseawesomeguys.com/prompts/)

Audio/Song3.ogg.import

@@ -28,6 +28,7 @@ public partial class ChartManager : SubViewportContainer
     //Might move this to be song specific? For now, should never go below ~2000, else visual break because there isn't enough room to loop.
     private double ChartLength = 5000;
     private double _loopLen; //secs
+    public double TrueBeatsPerLoop;
     public int BeatsPerLoop;
 
     public void OnNotePressed(ArrowType type)
@@ -44,7 +45,8 @@ public void PrepChart(SongData songData)
     {
         _loopLen = songData.SongLength / songData.NumLoops;
         TimeKeeper.LoopLength = (float)_loopLen;
-        BeatsPerLoop = (int)(_loopLen / (60f / songData.Bpm));
+        TrueBeatsPerLoop = (_loopLen / (60f / songData.Bpm));
+        BeatsPerLoop = (int)TrueBeatsPerLoop;
         ChartLength = (float)_loopLen * (float)Math.Floor(ChartLength / _loopLen);
         TimeKeeper.ChartLength = (float)ChartLength;
         TimeKeeper.Bpm = songData.Bpm;
@@ -112,7 +114,7 @@ private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0)
         newArrow.OutlineSprite.Modulate = IH.Arrows[(int)arrow].Color;
 
         _arrowGroup.AddChild(newArrow);
-        newArrow.Bounds = (float)((double)beat / BeatsPerLoop * (ChartLength / 2));
+        newArrow.Bounds = (float)(beat / TrueBeatsPerLoop * (ChartLength / 2));
         newArrow.Position += Vector2.Right * newArrow.Bounds * 10; //temporary fix for notes spawning and instantly calling loop from originating at 0,0
         return newArrow;
     }