diff --git a/convert.h b/convert.h index da7d037..dac6233 100644 --- a/convert.h +++ b/convert.h @@ -503,7 +503,9 @@ string fromSUS(string text) { string head = get<0>(x), body = get<3>(x); string prop = head.substr(3); if (prop[0] == '5') { - ScratchSlide = true, ScratchType = (i == l ? 0 : (i < l ? i - r - 1 : i - l + 1)); + ScratchSlide = true, ScratchType = (i == l ? ( + (body[0] == '3' ? -(r - l + 1) : (body[0] == '4' ? (r - l + 1) : 0)) + ) : (i < l ? i - r - 1 : i - l + 1)); x = {get<0>(x), magicNumber, get<2>(x), get<3>(x)}; } } diff --git a/dist/EngineData b/dist/EngineData index e7b879b..5666cf1 100644 Binary files a/dist/EngineData and b/dist/EngineData differ diff --git a/engine/play/InputManager.cpp b/engine/play/InputManager.cpp index 2515175..8996957 100644 --- a/engine/play/InputManager.cpp +++ b/engine/play/InputManager.cpp @@ -155,7 +155,7 @@ SonolusApi getClaimedStart(let index) { // return VOID; // } -double minFlickVR = 0.5; +double minFlickVR = 0.1; // Map usedTouchId(16); SonolusApi findFlickTouch(let lane, let enLane) { FUNCBEGIN diff --git a/engine/preview/holdNotes/ScratchHoldEnd.cpp b/engine/preview/holdNotes/ScratchHoldEnd.cpp index 86c3551..3372db0 100644 --- a/engine/preview/holdNotes/ScratchHoldEnd.cpp +++ b/engine/preview/holdNotes/ScratchHoldEnd.cpp @@ -26,7 +26,7 @@ class SiriusScratchHoldEnd: public Archetype { SonolusApi render() { FUNCBEGIN IF (noteId % noteCountDistance == 0) { drawNoteCount(beat, noteId); } FI; - drawPreviewNormalNote(Sprites.ScratchNote, beat, lane, enLane); + drawPreviewNormalNote(Sprites.ScratchNote, beat, scratchLane, scratchEnLane); drawPreviewHoldEighth(Sprites.Scratch, stBeat, beat, lane, enLane); IF (scratchLength > 0) { drawPreviewRightArrow(beat, scratchLane, scratchEnLane); } ELSE { diff --git a/main b/main index 8eb1979..076a727 100755 Binary files a/main and b/main differ