huge merge

Themes/_fallback/BGAnimations/ScreenCredits overlay.lua

@@ -0,0 +1,141 @@
+local function Fooled()
+	local phrases = {
+		"hornswaggled",
+		"bamboozled",
+		"hoodwinked",
+		"swindled",
+		"duped",
+		"hoaxed",
+		"fleeced",
+		"shafted",
+		"caboodled",
+		"beguiled",
+		"finagled",
+		"two-timed",
+		"suckered",
+		"flimflammed"
+	}
+	return phrases[math.random(#phrases)]
+end
+
+local ssc = {
+	"AJ Kelly as freem",
+	"Jonathan Payne (Midiman)",
+	"Colby Klein (shakesoda)",
+}
+
+local sm_ssc = {
+	"Jason Felds (wolfman2000)",
+	"Alberto Ramos (Daisuke Master)",
+	"Jack Walstrom (FSX)",
+}
+
+local stepmania = {
+	"Chris Danford",
+	"Glenn Maynard",
+	"Steve Checkoway",
+	-- and various other contributors
+}
+
+local contrib = {
+	"Aldo Fregoso (Aldo_MX)", -- delays
+	"Chris Eldridge (kurisu)", -- dance-threepanel
+	"cerbo",
+	"cesarmades", -- pump/cmd* noteskins
+	"corec", -- various fixes
+	"galopin", -- piu PlayStation2 usb mat support
+	"gholms", -- automake 1.11 support
+	"juanelote", -- SongManager:GetSongGroupByIndex, JumpToNext/PrevGroup logic mods
+	"Kaox", -- pump/default noteskin
+	"NitroX72", -- pump/frame noteskin
+	"sy567", -- beginner helper fix
+	"Thai Pangsakulyanont (theDtTvB)",
+	"v1toko", -- x-mode from StepNXA
+}
+
+local thanks = {
+	"A Pseudonymous Coder", -- support
+	"Bill Shillito (DM Ashura)", -- Music (not yet though)
+	"cpubasic13", -- testing (a lot)
+	"Dreamwoods",
+	"Infamouspat", -- oitg bro
+	"Jason Bolt (LightningXCE)",
+	"Jousway", -- Noteskins
+	"Matt1360", -- Automake magic + oitg bro
+	"Mark Cannon (vyhd)",  -- oitg bro + twirl/roll
+	"Petriform", -- Music
+	"Renard",
+	"Ryan McKanna (Plaguefox)",
+}
+
+local shoutout = {
+	"The Lua team", -- lua project lead or some shit. super nerdy but oh hell.
+	"Mojang", -- minecraft forever -freem
+	"NAKET Coder",
+	"Ciera Boyd", -- you bet your ass I'm putting my girlfriend in the credits
+	--Image(), -- we should have some logos probably to look super pro
+	"You showed us... your ultimate dance",
+	-- "Can't stop crying... buckets of tears!"
+}
+
+local copyright = {
+	"StepMania is released under the terms of the MIT license.",
+	"If you paid for the program you've been " .. Fooled() .. ".",
+	"All content is the sole property of their respectful owners."
+}
+
+local sections = {
+	{ "the spinal shark collective (project lead)", ssc },
+	{ "sm-ssc Team", sm_ssc },
+	{ "StepMania Team", stepmania },
+	{ "Other Contributors", contrib },
+	{ "Special Thanks", thanks },
+	{ "Shoutouts", shoutout },
+	{ "Copyright", copyright },
+}
+
+-- To add people or sections modify the above.
+
+local lineOn = cmd(zoom,0.875;strokecolor,color("#444444");shadowcolor,color("#444444");shadowlength,3)
+local sectionOn = cmd(diffuse,color("#88DDFF");strokecolor,color("#446688");shadowcolor,color("#446688");shadowlength,3)
+local item_padding_start = 4;
+
+local creditScroller = Def.ActorScroller {
+	SecondsPerItem = 0.5;
+	NumItemsToDraw = 40;
+	TransformFunction = function( self, offset, itemIndex, numItems)
+		self:y(30*offset)
+	end;
+	OnCommand = cmd(scrollwithpadding,item_padding_start,15);
+}
+
+local function AddLine( text, command )
+	local text = Def.ActorFrame{
+		LoadFont("Common normal")..{
+			Text = text or "";
+			OnCommand = command or lineOn;
+		}
+	}
+	table.insert( creditScroller, text )
+end
+
+-- Add sections with padding.
+for section in ivalues(sections) do
+	AddLine( section[1], sectionOn )
+	for name in ivalues(section[2]) do
+		AddLine( name )
+	end
+	AddLine()
+	AddLine()
+end
+
+creditScroller.BeginCommand=function(self)
+	SCREENMAN:GetTopScreen():PostScreenMessage( "SM_BeginFadingOut", (t.SecondsPerItem * (#t + item_padding_start) + 5) );
+end;
+
+
+return Def.ActorFrame{
+	creditScroller..{
+		InitCommand=cmd(CenterX;y,SCREEN_BOTTOM-64),
+	}
+};

Themes/_fallback/BGAnimations/ScreenSelectProfile overlay.lua

@@ -1,9 +1,9 @@
 function GetLocalProfiles()
-	local ret = {};
+	local t = {};
 
 	for p = 0,PROFILEMAN:GetNumLocalProfiles()-1 do
 		local profile=PROFILEMAN:GetLocalProfileFromIndex(p);
-		local item = Def.ActorFrame {
+		local ProfileCard = Def.ActorFrame {
 --[[ 			Def.Quad {
 				InitCommand=cmd(zoomto,200,1;y,40/2);
 				OnCommand=cmd(diffuse,Color('Outline'););
@@ -22,10 +22,10 @@ function GetLocalProfiles()
 				end;
 			};
 		};
-		table.insert( ret, item );
+		t[#t+1]=ProfileCard;
 	end;
 
-	return ret;
+	return t;
 end;
 
 function LoadCard(cColor)
@@ -38,14 +38,14 @@ function LoadCard(cColor)
 	return t
 end
 function LoadPlayerStuff(Player)
-	local ret = {};
+	local t = {};
 
 	local pn = (Player == PLAYER_1) and 1 or 2;
 
 --[[ 	local t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 200, 230) .. {
 		Name = 'BigFrame';
 	}; --]]
-	local t = Def.ActorFrame {
+	t[#t+1] = Def.ActorFrame {
 		Name = 'JoinFrame';
 		LoadCard(Color('Orange'));
 --[[ 		Def.Quad {
@@ -62,23 +62,13 @@ function LoadPlayerStuff(Player)
 			OnCommand=cmd(diffuseshift;effectcolor1,Color('White');effectcolor2,color("0.5,0.5,0.5"));
 		};
 	};
-	table.insert( ret, t );
 	
-	t = Def.ActorFrame {
+	t[#t+1] = Def.ActorFrame {
 		Name = 'BigFrame';
 		LoadCard(PlayerColor(Player));
 	};
-	table.insert( ret, t );
-
---[[ 	t = LoadActor(THEME:GetPathB('', '_frame 3x3'), 'metal', 170, 20) .. {
+	t[#t+1] = Def.ActorFrame {
 		Name = 'SmallFrame';
-	}; --]]
-	t = Def.ActorFrame {
-		Name = 'SmallFrame';
---[[ 		Def.Quad {
-			InitCommand=cmd(zoomto,170+4,32+4);
-			OnCommand=cmd(shadowlength,1);
-		}; --]]
 		InitCommand=cmd(y,-2);
 		Def.Quad {
 			InitCommand=cmd(zoomto,200-10,40+2);
@@ -97,9 +87,8 @@ function LoadPlayerStuff(Player)
 			OnCommand=cmd(diffuse,PlayerColor(Player);glow,color("1,1,1,0.25"));
 		};	
 	};
-	table.insert( ret, t );
 
-	t = Def.ActorScroller{
+	t[#t+1] = Def.ActorScroller{
 		Name = 'Scroller';
 		NumItemsToDraw=6;
 -- 		InitCommand=cmd(y,-230/2+20;);
@@ -114,34 +103,17 @@ function LoadPlayerStuff(Player)
 		end;
 		children = GetLocalProfiles();
 	};
-	table.insert( ret, t );
 	
-	t = Def.ActorFrame {
+	t[#t+1] = Def.ActorFrame {
 		Name = "EffectFrame";
-	--[[ 		Def.Quad {
-				InitCommand=cmd(y,-230/2;vertalign,top;zoomto,200,8;fadebottom,1);
-				OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
-			};
-			Def.Quad {
-				InitCommand=cmd(y,230/2;vertalign,bottom;zoomto,200,8;fadetop,1);
-				OnCommand=cmd(diffuse,Color("Black");diffusealpha,0.25);
-			}; --]]
 	};
-	table.insert( ret, t );
---[[ 	t = Def.BitmapText {
-		OnCommand = cmd(y,160);
-		Name = 'SelectedProfileText';
-		Font = "Common Normal";
-		Text = 'No profile';
-	}; --]]
-	t = LoadFont("Common Normal") .. {
+	t[#t+1] = LoadFont("Common Normal") .. {
 		Name = 'SelectedProfileText';
 		--InitCommand=cmd(y,160;shadowlength,1;diffuse,PlayerColor(Player));
 		InitCommand=cmd(y,160;shadowlength,1;);
 	};
-	table.insert( ret, t );
 
-	return ret;
+	return t;
 end;
 
 function UpdateInternal3(self, Player)

Themes/_fallback/Fonts/_korean 24px.ini

@@ -1,4 +1,4 @@
-[common]
+[common]
 Top=5
 Baseline=26
 LineSpacing=28
@@ -42,4 +42,5 @@ line 2=큰탑터투트티펌페
 line 3=폼핑할함해행헤혀
 line 4=환회휘태난터까시
 line 5=간너샐러버문쳐달
-line 6=깡천림홍석
+line 6=깡천림홍석악전반
+line 7=채

Themes/_fallback/Graphics/ScreenSelectMusic ScoreFrame P2.redir

@@ -0,0 +1 @@
+_blank

Themes/_fallback/Languages/en.ini

@@ -435,7 +435,7 @@ SoundResampleQuality=Advanced: Select the resampling quality to use.
 SoundVolume=Adjust the volume level during gameplay.
 SoundVolumeAttract=Adjust the volume level during attract mode.
 Speed=Speed
-Stepmania Credits=The Stepmania Development Team
+StepMania Credits=The StepMania Development Team.
 Steps=Steps
 Style=
 Test Input=Test the responsiveness of connected joysticks.
@@ -534,6 +534,7 @@ x2.5=2.5x
 8=8
 8th=8th
 9=9
+Actual=Actual
 Add=Additive
 All Music=All Music
 AllDifficulties=All Difficulties
@@ -706,6 +707,7 @@ Song BGAnimation=Song BGAnimation
 Song Bitmap=Song Bitmap
 Song Movie=Song Movie
 Space=Space
+Specified=Specified
 Split=Split
 Standard=Standard
 Start=Start
@@ -822,6 +824,7 @@ Delete=Delete
 Delete beat and shift up=Delete beat and shift up
 Description=Description
 Difficulty=Difficulty
+Display BPM=Display BPM
 DisplayAspectRatio=Aspect Ratio
 DisplayColorDepth=Display Color
 DisplayResolution=Display Resolution
@@ -843,6 +846,7 @@ Edit time signature (top)=Edit time signature (beats per measure)
 Edit time signature (bottom)=Edit time signature (single beat note value)
 Edit tickcount=Edit tickcount
 Edit combo=Edit combo
+Edit warp=Edit warp
 Editor options=Options
 EditorShowBGChangesPlay=Show Backgrounds
 Effect=Effect
@@ -900,9 +904,11 @@ Low Meter=Low Meter
 Advanced Options=Advanced Options
 Main title=Main title
 Main title transliteration=Main title transliteration
+Max BPM=Max Specified BPM
 MaxTextureResolution=Texture Resolution
 MenuTimer=Menu Timer
 Meter=Meter
+Min BPM=Min Specified BPM
 Mines=Mines
 MoveRandomToEnd=Random At End
 More Options=More Options
@@ -985,7 +991,7 @@ ShowSongOptions=Show Song Options
 ShowStats=Show Stats
 SmoothLines=SmoothLines
 SoundEffect=Sound Effect
-Stepmania Credits=Stepmania Credits
+StepMania Credits=StepMania Credits
 Center1Player=Center 1 Player
 Song=Song
 Song Group=Song Group
@@ -1209,6 +1215,7 @@ Enter a new Time Signature numerator value.=Enter the number of beats per measur
 Enter a new Time Signature denominator value.=Enter the note value that represents one beat.
 Enter a new Tickcount value.=Enter a new Tickcount value.
 Enter a new Combo value.=Enter a new Combo value.
+Enter a new Warp value.=Enter the beat you will warp to when you reach this point.
 Enter a new artist transliteration.=Enter a new artist transliteration.
 Enter a new artist.=Enter a new artist.
 Enter a new genre.=Enter a new genre.
@@ -1221,6 +1228,8 @@ Enter a new main title transliteration.=Enter a new main title transliteration.
 Enter a new main title.=Enter a new main title.
 Enter a new sub title transliteration.=Enter a new sub title transliteration.
 Enter a new sub title.=Enter a new sub title.
+Enter a new min BPM.=Enter the minimum displayed BPM.
+Enter a new max BPM.=Enter the maximum displayed BPM.
 More than %d notes per measure is not allowed.  This change has been reverted.=More than %d notes per measure is not allowed.  This change has been reverted.
 No backgrounds available=No backgrounds available
 EditHelpText=Up/Down:\n     change beat\nLeft/Right:\n     change snap\nNumber keys:\n     add/remove\n     tap note\nCreate hold note:\n     Hold a number\n     while moving\n     Up or Down\nCreate roll note:\n      Hold Shift,\n      then create a\n      hold note.\nSpace bar:\n     Set area\n     marker\nEnter:\n     Area Menu\nEscape:\n     Main Menu\nF1:\n     Show help\n
@@ -2221,18 +2230,6 @@ HeaderText=Edit Course
 HelpText=&MENUUP;&MENUDOWN; Move &MENULEFT;&MENURIGHT; Change Value
 [ScreenOptionsCourseOverview]
 HeaderText=Course Overview
-[ScreenQuickSetupOverview]
-HeaderText=Quick Setup - Welcome!
-[ScreenQuickSetupPhaseOne]
-HeaderText=Quick Setup - Page 1: Profile
-[ScreenQuickSetupPhaseTwo]
-HeaderText=Quick Setup - Page 2: Gameplay
-[ScreenQuickSetupPhaseThree]
-HeaderText=Quick Setup - Page 3: Appearance
-[ScreenQuickSetupPhaseFour]
-HeaderText=Quick Setup - Page 4: Extra
-[ScreenQuickSetupFinished]
-HeaderText=Quick Setup - Finished!
 [ScreenSelectProfile]
 HeaderText=Select Profile
 [ScreenSelectPlayStyle]

Themes/_fallback/Scripts/02 Branches.lua

@@ -71,6 +71,13 @@ Branch = {
 		end;
 		return "ScreenSelectProfile";
 	end,
+	OptionsEdit = function()
+		-- Similar to above, don't let anyone in here with 0 songs.
+		if SONGMAN:GetNumSongs() == 0 and SONGMAN:GetNumAdditionalSongs() == 0 then
+			return "ScreenHowToInstallSongs";
+		end;
+		return "ScreenOptionsEdit";
+	end,
 	AfterProfileLoad = function()
 		return "ScreenSelectProfile"
 	end,
@@ -186,10 +193,4 @@ Branch = {
 	Network = function()
 		return IsNetConnected() and "ScreenTitleMenu" or "ScreenTitleMenu"
 	end,
-	QuickSetupStart = "ScreenQuickSetupOverview",
-	QuickSetupA = "ScreenQuickSetupPhaseOne",
-	QuickSetupB = "ScreenQuickSetupPhaseTwo",
-	QuickSetupC = "ScreenQuickSetupPhaseThree",
-	QuickSetupD = "ScreenQuickSetupPhaseFour",
-	QuickSetupFinished = "ScreenQuickSetupFinished"
 }

Themes/_fallback/Scripts/02 Lyrics.lua

@@ -1,5 +1,6 @@
 function Actor:LyricCommand(side)
 	self:settext( Var "LyricText" )
+	self:draworder(102)
 
 	self:stoptweening()
 	self:shadowlengthx(0)

Themes/_fallback/Scripts/03 CustomSpeedMods.lua

@@ -40,7 +40,7 @@ v1.1
 * Cleaned up code some, I think.
 ________________________________________________________________________________
 anticipated future changes:
-* M-Mod support (when sm-ssc imntegrates it)
+* M-Mod support (when sm-ssc integrates it)
 ]]
 
 -- ProfileDir(slot): gets the profile dir for slot,
@@ -68,7 +68,7 @@ local function ParseSpeedModFile(path)
 		return mods
 	else
 		-- error; write a fallback mod file and return it
-		local fallbackString = "0.5x,0.75x,1x,1.75x,2x,2.25x,2.5x,C150,C300"
+		local fallbackString = "0.5x,1x,1.5x,2x,3x,4x,8x,C200,C400"
 		Trace("[CustomSpeedMods]: Could not read SpeedMods; writing fallback to "..path)
 		file:Open(path, 2)
 		file:Write(fallbackString)

Themes/_fallback/Scripts/03 ProductivityHelpers.lua

@@ -141,6 +141,10 @@ function Actor:xy(actorX,actorY)
 	self:y(actorY)
 end
 
+function PositionPerPlayer(player, p1X, p2X)
+	return player == PLAYER_1 and p1X or p2X
+end
+
 -- MaskSource([clearzbuffer])
 -- Sets an actor up as the source for a mask. Clears zBuffer by default.
 function Actor:MaskSource(noclear)

Themes/_fallback/metrics.ini

@@ -64,6 +64,7 @@ OverlayScreens="ScreenSystemLayer,ScreenSyncOverlay,ScreenStatsOverlay,ScreenDeb
 PercentScoreDecimalPlaces=2
 
 # 02 #
+
 [LightsManager]
 # Mostly useless since it doesn't work, as well as that barely anyone has 
 # lights to play around with.
@@ -122,12 +123,39 @@ UnlockColor=color("1,0.5,0,1")
 ExtraColor=color("#ff0000")	-- red
 
 [UnlockManager]
-# Unlock specific things. we'll go in-depth with this one day, but it really
-# isnt what sm-ssc was designed for.
+# Unlock specific things.
 AutoLockChallengeSteps=false
 UnlockNames=""
 
+# useful commands:
+# require,(UnlockRequirement),(value);
+# where (UnlockRequirement) is one of the UnlockRequirement enums.
+
+# song,(Song Name);
+# sets a Song to be unlocked
+
+# course,(Course Name);
+# sets a Course to be unlocked
+
+# roulette;
+# Song shows up in roulette (useful with Song only)
+
+# mod,(modifier);
+# sets a modifier to be unlocked.
+
+# code,(code);
+# assigns a code to the unlock
+
+# examples:
+# 1) The song "Pledge" requires 500 AP.
+# Unlock1Command=song,"Pledge";require,"UnlockRequirement_ArcadePoints",500
+
+# 2) The song "ABC" can be unlocked via roulette; pick an arbitrary code
+# to use to store the unlock.
+# Unlock2Command=song,"ABC";code,"59183751";roulette
+
 # 03 # 
+
 [ArrowEffects]
 # Complicated stuff you probably shouldn't ever mess with or else you'll 
 # destroy mods completely!
@@ -193,6 +221,8 @@ BottomEdge=SCREEN_BOTTOM
 # Scroll stuff when you roll over it, DDR Extreme style.
 ScrollRandom=false
 ScrollRoulette=false
+# Control how fast the banner scrolls. Higher numbers mean slower.
+ScrollSpeedDivisor=2
 
 [BitmapText]
 # The colors in the 'roulette' text. you can have alot!
@@ -233,6 +263,11 @@ FormatString="%03.0f"
 
 [CodeDetector]
 # Codes on the MusicWheel that change stuff!
+# For Future Reference:
+# @ = Holding
+# - = In Conjuction With / Then
+# ~ = Released
+# + = At The Same Time
 PrevSteps1="Up,Up"
 PrevSteps2="MenuUp,MenuUp"
 NextSteps1="Down,Down"
@@ -279,6 +314,7 @@ SaveScreenshot1="MenuLeft-MenuRight"
 SaveScreenshot2=""
 CancelAllPlayerOptions="Left,Right,Left,Right,Left,Right"
 BackInEventMode=""
+
 [CodeDetectorOnline]
 Fallback="CodeDetector"
 PrevSteps1="MenuUp,MenuUp"
@@ -337,6 +373,7 @@ TipShowTime=4
 TipSwitchTime=1
 # The Command when its made
 TipOnCommand=shadowlength,0;diffuseblink
+
 [Judgment]
 # New #
 JudgmentOnCommand=
@@ -438,6 +475,7 @@ PumpRoutineString="Routine"
 # Difficulty_Edit-StepsType_Pump_Halfdouble=Edit
 # Difficulty_Edit-StepsType_Pump_Double=Edit
 # Course=Progressive
+
 [CustomScoring]
 # Custom scoring, usually good for custom games.
 
@@ -464,6 +502,7 @@ PointsCheckpointMiss=-5
 PointsNone=0
 PointsHoldHeld=+5
 PointsHoldLetGo=-5
+
 [DifficultyList]
 # A list that shows difficulties in a song.
 CapitalizeDifficultyNames=false
@@ -483,6 +522,9 @@ BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.25;diffusealpha,0
 # ?
 BannerResetFadeCommand=diffusealpha,1
 
+BannerRouletteCommand=
+BannerRandomCommand=
+
 [Gameplay]
 # System Direction
 ComboIsPerRow=ComboPerRow()
@@ -585,6 +627,7 @@ StreamX=0
 StreamY=0
 OverX=0
 OverY=0
+
 [LifeMeterBattery]
 # The bar that shows up in Oni mode.
 
@@ -627,7 +670,6 @@ DancePointsP2Y=0
 DancePointsP2OnCommand=zoom,0.7;shadowlength,0;diffuse,PlayerColor(PLAYER_2)
 DancePointsP2OffCommand=
 
-
 [LifeMeterTime]
 # The Lifemeter that shows up when you're playing survival.
 
@@ -838,16 +880,19 @@ PortalColor=color("1,0,0,1")
 
 SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Artist", "SortOrder_Genre" }
 # SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" }
-#
+
 ShowRoulette=true
 ShowRandom=false
 ShowPortal=false
-#
+
+SortBPMDivision=20
+SortLengthDivision=5
+
 MostPlayedSongsToShow=30
 RecentSongsToShow=30
-#
+
 UseEasyMarkerFlag=false
-#
+
 ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent"
 # ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,ChallengeMeter,DoubleEasyMeter,DoubleMediumMeter,DoubleHardMeter,DoubleChallengeMeter,Genre,Length,Recent,NormalMode,BattleMode"
 ChoicePreferred="sort,Preferred"
@@ -870,7 +915,7 @@ ChoiceLength="sort,Length"
 ChoiceRecent="sort,Recent"
 ChoiceNormalMode="playmode,regular"
 ChoiceBattleMode="playmode,battle"
-#
+
 CustomWheelItemNames=""
 
 [CourseWheel]
@@ -963,6 +1008,7 @@ RoutineNoteSkinP2=RoutineSkinP2()
 BPMColor=color("1,0,0,1")
 StopColor=color("0.8,0.8,0,1")
 DelayColor=color("0,0.8,0.8,1")
+WarpColor=color("1,0,0.5,1")
 TimeSignatureColor=color("1,0.55,0,1")
 TickcountColor=color("0,1,0,1")
 ComboColor=color("0.55,1,0,1")
@@ -970,13 +1016,15 @@ ComboColor=color("0.55,1,0,1")
 BPMIsLeftSide=true
 StopIsLeftSide=true
 DelayIsLeftSide=true
+WarpIsLeftSide=false
 TimeSignatureIsLeftSide=true
 TickcountIsLeftSide=false
 ComboIsLeftSide=false
 #
 BPMOffsetX=60
-StopOffsetX=10
-DelayOffsetX=10
+StopOffsetX=50
+DelayOffsetX=120
+WarpOffsetX=60
 TimeSignatureOffsetX=30
 TickcountOffsetX=10
 ComboOffsetX=30
@@ -1095,7 +1143,6 @@ TextOffCommand=
 
 [ScoreDisplayOni]
 
-
 [ScoreDisplayLifeTime]
 FrameX=
 FrameY=
@@ -1245,6 +1292,7 @@ SoundProperty="Pitch"
 PropertyMin=7/8
 PropertyCenter=1.0
 PropertyMax=9/8
+
 [StepsDisplayListRow]
 FrameX=0
 FrameY=0
@@ -1321,6 +1369,7 @@ ShowTraining=false
 BlinkPlayersBest=true
 
 # 04 #
+
 [Screen]
 ScreenInitCommand=
 ScreenOnCommand=
@@ -1371,6 +1420,7 @@ HeaderTextOffCommand=
 
 LineOnCommand=zoom,0.75
 #
+
 [ScreenSystemLayer]
 Class="ScreenSystemLayer"
 Fallback="Screen"
@@ -1421,6 +1471,7 @@ Fallback="Screen"
 StatusOnCommand=x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+150;shadowlength,2;strokecolor,color("#000000");
 AdjustmentsOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;
 #
+
 [ScreenStatsOverlay]
 Class="ScreenStatsOverlay"
 Fallback="Screen"
@@ -1434,6 +1485,7 @@ SkipOnCommand=zoom,0.5
 SkipWidth=190
 SkipSpacingY=14
 #
+
 [ScreenWithMenuElements]
 Class="ScreenWithMenuElements"
 Fallback="Screen"
@@ -1657,21 +1709,18 @@ 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"
-Choice5="screen,ScreenOptionsEdit;text,Edit/Share"
+Choice5="text,Edit/Share;screen,"..Branch.OptionsEdit()
 Choice6="screen,ScreenJukeboxMenu;text,Jukebox"
 Choice7="screen,ScreenExit;text,Exit"
 Choice8="screen,ScreenTest;text,Sandbox"
-Choice9="screen,ScreenQuickSetupOverview;text,Setup"
 # Aliases for the future.
-ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup"
-ChoiceGameStart="applydefaultoptions;screen,ScreenSelectProfile;text,Game Start"
+ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
 ChoiceOnline="screen,ScreenNetworkOptions;text,Play Online"
 ChoiceGameSelect="screen,ScreenSelectGame;text,Select Game"
 ChoiceOptions="screen,ScreenOptionsSystemDirection;text,Options"
-ChoiceEdit="screen,ScreenOptionsEdit;text,Edit/Share"
+ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit()
 ChoiceJukebox="screen,ScreenJukeboxMenu;text,Jukebox"
 ChoiceSandbox="screen,ScreenTest;text,Sandbox"
-ChoiceSetup="screen,ScreenQuickSetupOverview;text,Setup"
 ChoiceExit="screen,ScreenExit;text,Exit"
 #
 AllowRepeatingInput=true
@@ -1720,87 +1769,7 @@ LogoX=SCREEN_CENTER_X
 LogoY=SCREEN_CENTER_Y-80
 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,8,0;zoom,0;bounceend,0.35;zoom,1
 LogoOffCommand=
-[ScreenQuickSetupOverview]
-Class="ScreenSelectMaster"
-Fallback="ScreenSelectMaster"
-#
-NextScreen=Branch.QuickSetupA
-PrevScreen=Branch.TitleMenu()
-#
-TimerSeconds=-1
-#
-DefaultChoice="Start"
-ChoiceNames="Start,Back"
-#
-ChoiceStart="name,Start;screen,".. Branch.QuickSetupA
-ChoiceBack="name,Back;screen,".. Branch.TitleMenu
-#
-PerChoiceScrollElement=false
-PerChoiceIconElement=false
-#
-ShowScroller=true
-WrapScroller=false
-ShowIcon=true
-[ScreenQuickSetupPhaseOne]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupBl
-PrevScreen=Branch.QuickSetupStart
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupB
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupStart
-[ScreenQuickSetupPhaseTwo]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupC
-PrevScreen=Branch.QuickSetupA
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupC
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupA
-[ScreenQuickSetupPhaseThree]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupD
-PrevScreen=Branch.QuickSetupB
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupD
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupB
-[ScreenQuickSetupPhaseFour]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.QuickSetupFinished
-PrevScreen=Branch.QuickSetupC
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.QuickSetupFinished
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupC
-[ScreenQuickSetupFinished]
-Class="ScreenSelectMaster"
-Fallback="ScreenQuickSetupOverview"
-#
-NextScreen=Branch.TitleMenu()
-PrevScreen=Branch.QuickSetupD
-#
-DefaultChoice="Set"
-ChoiceNames="Set,Back"
-#
-ChoiceSet="name,Set;screen,".. Branch.TitleMenu
-ChoiceBack="name,Back;screen,".. Branch.QuickSetupD
+
 [ScreenProfileLoad]
 Class="ScreenProfileLoad"
 Fallback="ScreenWithMenuElementsBlank"
@@ -1817,7 +1786,7 @@ LoadEdits=true
 Fallback="ScreenWithMenuElements"
 Class="ScreenSelectProfile"
 #
-ScreenOnCommand=lockinput,1
+ScreenOnCommand=%function(self) self:lockinput(3); end;
 #
 NextScreen=Branch.AfterSelectProfile()
 PrevScreen=Branch.TitleMenu()
@@ -1830,7 +1799,8 @@ CodeUp="+MenuUp"
 CodeUp2="+Up"
 CodeDown="+MenuDown"
 CodeDown2="+Down"
-CodeStart="Start"
+# Holding Start let us skip ( annoying )
+CodeStart="~Start,+Start"
 CodeBack="Back"
 CodeCenter="Center"
 CodeDownLeft="DownLeft"
@@ -1850,16 +1820,16 @@ DefaultChoice="Single"
 ChoiceNames=GameCompatibleModes()
 #
 OptionOrderAuto="1:2,2:1"
-ChoiceSingle="name,Single;style,single;screen,"..Branch.AfterSelectPlayMode()
-ChoiceDouble="name,Double;style,double;screen,"..Branch.AfterSelectPlayMode()
-ChoiceSolo="name,Solo;style,solo;screen,"..Branch.AfterSelectPlayMode()
-ChoiceVersus="name,Versus;style,versus;screen,"..Branch.AfterSelectPlayMode()
-ChoiceCouple="name,Couple;style,couple;screen,"..Branch.AfterSelectPlayMode()
-ChoiceHalfDouble="name,HalfDouble;style,halfdouble;screen,"..Branch.AfterSelectPlayMode()
-Choice5Keys="name,5Keys;style,single5;;screen,"..Branch.AfterSelectPlayMode()
-Choice7Keys="name,7Keys;style,single7;screen,"..Branch.AfterSelectPlayMode()
-Choice10Keys="name,10Keys;style,double10;screen,"..Branch.AfterSelectPlayMode()
-Choice14Keys="name,14Keys;style,double14;screen,"..Branch.AfterSelectPlayMode()
+ChoiceSingle="name,Single;style,single;text,Single;screen,"..Branch.AfterSelectPlayMode()
+ChoiceDouble="name,Double;style,double;text,Double;screen,"..Branch.AfterSelectPlayMode()
+ChoiceSolo="name,Solo;style,solo;text,Solo;screen,"..Branch.AfterSelectPlayMode()
+ChoiceVersus="name,Versus;style,versus;text,Versus;screen,"..Branch.AfterSelectPlayMode()
+ChoiceCouple="name,Couple;style,couple;text,Couple;screen,"..Branch.AfterSelectPlayMode()
+ChoiceHalfDouble="name,HalfDouble;style,halfdouble;text,HalfDouble;screen,"..Branch.AfterSelectPlayMode()
+Choice5Keys="name,5Keys;style,single5;text,5Keys;screen,"..Branch.AfterSelectPlayMode()
+Choice7Keys="name,7Keys;style,single7;text,7Keys;screen,"..Branch.AfterSelectPlayMode()
+Choice10Keys="name,10Keys;style,double10;text,10Keys;screen,"..Branch.AfterSelectPlayMode()
+Choice14Keys="name,14Keys;style,double14;text,14Keys;screen,"..Branch.AfterSelectPlayMode()
 ChoiceKB7="name,kb7;style,single;screen,"..Branch.AfterSelectPlayMode()
 #
 PerChoiceScrollElement=false
@@ -1880,7 +1850,7 @@ PrevScreen=Branch.TitleMenu()
 #
 TimerSeconds=40
 #
-DefaultChoice="Easy"
+DefaultChoice="Normal"
 ChoiceNames="Normal,Rave,Extended,Oni,Endless"
 #
 PerChoiceScrollElement=false
@@ -1890,13 +1860,13 @@ ShowScroller=true
 WrapScroller=true
 ShowIcon=false
 #
-ChoiceEasy="applydefaultoptions;name,Easy;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
-ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
-ChoiceHard="applydefaultoptions;name,Hard;playmode,regular;difficulty,hard;screen,ScreenSelectMusic;setenv,sMode,Normal"
-ChoiceRave="applydefaultoptions;name,Rave;playmode,rave;screen,ScreenSelectMusic;setenv,sMode,Rave"
-ChoiceExtended="applydefaultoptions;name,Extended;playmode,nonstop;screen,ScreenSelectCourse;setenv,sMode,Extended"
-ChoiceOni="applydefaultoptions;name,Oni;playmode,oni;screen,ScreenSelectCourse;setenv,sMode,Oni"
-ChoiceEndless="applydefaultoptions;name,Endless;playmode,endless;screen,ScreenSelectCourse;setenv,sMode,Endless"
+ChoiceEasy="applydefaultoptions;name,Easy;text,Easy;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
+ChoiceNormal="applydefaultoptions;name,Normal;text,Normal;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
+ChoiceHard="applydefaultoptions;name,Hard;text,Hard;playmode,regular;difficulty,hard;screen,ScreenSelectMusic;setenv,sMode,Normal"
+ChoiceRave="applydefaultoptions;name,Rave;text,Rave;playmode,rave;screen,ScreenSelectMusic;setenv,sMode,Rave"
+ChoiceExtended="applydefaultoptions;name,Extended;text,Extended;playmode,nonstop;screen,ScreenSelectCourse;setenv,sMode,Extended"
+ChoiceOni="applydefaultoptions;name,Oni;text,Oni;playmode,oni;screen,ScreenSelectCourse;setenv,sMode,Oni"
+ChoiceEndless="applydefaultoptions;name,Endless;text,Endless;playmode,endless;screen,ScreenSelectCourse;setenv,sMode,Endless"
 
 [ScreenSelectCharacter]
 Class="ScreenSelectMaster"
@@ -1911,6 +1881,7 @@ PerChoiceIconElement=false
 ShowScroller=true
 WrapScroller=true
 ShowIcon=false
+
 [ScreenGameInformation]
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
@@ -2035,6 +2006,7 @@ ScreenModsCommand=setupcoursestagemods
 #
 MusicWheelType="CourseWheel"
 Codes="CourseCodeDetector"
+
 [CourseCodeDetector]
 Fallback="CodeDetector"
 NextSort1=
@@ -2042,7 +2014,6 @@ NextSort2=
 NextSort3=
 NextSort4=
 
-
 [StepsDisplay]
 FrameX=0
 FrameY=0
@@ -2076,7 +2047,7 @@ ShowAutogen=true
 AutogenX=40
 AutogenY=0
 AutogenOnCommand=
-AutogenSetCommand=%function(self,param) if param.CustomDifficulty then self:diffuse(CustomDifficultyToLightColor(param.CustomDifficulty)); self:strokecolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); end end
+AutogenSetCommand=
 ShowStepsType=false
 StepsTypeX=0
 StepsTypeY=0
@@ -2137,9 +2108,12 @@ PageOnCommand=
 ContainerOnCommand=
 ContainerOffCommand=
 CursorOnCommand=
-LineHighlightOnCommand=
-LineHighlightChangeCommand=
-LineHighlightChangeToExitCommand=
+LineHighlightP1OnCommand=
+LineHighlightP1ChangeCommand=
+LineHighlightP1ChangeToExitCommand=
+LineHighlightP2OnCommand=
+LineHighlightP2ChangeCommand=
+LineHighlightP2ChangeToExitCommand=
 ShowScrollBar=false
 ScrollBarHeight=0
 ScrollBarTime=0
@@ -2527,9 +2501,13 @@ Fallback="ScreenOptionsSimple"
 
 OptionRowNormalMetricsGroup="OptionRowService"
 
-LineHighlightOnCommand=visible,false
-LineHighlightChangeCommand=
-LineHighlightChangeToExitCommand=
+LineHighlightP1OnCommand=visible,false
+LineHighlightP1ChangeCommand=
+LineHighlightP1ChangeToExitCommand=
+
+LineHighlightP2OnCommand=visible,false
+LineHighlightP2ChangeCommand=
+LineHighlightP2ChangeToExitCommand=
 
 CursorOnCommand=visible,false
 
@@ -2540,7 +2518,7 @@ Fallback="ScreenOptionsSimpleService"
 NextScreen=Branch.Init()
 PrevScreen=Branch.Init()
 
-LineNames="SystemDirection,KeyConfig,GameType,6,8,Reload,MoreOptions"
+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"
 Line1="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
 Line2="gamecommand;screen,ScreenTestInput;name,Test Input"
@@ -2561,6 +2539,7 @@ LineKeyConfig="gamecommand;screen,ScreenMapControllers;name,Key Joy Mappings"
 LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
 LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
 LineReload="gamecommand;screen,ScreenReloadSongs;name,Reload Songs"
+LineCredits="gamecommand;screen,ScreenCredits;name,StepMania Credits"
 LineMoreOptions="gamecommand;screen,ScreenOptionsExtended;name,More Options"
 
 [ScreenOptionsExtended]
@@ -2585,9 +2564,13 @@ PrevScreen="ScreenOptionsService"
 NextScreen="ScreenOptionsService"
 HelpText=Screen.String("HelpTextOptionsAndBack")
 
-LineHighlightOnCommand=visible,false
-LineHighlightChangeCommand=
-LineHighlightChangeToExitCommand=
+LineHighlightP1OnCommand=visible,false
+LineHighlightP1ChangeCommand=
+LineHighlightP1ChangeToExitCommand=
+
+LineHighlightP2OnCommand=visible,false
+LineHighlightP2ChangeCommand=
+LineHighlightP2ChangeToExitCommand=
 #
 ExplanationTogetherX=SCREEN_CENTER_X
 ExplanationTogetherY=SCREEN_CENTER_Y+174
@@ -2596,6 +2579,7 @@ ExplanationTogetherOffCommand=
 
 [ScreenOptionsServiceExtendedChild]
 Fallback="ScreenOptionsServiceChild"
+
 [ScreenMiniMenu]
 Class="ScreenMiniMenu"
 Fallback="ScreenOptions"
@@ -2915,12 +2899,14 @@ Line16="list,Steps"
 Line17="list,Characters"
 
 #
+
 [ScreenPlayerOptionsRestricted]
 Fallback="ScreenPlayerOptions"
 NextScreen="ScreenStageInformation"
 LineNames="1,8,16,17"
 
 # funny
+
 [ScreenSongOptions]
 Fallback="ScreenOptions"
 Class="ScreenSongOptions"
@@ -2955,6 +2941,7 @@ AllowStartToSkip=false
 PrepareScreen=
 
 # 05 # A
+
 [ScreenExit]
 # Midiman:
 # Fun fact, if you don't enable this screen, Force Crashing will hang
@@ -3248,6 +3235,7 @@ DebugX=SCREEN_CENTER_X
 DebugY=SCREEN_BOTTOM-72
 DebugOnCommand=zoom,0.75
 #
+SongNumberFormat="%d"
 SongNumberP1X=THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") - 60
 SongNumberP1Y=SCREEN_TOP+24+7
 SongNumberP1OnCommand=visible,false
@@ -3299,6 +3287,7 @@ PlayerOptionsHideFailType=false
 MaxComboNumDigits=4
 #
 ShowBannerArea=true
+RollingNumbersClass="RollingNumbersJudgment"
 ShowSharedJudgmentLineLabels=false
 ShowJudgmentLineW1=false
 ShowJudgmentLineW2=false
@@ -3367,6 +3356,7 @@ DisqualifiedP2OffCommand=
 #
 DetailLineFormat="%3d/%3d"
 #
+
 [ScreenEvaluationNormal]
 Fallback="ScreenEvaluation"
 #
@@ -3419,11 +3409,13 @@ NextScreen=Branch.AfterProfileSave()
 PrevScreen=Branch.TitleMenu()
 #
 TimerSeconds=-1
+
 [ScreenProfileSaveSummary]
 Fallback="ScreenProfileSave"
 #
 NextScreen="ScreenGameOver"
 PrevScreen="ScreenGameOver"
+
 [ScreenGameOver]
 Class="ScreenEnding"
 Fallback="ScreenAttract"
@@ -3486,6 +3478,7 @@ Answer3Of3OffCommand=
 #
 # stuff for edit mode:
 #
+
 [ScreenOptionsEdit]
 Class="ScreenOptionsMaster"
 Fallback="ScreenOptionsSimpleService"
@@ -3614,6 +3607,7 @@ TimerSeconds=-1
 HelpText=Screen.String("HelpTextOptionsAndBack")
 
 # could use a redo but whatever
+
 [ScreenEdit]
 Class="ScreenEdit"
 Fallback="ScreenWithMenuElementsBlank"
@@ -3628,6 +3622,7 @@ ShowHelp=false
 AllowOperatorMenuButton=false
 ShowCreditDisplay=false
 ShowStyleIcon=false
+InvertScrollSpeedButtons=false
 TimerSeconds=-1
 EditModifiers="no reverse"
 EditHelpX=SCREEN_LEFT+4
@@ -3694,13 +3689,14 @@ CancelTransitionsOut=true
 PlayMusic=false
 TimerSeconds=-1
 ShowStyleIcon=false
-LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16"
+LineNames="1,2,3,4,5,6,R,7,8,9,10,11,12,13,14,15,16"
 Line1="list,Speed"
 Line2="list,Accel"
 Line3="list,Effect"
 Line4="list,Appearance"
 Line5="list,Turn"
 Line6="list,Insert"
+LineR="list,Remove"
 Line7="list,Scroll"
 Line8="list,NoteSkins"
 Line9="list,Holds"
@@ -3717,6 +3713,7 @@ OutCancelCommand=
 Fallback="StepsDisplay"
 
 # oh, right, minimenus.
+
 [ScreenMiniMenuEditHelp]
 Fallback="ScreenMiniMenu"
 ShowFooter=false
@@ -3778,6 +3775,7 @@ Fallback="ScreenMiniMenu"
 Fallback="ScreenMiniMenu"
 
 # Export Packages
+
 [ScreenOptionsExportPackage]
 Class="ScreenOptionsExportPackage"
 Fallback="ScreenOptionsSimpleService"
@@ -3795,6 +3793,7 @@ Fallback="OptionRowService"
 TitleX=SCREEN_CENTER_X-150
 
 # Manage Courses
+
 [OptionRowCourseOverview]
 Fallback="OptionRowService"
 ItemsLongRowSharedX=SCREEN_CENTER_X-100
@@ -3843,6 +3842,7 @@ EditScreen="ScreenOptionsEditCourse"
 OptionRowNormalMetricsGroup="OptionRowCourseOverview"
 
 # visual/interactive syncing
+
 [ScreenGameplaySyncMachine]
 Class="ScreenGameplaySyncMachine"
 Fallback="ScreenGameplay"
@@ -3851,7 +3851,7 @@ NextScreen="ScreenOptionsExtended"
 PlayerType="PlayerSyncMachine"
 
 AllowCenter1Player=false
-SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;zoom,0;decelerate,0.5;zoom,0.6
+SyncInfoOnCommand=x,PositionPerPlayer(GAMESTATE:GetMasterPlayerNumber(),SCREEN_CENTER_X+160,SCREEN_CENTER_X-160);y,SCREEN_CENTER_Y;zoom,0;decelerate,0.5;zoom,0.6
 
 # hidden by default:
 LifeP1OnCommand=visible,false
@@ -3872,6 +3872,7 @@ Fallback="Player"
 ComboOnCommand=visible,false
 
 # sm-ssc helper screens
+
 [ScreenHowToInstallSongs]
 Class="ScreenSplash"
 Fallback="ScreenSplash"
@@ -3882,6 +3883,7 @@ TimerSeconds=-1
 ShowHelp=false
 
 # stuff for online mode:
+
 [ScreenSMOnlineLogin]
 Class="ScreenSMOnlineLogin"
 Fallback="ScreenOptionsServiceChild"
@@ -4126,6 +4128,7 @@ UserOnCommand=
 UserOffCommand=
 
 # Arcade
+
 [ScreenLogo]
 Fallback="ScreenAttract"
 #
@@ -4189,6 +4192,7 @@ ChoiceNames="1"
 IdleCommentSeconds=-1
 IdleTimeoutSeconds=-1
 IdleTimeoutScreen=Branch.AfterInit()
+
 [ScreenDemonstration]
 Fallback="ScreenGameplay"
 Class="ScreenDemonstration"
@@ -4232,3 +4236,15 @@ StartScreen="ScreenTitleMenu"
 LightsMode="LightsMode_Demonstration"
 ShowCourseModifiersProbability=0
 AllowAdvancedModifiers=true
+
+[ScreenCredits]
+Class="ScreenSplash"
+Fallback="ScreenSplash"
+AllowStartToSkip=true
+NextScreen=Branch.TitleMenu()
+PrevScreen=Branch.TitleMenu()
+TimerSeconds=40
+TimerStealth=true
+ForceTimer=true
+TimerMetricsGroup="MenuTimerNoSound"
+TimerOnCommand=visible,false