Implement ScreenCaution, fix CDTitle

Themes/_fallback/Scripts/02 Branches.lua

@@ -59,6 +59,13 @@ Branch = {
 			return "ScreenTitleJoin"
 		end
 	end,
+	AfterTitleMenu = function()
+		if PREFSMAN:GetPreference("ShowCaution") then
+			return "ScreenCaution"
+		else
+			return Branch.StartGame()
+		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

Themes/_fallback/metrics.ini

@@ -1837,7 +1837,7 @@ UpdateOnMessage=""
 NumChoicesOnPage1=100
 DefaultChoice="GameStart"
 ChoiceNames="GameStart,Options,Edit,Jukebox,GameSelect,Exit"
-ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame()
+ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.AfterTitleMenu()
 #ChoiceQuickPlay="applydefaultoptions;text,Quick Play;"
 ChoiceOptions="screen,ScreenOptionsService;text,Options"
 ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit()
@@ -1892,6 +1892,14 @@ LogoY=SCREEN_CENTER_Y-80
 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,8,0;zoom,0;bounceend,0.35;zoom,1
 LogoOffCommand=
 
+[ScreenCaution]
+Fallback="ScreenSplash"
+PrepareScreen=""
+NextScreen=Branch.StartGame()
+PrevScreen=Branch.TitleMenu()
+TimerSeconds=3
+AllowStartToSkip=true
+
 [ScreenProfileLoad]
 Class="ScreenProfileLoad"
 Fallback="ScreenWithMenuElementsBlank"
@@ -2999,7 +3007,7 @@ Line19="conf,NumBackgrounds"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="1,3,4,6,7,9,10,11,12,14"
+LineNames="1,3,4,6,7,8,9,10,11,12,14"
 Line1="conf,Center1Player"
 Line3="conf,DancePointsForOni"
 Line4="conf,MenuTimer"

Themes/default/BGAnimations/ScreenCaution overlay/default.lua

@@ -0,0 +1,46 @@
+local t = Def.ActorFrame {};
+
+-- Fade
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center);	
+	Def.Quad {
+		InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
+		OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;linear,0.5;diffusealpha,0.75);
+		OffCommand=cmd(linear,0.25;diffusealpha,0);
+	};
+};
+-- Emblem
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center);
+	OnCommand=cmd(diffusealpha,0.5);
+	LoadActor("_warning bg") .. {
+		OnCommand=cmd(diffuse,Color.Yellow);
+	};
+	Def.ActorFrame {
+		LoadActor("_exclamation") .. {
+			OnCommand=cmd(diffuse,Color.Yellow);
+		};
+	};
+};
+
+-- Text
+t[#t+1] = Def.ActorFrame {
+	InitCommand=cmd(Center;y,SCREEN_CENTER_Y);
+	OnCommand=cmd(addy,-96);
+	-- Underline
+	Def.Quad {
+		InitCommand=cmd(y,16;zoomto,256,1);
+		OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,256;fadeleft,0.25;faderight,0.25);
+	};
+	LoadFont("Common Bold") .. {
+		Text=Screen.String("Caution");
+		OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25));
+	};
+	LoadFont("Common Normal") .. {
+		Text=Screen.String("CautionText");
+		InitCommand=cmd(y,128);
+		OnCommand=cmd(strokecolor,color("0,0,0,0.5");shadowlength,1;wrapwidthpixels,SCREEN_WIDTH-80);
+	};
+};
+--
+return t

Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua

@@ -182,7 +182,7 @@ if not GAMESTATE:IsCourseMode() then
 			cdtitle:visible(false);
 		end;
 		
-		self:zoom(scale(height,48,128,0.8,1.0))
+		self:zoom(scale(height,32,480,1,32/480))
 	end;
 	t[#t+1] = Def.ActorFrame {
 		OnCommand=cmd(draworder,105;x,SCREEN_CENTER_X-256;y,SCREEN_CENTER_Y-84;zoom,0;sleep,0.5;decelerate,0.25;zoom,1;SetUpdateFunction,CDTitleUpdate);

Themes/default/Graphics/ScreenWithMenuElements header/default.lua

@@ -3,7 +3,7 @@ local t = Def.ActorFrame {};
 local function Update(self)
 	local c = self:GetChildren();
 	local bps = GAMESTATE:GetSongBPS() or 1
-	c.TextureStripe:texcoordvelocity(bps,0);
+	c.TextureStripe:texcoordvelocity(bps/3,0);
 end
 
 local function IsVisible()

Themes/default/Sounds/ScreenTitleJoin music.redir

@@ -1 +1 @@
-_Music title
+_silent

Themes/default/Sounds/ScreenTitleMenu music.redir

@@ -1 +1 @@
-_Music title
+_silent