---PlayerOptions REWORK---

-seperate playeroptions menus (main, theme, and effects)
-options reorganized to prioritize important mods
-metrics cleanup
-language additions and cleanup
-granular sudden/hidden offset row (increments of 10%)
-downscroll on/off row (scroll row moved to the new effects menu)

NOTE: This commit is not yet fully functional. At the moment, a scripts
reload is required to make the seperate playeroptions menus function. To
be fixed in a future commit before merge.

Themes/Til Death/BGAnimations/ScreenPlayerOptions underlay.lua

@@ -1,4 +1,9 @@
-t = Def.ActorFrame {}
+t = Def.ActorFrame {
+	InitCommand=function(self)
+		setenv("DifferentOptionsScreen",false)
+		setenv("NewOptions","Main")
+	end
+}
 
 t[#t + 1] =
 	LoadActor(THEME:GetPathG("", "_OptionsScreen")) ..

Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/default.lua

@@ -28,6 +28,7 @@ local t =
 		self:SetUpdateFunctionInterval(0.025)
 		local s = SCREENMAN:GetTopScreen()
 		s:AddInputCallback(input)
+		setenv("NewOptions","Main")
 	end
 }
 

Themes/Til Death/Languages/en.ini

@@ -119,8 +119,6 @@ UpdateAvailable=Update Available\nClick to Update
 2.95x=2.95x
 3.0x=3.0x
 
-reversedownscroll=Reverse (Downscroll)
-
 Bottom=Bottom
 ClearGradeBackground=Clear+Grade Background
 EWMA=EWMA

Themes/Til Death/Scripts/02 Branches.lua

@@ -129,7 +129,7 @@ Branch = {
 			if not IsSMOnlineLoggedIn(PLAYER_1) then
 				return "ScreenNetSelectProfile"
 			else
-				return "ScreenNetSelectProfile" --return "ScreenNetRoom" 	-- cant do this, we need to select a local profile even 	
+				return "ScreenNetSelectProfile" --return "ScreenNetRoom" 	-- cant do this, we need to select a local profile even
 			end																-- if logged into smo -mina
 		else
 			return "ScreenNetworkOptions"
@@ -155,10 +155,10 @@ Branch = {
 		end
 	end,
 	PlayerOptions = function()
-		if SCREENMAN:GetTopScreen():GetGoToOptions() then
+		if SCREENMAN:GetTopScreen():GetGoToOptions() or GAMESTATE:Env()["DifferentOptionsScreen"] then
 			return "ScreenPlayerOptions"
 		else
-			return "ScreenStageInformation"
+			return ToGameplay()
 		end
 	end,
 	SongOptions = function()

Themes/Til Death/Scripts/02 OptionsMenu.lua

@@ -0,0 +1,8 @@
+function getPlayerOptionsList(itemSet)
+	local Items = {
+		["Main"] = "Speed,RateList,NoteSk,PRAC,DownSc,Center,Persp,LC,BG,SF,Background,Judge,Life,Fail,Score",
+		["Theme"] = "CG,CBHL,JT,CT,DP,TT,TG,TTM,JC,EB,EBC,PI,FBP,FB,MB,LEADB,NPS",
+		["Effect"] = "Persp,App,GHO,SHO,Acc,Hide,Effect1,Effect2,Scroll,Turn,Insert,R1,R2,Holds,Mines"
+	}
+	return Items[itemSet] .. ",NextScr"
+end

Themes/Til Death/Scripts/02 ThemePrefs.lua

@@ -1236,4 +1236,4 @@ function FadeNoteFieldInSyncMachine()
 	}
 	setmetatable(t, t)
 	return t
-end
+end

Themes/Til Death/metrics.ini

@@ -328,10 +328,17 @@ StepsTypeSetCommand=%function(self,param) \
 end; \
 
 [ScreenPlayerOptions]
-LineNames="1,Rate,8,RS,CG,PRAC,7,14,4,2,13,5,10,LC,Center,CBHL,JT,CT,DP,TT,TG,TTM,JC,EB,EBC,PI,FBP,FB,MB,LEADB,NPS,16,BG,SF,Background,Life,Judge,Fail,Score"
-LineCenter="conf,Center1Player"
-LineCG="lua,CustomizeGameplay()"
+LineNames=getPlayerOptionsList( getenv("NewOptions") or "Main" )
+
+#Main Page
 LineRS="lua,ReceptorSize()"
+LineLC="lua,LaneCover()"
+LineBG="lua,BackgroundType()"
+LineSF="lua,OptionRowScreenFilter()"
+#--DISABLED: LineCW="lua,CustomEvalWindows()"
+# Theme Page
+LineCG="lua,CustomizeGameplay()"
+LineCBHL="lua,CBHighlight()"
 LineJT="lua,JudgmentText()"
 LineCT="lua,ComboText()"
 LineDP="lua,DisplayPercent()"
@@ -340,105 +347,24 @@ LineTG="lua,TargetGoal()"
 LineTTM="lua,TargetTrackerMode()"
 LineJC="lua,JudgeCounter()"
 LineEB="lua,ErrorBar()"
+LineEBC="lua,ErrorBarCount()"
 LinePI="lua,PlayerInfo()"
 LineFBP="lua,ProgressBar()"
 LineFB="lua,FullProgressBar()"
-LineLEADB="lua,LeaderBoard()"
 LineMB="lua,MiniProgressBar()"
-LineSF="lua,OptionRowScreenFilter()"
-LineLC="lua,LaneCover()"
+LineLEADB="lua,LeaderBoard()"
 LineNPS="lua,NPSDisplay()"
-LineRate="list,Rate"
-LineBG="lua,BackgroundType()"
-LineFail="list,Fail"
-LineScore="list,SaveScores"
-LineLife="conf,LifeDifficulty"
-LineJudge="conf,TimingWindowScale"
-LineCW="lua,CustomEvalWindows()"
-LineBackground="conf,BGBrightness"
-LineCBHL="lua,CBHighlight()"
-LineEBC="lua,ErrorBarCount()"
 
-NextScreen=ToGameplay()
+NextScreen=Branch.PlayerOptions()
 
 [ScreenOptionsMaster]
-EffectsReceptor="4;selectmultiple"
-EffectsReceptorDefault="mod,no confusion,no invert,no flip,no xmode"
-EffectsReceptor,1="mod,confusion;name,Confusion"
-EffectsReceptor,2="mod,invert;name,Invert"
-EffectsReceptor,3="mod,Flip;name,Flip"
-EffectsReceptor,4="mod,45% xmode;name,XMode"
-
-Rate="51;together"
-RateDefault="mod,1.0xMusic;mod,no haste"
-Rate,1="mod,0.5xMusic;name,0.5x"
-Rate,2="mod,0.55xMusic;name,0.55x"
-Rate,3="mod,0.6xMusic;name,0.6x"
-Rate,4="mod,0.65xMusic;name,0.65x"
-Rate,5="mod,0.7xMusic;name,0.7x"
-Rate,6="mod,0.75xMusic;name,0.75x"
-Rate,7="mod,0.8xMusic;name,0.8x"
-Rate,8="mod,0.85xMusic;name,0.85x"
-Rate,9="mod,0.9xMusic;name,0.9x"
-Rate,10="mod,0.95xMusic;name,0.95x"
-Rate,11="mod,1.0xMusic;name,1.0x"
-Rate,12="mod,1.05xMusic;name,1.05x"
-Rate,13="mod,1.1xMusic;name,1.1x"
-Rate,14="mod,1.15xMusic;name,1.15x"
-Rate,15="mod,1.2xMusic;name,1.2x"
-Rate,16="mod,1.25xMusic;name,1.25x"
-Rate,17="mod,1.3xMusic;name,1.3x"
-Rate,18="mod,1.35xMusic;name,1.35x"
-Rate,19="mod,1.4xMusic;name,1.4x"
-Rate,20="mod,1.45xMusic;name,1.45x"
-Rate,21="mod,1.5xMusic;name,1.5x"
-Rate,22="mod,1.55xMusic;name,1.55x"
-Rate,23="mod,1.6xMusic;name,1.6x"
-Rate,24="mod,1.65xMusic;name,1.65x"
-Rate,25="mod,1.7xMusic;name,1.7x"
-Rate,26="mod,1.75xMusic;name,1.75x"
-Rate,27="mod,1.8xMusic;name,1.8x"
-Rate,28="mod,1.85xMusic;name,1.85x"
-Rate,29="mod,1.9xMusic;name,1.9x"
-Rate,30="mod,1.95xMusic;name,1.95x"
-Rate,31="mod,2.0xMusic;name,2.0x"
-Rate,32="mod,2.05xMusic;name,2.05x"
-Rate,33="mod,2.1xMusic;name,2.1x"
-Rate,34="mod,2.15xMusic;name,2.15x"
-Rate,35="mod,2.2xMusic;name,2.2x"
-Rate,36="mod,2.25xMusic;name,2.25x"
-Rate,37="mod,2.3xMusic;name,2.3x"
-Rate,38="mod,2.35xMusic;name,2.35x"
-Rate,39="mod,2.4xMusic;name,2.4x"
-Rate,40="mod,2.45xMusic;name,2.45x"
-Rate,41="mod,2.5xMusic;name,2.5x"
-Rate,42="mod,2.55xMusic;name,2.55x"
-Rate,43="mod,2.6xMusic;name,2.6x"
-Rate,44="mod,2.65xMusic;name,2.6x"
-Rate,45="mod,2.7xMusic;name,2.7x"
-Rate,46="mod,2.75xMusic;name,2.75x"
-Rate,47="mod,2.8xMusic;name,2.8x"
-Rate,48="mod,2.85xMusic;name,2.85x"
-Rate,49="mod,2.9xMusic;name,2.9x"
-Rate,50="mod,2.95xMusic;name,2.95x"
-Rate,51="mod,3.0xMusic;name,3.0x"
-
-Scroll="5;selectmultiple"
-ScrollDefault="mod,no reverse,no split,no alternate,no cross,no centered"
-Scroll,1="mod,reverse;name,reversedownscroll"
-Scroll,2="mod,split;name,Split"
-Scroll,3="mod,alternate;name,Alternate"
-Scroll,4="mod,cross;name,Cross"
-Scroll,5="mod,centered;name,Centered"
-
-Appearance="6;selectmultiple"
-AppearanceDefault="mod,no hidden,no hiddenoffset,no sudden,no suddenoffset,no stealth,no blink,no randomvanish"
-Appearance,1="mod,hidden;name,Hidden"
-Appearance,2="mod,hiddenoffset;name,HiddenOffset"
-Appearance,3="mod,sudden;name,Sudden"
-Appearance,4="mod,suddenoffset;name,SuddenOffset"
-Appearance,5="mod,stealth;name,Stealth"
-Appearance,6="mod,blink;name,Blink"
+#Appearance="6;selectmultiple"
+#AppearanceDefault="mod,no hidden,no hiddenoffset,no sudden,no suddenoffset,no stealth,no blink,no randomvanish"
+#Appearance,1="mod,hidden;name,Hidden"
+#Appearance,2="mod,hiddenoffset;name,HiddenOffset"
+#Appearance,4="mod,suddenoffset;name,SuddenOffset"
+#Appearance,5="mod,stealth;name,Stealth"
+#Appearance,6="mod,blink;name,Blink"
 
 [ScreenEvaluation]
 # judge changer listener i guess

Themes/_fallback/BGAnimations/ScreenPlayerOptions overlay.lua

@@ -1,4 +1,9 @@
-local t = Def.ActorFrame {}
+local t = Def.ActorFrame {
+	InitCommand=function(self)
+		setenv("NewOptions","Main")
+		setenv("DifferentOptionsScreen",false)
+	end,
+}
 
 local NSPreviewSize = 0.5
 local NSPreviewX = 35

Themes/_fallback/BGAnimations/ScreenSelectMusic overlay.lua

@@ -0,0 +1,8 @@
+local t = Def.ActorFrame {
+	InitCommand = function(self)
+		setenv("NewOptions","Main")
+		setenv("DifferentOptionsScreen",false)
+	end
+}
+
+return t