diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index ca3a698e92..c323580100 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -42,6 +42,16 @@ Branch = { return "ScreenTitleJoin" end end, + StartGame = function() + -- Check to see if there are 0 songs installed. Also make sure to check + -- that the additional song count is also 0, because there is + -- a possibility someone will use their existing StepMania simfile + -- collection with sm-ssc via AdditionalFolders/AdditionalSongFolders. + if SONGMAN:GetNumSongs() == 0 and SONGMAN:GetNumAdditionalSongs() == 0 then + return "ScreenHowToInstallSongs"; + end; + return "ScreenSelectProfile"; + end, AfterProfileLoad = function() return "ScreenSelectProfile" end, @@ -108,6 +118,15 @@ Branch = { end end, PlayerOptions = function() + local pm = GAMESTATE:GetPlayMode() + local restricted = { "PlayMode_Oni", "PlayMode_Rave", + --"PlayMode_Battle" -- ?? + }; + for i=1,#restricted do + if restricted[i] == pm then + return "ScreenPlayerOptionsRestricted" + end; + end if SCREENMAN:GetTopScreen():GetGoToOptions() then return "ScreenPlayerOptions"; else diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index f376a7e7c5..6d64acea06 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1411,7 +1411,7 @@ NumChoicesOnPage1=100 ChoiceNames="1,4,7" #~ ChoiceNames="1,2,3,4,5,6,7" DefaultChoice="1" -Choice1="applydefaultoptions;screen,ScreenSelectProfile;text,Game Start" +Choice1="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame() Choice2="screen,ScreenNetworkOptions;text,Play Online" Choice3="screen,ScreenSelectGame;text,Select Game" Choice4="screen,ScreenOptionsService;text,Options" @@ -2588,6 +2588,12 @@ Line15="list,ScoreDisplay" Line16="list,Steps" Line17="list,Characters" +# +[ScreenPlayerOptionsRestricted] +Fallback="ScreenPlayerOptions" +NextScreen="ScreenStageInformation" +LineNames="1,8,16,17" + # funny [ScreenSongOptions] Fallback="ScreenOptions" @@ -3391,6 +3397,16 @@ SongOptionsOnCommand=visible,false Fallback="Player" ComboOnCommand=visible,false +# sm-ssc helper screens +[ScreenHowToInstallSongs] +Class="ScreenSplash" +Fallback="ScreenSplash" +NextScreen=Branch.TitleMenu() +PrevtScreen=Branch.TitleMenu() +ShowStyleIcon=false +TimerSeconds=-1 +ShowHelp=false + # stuff for online mode: [ScreenSMOnlineLogin] Class="ScreenSMOnlineLogin"