Merge pull request #38 from Project-Funk-Engine/rewrite

Finalized sprint 1 version

Author: LifeHckr

Audio/335571__magntron__gamemusic_120bpm.mp3

@@ -0,0 +1,19 @@
+[remap]
+
+importer="mp3"
+type="AudioStreamMP3"
+uid="uid://cv6lqjj6lu36h"
+path="res://.godot/imported/335571__magntron__gamemusic_120bpm.mp3-a87b357c4b3c9199709863b47f78bd2a.mp3str"
+
+[deps]
+
+source_file="res://Audio/335571__magntron__gamemusic_120bpm.mp3"
+dest_files=["res://.godot/imported/335571__magntron__gamemusic_120bpm.mp3-a87b357c4b3c9199709863b47f78bd2a.mp3str"]
+
+[params]
+
+loop=true
+loop_offset=0
+bpm=0
+beat_count=0
+bar_beats=4

Audio/335571__magntron__gamemusic_120bpm.mp3.import

@@ -1,2 +1,3 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003Fgamef_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F6354a7b35d7821629924d3676acd7e67a6f7f94343e0e66ec439aa2bd6ed5_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FUsers_003Fgamef_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F6354a7b35d7821629924d3676acd7e67a6f7f94343e0e66ec439aa2bd6ed5_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F6354a7b35d7821629924d3676acd7e67a6f7f94343e0e66ec439aa2bd6ed5_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

Funk Engine.sln.DotSettings.user

@@ -10,17 +10,22 @@
  */
 public partial class BattleDirector : Node2D
 {
-    [Export]
-    public ChartManager CM;
+    #region Declarations
+    private HealthBar Player;
+    private HealthBar Enemy;
 
     [Export]
-    public NoteManager NM;
+    private ChartManager CM;
 
-    private HealthBar Player;
-    private HealthBar Enemy;
+    [Export]
+    private InputHandler IH;
 
+    [Export]
     private NotePlacementBar NotePlacementBar;
 
+    [Export]
+    private AudioStreamPlayer Audio;
+
     private double _timingInterval = .1; //secs
 
     [Signal]
@@ -29,148 +34,231 @@ public partial class BattleDirector : Node2D
     [Signal]
     public delegate void EnemyDamageEventHandler(int damage);
 
+    private SongData _curSong;
+
     public struct SongData
     {
         public int Bpm;
         public double SongLength;
         public int NumLoops;
     }
+    #endregion
 
-    private SongData _curSong;
-
+    #region Note Handling
     //Assume queue structure for notes in each lane.
-    private readonly Note[][] _laneNotes = new Note[][]
-    {
-        Array.Empty<Note>(),
-        Array.Empty<Note>(),
-        Array.Empty<Note>(),
-        Array.Empty<Note>(),
+    //Can eventually make this its own structure
+    private NoteArrow[][] _laneData = Array.Empty<NoteArrow[]>();
+    private int[] _laneLastBeat = new int[]
+    { //Temporary (hopefully) measure to bridge from note queue structure to ordered array
+        0,
+        0,
+        0,
+        0,
     };
     private Note[] _notes = Array.Empty<Note>();
 
-    public override void _Ready()
+    //Returns first note of lane without modifying lane data
+    private Note GetNoteAt(NoteArrow.ArrowType dir, int beat)
     {
-        AddExampleNote();
-        CM.PrepChart(_curSong, _notes);
-
-        Player = GetNode<HealthBar>("PlayerHP");
-        Enemy = GetNode<HealthBar>("EnemyHP");
-        NotePlacementBar = GetNode<NotePlacementBar>("NotePlacementBar");
+        return GetNote(_laneData[(int)dir][beat]);
+    }
 
-        CM.Connect(nameof(NoteManager.NotePressed), new Callable(this, nameof(OnNotePressed)));
-        CM.Connect(nameof(NoteManager.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
+    //Get note of a note arrow
+    private Note GetNote(NoteArrow arrow)
+    {
+        return _notes[arrow.NoteIdx];
     }
 
-    public override void _Process(double delta)
+    private bool AddNoteToLane(Note note, bool isActive = true)
     {
-        TimeKeeper.CurrentTime += delta;
-        //Check beats for each lane for passive misses
-        double curBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm);
-        for (int i = 0; i < _laneNotes.Length; i++)
+        note.Beat %= CM.BeatsPerLoop;
+        //Don't add dupe notes
+        if (note.Beat == 0 || _notes.Any(nt => nt.Type == note.Type && nt.Beat == note.Beat))
         {
-            if (_laneNotes[i].Length <= 0)
-                continue;
-            double beatDif = (curBeat - _laneNotes[i].First().Beat);
-            if (beatDif > 1)
-            {
-                handleTiming((NoteArrow.ArrowType)i, Math.Abs(beatDif));
-            }
+            return false; //Beat at 0 is too messy.
         }
+        _notes = _notes.Append(note).ToArray();
+        //Get noteArrow from CM
+        var arrow = CM.AddArrowToLane(note, _notes.Length - 1);
+        arrow.IsActive = isActive;
+        _laneData[(int)note.Type][note.Beat] = arrow;
+        return true;
     }
+    #endregion
 
-    //Creeate dummy song data and notes
-    private void AddExampleNote()
+    //Creeate dummy notes
+    private void AddExampleNotes()
     {
-        _curSong = new SongData
+        GD.Print(CM.BeatsPerLoop);
+        for (int i = 1; i < 15; i++)
         {
-            Bpm = 120,
-            SongLength = 100,
-            NumLoops = 5,
-        };
-        for (int i = 0; i < 4; i++)
+            Note exampleNote = new Note(NoteArrow.ArrowType.Up, i * 4);
+            AddNoteToLane(exampleNote);
+        }
+        for (int i = 1; i < 15; i++)
+        {
+            Note exampleNote = new Note(NoteArrow.ArrowType.Left, 4 * i + 1);
+            AddNoteToLane(exampleNote);
+        }
+        for (int i = 0; i < 10; i++)
         {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Up, i + 3);
+            Note exampleNote = new Note(NoteArrow.ArrowType.Right, 3 * i + 32);
             AddNoteToLane(exampleNote);
         }
-        for (int i = 0; i < 1; i++)
+        for (int i = 0; i < 3; i++)
         {
-            Note exampleNote = new Note(NoteArrow.ArrowType.Left, i + 4);
+            Note exampleNote = new Note(NoteArrow.ArrowType.Down, 8 * i + 16);
             AddNoteToLane(exampleNote);
         }
     }
 
-    private void AddNoteToLane(Note note)
+    public override void _Ready()
     {
-        _notes = _notes.Append(note).ToArray();
-        _laneNotes[(int)note.Type] = _laneNotes[(int)note.Type].Append(note).ToArray();
+        _curSong = new SongData
+        {
+            Bpm = 120,
+            SongLength = Audio.Stream.GetLength(),
+            NumLoops = 5,
+        };
+
+        var timer = GetTree().CreateTimer(AudioServer.GetTimeToNextMix());
+        timer.Timeout += Begin;
     }
 
+    private void Begin()
+    {
+        CM.PrepChart(_curSong);
+        _laneData = new NoteArrow[][]
+        {
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+            new NoteArrow[CM.BeatsPerLoop],
+        };
+        AddExampleNotes();
+
+        Player = GetNode<HealthBar>("PlayerHP");
+        Player.GetNode<Sprite2D>("Sprite2D").Scale *= .5f; //TEMP
+        Player.GetNode<Sprite2D>("Sprite2D").Position += Vector2.Down * 30; //TEMP
+        Enemy = GetNode<HealthBar>("EnemyHP");
+
+        //TEMP
+        var enemTween = CreateTween();
+        enemTween
+            .TweenProperty(Enemy.GetNode<Sprite2D>("Sprite2D"), "position", Vector2.Down * 5, 1f)
+            .AsRelative();
+        enemTween
+            .TweenProperty(Enemy.GetNode<Sprite2D>("Sprite2D"), "position", Vector2.Up * 5, 1f)
+            .AsRelative();
+        enemTween.SetTrans(Tween.TransitionType.Spring);
+        enemTween.SetEase(Tween.EaseType.In);
+        enemTween.SetLoops();
+        enemTween.Play();
+
+        CM.Connect(nameof(InputHandler.NotePressed), new Callable(this, nameof(OnNotePressed)));
+        CM.Connect(nameof(InputHandler.NoteReleased), new Callable(this, nameof(OnNoteReleased)));
+
+        Audio.Play();
+    }
+
+    public override void _Process(double delta)
+    {
+        TimeKeeper.CurrentTime = Audio.GetPlaybackPosition();
+        CheckMiss();
+    }
+
+    #region Input&Timing
     private void OnNotePressed(NoteArrow.ArrowType type)
     {
         CheckNoteTiming(type);
     }
 
     private void OnNoteReleased(NoteArrow.ArrowType arrowType) { }
 
-    private void handleTiming(NoteArrow.ArrowType type, double beatDif)
+    //Check all lanes for misses from missed inputs
+    private void CheckMiss()
+    {
+        //On current beat, if prev beat is active and not inputted
+        double realBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
+        for (int i = 0; i < _laneData.Length; i++)
+        {
+            if (
+                _laneLastBeat[i] < Math.Floor(realBeat)
+                || (_laneLastBeat[i] == CM.BeatsPerLoop - 1 && Math.Floor(realBeat) == 0)
+            )
+            { //If above, a note has been missed
+                //GD.Print("Last beat " + _laneLastBeat[i]);
+                if (
+                    _laneData[i][_laneLastBeat[i]] == null
+                    || !_laneData[i][_laneLastBeat[i]].IsActive
+                )
+                {
+                    _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
+                    continue;
+                }
+                //Note exists and has been missed
+                _laneData[i][_laneLastBeat[i]].NoteHit();
+                HandleTiming((NoteArrow.ArrowType)i, 1);
+                _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
+            }
+        }
+    }
+
+    private void CheckNoteTiming(NoteArrow.ArrowType type)
+    {
+        double realBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
+        int curBeat = (int)Math.Round(realBeat);
+        GD.Print("Cur beat " + curBeat + "Real: " + realBeat.ToString("#.###"));
+        if (
+            _laneData[(int)type][curBeat % CM.BeatsPerLoop] == null
+            || !_laneData[(int)type][curBeat % CM.BeatsPerLoop].IsActive
+        )
+        {
+            _laneLastBeat[(int)type] = (curBeat) % CM.BeatsPerLoop;
+            PlayerAddNote(type, curBeat);
+            return;
+        }
+        double beatDif = Math.Abs(realBeat - curBeat);
+        _laneData[(int)type][curBeat % CM.BeatsPerLoop].NoteHit();
+        _laneLastBeat[(int)type] = (curBeat) % CM.BeatsPerLoop;
+        HandleTiming(type, beatDif);
+    }
+
+    private void HandleTiming(NoteArrow.ArrowType type, double beatDif)
     {
-        //Cycle note queue
-        _laneNotes[(int)type].First().Beat += CM.BeatsPerLoop;
-        _laneNotes[(int)type] = _laneNotes[(int)type] //Credit: Stackoverflow https://stackoverflow.com/questions/49494535/moving-the-first-array-element-to-end-in-c-sharp
-            .Skip(1)
-            .Concat(_laneNotes[(int)type].Take(1))
-            .ToArray(); //TODO: No stackoverflow code
-        //Do timing stuff
-        if (beatDif < _timingInterval * 2)
+        if (beatDif < _timingInterval * 1)
         {
             GD.Print("Perfect");
-            Enemy.TakeDamage(10);
+            Enemy.TakeDamage(3);
             NotePlacementBar.HitNote();
+            NotePlacementBar.ComboText("Perfect!");
         }
-        else if (beatDif < _timingInterval * 4)
+        else if (beatDif < _timingInterval * 2)
         {
             GD.Print("Good");
-            Enemy.TakeDamage(5);
+            Enemy.TakeDamage(1);
             NotePlacementBar.HitNote();
+            NotePlacementBar.ComboText("Good");
         }
-        else if (beatDif < _timingInterval * 6)
+        else if (beatDif < _timingInterval * 3)
         {
-            GD.Print("Okay");
-            Enemy.TakeDamage(1);
+            GD.Print("Ok");
+            Player.TakeDamage(1);
             NotePlacementBar.HitNote();
+            NotePlacementBar.ComboText("Okay");
         }
         else
         {
             GD.Print("Miss");
-            Player.TakeDamage(10);
+            Player.TakeDamage(2);
             NotePlacementBar.MissNote();
+            NotePlacementBar.ComboText("Miss");
         }
     }
-
-    private void CheckNoteTiming(NoteArrow.ArrowType type)
-    {
-        double curBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm);
-        if (_laneNotes[(int)type].Length == 0)
-        {
-            PlayerAddNote(type, (int)curBeat);
-            return;
-        }
-        double beatDif = Math.Abs(curBeat - _laneNotes[(int)type].First().Beat);
-        if (beatDif > 1)
-        {
-            PlayerAddNote(type, (int)curBeat);
-            return;
-        }
-        GD.Print("Note Hit. Dif: " + beatDif);
-        CM.HandleNote(type);
-        handleTiming(type, beatDif);
-    }
+    #endregion
 
     private void PlayerAddNote(NoteArrow.ArrowType type, int beat)
     {
-        //TODO: notes currently can only be placed in first loop.
-        // placed notes are also non-interactable
-
         // can also add some sort of keybind here to also have pressed
         // in case the user just presses the note too early and spawns a note
         GD.Print(
@@ -181,8 +269,9 @@ private void PlayerAddNote(NoteArrow.ArrowType type, int beat)
         );
         if (NotePlacementBar.CanPlaceNote())
         {
-            CM.CreateNote(type, beat);
-            NotePlacementBar.PlacedNote();
+            Note exampleNote = new Note(type, beat % CM.BeatsPerLoop);
+            if (AddNoteToLane(exampleNote, false))
+                NotePlacementBar.PlacedNote();
         }
     }
 }