From ff3f16ca12645910d3d1516cfb2058d9304bac1a Mon Sep 17 00:00:00 2001 From: Barinade Date: Fri, 13 Dec 2019 02:10:07 -0600 Subject: [PATCH] Fix Beat single5, single7, double5, double7 support ehh not really fix, but technically they all use x+1 lanes because of the scratch so the double is 16 columns instead of 14 --- Themes/Til Death/Scripts/01 player_config.lua | 11 +++++++++-- Themes/_fallback/Scripts/00 Utility.lua | 8 ++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Themes/Til Death/Scripts/01 player_config.lua b/Themes/Til Death/Scripts/01 player_config.lua index 5537342390..f1474cd96f 100644 --- a/Themes/Til Death/Scripts/01 player_config.lua +++ b/Themes/Til Death/Scripts/01 player_config.lua @@ -102,7 +102,8 @@ local defaultConfig = { ["7K"] = DeepCopy(defaultGameplayCoordinates), ["8K"] = DeepCopy(defaultGameplayCoordinates), ["10K"] = DeepCopy(defaultGameplayCoordinates), - ["14K"] = DeepCopy(defaultGameplayCoordinates) + ["12K"] = DeepCopy(defaultGameplayCoordinates), + ["16K"] = DeepCopy(defaultGameplayCoordinates) }, GameplaySizes = { ["4K"] = DeepCopy(defaultGameplaySizes), @@ -111,7 +112,8 @@ local defaultConfig = { ["7K"] = DeepCopy(defaultGameplaySizes), ["8K"] = DeepCopy(defaultGameplaySizes), ["10K"] = DeepCopy(defaultGameplaySizes), - ["14K"] = DeepCopy(defaultGameplaySizes) + ["12K"] = DeepCopy(defaultGameplaySizes), + ["16K"] = DeepCopy(defaultGameplaySizes) } } @@ -132,6 +134,9 @@ playerConfig.load = function(self, slot) defaultConfig.GameplaySizes["7K"] = sizes defaultConfig.GameplaySizes["8K"] = sizes defaultConfig.GameplaySizes["10K"] = sizes + defaultConfig.GameplaySizes["12K"] = sizes + defaultConfig.GameplaySizes["16K"] = sizes + end if coords and not coords["4K"] then defaultConfig.GameplayXYCoordinates["4K"] = coords @@ -140,6 +145,8 @@ playerConfig.load = function(self, slot) defaultConfig.GameplayXYCoordinates["7K"] = coords defaultConfig.GameplayXYCoordinates["8K"] = coords defaultConfig.GameplayXYCoordinates["10K"] = coords + defaultConfig.GameplayXYCoordinates["12K"] = coords + defaultConfig.GameplayXYCoordinates["16K"] = coords end force_table_elements_to_match_type = tmp return tmp2(self, slot) diff --git a/Themes/_fallback/Scripts/00 Utility.lua b/Themes/_fallback/Scripts/00 Utility.lua index d0f5533363..a605858f1d 100644 --- a/Themes/_fallback/Scripts/00 Utility.lua +++ b/Themes/_fallback/Scripts/00 Utility.lua @@ -293,14 +293,14 @@ function getCurrentKeyMode() local keys = { StepsType_Dance_Single = "4K", StepsType_Pump_Single = "5K", - StepsType_Bm_Single5 = "5K", + StepsType_Bm_Single5 = "6K", StepsType_Dance_Solo = "6K", StepsType_Kb7_Single = "7K", - StepsType_Bm_Single7 = "7K", + StepsType_Bm_Single7 = "8K", StepsType_Dance_Double = "8K", StepsType_Pump_Double = "10K", - StepsType_Bm_Double5 = "10K", - StepsType_Bm_Double7 = "14K", + StepsType_Bm_Double5 = "12K", + StepsType_Bm_Double7 = "16K", } local stepstype = GAMESTATE:GetCurrentSteps(PLAYER_1):GetStepsType() return keys[stepstype]