skip duplicate kicks if ex+ and there's kicks on both 95 and 96

Encore-Developers · Oct 8, 2024 · b6a4060 · b6a4060
1 parent 3c784bd
commit b6a4060
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Encore/src/song/chart.cpp b/Encore/src/song/chart.cpp
@@ -894,6 +894,9 @@ void Chart::parsePlasticDrums(
                 int tick = midiFile.getAbsoluteTickTime(time);
                 int pitch = events[i][1];
                 int lane = pitch - notePitches[0];
+                if (lane == 0 && doubleKick && findNoteIdx(time, lane) != -1) {
+                    continue;
+                }
                 Note newNote;
                 if (lane == 1)
                     newNote.pSnare = true;
@@ -919,6 +922,9 @@ void Chart::parsePlasticDrums(
                 double time = midiFile.getTimeInSeconds(trkidx, i);
                 int tick = midiFile.getAbsoluteTickTime(time);
                 int lane = 0;
+                if (findNoteIdx(time, lane)!=-1) {
+                    continue;
+                }
                 Note newNote;
                 newNote.lane = lane;
                 newNote.tick = tick;
@@ -1145,4 +1151,4 @@ void Chart::parsePlasticDrums(
     Encore::EncoreLog(LOG_DEBUG, TextFormat("ENC: Base score: %01i", baseScore));
     Encore::EncoreLog(LOG_DEBUG, TextFormat("ENC: Processed plastic chart for %01i", instrument));
 
-}
+}