From d55f2e5cafa80c70d05cecf46f6b88c02d08889e Mon Sep 17 00:00:00 2001 From: msk <15199219+muskit@users.noreply.github.com> Date: Mon, 9 Oct 2023 02:38:52 -0700 Subject: [PATCH] fix parser --- Scripts/Data/Mer/Mer.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Scripts/Data/Mer/Mer.cs b/Scripts/Data/Mer/Mer.cs index 99169c5..d60aa10 100644 --- a/Scripts/Data/Mer/Mer.cs +++ b/Scripts/Data/Mer/Mer.cs @@ -61,10 +61,7 @@ namespace WacK.Data.Mer ++playableNoteCount; break; case "2": // touch w/ bonus - notes[currentMeasure].Add((currentBeat, new MerNote(int.Parse(tokens[5]), int.Parse(tokens[6]), type: MerType.Touch, bonus: true))); - ++playableNoteCount; - break; - case "20": // touch w/ bonus (+ "big effect") + case "20": // TODO: big effect notes[currentMeasure].Add((currentBeat, new MerNote(int.Parse(tokens[5]), int.Parse(tokens[6]), type: MerType.Touch, bonus: true))); ++playableNoteCount; break; @@ -97,6 +94,7 @@ namespace WacK.Data.Mer ++playableNoteCount; break; case "8": // swipe CCW w/ bonus + case "24": // TODO: big effect notes[currentMeasure].Add((currentBeat, new MerNote(int.Parse(tokens[5]), int.Parse(tokens[6]), type: MerType.SwipeCCW, bonus: true))); ++playableNoteCount; break; @@ -105,6 +103,7 @@ namespace WacK.Data.Mer ++playableNoteCount; break; case "6": // swipe CW w/ bonus + case "23": // TODO: big effect notes[currentMeasure].Add((currentBeat, new MerNote(int.Parse(tokens[5]), int.Parse(tokens[6]), type: MerType.SwipeCW, bonus: true))); ++playableNoteCount; break; @@ -127,7 +126,10 @@ namespace WacK.Data.Mer case "13": // BG rem notes[currentMeasure].Add((currentBeat, new MerNote(int.Parse(tokens[5]), int.Parse(tokens[6]), value: tokens[8], type: MerType.BGRem))); break; - + case "15": // TODO: "SAME_TIME" (BG instant anim?) + break; + case "14": // TODO: end of chart + break; } break; case "2": // tempo