[default -> loading window] YAM

Themes/_fallback/Scripts/02 Branches.lua

@@ -33,11 +33,7 @@ end
 
 Branch = {
 	Init = function()
-		if GAMESTATE:GetCoinMode() == 'CoinMode_Home' then
-			return "ScreenInit"
-		else
-			return "ScreenInit"
-		end
+		return "ScreenInit"
 	end,
 	AfterInit = function()
 		if GAMESTATE:GetCoinMode() == 'CoinMode_Home' then

Themes/_fallback/Scripts/03 ProductivityHelpers.lua

@@ -224,10 +224,10 @@ end;
 --[[ ----------------------------------------------------------------------- ]]
 
 --[[ profile stuff ]]
--- Profile(pn)
+-- GetPlayerOrMachineProfile(pn)
 -- This returns a profile, preferably a player one.
 -- If there isn't one, we fall back on the machine profile.
-function Profile(pn)
+function GetPlayerOrMachineProfile(pn)
 	if PROFILEMAN:IsPersistentProfile(pn) then
 		-- player profile
 		return PROFILEMAN:GetProfile(pn);

Themes/_fallback/metrics.ini

@@ -2510,8 +2510,8 @@ CursorOnCommand=visible,false
 Class="ScreenOptionsMaster"
 Fallback="ScreenOptionsSimpleService"
 #
-NextScreen=Branch.Init()
-PrevScreen=Branch.Init()
+NextScreen=Branch.AfterInit()
+PrevScreen=Branch.AfterInit()
 
 LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,Credits,MoreOptions"
 # LineNames="SystemDirection,1,2,Sync,13,3,10,11,4,12,6,5,Theme,8,9"
@@ -2884,7 +2884,6 @@ Line11="list,Attacks"
 Line12="list,PlayerAutoPlay"
 Line13="list,Hide"
 Line14="list,Persp"
-Line15="list,ScoreDisplay"
 Line16="list,Steps"
 Line17="list,Characters"
 

Themes/default/Graphics/ScreenTitleMenu logo/default.lua

@@ -3,21 +3,6 @@
 -- this file are in metrics.ini ([ScreenTitleMenu] ShowLogo, etc.)
 local t = Def.ActorFrame{ -- [BGAnimation]
 	LoadActor("_logo"); -- [Layer1] Type=0 File=_ball.png
-	LoadActor("_logo")..{ -- [Layer2] Type=0 File=_ball.png
-	};
-	--[[LoadActor("_text")..{ -- [Layer3] Type=0 File=_text.png
-		InitCommand=cmd(y,48;hide_if,GAMESTATE:GetMultiplayer()); -- Command=y,48
-	};
-	LoadActor("_multi")..{ -- [Layer4] Type=0 File=_multi.png
-		InitCommand=cmd(y,60;hide_if,not GAMESTATE:GetMultiplayer()); -- Command=y,48
-		-- the hide_if command would be similar to Condition=, which also exists.
-		-- Condition=GAMESTATE:GetMultiplayer(); is the equivalent code.
-	};]]
-	LoadFont("Common normal")..{
-		Text="sm-ssc Multiplayer";
-		InitCommand=cmd(y,5;shadowlength,0;strokecolor,color("0,0,0,0.375");diffusebottomedge,color("#D6DBDD"););
-		BeginCommand=cmd(hide_if,not GAMESTATE:GetMultiplayer());
-	};
 };
 
 return t;

Themes/default/metrics.ini

@@ -1216,7 +1216,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X
 [ScreenTestInput]
 
 [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"
+LineNames="1,2,3,4,5,6,7,8,9,FlashyCombo,RollCombo,10,11,12,13,14,16,LF,17,18,19,20,21,22"
 LineLF="lua,UserPrefLongFail()"
 LineRollCombo="lua,UserPrefComboOnRolls()"
 LineFlashyCombo="lua,UserPrefFlashyCombo()"
@@ -1224,7 +1224,7 @@ LineFlashyCombo="lua,UserPrefFlashyCombo()"
 [ScreenOptionsGraphicsSound]
 
 [ScreenOptionsAdvanced]
-LineNames="Score,3,4,8,11,13,14,15,16,28,29,30,RollCombo"
+LineNames="Score,3,4,8,11,13,14,16,28,29,30,RollCombo"
 LineRollCombo="lua,UserPrefComboOnRolls()"
 
 [ScreenAppearanceOptions]