From 2188f4dbce7182832a5a62ba6a6e636255184c89 Mon Sep 17 00:00:00 2001 From: fdigl Date: Tue, 22 Feb 2022 18:08:06 -0800 Subject: [PATCH 1/2] add additional special folder keys Apparently I'm special and name things different from everybody else --- scripts/songselect/filterwheel.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/scripts/songselect/filterwheel.lua b/scripts/songselect/filterwheel.lua index c9030b3..144cd67 100644 --- a/scripts/songselect/filterwheel.lua +++ b/scripts/songselect/filterwheel.lua @@ -25,14 +25,15 @@ local specialFolders = { { keys = { 'SOUND VOLTEX BOOTH', 'SDVX BOOTH', 'SOUND VOLTEX I', 'SDVX I', - 'SOUND VOLTEX 1', 'SDVX 1', 'SDVX I BOOTH' + 'SOUND VOLTEX 1', 'SDVX 1', 'SDVX I BOOTH', 'SOUND VOLTEX I BOOTH' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Booth.png', 0) }, { keys = { 'SOUND VOLTEX INFINITE INFECTION', 'SDVX INFINITE INFECTION', - 'SOUND VOLTEX II', 'SDVX II', 'SOUND VOLTEX 2', 'SDVX 2', 'SDVX II INFINITE INFECTION' + 'SOUND VOLTEX II', 'SDVX II', 'SOUND VOLTEX 2', 'SDVX 2', 'SDVX II INFINITE INFECTION', + 'SOUND VOLTEX II INFINITE INFECTION' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Infinite Infection.png', @@ -41,6 +42,7 @@ local specialFolders = { { keys = { 'SOUND VOLTEX GRAVITY WARS', + 'SOUND VOLTEX III GRAVITY WARS', 'SDVX GRAVITY WARS', 'SOUND VOLTEX III', 'SDVX III', @@ -53,14 +55,16 @@ local specialFolders = { { keys = { 'SOUND VOLTEX HEAVENLY HAVEN', 'SDVX HEAVENLY HAVEN', - 'SOUND VOLTEX IV', 'SDVX IV', 'SOUND VOLTEX 4', 'SDVX 4', 'SDVX IV HEAVENLY HAVEN' + 'SOUND VOLTEX IV', 'SDVX IV', 'SOUND VOLTEX 4', 'SDVX 4', 'SDVX IV HEAVENLY HAVEN', + 'SOUND VOLTEX IV HEAVENLY HAVEN' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Heavenly Haven.png', 0) }, { keys = { 'SOUND VOLTEX VIVID WAVE', 'SDVX VIVID WAVE', 'SOUND VOLTEX V', - 'SDVX V', 'SOUND VOLTEX 5', 'SDVX 5', 'SDVX V VIVID WAVE' + 'SDVX V', 'SOUND VOLTEX 5', 'SDVX 5', 'SDVX V VIVID WAVE', + 'SOUND VOLTEX V VIVID WAVE' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Vivid Wave.png', 0) @@ -68,6 +72,7 @@ local specialFolders = { keys = { 'SOUND VOLTEX EXCEED GEAR', 'SDVX EXCEED GEAR', 'SOUND VOLTEX VI', 'SDVX VI', 'SOUND VOLTEX 6', 'SDVX 6', 'SDVX VI EXCEED GEAR' + 'SOUND VOLTEX VI EXCEED GEAR' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Exceed Gear.png', 0) From 361786236452669f2990b36b983fdf9e38784d63 Mon Sep 17 00:00:00 2001 From: fdigl Date: Tue, 22 Feb 2022 18:12:15 -0800 Subject: [PATCH 2/2] add special folder case for lowercase nautica Nautica downloader created a folder with all lowercase letters, this may not be detected by the specified key. --- scripts/songselect/filterwheel.lua | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/scripts/songselect/filterwheel.lua b/scripts/songselect/filterwheel.lua index 144cd67..2efbcdc 100644 --- a/scripts/songselect/filterwheel.lua +++ b/scripts/songselect/filterwheel.lua @@ -24,16 +24,18 @@ local ITEM_HEIGHT = 172; local specialFolders = { { keys = { - 'SOUND VOLTEX BOOTH', 'SDVX BOOTH', 'SOUND VOLTEX I', 'SDVX I', - 'SOUND VOLTEX 1', 'SDVX 1', 'SDVX I BOOTH', 'SOUND VOLTEX I BOOTH' + 'SOUND VOLTEX BOOTH', 'SOUND VOLTEX I BOOTH', 'SDVX BOOTH', + 'SOUND VOLTEX I', 'SDVX I', + 'SOUND VOLTEX 1', 'SDVX 1', 'SDVX I BOOTH' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Booth.png', 0) }, { keys = { 'SOUND VOLTEX INFINITE INFECTION', 'SDVX INFINITE INFECTION', - 'SOUND VOLTEX II', 'SDVX II', 'SOUND VOLTEX 2', 'SDVX 2', 'SDVX II INFINITE INFECTION', - 'SOUND VOLTEX II INFINITE INFECTION' + 'SOUND VOLTEX II INFINITE INFECTION', + 'SOUND VOLTEX II', 'SDVX II', 'SOUND VOLTEX 2', 'SDVX 2', + 'SDVX II INFINITE INFECTION' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Infinite Infection.png', @@ -42,49 +44,47 @@ local specialFolders = { { keys = { 'SOUND VOLTEX GRAVITY WARS', - 'SOUND VOLTEX III GRAVITY WARS', 'SDVX GRAVITY WARS', 'SOUND VOLTEX III', + 'SOUND VOLTEX III GRAVITY WARS', 'SDVX III', 'SOUND VOLTEX 3', 'SDVX 3', - 'SDVX III GRAVITY WARS', + 'SDVX III GRAVITY WARS' }, folderBg = gfx.CreateSkinImage('song_select/filter_wheel/special_folder_bgs/Gravity Wars.png', 0) }, { keys = { - 'SOUND VOLTEX HEAVENLY HAVEN', 'SDVX HEAVENLY HAVEN', - 'SOUND VOLTEX IV', 'SDVX IV', 'SOUND VOLTEX 4', 'SDVX 4', 'SDVX IV HEAVENLY HAVEN', - 'SOUND VOLTEX IV HEAVENLY HAVEN' + 'SOUND VOLTEX HEAVENLY HAVEN', 'SDVX HEAVENLY HAVEN', 'SOUND VOLTEX IV HEAVENLY HAVEN', + 'SOUND VOLTEX IV', 'SDVX IV', 'SOUND VOLTEX 4', 'SDVX 4', 'SDVX IV HEAVENLY HAVEN' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Heavenly Haven.png', 0) }, { keys = { 'SOUND VOLTEX VIVID WAVE', 'SDVX VIVID WAVE', 'SOUND VOLTEX V', - 'SDVX V', 'SOUND VOLTEX 5', 'SDVX 5', 'SDVX V VIVID WAVE', - 'SOUND VOLTEX V VIVID WAVE' + 'SDVX V', 'SOUND VOLTEX 5', 'SDVX 5', 'SDVX V VIVID WAVE', 'SOUND VOLTEX V VIVID WAVE' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Vivid Wave.png', 0) }, { keys = { 'SOUND VOLTEX EXCEED GEAR', 'SDVX EXCEED GEAR', 'SOUND VOLTEX VI', - 'SDVX VI', 'SOUND VOLTEX 6', 'SDVX 6', 'SDVX VI EXCEED GEAR' + 'SDVX VI', 'SOUND VOLTEX 6', 'SDVX 6', 'SDVX VI EXCEED GEAR', 'SOUND VOLTEX VI EXCEED GEAR' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Exceed Gear.png', 0) }, { keys = { - 'NAUTICA', + 'NAUTICA', 'nautica' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/Nautica.png', 0) }, { keys = { - 'KSHOOTMANIA', 'K-SHOOT MANIA', "K SHOOT MANIA" + 'KSHOOTMANIA', 'K-SHOOT MANIA', 'K SHOOT MANIA' }, folderBg = gfx.CreateSkinImage( 'song_select/filter_wheel/special_folder_bgs/KShootMania.png', 0)