Work on removing non sleep calls on in/out layers

BGAnimations/ScreenCaution underlay/default.lua

@@ -1,15 +1,7 @@
-local caution = Def.ActorFrame{
-
-}
+local caution = Def.ActorFrame{}
 
-return Def.ActorFrame{
-	--Yeah I know.
-	--[[OnCommand=function(s) s:sleep(0.1):queuecommand("Dim1") end,
-	Dim1Command=function(s) SOUND:DimMusic(0.75,math.huge) s:sleep(0.1):queuecommand("Dim2") end,
-	Dim2Command=function(s) SOUND:DimMusic(0.5,math.huge) s:sleep(0.1):queuecommand("Dim3") end,
-	Dim3Command=function(s) SOUND:DimMusic(0.25,math.huge) s:sleep(0.1):queuecommand("Dim4") end,
-	Dim4Command=function(s) SOUND:DimMusic(0,math.huge) end,]]
-	loadfile(THEME:GetPathB("","_StageDoors"))()..{
+if ThemePrefs.Get("ShowHTP") == true and (PROFILEMAN:IsPersistentProfile(PLAYER_1) or PROFILEMAN:IsPersistentProfile(PLAYER_2)) then
+	caution[#caution+1] = loadfile(THEME:GetPathB("","_StageDoors"))()..{
 		OnCommand=function(s)
 			if PROFILEMAN:IsPersistentProfile(PLAYER_1) or PROFILEMAN:IsPersistentProfile(PLAYER_2) then
 				s:visible(false)
@@ -27,6 +19,16 @@ return Def.ActorFrame{
 			end
 		end,
 	};
+end
+
+return Def.ActorFrame{
+	--Yeah I know.
+	--[[OnCommand=function(s) s:sleep(0.1):queuecommand("Dim1") end,
+	Dim1Command=function(s) SOUND:DimMusic(0.75,math.huge) s:sleep(0.1):queuecommand("Dim2") end,
+	Dim2Command=function(s) SOUND:DimMusic(0.5,math.huge) s:sleep(0.1):queuecommand("Dim3") end,
+	Dim3Command=function(s) SOUND:DimMusic(0.25,math.huge) s:sleep(0.1):queuecommand("Dim4") end,
+	Dim4Command=function(s) SOUND:DimMusic(0,math.huge) end,]]
+	caution,
 	Def.ActorFrame{
 		InitCommand=function(s) s:Center() end,
 		OnCommand=function(s) s:diffusealpha(0):Center():zoomy(0):sleep(0.1):diffusealpha(1):linear(0.066):zoom(1) end,

BGAnimations/ScreenGameOver in.lua

@@ -1,6 +1,3 @@
-return Def.ActorFrame{
-	Def.Quad{
-		InitCommand=function(s) s:FullScreen():diffuse(color("0,0,0,1")) end,
-		OnCommand=function(s) s:linear(0.4):diffusealpha(0) end,
-	};
+return Def.Actor
+	OnCommand=function(s) s:sleep(0.4) end,
 }

BGAnimations/ScreenGameOver overlay/default.lua

@@ -53,4 +53,8 @@ return Def.ActorFrame{
     File="go.ogg",
     OnCommand=function(s) s:play() end,
   };
+  Def.Quad{
+		InitCommand=function(s) s:FullScreen():diffuse(color("0,0,0,1")) end,
+		OnCommand=function(s) s:linear(0.4):diffusealpha(0) end,
+	};
 };

BGAnimations/ScreenGameplay decorations/default.lua

@@ -1,9 +1,53 @@
 local t = Def.ActorFrame{};
+local jk = LoadModule "Jacket.lua"
 
 t[#t+1] = StatsEngine()
 
 local LoadingScreen = Var "LoadingScreen"
 
+--BGVideo
+t[#t+1] = Def.ActorFrame {
+  loadfile(THEME:GetPathB("ScreenWithMenuElements","background"))()..{
+    InitCommand=function(s)
+      s:visible(true)
+    end,
+    OnCommand=function(s) s:linear(0.25):diffusealpha(0):queuecommand("Finish") end,
+    FinishCommand=function(s) s:finishtweening():visible(false) end,
+  };
+};
+
+t[#t+1] = loadfile(THEME:GetPathB("","_StageDoors"))()..{
+  InitCommand=function(s)
+    s:visible(true)
+  end,
+  OnCommand=function(s)
+    s:queuecommand("AnOff"):sleep(0.25):queuecommand("Finish")
+  end,
+  FinishCommand=function(s) s:finishtweening():visible(false) end,
+};
+--Jacket--
+t[#t+1] = Def.ActorFrame {
+  InitCommand=function(s)
+    s:Center():diffusealpha(1):zoom(1)
+  end,
+  OnCommand=function(s) s:sleep(0.5):decelerate(0.2):zoom(2):diffusealpha(0) end,
+  Def.Quad{
+    InitCommand=function(s) s:diffuse(Color.Black)
+      s:setsize(620,620)	
+    end,
+  };
+  Def.Sprite {
+    InitCommand=function(self)
+      if GAMESTATE:IsCourseMode() then
+        local ent = GAMESTATE:GetCurrentTrail(GAMESTATE:GetMasterPlayerNumber()):GetTrailEntries()
+        self:Load(jk.GetSongGraphicPath(ent[1]:GetSong())):setsize(620,620)
+      else
+        self:Load(jk.GetSongGraphicPath(GAMESTATE:GetCurrentSong())):setsize(620,620)	
+      end
+    end;
+  };
+};
+
 t[#t+1] = Def.Actor{
     AfterStatsEngineMessageCommand = function(_,params)
       local pn = params.Player

BGAnimations/ScreenGameplay in.lua

@@ -1,36 +1,3 @@
-local t = Def.ActorFrame {};
-local jk = LoadModule "Jacket.lua"
---BGVideo
-	t[#t+1] = Def.ActorFrame {
-		loadfile(THEME:GetPathB("ScreenWithMenuElements","background"))()..{
-			InitCommand=function(s)
-				s:visible(true)
-			end,
-			OnCommand=function(s) s:linear(0.25):diffusealpha(0):queuecommand("Finish") end,
-			FinishCommand=function(s) s:finishtweening():visible(false) end,
-		};
-	};
---Jacket--
-t[#t+1] = Def.ActorFrame {
-	 InitCommand=function(s)
-		s:Center():diffusealpha(1):zoom(1)
-	end,
-	OnCommand=function(s) s:sleep(0.5):decelerate(0.2):zoom(2):diffusealpha(0) end,
-	Def.Quad{
-		InitCommand=function(s) s:diffuse(Color.Black)
-			s:setsize(620,620)	
-		end,
-	};
-	Def.Sprite {
-		InitCommand=function(self)
-			if GAMESTATE:IsCourseMode() then
-				local ent = GAMESTATE:GetCurrentTrail(GAMESTATE:GetMasterPlayerNumber()):GetTrailEntries()
-				self:Load(jk.GetSongGraphicPath(ent[1]:GetSong())):setsize(620,620)
-			else
-				self:Load(jk.GetSongGraphicPath(GAMESTATE:GetCurrentSong())):setsize(620,620)	
-			end
-		end;
-	};
+return Def.Actor{
+	OnCommand=function(s) s:sleep(0.7) end,
 };
-
-return t;

BGAnimations/ScreenGameplay next course song.lua

@@ -73,19 +73,19 @@ return Def.ActorFrame {
 			ChangeCourseSongInMessageCommand=function(s) s:diffusealpha(0):sleep(0.4):linear(0.05):diffusealpha(1):sleep(2.5):linear(0.2):diffusealpha(0) end,
 		};
 		Def.Sprite{
-			Texture="ScreenStageInformation in/star",
+			Texture="ScreenStageInformation decorations/star",
 			ChangeCourseSongInMessageCommand=function(s) s:diffusealpha(0):sleep(0.4):linear(0.05):diffusealpha(1):linear(0.2):diffusealpha(0) end,
 		};
 		Def.Quad{
 			InitCommand=function(s) s:setsize(SCREEN_WIDTH,SCREEN_HEIGHT):diffusealpha(0):blend(Blend.Add) end,
 			ChangeCourseSongInMessageCommand=function(s) s:diffusealpha(0):sleep(0.4):linear(0.05):diffusealpha(0.25):linear(0.2):diffusealpha(0) end,
 		};
 		Def.Sprite{
-			Texture="ScreenStageInformation in/arrow",
+			Texture="ScreenStageInformation decorations/arrow",
 			ChangeCourseSongInMessageCommand=function(s) s:x(1700):sleep(0.2):linear(0.4):x(-1700) end,
 		};
 		Def.Sprite{
-			Texture="ScreenStageInformation in/arrow",
+			Texture="ScreenStageInformation decorations/arrow",
 			InitCommand=function(s) s:zoomx(-1) end,
 			ChangeCourseSongInMessageCommand=function(s) s:x(-1700):sleep(0.2):linear(0.4):x(1700) end,
 		};

BGAnimations/ScreenSelectMode decorations/default.lua

@@ -137,4 +137,9 @@ t[#t+1] = Def.ActorFrame {
 	OnCommand=function(s) s:sleep(0.3):decelerate(0.6):diffusealpha(0.5) end,
   };}
 
+t[#t+1] = Def.Quad{
+	InitCommand=function(s) s:FullScreen():diffuse(color("0,0,0,0")) end,
+	OffCommand=function(s) s:sleep(0.3):linear(0.2):diffusealpha(1) end,
+};
+
 return t

BGAnimations/ScreenSelectMode in.lua

@@ -0,0 +1,3 @@
+return Def.Actor{
+    OnCommand=function(s) s:sleep(0.5) end,
+}

BGAnimations/ScreenSelectMode out.lua

@@ -1,8 +1,3 @@
-local t = Def.ActorFrame {
-	Def.Quad{
-		InitCommand=function(s) s:FullScreen():diffuse(color("0,0,0,0")) end,
-		StartTransitioningCommand=function(s) s:sleep(0.3):linear(0.2):diffusealpha(1) end,
-	};
+return Def.Actor{
+	StartTransitioningCommand=function(s) s:sleep(0.5) end,
 };
-
-return t;

BGAnimations/ScreenSelectMusic in.lua

@@ -1 +1,3 @@
-return Def.ActorFrame{}
+return Def.Actor{
+    OnCommand=function(s) s:sleep(0.5) end,
+}

BGAnimations/ScreenSelectMusic out.lua

@@ -1,10 +1,3 @@
-LoadFromProfilePrefs()
 return Def.ActorFrame{
-	Def.Sound{
-		File=THEME:GetPathS("","_swoosh out"),
-		StartTransitioningCommand=function(s) s:sleep(1):queuecommand("Play") end,
-		PlayCommand=function(s) s:play() end,
-	};
-	StartTransitioningCommand=function(s) s:sleep(1):queuecommand("Dim") end,
-	DimCommand=function(s) SOUND:DimMusic(0,math.huge) end,
+	OnCommand=function(s) s:sleep(1) end,
 };

BGAnimations/ScreenSelectMusic overlay/default.lua

@@ -56,4 +56,14 @@ return Def.ActorFrame{
 			end
 		end
 	end,
+	Def.Sound{
+		File=THEME:GetPathS("","_swoosh out"),
+		OffCommand=function(s) s:sleep(1):queuecommand("Play") end,
+		PlayCommand=function(s) s:play() end,
+	};
+	OffCommand=function(s)
+		LoadFromProfilePrefs()
+		s:sleep(1):queuecommand("Dim")
+	end,
+	DimCommand=function(s) SOUND:DimMusic(0,math.huge) end,
 }

BGAnimations/ScreenSelectPlayCourseMode in.lua

@@ -0,0 +1,3 @@
+return Def.Actor{
+	OnCommand=function(s) s:sleep(0.75) end,
+};

BGAnimations/ScreenSelectPlayCourseMode underlay.lua

@@ -1,4 +1,4 @@
-return Def.Actor{
+return Def.ActorFrame{
   OnCommand=function(s)
 		SCREENMAN:GetTopScreen():SetPrevScreenName("ScreenSelectMusic")
 	end,
@@ -7,5 +7,14 @@ return Def.Actor{
 			GAMESTATE:SetCurrentPlayMode("PlayMode_Regular")
 			SCREENMAN:GetTopScreen():Cancel()
 		end
-	end
+	end,
+	Def.Quad{
+		InitCommand=function(s) s:FullScreen() end,
+		OnCommand=function(s) s:diffusealpha(0):sleep(0.75) end,
+	};
+	Def.Sound{
+		File=THEME:GetPathS("","ScreenSelectPlayMode in.ogg"),
+		OnCommand=function(s) s:queuecommand("Play") end,
+		PlayCommand=function(s) s:play() end,
+	}
 }

BGAnimations/ScreenSelectProfile in.lua

@@ -1,8 +1,5 @@
-return Def.ActorFrame{
-	Def.Quad{
-		InitCommand=function(s) s:FullScreen():diffuse(Color.Black) end,
-		OnCommand=function(s)
-			s:diffusealpha(1):sleep(0.1):linear(0.2):diffusealpha(0)
-		end,
-	}
+return Def.Actor{
+	OnCommand=function(s)
+		s:sleep(0.3)
+	end,
 };

BGAnimations/ScreenSelectProfile overlay/default.lua

@@ -568,6 +568,12 @@ local t = Def.ActorFrame{
 		LoadActor( THEME:GetPathS("Common","value") )..{
 			DirectionButtonMessageCommand=function(self) self:play() end;
 		};
+		Def.Quad{
+			InitCommand=function(s) s:FullScreen():diffuse(Color.Black) end,
+			OnCommand=function(s)
+				s:diffusealpha(1):sleep(0.1):linear(0.2):diffusealpha(0)
+			end,
+		}
 	};
 }