From f2b72864f143412faa8ba0b709ec87ba512df4a0 Mon Sep 17 00:00:00 2001 From: Gabe Marchan Date: Fri, 1 Jun 2018 23:23:18 -0500 Subject: [PATCH] Revert "Expanded the Screen Filter options to a wider range." This reverts commit 763635c3a529162f8707c003444f65b2aa061203. --- Themes/itg3/Scripts/CustomMods.lua | 20 +++++++++----------- Themes/itg3/Scripts/Other.lua | 7 +++---- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Themes/itg3/Scripts/CustomMods.lua b/Themes/itg3/Scripts/CustomMods.lua index 79b9d15..bf189a1 100644 --- a/Themes/itg3/Scripts/CustomMods.lua +++ b/Themes/itg3/Scripts/CustomMods.lua @@ -224,22 +224,20 @@ function OptionScreenFilter() SelectType = "SelectOne", OneChoiceForAllPlayers = false, ExportOnChange = false, - Choices = { "Disabled", "Light", "Medium", "Dark", "Darkest"}, + Choices = { "Disabled", "Dark", "Darker", "Darkest"}, LoadSelections = function(self, list, pn) --if GAMESTATE:StageIndex() == 0 then ResetCustomMods() end -- Reset if we're on the first stage - if CustomMods[pn].dark == 0 then list[1] = true - elseif CustomMods[pn].dark == 0.3 then list[2] = true - elseif CustomMods[pn].dark == 0.5 then list[3] = true - elseif CustomMods[pn].dark == 0.7 then list[4] = true - elseif CustomMods[pn].dark == 0.9 then list[5] = true + if CustomMods[pn].dark == 0 then list[1] = true + elseif CustomMods[pn].dark == 0.5 then list[2] = true + elseif CustomMods[pn].dark == 0.65 then list[3] = true + elseif CustomMods[pn].dark == 0.85 then list[4] = true else list[1] = true end end, SaveSelections = function(self, list, pn) - if list [1] then CustomMods[pn].dark = 0 - elseif list [2] then CustomMods[pn].dark = 0.3 - elseif list [3] then CustomMods[pn].dark = 0.5 - elseif list [4] then CustomMods[pn].dark = 0.7 - elseif list [5] then CustomMods[pn].dark = 0.9 + if list [1] then CustomMods[pn].dark = 0 + elseif list [2] then CustomMods[pn].dark = 0.5 + elseif list [3] then CustomMods[pn].dark = 0.65 + elseif list [4] then CustomMods[pn].dark = 0.85 else CustomMods[pn].dark = 0 end end } diff --git a/Themes/itg3/Scripts/Other.lua b/Themes/itg3/Scripts/Other.lua index 1d9420a..12313a1 100644 --- a/Themes/itg3/Scripts/Other.lua +++ b/Themes/itg3/Scripts/Other.lua @@ -1101,10 +1101,9 @@ elseif CustomMods[pn].spinreverse then if t == "" then t = "Spin Left" else t = elseif CustomMods[pn].spin then if t == "" then t = "Spin Right" else t = t .. ", Spin Right" end elseif CustomMods[pn].vibrate then if t == "" then t = "Vibrate" else t = t .. ", Vibrate" end end -if CustomMods[pn].dark == 0.3 then if t == "" then t = "Light Filter" else t = t .. ", Light Filter" end end -if CustomMods[pn].dark == 0.5 then if t == "" then t = "Medium Filter" else t = t .. ", Medium Filter" end end -if CustomMods[pn].dark == 0.7 then if t == "" then t = "Dark Filter" else t = t .. ", Dark Filter" end end -if CustomMods[pn].dark == 0.9 then if t == "" then t = "Darkest Filter" else t = t .. ", Darkest Filter" end end +if CustomMods[pn].dark == 0.5 then if t == "" then t = "Dark Filter" else t = t .. ", Dark Filter" end end +if CustomMods[pn].dark == 0.65 then if t == "" then t = "Darker Filter" else t = t .. ", Darker Filter" end end +if CustomMods[pn].dark == 0.85 then if t == "" then t = "Darkest Filter" else t = t .. ", Darkest Filter" end end if GetRateMod() ~= '' then if t == "" then t = GetRateMod() else t = t .. ", " .. GetRateMod() end end