From 338fdd8892f8575e4a0e3676cc7cd27653fb0825 Mon Sep 17 00:00:00 2001 From: hayoreo Date: Wed, 6 Mar 2024 14:10:35 -0800 Subject: [PATCH] Add pump mirrors and language. --- Themes/_fallback/Languages/en.ini | 2 + src/NoteDataUtil.cpp | 74 +++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 78c1e250a4..ca31e6b367 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -814,6 +814,8 @@ Metronome=Metronome Mines=Mines Mini=Mini Mirror=Mirror +LRMirror=LRMirror +UDMirror=UDMirror N/A=N/A Native Language=Native Language Never=Never diff --git a/src/NoteDataUtil.cpp b/src/NoteDataUtil.cpp index c93131c07b..bbd3839e2f 100644 --- a/src/NoteDataUtil.cpp +++ b/src/NoteDataUtil.cpp @@ -1398,6 +1398,44 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu iTakeFromTrack[4] = 1; iTakeFromTrack[5] = 0; break; + case StepsType_pump_single: + iTakeFromTrack[0] = 4; + iTakeFromTrack[1] = 3; + iTakeFromTrack[3] = 1; + iTakeFromTrack[4] = 0; + break; + case StepsType_pump_halfdouble: + iTakeFromTrack[0] = 5; + iTakeFromTrack[1] = 4; + iTakeFromTrack[2] = 3; + iTakeFromTrack[3] = 2; + iTakeFromTrack[4] = 1; + iTakeFromTrack[5] = 0; + break; + case StepsType_pump_double: + iTakeFromTrack[0] = 9; + iTakeFromTrack[1] = 8; + iTakeFromTrack[2] = 7; + iTakeFromTrack[3] = 6; + iTakeFromTrack[4] = 5; + iTakeFromTrack[5] = 4; + iTakeFromTrack[6] = 3; + iTakeFromTrack[7] = 2; + iTakeFromTrack[8] = 1; + iTakeFromTrack[9] = 0; + break; + case StepsType_pump_couple: + iTakeFromTrack[0] = 9; + iTakeFromTrack[1] = 8; + iTakeFromTrack[2] = 7; + iTakeFromTrack[3] = 6; + iTakeFromTrack[4] = 5; + iTakeFromTrack[5] = 4; + iTakeFromTrack[6] = 3; + iTakeFromTrack[7] = 2; + iTakeFromTrack[8] = 1; + iTakeFromTrack[9] = 0; + break; default: break; } break; @@ -1409,19 +1447,47 @@ static void GetTrackMapping( StepsType st, NoteDataUtil::TrackMapping tt, int Nu iTakeFromTrack[2] = 1; break; case StepsType_dance_double: - iTakeFromTrack[0] = 0; iTakeFromTrack[1] = 2; iTakeFromTrack[2] = 1; - iTakeFromTrack[3] = 3; - iTakeFromTrack[4] = 4; iTakeFromTrack[5] = 6; iTakeFromTrack[6] = 5; - iTakeFromTrack[7] = 7; break; case StepsType_dance_solo: iTakeFromTrack[2] = 3; iTakeFromTrack[3] = 2; break; + case StepsType_pump_single: + iTakeFromTrack[0] = 1; + iTakeFromTrack[1] = 0; + iTakeFromTrack[3] = 4; + iTakeFromTrack[4] = 3; + break; + case StepsType_pump_halfdouble: + iTakeFromTrack[1] = 2; + iTakeFromTrack[2] = 1; + iTakeFromTrack[3] = 4; + iTakeFromTrack[4] = 3; + break; + case StepsType_pump_double: + iTakeFromTrack[0] = 1; + iTakeFromTrack[1] = 0; + iTakeFromTrack[3] = 4; + iTakeFromTrack[4] = 3; + iTakeFromTrack[5] = 6; + iTakeFromTrack[6] = 5; + iTakeFromTrack[8] = 9; + iTakeFromTrack[9] = 8; + break; + case StepsType_pump_couple: + iTakeFromTrack[0] = 1; + iTakeFromTrack[1] = 0; + iTakeFromTrack[3] = 4; + iTakeFromTrack[4] = 3; + iTakeFromTrack[5] = 6; + iTakeFromTrack[6] = 5; + iTakeFromTrack[8] = 9; + iTakeFromTrack[9] = 8; + break; default: break; } break;