Merge pull request #13 from sillybear/patch-1

Transition items cleaning part 1
MidflightDigital · Jan 26, 2022 · 1e4c7d7 · 1e4c7d7
2 parents 1a9bbc1 + 7693dce
commit 1e4c7d7
Show file tree

Hide file tree

Showing 35 changed files with 60 additions and 85 deletions.
diff --git a/BGAnimations/ScreenCaution in.lua b/BGAnimations/ScreenCaution in.lua
diff --git a/BGAnimations/ScreenCaution out.lua b/BGAnimations/ScreenCaution out.lua
diff --git a/BGAnimations/ScreenDDRNameEntry in.redir b/BGAnimations/ScreenDDRNameEntry in.redir
diff --git a/BGAnimations/ScreenDDRNameEntry out.redir b/BGAnimations/ScreenDDRNameEntry out.redir
diff --git a/BGAnimations/ScreenDataSaveSummary in.redir b/BGAnimations/ScreenDataSaveSummary in.redir
diff --git a/BGAnimations/ScreenDataSaveSummaryEnd out.redir b/BGAnimations/ScreenDataSaveSummaryEnd out.redir
diff --git a/BGAnimations/ScreenDemonstration in.lua b/BGAnimations/ScreenDemonstration in.lua
diff --git a/BGAnimations/ScreenEvaluationSummary in.redir b/BGAnimations/ScreenEvaluationSummary in.redir
diff --git a/BGAnimations/ScreenGameOver in.lua b/BGAnimations/ScreenGameOver in.lua
diff --git a/BGAnimations/ScreenGameplay in.lua b/BGAnimations/ScreenGameplay in.lua
diff --git a/BGAnimations/ScreenLogo out.lua b/BGAnimations/ScreenLogo out.lua
diff --git a/BGAnimations/ScreenPlayerOptionsPopup cancel.redir b/BGAnimations/ScreenPlayerOptionsPopup cancel.redir
diff --git a/BGAnimations/ScreenProfileLoad in.lua b/BGAnimations/ScreenProfileLoad in.lua
diff --git a/BGAnimations/ScreenProfileLoad out.redir b/BGAnimations/ScreenProfileLoad out.redir
diff --git a/BGAnimations/ScreenProfileSave in.redir b/BGAnimations/ScreenProfileSave in.redir
diff --git a/BGAnimations/ScreenProfileSave out.lua b/BGAnimations/ScreenProfileSave out.lua
diff --git a/BGAnimations/ScreenSelectMode in.lua b/BGAnimations/ScreenSelectMode in.lua
diff --git a/BGAnimations/ScreenSelectMode out.lua b/BGAnimations/ScreenSelectMode out.lua
diff --git a/BGAnimations/ScreenSelectMusic in.lua b/BGAnimations/ScreenSelectMusic in.lua
diff --git a/BGAnimations/ScreenSelectMusic out.lua b/BGAnimations/ScreenSelectMusic out.lua
diff --git a/BGAnimations/ScreenSelectPlayCourseMode in.lua b/BGAnimations/ScreenSelectPlayCourseMode in.lua
diff --git a/BGAnimations/ScreenSelectPlayCourseMode out.redir b/BGAnimations/ScreenSelectPlayCourseMode out.redir
diff --git a/BGAnimations/ScreenSelectProfile in.lua b/BGAnimations/ScreenSelectProfile in.lua
diff --git a/BGAnimations/ScreenSelectProfile out.lua b/BGAnimations/ScreenSelectProfile out.lua
diff --git a/BGAnimations/ScreenSelectStyle in.lua b/BGAnimations/ScreenSelectStyle in.lua
diff --git a/BGAnimations/ScreenSelectStyle out.lua b/BGAnimations/ScreenSelectStyle out.lua
diff --git a/BGAnimations/ScreenSortList in.redir b/BGAnimations/ScreenSortList in.redir
diff --git a/BGAnimations/ScreenSortList out.redir b/BGAnimations/ScreenSortList out.redir
diff --git a/BGAnimations/ScreenStageInformation out.lua b/BGAnimations/ScreenStageInformation out.lua
diff --git a/BGAnimations/ScreenTitleMenu in.lua b/BGAnimations/ScreenTitleMenu in.lua
diff --git a/BGAnimations/ScreenTitleMenu out.lua b/BGAnimations/ScreenTitleMenu out.lua
diff --git a/BGAnimations/ScreenWithMenuElements cancel.lua b/BGAnimations/ScreenWithMenuElements cancel.lua
@@ -0,0 +1,7 @@
+local screen = Var 'LoadingScreen'
+
+return Def.Actor {
+	StartTransitioningMessageCommand=function(s)
+		s:sleep(THEME:GetMetric(screen, 'CancelTransitionSeconds'))
+	end,
+}
diff --git a/BGAnimations/ScreenWithMenuElements in.lua b/BGAnimations/ScreenWithMenuElements in.lua
@@ -0,0 +1,7 @@
+local screen = Var 'LoadingScreen'
+
+return Def.Actor {
+	StartTransitioningMessageCommand=function(s)
+		s:sleep(THEME:GetMetric(screen, 'InTransitionSeconds'))
+	end,
+}
diff --git a/BGAnimations/ScreenWithMenuElements out.lua b/BGAnimations/ScreenWithMenuElements out.lua
@@ -0,0 +1,7 @@
+local screen = Var 'LoadingScreen'
+
+return Def.Actor {
+	StartTransitioningMessageCommand=function(s)
+		s:sleep(THEME:GetMetric(screen, 'OutTransitionSeconds'))
+	end,
+}
diff --git a/metrics.ini b/metrics.ini
@@ -162,6 +162,9 @@ SkipSpacingY=14
 
 # Defaults for most top-level screens
 [ScreenWithMenuElements]
+InTransitionSeconds=0
+OutTransitionSeconds=0
+CancelTransitionSeconds=0
 ShowHeader=true
 HeaderX=
 HeaderY=
@@ -577,11 +580,13 @@ MoreExitUnselectedP2Command=
 
 [ScreenPlayerOptionsPopup]
 Fallback="ScreenPlayerOptions"
+CancelTransitionSeconds=1
+
 ShowHeader=false
 ShowFooter=false
 TimerStealth=true
 TimerSeconds=-1
-ScreenOutDelay=1
+OutTransitionSeconds=1
 
 [OptionRowExitPlayer]
 Fallback="OptionRow"
@@ -842,6 +847,7 @@ ShowCreditDisplay=true
 [ScreenLogo]
 Class="ScreenWithMenuElements"
 NextScreen="ScreenDemonstration"
+OutTransitionSeconds=0.3
 TimerSeconds=20
 TimerStealth=false
 ForceTimer=true
@@ -852,6 +858,7 @@ ShowCreditDisplay=true
 Class="ScreenDemonstration"
 Fallback="ScreenGameplay"
 FooterText="STARLiGHT"
+InTransitionSeconds=0.297
 
 NextScreen="ScreenMDSplash"
 StartScreen=Branch.AttractStart()
@@ -896,6 +903,7 @@ ChoiceStart="text,START;screen,ScreenSelectMode"
 ChoiceArcStart="text,START;screen,ScreenSelectProfile"
 PrevScreen=Branch.FirstScreen()
 NextScreen="ScreenLogo"
+InTransitionSeconds=0.2
 
 TimerSeconds=20
 ForceTimer=true
@@ -907,6 +915,8 @@ ShowIcon=false
 
 [ScreenDDRNameEntry]
 Fallback="ScreenWithMenuElements"
+InTransitionSeconds=0.3
+OutTransitionSeconds=1
 PrevScreen=Branch.FirstScreen()
 NextScreen="ScreenSelectStyle"
 HeaderText="logout"
@@ -926,6 +936,9 @@ StopMusicOnBack=true
 
 [ScreenSelectMode]
 Fallback="ScreenTitleMenu"
+InTransitionSeconds=0.5
+OutTransitionSeconds=0.5
+
 ShowHeader=true
 HeaderText="mainmenu"
 ShowFooter=true
@@ -1000,6 +1013,9 @@ Fallback="ScreenWithMenuElements"
 Class="ScreenSelectProfile"
 HeaderText="login"
 #
+InTransitionSeconds=0.3
+OutTransitionSeconds=1
+
 NextScreen="ScreenSelectStyle"
 PrevScreen=Branch.FirstScreen()
 ScreenOnCommand=%function(self) self:lockinput(3); end;
@@ -1067,7 +1083,7 @@ Fallback="ScreenProfileSave"
 NextScreen="ScreenCaution"
 
 [ScreenProfileSave]
-
+OutTransitionSeconds=GAMESTATE:IsAnExtraStage() and 2 or 0
 
 [ScreenProfileSaveSummary]
 NextScreen=Branch.AfterSaveSummary()
@@ -1076,8 +1092,10 @@ NextScreen=Branch.AfterSaveSummary()
 ScreenOutDelay=0
 ScreenInDelay=0
 Fallback="ScreenSplash"
+InTransitionSeconds=0.3
 TimerSeconds=20
 TimerOnCommand=visible,true
+
 ShowHeader=true
 ShowFooter=false
 HeaderText="logout"
@@ -1092,11 +1110,14 @@ Class="ScreenProfileSave"
 Fallback="ScreenProfileSave"
 NextScreen="ScreenGameOver"
 PrevScreen="ScreenGameOver"
+OutTransitionSeconds=1
 TimerSeconds=-1
 
 [ScreenProfileLoad]
 Fallback="ScreenSelectProfile"
 NextScreen="ScreenCaution"
+InTransitionSeconds=1
+
 ShowHeader=false
 ShowFooter=false
 PlayMusic=true
@@ -1107,6 +1128,9 @@ CodeStart="Start"
 Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
 PrevScreen=Branch.FirstScreen()
+InTransitionSeconds=0.75
+OutTransitionSeconds=2
+
 ShowFooter=true
 HeaderText="selstyle"
 ShowHelp=true
@@ -1224,6 +1248,9 @@ Class="ScreenSelectMaster"
 Fallback="ScreenSelectMaster"
 PrevScreen=Branch.TitleMenu()
 TimerSeconds=40
+InTransitionSeconds=0.75
+OutTransitionSeconds=2
+
 HeaderText="selmode"
 ShowFooter=true
 FooterText="prepare"
@@ -1263,15 +1290,19 @@ ForceTimer=true
 TimerStealth=true
 TimerSeconds=3.5
 TimerOnCommand=draworder,6;visible,false
+InTransitionSeconds=0.4
+OutTransitionSeconds=1
 
 [ScreenSelectMusic]
 Class="ScreenSelectMusic"
 Fallback="ScreenWithMenuElements"
+InTransitionSeconds=0.5
+OutTransitionSeconds=1
+
 HeaderText="selmusic"
 PrevScreen=Branch.TitleMenu()
 TimerY=SCREEN_TOP+80
 ShowHelp=true
-
 TimerSeconds=90
 
 UsePlayerSelectMenu=false
@@ -1907,6 +1938,8 @@ Commify=false
 LeadingZeroMultiplyColor=color("#FFFFFF")
 
 [ScreenGameplay]
+InTransitionSeconds=0.7
+
 ShowScoreInRave=false
 CodeNames="SpeedUp,SpeedUp2,SpeedDown,SpeedDown2,AppearancePlusHarsher,AppearancePlusEasier,AppearancePlusHarsher2,AppearancePlusEasier2,AppearancePlusShow"
 CodeSpeedUp="MenuRight"
@@ -2234,6 +2267,8 @@ HelpOnCommand=draworder,10;diffusealpha,0;sleep,2;diffusealpha,1;diffuseshift;ef
 [ScreenGameOver]
 TimerSeconds=6
 NextScreen="ScreenWarning"
+InTransitionSeconds=0.4
+
 ForceTimer=true
 TimerStealth=true
 StopMusicOnBack=true
@@ -2545,4 +2580,4 @@ TextOnCommand=halign,1
 [ScreenAP]
 Fallback="ScreenWithMenuElements"
 ShowHeader=false
-ShowFooter=false
+ShowFooter=false