Properly fix solos, and fix Pro Drums/5-lane drums SP/solos/activatio…

…ns not showing up (YARC-Official#508) * Properly fix guitar solos, and fix drum solos too * Fix Pro/5-lane drums SP/solos/fills not loading
alexdlli · Jul 2, 2023 · 0513398 · 0513398
1 parent 83dda42
commit 0513398
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/Assets/Script/Obsolete/Data/YargChart.cs b/Assets/Script/Obsolete/Data/YargChart.cs
@@ -124,7 +124,7 @@ public List<NoteInfo>[] GhDrums
 
 #pragma warning restore format
 
-        private List<MoonSong.MoonInstrument> _loadedEvents = new();
+        private List<string> _loadedEvents = new();
 
         public List<EventInfo> events = new();
         public List<Beat> beats = new();
@@ -251,14 +251,14 @@ private List<NoteInfo>[] LoadArray(ChartLoader<NoteInfo> loader)
                 notes[(int) diff] = loader.GetNotesFromChart(_song, diff);
             }
 
-            if (_loadedEvents.Contains(instrument))
+            if (_loadedEvents.Contains(instrumentName))
             {
                 return notes;
             }
 
             events.AddRange(loader.GetEventsFromChart(_song));
             events.Sort((e1, e2) => e1.time.CompareTo(e2.time));
-            _loadedEvents.Add(instrument);
+            _loadedEvents.Add(instrumentName);
 
             return notes;
         }

diff --git a/Assets/Script/Track/AbstractTrack.cs b/Assets/Script/Track/AbstractTrack.cs
@@ -271,7 +271,7 @@ const float
             // Solos and SP cannot share notes, so we can save some iteration time and only go start-to-end once overall
             int spNoteIndex = 0;
             int soloNoteIndex = 0;
-            bool chordsAreSingleNote = player.chosenInstrument is "drums" or "realDrums" or "ghDrums";
+            bool chordsAreSingleNote = player.chosenInstrument is not ("drums" or "realDrums" or "ghDrums");
             foreach (var eventInfo in Play.Instance.chart.events)
             {
                 if (eventInfo.name == spName)

diff --git a/Assets/Script/Track/DrumsTrack.cs b/Assets/Script/Track/DrumsTrack.cs
@@ -464,6 +464,12 @@ private void DrumHitAction(int drum, bool cymbal)
             notePool.HitNote(hit);
             StopAudio = false;
 
+            // Solo stuff
+            if (soloInProgress)
+            {
+                soloNotesHit++;
+            }
+
             // Play particles
             if (hit.fret != kickIndex)
             {

diff --git a/Assets/Script/Track/FiveFretTrack.cs b/Assets/Script/Track/FiveFretTrack.cs
@@ -464,14 +464,14 @@ private void UpdateInput()
             StopAudio = false;
             lastHitNote = chord;
 
-            foreach (var hit in chord)
+            // Solo stuff
+            if (soloInProgress)
             {
-                // Solo stuff
-                if (soloInProgress)
-                {
-                    soloNotesHit++;
-                }
+                soloNotesHit++;
+            }
 
+            foreach (var hit in chord)
+            {
                 hitChartIndex++;
                 // Hit notes
                 notePool.HitNote(hit);