diff --git a/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua b/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua index ab905f60aa..74fc02a2a4 100644 --- a/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua +++ b/Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua @@ -387,49 +387,6 @@ function GamePrefComboUnderField() return t; end -function GetDefaultArrowSpacing() - local rates = { - 64, -- Default - 80, -- Pro - 128, -- New - }; - return GetUserPrefB("AdjustSpeed") and rates[3] or rates[1]; -end; -function UserPrefAdjustSpeed() - local t = { - Name = "UserPrefAdjustSpeed"; - LayoutType = "ShowAllInRow"; - SelectType = "SelectOne"; - OneChoiceForAllPlayers = true; - ExportOnChange = false; - Choices = { 'Normal','Fast' }; - LoadSelections = function(self, list, pn) - if ReadUserPrefFromFile("AdjustSpeed") ~= nil then - if GetUserPrefB("AdjustSpeed") then - list[2] = true; - else - list[1] = true; - end; - else - WriteUserPrefToFile("AdjustSpeed",true); - list[2] = true; - end; - end; - SaveSelections = function(self, list, pn) - local val; - if list[2] then - val = true; - else - val = false; - end; - WriteUserPrefToFile("AdjustSpeed",val); - MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); - end; - }; - setmetatable( t, t ); - return t; -end function GamePrefAutoSetStyle() local t = { Name = "GamePrefAutoSetStyle"; diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index c0c7348f48..7a48d01b9f 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -126,7 +126,7 @@ FrameWidthEffectsMinMultiplier=0.5 FrameWidthEffectsMaxMultiplier=1.2 FrameWidthLockEffectsToOverlapping=false FrameWidthLockEffectsTweenPixels=25 -ArrowSpacing=128 +ArrowSpacing=64 DrawHiddenNotesAfterReceptor=true BlinkModFrequency=0.3333 BoostModMinClamp=-400 diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index 526b6ca897..8d414c3ae2 100644 --- a/Themes/default/Scripts/03 ThemePrefs.lua +++ b/Themes/default/Scripts/03 ThemePrefs.lua @@ -51,9 +51,6 @@ function InitUserPrefs() if GetUserPrefB("UserPrefComboUnderField") == nil then SetUserPref("UserPrefComboUnderField", true); end; - if GetUserPrefB("UserPrefAdjustSpeed") == nil then - SetUserPref("UserPrefAdjustSpeed", false); - end; --[[ if GetUserPref("ProTimingP1") == nil then SetUserPref("ProTimingP1", false); end; @@ -500,49 +497,4 @@ function UserPrefComboUnderField() setmetatable( t, t ); return t; end - -function GetDefaultArrowSpacing() - local rates = { - 64, -- Default - 80, -- Pro - 128, -- New - }; - return GetUserPrefB("UserPrefAdjustSpeed") and rates[3] or rates[1]; -end; - -function UserPrefAdjustSpeed() - local t = { - Name = "UserPrefAdjustSpeed"; - LayoutType = "ShowAllInRow"; - SelectType = "SelectOne"; - OneChoiceForAllPlayers = true; - ExportOnChange = false; - Choices = { 'Slow','Fast' }; - LoadSelections = function(self, list, pn) - if ReadPrefFromFile("UserPrefAdjustSpeed") ~= nil then - if GetUserPrefB("UserPrefAdjustSpeed") then - list[2] = true; - else - list[1] = true; - end; - else - WritePrefToFile("UserPrefAdjustSpeed",true); - list[2] = true; - end; - end; - SaveSelections = function(self, list, pn) - local val; - if list[2] then - val = true; - else - val = false; - end; - WritePrefToFile("UserPrefAdjustSpeed",val); - MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } ); - THEME:ReloadMetrics(); - end; - }; - setmetatable( t, t ); - return t; -end --[[ end option rows ]] diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index a55b777546..bf2e39a2ce 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -321,9 +321,6 @@ AveragePulseCommand=finishtweening;diffusealpha,1;zoom,0.75*1.25;decelerate,0.05 # ReceptorArrowsYReverse=GetTapPosition('Reverse') # RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls") -[ArrowEffects] -ArrowSpacing=GetDefaultArrowSpacing() - [ScoreDisplayNormal] FrameX= FrameY=