GamePrefs now holds _fallback inclusive choices, instead of ThemePrefs.

Themes/_fallback/Languages/en.ini

@@ -291,7 +291,7 @@ Not Supported=Mode not supported while networked.
 192nd=192nd
 
 [OptionExplanations]
-Accel=Accel
+Accel=Accelerate, Decelerate or otherwise adjust the arrow speed.
 AllowExtraStage=When enabled (and Event Mode isn't on), allows the player to earn extra stages after completing certain requirements.
 AllowW1=Enable or disable fantastic judgement.  NEVER - never show Fantastic, COURSES ONLY - only during nonstop/oni modes, ALWAYS - all modes of play.
 Announcer=Choose from this list of installed announcer packs.
@@ -692,6 +692,7 @@ Silent=Silent
 Skip=Skip
 Skippy=Skippy
 Slow=Slow
+SN2=Supernova 2
 SongAttacks=Song Attacks
 Song BGAnimation=Song BGAnimation
 Song Bitmap=Song Bitmap

Themes/_fallback/Scripts/03 ThemeAndGamePrefs.lua

@@ -0,0 +1,495 @@
+-- sm-ssc Default Theme Preferences Handler
+function InitGamePrefs()
+	if GetGamePrefB("AutoSetStyle") == nil then
+		SetGamePref("AutoSetStyle", false);
+	end;
+	if GetGamePrefB("NotePosition") == nil then
+		SetGamePref("NotePosition", true);
+	end;
+	if GetGamePrefB("ComboOnRolls") == nil then
+		SetGamePref("ComboOnRolls", false);
+	end;
+	if GetGamePrefB("ComboUnderField") == nil then
+		SetGamePref("ComboUnderField", true);
+	end;
+	if GetGamePrefB("AdjustSpeed") == nil then
+		SetGamePref("AdjustSpeed", false);
+	end;
+end
+function InitUserPrefs()
+	if GetUserPref("UserPrefGameplayShowStepsDisplay") == nil then
+		SetUserPref("UserPrefGameplayShowStepsDisplay", true);
+	end;
+	if GetUserPref("UserPrefGameplayShowScore") == nil then
+		SetUserPref("UserPrefGameplayShowScore", false);
+	end;
+	if GetUserPrefB("UserPrefShowLotsaOptions") == nil then
+		SetUserPref("UserPrefShowLotsaOptions", true);
+	end;
+	if GetUserPrefB("UserPrefLongFail") == nil then
+		SetUserPref("UserPrefLongFail", false);
+	end;
+	if GetUserPrefB("UserPrefProtimingP1") == nil then
+		SetUserPref("UserPrefProtimingP1", false);
+	end;
+	if GetUserPrefB("UserPrefProtimingP2") == nil then
+		SetUserPref("UserPrefProtimingP2", false);
+	end;
+	if GetUserPrefB("FlashyCombos") == nil then
+		SetUserPref("FlashyCombos", false);
+	end;
+--[[ 	if GetUserPref("ProTimingP1") == nil then
+		SetUserPref("ProTimingP1", false);
+	end;
+	if GetUserPref("ProTimingP2") == nil then
+		SetUserPref("ProTimingP2", false);
+	end; --]]
+end;
+--[[ theme option rows ]]
+-- screen cover
+function GetProTiming(pn)
+	local pname = ToEnumShortString(pn);
+	if GetUserPref("ProTiming"..pname) then
+		return GetUserPrefB("ProTiming"..pname);
+	else
+		SetUserPref("ProTiming"..pname,false);
+		return false;
+	end;
+end;
+function OptionRowProTiming()
+	local t = {
+		Name = "ProTiming";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = false;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			local bShow;
+			if GetUserPrefB("UserPrefProtiming" .. ToEnumShortString(pn) ) then
+				bShow = GetUserPrefB("UserPrefProtiming" .. ToEnumShortString(pn) );
+				if bShow then
+					list[2] = true;
+				else
+					list[1] = true;
+				end
+			else
+				list[1] = true;
+			end;
+--[[ 			local pname = ToEnumShortString(pn);
+
+			if getenv("ProTiming"..pname) == true then
+				list[2] = true;
+			else
+				list[1] = true;
+			end; --]]
+		end;
+		SaveSelections = function(self, list, pn)
+			local bSave;
+			if list[2] then
+				bSave = true;
+			else
+				bSave = false;
+			end;
+			SetUserPref("UserPrefProtiming" .. ToEnumShortString(pn),bSave);
+--[[ 			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			local pname = ToEnumShortString(pn);
+			setenv("ProTiming"..pname, val); --]]
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end;
+
+function UserPrefGameplayShowScore()
+	local t = {
+		Name = "UserPrefGameplayShowScore";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			if ReadPrefFromFile("UserPrefGameplayShowScore") ~= nil then
+				if GetUserPrefB("UserPrefGameplayShowScore") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WritePrefToFile("UserPrefGameplayShowScore",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WritePrefToFile("UserPrefGameplayShowScore",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+
+function UserPrefGameplayShowStepsDisplay()
+	local t = {
+		Name = "UserPrefGameplayShowStepsDisplay";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			if ReadPrefFromFile("UserPrefGameplayShowStepsDisplay") ~= nil then
+				if GetUserPrefB("UserPrefGameplayShowStepsDisplay") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WritePrefToFile("UserPrefGameplayShowStepsDisplay",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WritePrefToFile("UserPrefGameplayShowStepsDisplay",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+
+function UserPrefShowLotsaOptions()
+	local t = {
+		Name = "UserPrefShowLotsaOptions";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Many','Few' };
+		LoadSelections = function(self, list, pn)
+			if ReadPrefFromFile("UserPrefShowLotsaOptions") ~= nil then
+				if GetUserPrefB("UserPrefShowLotsaOptions") then
+					list[1] = true;
+				else
+					list[2] = true;
+				end;
+			else
+				WritePrefToFile("UserPrefShowLotsaOptions",false);
+				list[2] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[1] then
+				val = true;
+			else
+				val = false;
+			end;
+			WritePrefToFile("UserPrefShowLotsaOptions",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+
+function GetDefaultOptionLines()
+	local LineSets = {
+		"1,8,14,2,3,4,5,6,R,7,9,10,11,12,13,15,16,17,18", -- All
+		"1,8,14,2,7,13,16,17,18", -- DDR Essentials ( no turns, fx )
+	};
+	local function IsExtra()
+		if GAMESTATE:IsExtraStage() or GAMESTATE:IsExtraStage2() then
+			return true
+		else
+			return false
+		end
+	end
+	if not IsExtra() then
+		if GetUserPrefB("UserPrefShowLotsaOptions") then
+			return GetUserPrefB("UserPrefShowLotsaOptions") and LineSets[1] or LineSets[2];
+		else
+			return LineSets[2]; -- Just make sure!
+		end
+	else
+		return "1,8,14,2,7,13,16,17,18" -- "failsafe" list
+	end
+end;
+function UserPrefLongFail()
+	local t = {
+		Name = "UserPrefLongFail";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Short','Long' };
+		LoadSelections = function(self, list, pn)
+			if ReadPrefFromFile("UserPrefLongFail") ~= nil then
+				if GetUserPrefB("UserPrefLongFail") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WritePrefToFile("UserPrefLongFail",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WritePrefToFile("UserPrefLongFail",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+function UserPrefFlashyCombo()
+	local t = {
+		Name = "UserPrefFlashyCombo";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			if ReadPrefFromFile("UserPrefFlashyCombo") ~= nil then
+				if GetUserPrefB("UserPrefFlashyCombo") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WritePrefToFile("UserPrefFlashyCombo",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WritePrefToFile("UserPrefFlashyCombo",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+--[[ end themeoption rows ]]
+
+--[[ game option rows ]]
+function GamePrefComboOnRolls()
+	local t = {
+		Name = "GamePrefComboOnRolls";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			if ReadGamePrefFromFile("ComboOnRolls") ~= nil then
+				if GetGamePrefB("ComboOnRolls") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WriteGamePrefToFile("ComboOnRolls",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WriteGamePrefToFile("ComboOnRolls",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+function GamePrefComboUnderField()
+	local t = {
+		Name = "GamePrefComboUnderField";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			if ReadGamePrefFromFile("ComboUnderField") ~= nil then
+				if GetGamePrefB("ComboUnderField") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WriteGamePrefToFile("ComboUnderField",true);
+				list[2] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WriteGamePrefToFile("ComboUnderField",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+
+function GetDefaultArrowSpacing()
+	local rates = {
+		64,		-- Default
+		80,		-- Pro
+		128,	-- New
+	};
+	return GetGamePrefB("AdjustSpeed") and rates[3] or rates[1];
+end;
+function GamePrefAdjustSpeed()
+	local t = {
+		Name = "GamePrefAdjustSpeed";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Normal','Fast' };
+		LoadSelections = function(self, list, pn)
+			if ReadGamePrefFromFile("AdjustSpeed") ~= nil then
+				if GetGamePrefB("AdjustSpeed") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WriteGamePrefToFile("AdjustSpeed",true);
+				list[2] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WriteGamePrefToFile("AdjustSpeed",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+function GamePrefAutoSetStyle()
+	local t = {
+		Name = "GamePrefAutoSetStyle";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Off','On' };
+		LoadSelections = function(self, list, pn)
+			if ReadGamePrefFromFile("AutoSetStyle") ~= nil then
+				if GetGamePrefB("AutoSetStyle") then
+					list[2] = true;
+				else
+					list[1] = true;
+				end;
+			else
+				WriteGamePrefToFile("AutoSetStyle",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[2] then
+				val = true;
+			else
+				val = false;
+			end;
+			WriteGamePrefToFile("AutoSetStyle",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end
+function GamePrefNotePosition()
+	local t = {
+		Name = "GamePrefNotePosition";
+		LayoutType = "ShowAllInRow";
+		SelectType = "SelectOne";
+		OneChoiceForAllPlayers = true;
+		ExportOnChange = false;
+		Choices = { 'Normal','Lower' };
+		LoadSelections = function(self, list, pn)
+			if ReadGamePrefFromFile("NotePosition") ~= nil then
+				if GetGamePrefB("NotePosition") then
+					list[1] = true;
+				else
+					list[2] = true;
+				end;
+			else
+				WriteGamePrefToFile("NotePosition",false);
+				list[1] = true;
+			end;
+		end;
+		SaveSelections = function(self, list, pn)
+			local val;
+			if list[1] then
+				val = true;
+			else
+				val = false;
+			end;
+			WriteGamePrefToFile("NotePosition",val);
+			MESSAGEMAN:Broadcast("PreferenceSet", { Message == "Set Preference" } );
+			THEME:ReloadMetrics();
+		end;
+	};
+	setmetatable( t, t );
+	return t;
+end

Themes/_fallback/metrics.ini

@@ -25,7 +25,8 @@ ScreenHeight=480
 # Allows you to pick all available game modes for your gametype: for example,
 # inserting enough coins for 1p would let you choose between solo, single
 # and double before each game
-AutoSetStyle=true
+# AutoSetStyle=true
+AutoSetStyle=GetGamePrefB("AutoSetStyle")
 # Default modifiers and noteskin.
 DefaultModifiers="default;1.5x;"
 DefaultNoteSkinName="default"
@@ -920,7 +921,8 @@ RequireStepOnHoldHeads=HoldHeadStep()
 RequireStepOnMines=false
 InitialHoldLife=InitialHoldLife()
 MaxHoldLife=MaxHoldLife()
-RollBodyIncrementsCombo=RollBodyIncrementsCombo()
+# RollBodyIncrementsCombo=RollBodyIncrementsCombo()
+RollBodyIncrementsCombo=GetGamePrefB("UserPrefComboOnRolls")
 ScoreMissedHoldsAndRolls=ScoreMissedHoldsAndRolls()
 PercentUntilColorCombo=0.25
 

Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua

@@ -16,7 +16,7 @@ return Def.ActorFrame {
 		OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5);
 	};
 	Def.Quad {
-		InitCommand=cmd(y,24*(GetUserPrefB("UserPrefAutoSetStyle") and 8 or 5)-10;zoomto,164,2;fadeleft,8/164;faderight,8/164);
+		InitCommand=cmd(y,24*(5)-10;zoomto,164,2;fadeleft,8/164;faderight,8/164);
 		OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5);
 	};
 	Def.StepsDisplayList {

Themes/default/Languages/en.ini

@@ -59,27 +59,29 @@ HelpText=&BACK; Exit &START; Move On &MENULEFT;+&MENURIGHT; or &SELECT; Snapshot
 LifeDifficulty=Life Difficulty: %s
 TimingDifficulty=Timing Difficulty: %s
 [OptionTitles]
-UserPrefNotePosition=Note Positions
+GamePrefAutoSetStyle=Auto Set Style
+GamePrefNotePosition=Note Positions
+GamePrefComboOnRolls=Rolls Increment Combo
+GamePrefComboUnderField=Combo Under Field
+GamePrefAdjustSpeed=Adjust Speed
+
 UserPrefGameplayShowScore=Show Score
 UserPrefGameplayShowStepsDisplay=Show Steps
 UserPrefShowLotsaOptions=Options Density
-UserPrefAutoSetStyle=Auto Set Style
 UserPrefLongFail=Fail Length
-UserPrefComboOnRolls=Rolls Increment Combo
 UserPrefFlashyCombo=Flashy Combo
-UserPrefComboUnderField=Combo Under Field
-UserPrefAdjustSpeed=Adjust Speed
 [OptionExplanations]
-UserPrefNotePosition=Determines where the arrow receptors are placed in gameplay. 
+GamePrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania\n( or alternatively hit F2! )
+GamePrefNotePosition=Determines where the arrow receptors are placed in gameplay. 
+GamePrefComboOnRolls=Choose if rolls should increment the combo or not.
+GamePrefComboUnderField=Determine if the combo should display under the notes or not.
+GamePrefAdjustSpeed=Adjust the default scale for speed modifiers. Normal corresponds to the original StepMania 3.9 speed, Fast is twice that rate.
+
 UserPrefGameplayShowScore=Show or Hide the score display in gameplay.
 UserPrefGameplayShowStepsDisplay=Show or Hide the step information display in gameplay.
 UserPrefShowLotsaOptions=Choose how many lines/rows of options to choose from. &oq;Few&cq; keeps the list to a minimum. &oq;Many&cq; adds various show-off mods.
-UserPrefAutoSetStyle=Allow the game to list all one player and two player modes at once instead of one style only. This might require a restart of StepMania\n( or alternatively hit F2! )
 UserPrefLongFail=Choose between the original sm-ssc fail (Long) or the new sm-ssc fail (Short).
-UserPrefComboOnRolls=Choose if rolls should increment the combo or not.
 UserPrefFlashyCombo=Determine if combo flashes should be shown or not.
-UserPrefComboUnderField=Determine if the combo should display under the notes or not.
-UserPrefAdjustSpeed=Adjust the default scale for speed modifiers. Slow corresponds to the original StepMania 3.9 speed, Fast is twice that rate.
 [StepsListDisplayRow StepsType]
 Dance_Single=4
 Dance_Double=8

Themes/default/metrics.ini

@@ -5,7 +5,7 @@ FallbackTheme=_fallback
 FirstAttractScreen=""
 InitialScreen="ScreenInit"
 
-AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle")
+# AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle")
 [BitmapText]
 NumRainbowColors=1
 RainbowColor1=Color("Black");
@@ -317,9 +317,9 @@ ProtimingMissCommand=finishtweening;diffusealpha,1;zoom,1.15;glow,GameColor.Judg
 #
 AveragePulseCommand=finishtweening;diffusealpha,1;zoom,0.75*1.25;decelerate,0.05;zoom,0.75;sleep,2;linear,0.5;diffusealpha,0;
 [Player]
-ReceptorArrowsYStandard=GetTapPosition('Standard')
-ReceptorArrowsYReverse=GetTapPosition('Reverse')
-RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls")
+# ReceptorArrowsYStandard=GetTapPosition('Standard')
+# ReceptorArrowsYReverse=GetTapPosition('Reverse')
+# RollBodyIncrementsCombo=GetUserPrefB("UserPrefComboOnRolls")
 
 [ArrowEffects]
 ArrowSpacing=GetDefaultArrowSpacing()
@@ -514,7 +514,8 @@ end;
 #
 ShowDescription=true
 DescriptionX=-20-32
-DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0
+DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0
+# DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0
 DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8
 DescriptionSetCommand=%function(self,param) \
 	if self:GetText() == "" then \
@@ -532,7 +533,8 @@ AutogenY=0
 AutogenOnCommand=
 AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end
 #
-ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
+ShowStepsType=GetGamePrefB("AutoSetStyle")
+# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
 StepsTypeX=-20-32
 StepsTypeY=7
 StepsTypeOnCommand=zoom,0.45
@@ -582,7 +584,8 @@ end;
 #
 ShowDescription=true
 DescriptionX=-20
-DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0
+DescriptionY=GetGamePrefB("AutoSetStyle") and -5 or 0
+# DescriptionY=GetUserPrefB("UserPrefAutoSetStyle") and -5 or 0
 DescriptionOnCommand=shadowlength,1;uppercase,true;zoom,0.75;maxwidth,128+8
 DescriptionSetCommand=%function(self,param) \
 	if self:GetText() == "" then \
@@ -601,7 +604,8 @@ AutogenY=0
 AutogenOnCommand=
 AutogenSetCommand=%function(self,param) if param.Difficulty then self:diffuse(CustomDifficultyToLightColor(param.Difficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.Difficulty)); end end
 #
-ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
+ShowStepsType=GetGamePrefB("AutoSetStyle")
+# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
 StepsTypeX=-20
 StepsTypeY=7
 StepsTypeOnCommand=zoom,0.45
@@ -612,7 +616,7 @@ Fallback="StepsDisplay"
 [StepsDisplayListRow]
 #
 CapitalizeDifficultyNames=false
-NumShownItems=GetUserPrefB("UserPrefAutoSetStyle") and 8 or 5
+NumShownItems=5
 ItemsSpacingY=24
 MoveCommand=decelerate,0.3
 #
@@ -654,7 +658,8 @@ MeterSetCommand=%function(self,param) \
 end;
 #
 ShowDescription=true
-DescriptionX=GetUserPrefB("UserPrefAutoSetStyle") and (-64-8+20) or (-64-8)
+DescriptionX=GetGamePrefB("AutoSetStyle") and (-64-8+20) or (-64-8)
+# DescriptionX=GetUserPrefB("UserPrefAutoSetStyle") and (-64-8+20) or (-64-8)
 DescriptionY=0
 DescriptionOnCommand=shadowlength,1;horizalign,left;zoom,0.65;maxwidth,128+8-20;uppercase,true;
 DescriptionOffCommand=
@@ -675,7 +680,8 @@ AutogenY=0
 AutogenOnCommand=blend,Blend.Add;diffuseshift;effectcolor1,color("#FFCC00FF");effectcolor2,color("#FFCC0088");
 AutogenSetCommand=
 #
-ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
+ShowStepsType=GetGamePrefB("AutoSetStyle")
+# ShowStepsType=GetUserPrefB("UserPrefAutoSetStyle")
 StepsTypeX=-64-8
 StepsTypeY=0
 StepsTypeOnCommand=
@@ -823,23 +829,23 @@ ItemsLongRowSharedX=SCREEN_CENTER_X
 Fallback="ScreenOptionsServiceChild"
 LineNames="gNotePos,gAuto,gScore,gSDisp,gOpts,gLongFail,gComboUnderField,FlashyCombo,AdjustSpeed"
 #,gAuto
-LinegNotePos="lua,UserPrefNotePosition()"
+LinegNotePos="lua,GamePrefNotePosition()"
 LinegScore="lua,UserPrefGameplayShowScore()"
 LinegSDisp="lua,UserPrefGameplayShowStepsDisplay()"
 LinegOpts="lua,UserPrefShowLotsaOptions()"
-LinegAuto="lua,UserPrefAutoSetStyle()"
+LinegAuto="lua,GamePrefAutoSetStyle()"
 LinegLongFail="lua,UserPrefLongFail()"
-LinegComboUnderField="lua,UserPrefComboUnderField()"
+LinegComboUnderField="lua,GamePrefComboUnderField()"
 LineFlashyCombo="lua,UserPrefFlashyCombo()"
-LineAdjustSpeed="lua,UserPrefAdjustSpeed()"
+LineAdjustSpeed="lua,GamePrefAdjustSpeed()"
 [ScreenOptionsSystemDirection]
 LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,15,16,LF,17,18,19,20,21,22"
 LineLF="lua,UserPrefLongFail()"
-LineRollCombo="lua,UserPrefComboOnRolls()"
+LineRollCombo="lua,GamePrefComboOnRolls()"
 LineFlashyCombo="lua,UserPrefFlashyCombo()"
 [ScreenOptionsAdvanced]
 LineNames="2,3,4,8,11,13,14,15,16,28,29,30,RollCombo"
-LineRollCombo="lua,UserPrefComboOnRolls()"
+LineRollCombo="lua,GamePrefComboOnRolls()"
 [ScreenOptionsService]
 ShowHeader=false
 
@@ -1159,7 +1165,8 @@ StageDisplayY=SCREEN_TOP+160-96+4
 StageDisplayOnCommand=draworder,105;fov,90;zoom,0.75;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.75
 StageDisplayOffCommand=linear,0.25;zoomy,0;
 #
-ShowDifficultyDisplay=not GetUserPrefB("UserPrefAutoSetStyle") and not GAMESTATE:IsCourseMode()
+ShowDifficultyDisplay=not GetGamePrefB("AutoSetStyle") and not GAMESTATE:IsCourseMode()
+# ShowDifficultyDisplay=not GetUserPrefB("UserPrefAutoSetStyle") and not GAMESTATE:IsCourseMode()
 DifficultyDisplayX=SCREEN_CENTER_X-160+64
 DifficultyDisplayY=SCREEN_TOP+160-96+4
 DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1
@@ -1721,11 +1728,11 @@ ScoreLabelOffCommand=
 #
 ScoreNumberP1X=SCREEN_CENTER_X-160
 ScoreNumberP1Y=SCREEN_TOP+320
-ScoreNumberP1OnCommand=visible,not PREFSMAN:GetPreference("PercentageScoring");diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1;zoom,0.775
+ScoreNumberP1OnCommand=diffuse,PlayerColor(PLAYER_1);diffusetopedge,BoostColor(PlayerColor(PLAYER_1),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );shadowlength,1;zoom,0.775
 ScoreNumberP1OffCommand=
 ScoreNumberP2X=SCREEN_CENTER_X+160
 ScoreNumberP2Y=SCREEN_TOP+320
-ScoreNumberP2OnCommand=visible,not PREFSMAN:GetPreference("PercentageScoring");diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1;zoom,0.775
+ScoreNumberP2OnCommand=diffuse,PlayerColor(PLAYER_2);diffusetopedge,BoostColor(PlayerColor(PLAYER_2),1.5);strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );shadowlength,1;zoom,0.775
 ScoreNumberP2OffCommand=
 #
 PercentFrameP1X=SCREEN_CENTER_X-160
@@ -1740,12 +1747,12 @@ PercentFrameP2OffCommand=
 #
 PercentP1X=SCREEN_CENTER_X-160
 PercentP1Y=SCREEN_TOP+320
-PercentP1OnCommand=visible,PREFSMAN:GetPreference("PercentageScoring");
+PercentP1OnCommand=visible,false
 PercentP1OffCommand=
 #
 PercentP2X=SCREEN_CENTER_X-160
 PercentP2Y=SCREEN_TOP+320
-PercentP2OnCommand=visible,PREFSMAN:GetPreference("PercentageScoring");
+PercentP2OnCommand=visible,false
 PercentP2OffCommand=
 #
 LargeBannerX=SCREEN_CENTER_X
@@ -1777,12 +1784,12 @@ GradeP2OffCommand=
 #
 PlayerOptionsP1X=SCREEN_CENTER_X-160
 PlayerOptionsP1Y=SCREEN_TOP+352
-PlayerOptionsP1OnCommand=zoom,0.5
+PlayerOptionsP1OnCommand=zoom,0.5;shadowlength,1
 PlayerOptionsP1OffCommand=
 ##
 PlayerOptionsP2X=SCREEN_CENTER_X+160
 PlayerOptionsP2Y=SCREEN_TOP+352
-PlayerOptionsP2OnCommand=zoom,0.5
+PlayerOptionsP2OnCommand=zoom,0.5;shadowlength,1
 PlayerOptionsP2OffCommand=
 #
 SongOptionsX=SCREEN_CENTER_X
@@ -1884,20 +1891,20 @@ PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0;
 ShowGameType=true
 GameTypeX=SCREEN_CENTER_X
 GameTypeY=SCREEN_BOTTOM-48
-GameTypeOnCommand=addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y;zoom,0.5;shadowlength,1;shadowcolor,color("#22222266")
+GameTypeOnCommand=addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y;zoom,0.675;shadowlength,1;shadowcolor,color("#22222266")
 GameTypeOffCommand=bouncebegin,0.15;addy,SCREEN_CENTER_Y;
 #
+ShowTimingDifficulty=true
+TimingDifficultyX=SCREEN_CENTER_X
+TimingDifficultyY=SCREEN_TOP+16
+TimingDifficultyOnCommand=zoom,0.675;draworder,105
+TimingDifficultyOffCommand=
+#
 ShowLifeDifficulty=true
 LifeDifficultyX=SCREEN_CENTER_X
 LifeDifficultyY=SCREEN_TOP+32
-LifeDifficultyOnCommand=zoom,0.5;draworder,105
-LifeDifficultyOffCommand=linear,0.5;cropright,1
-#
-ShowTimingDifficulty=true
-TimingDifficultyX=SCREEN_CENTER_X
-TimingDifficultyY=SCREEN_TOP+20
-TimingDifficultyOnCommand=zoom,0.5;draworder,105
-TimingDifficultyOffCommand=linear,0.5;cropright,1
+LifeDifficultyOnCommand=zoom,0.675;draworder,105
+LifeDifficultyOffCommand=
 [ScreenEvaluationNormal]
 Fallback="ScreenEvaluation"
 #