Merge pull request #16 from openitg/darklink87

Merging
openitg · Jun 18, 2018 · d56fd33 · d56fd33
2 parents 55b8ab2 + f2b7286
commit d56fd33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git 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
@@ -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