rebirth add measure lines toggle to settings

Yasha-jin · Dec 13, 2021 · 09eaf6c · 09eaf6c
1 parent 2127beb
commit 09eaf6c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/Themes/Rebirth/BGAnimations/playerInfoFrame/settings.lua b/Themes/Rebirth/BGAnimations/playerInfoFrame/settings.lua
@@ -2894,6 +2894,7 @@ local function rightFrame()
         leaderboard = playeroption("leaderboardEnabled"),
         displayMean = playeroption("DisplayMean"),
         measureCounter = playeroption("MeasureCounter"),
+        measureLines = {get = getdataPLAYER("MeasureLines"), set = function(x) setdataPLAYER("MeasureLines", x) THEME:ReloadMetrics() end},
         npsDisplay = playeroption("NPSDisplay"),
         npsGraph = playeroption("NPSGraph"),
         playerInfo = playeroption("PlayerInfo"),
@@ -4548,6 +4549,14 @@ local function rightFrame()
                 Directions = optionDataToggleDirectionsFUNC("measureCounter", true, false),
                 ChoiceIndexGetter = optionDataToggleIndexGetterFUNC("measureCounter", true),
             },
+            {
+                Name = "Measure Lines",
+                Type = "SingleChoice",
+                Explanation = "Toggle showing a line on the NoteField for every measure.",
+                Choices = choiceSkeleton("On", "Off"),
+                Directions = optionDataToggleDirectionsFUNC("measureLines", true, false),
+                ChoiceIndexGetter = optionDataToggleIndexGetterFUNC("measureLines", true),
+            },
             {
                 Name = "NPS Display",
                 Type = "SingleChoice",

diff --git a/Themes/Rebirth/Scripts/01 player_config.lua b/Themes/Rebirth/Scripts/01 player_config.lua
@@ -155,6 +155,7 @@ local defaultConfig = {
     DisplayMean = true,
     leaderboardEnabled = false,
     MeasureCounter = false,
+    MeasureLines = false,
     MiniProgressBar = true,
     NPSDisplay = true,
     NPSGraph = true,

diff --git a/Themes/Rebirth/Scripts/02 ThemePrefs.lua b/Themes/Rebirth/Scripts/02 ThemePrefs.lua
@@ -1010,7 +1010,7 @@ function MeasureLines()
         ExportOnChange = true,
         Choices = {THEME:GetString("OptionNames", "Off"), THEME:GetString("OptionNames", "On")},
         LoadSelections = function(self, list, pn)
-            local pref = themeConfig:get_data().global.MeasureLines
+            local pref = playerConfig:get_data().MeasureLines
             if pref then
                 list[2] = true
             else
@@ -1024,10 +1024,9 @@ function MeasureLines()
             else
                 value = true
             end
-            themeConfig:get_data().global.MeasureLines = value
-            themeConfig:set_dirty()
-            themeConfig:save()
-            THEME:ReloadMetrics()
+            playerConfig:get_data().MeasureLines = value
+            playerConfig:set_dirty()
+            playerConfig:save()
         end
     }
     setmetatable(t, t)

diff --git a/Themes/Rebirth/metrics.ini b/Themes/Rebirth/metrics.ini
@@ -34,6 +34,11 @@ NumWheelItems=-3
 
 [NoteField]
 ShowBoard=true
+ShowBeatBars=playerConfig:get_data().MeasureLines
+BarMeasureAlpha=0.4
+Bar4thAlpha=0
+Bar8thAlpha=0
+Bar16thAlpha=0
 
 [OptionRow]
 FrameX=SCREEN_CENTER_X-convertForThemeHeight(222)