diff --git a/BGAnimations/ScreenCaution in.lua b/BGAnimations/ScreenCaution in.lua deleted file mode 100644 index 0c6ac4c2..00000000 --- a/BGAnimations/ScreenCaution in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0.4) end, -}; diff --git a/BGAnimations/ScreenCaution out.lua b/BGAnimations/ScreenCaution out.lua deleted file mode 100644 index 29902b44..00000000 --- a/BGAnimations/ScreenCaution out.lua +++ /dev/null @@ -1,4 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(1)end, -} - diff --git a/BGAnimations/ScreenDDRNameEntry in.redir b/BGAnimations/ScreenDDRNameEntry in.redir deleted file mode 100644 index 04be8001..00000000 --- a/BGAnimations/ScreenDDRNameEntry in.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenSelectProfile in \ No newline at end of file diff --git a/BGAnimations/ScreenDDRNameEntry out.redir b/BGAnimations/ScreenDDRNameEntry out.redir deleted file mode 100644 index 12f5fd2b..00000000 --- a/BGAnimations/ScreenDDRNameEntry out.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenSelectProfile out \ No newline at end of file diff --git a/BGAnimations/ScreenDataSaveSummary in.redir b/BGAnimations/ScreenDataSaveSummary in.redir deleted file mode 100644 index 04be8001..00000000 --- a/BGAnimations/ScreenDataSaveSummary in.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenSelectProfile in \ No newline at end of file diff --git a/BGAnimations/ScreenDataSaveSummaryEnd out.redir b/BGAnimations/ScreenDataSaveSummaryEnd out.redir deleted file mode 100644 index 12f5fd2b..00000000 --- a/BGAnimations/ScreenDataSaveSummaryEnd out.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenSelectProfile out \ No newline at end of file diff --git a/BGAnimations/ScreenDemonstration in.lua b/BGAnimations/ScreenDemonstration in.lua deleted file mode 100644 index 563844ec..00000000 --- a/BGAnimations/ScreenDemonstration in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - InitCommand=function(s) s:sleep(0.297) end, -} \ No newline at end of file diff --git a/BGAnimations/ScreenEvaluationSummary in.redir b/BGAnimations/ScreenEvaluationSummary in.redir deleted file mode 100644 index 04b2ead7..00000000 --- a/BGAnimations/ScreenEvaluationSummary in.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/BGAnimations/ScreenGameOver in.lua b/BGAnimations/ScreenGameOver in.lua deleted file mode 100644 index 8a865e96..00000000 --- a/BGAnimations/ScreenGameOver in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor - OnCommand=function(s) s:sleep(0.4) end, -} diff --git a/BGAnimations/ScreenGameplay in.lua b/BGAnimations/ScreenGameplay in.lua deleted file mode 100644 index 5579accd..00000000 --- a/BGAnimations/ScreenGameplay in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0.7) end, -}; diff --git a/BGAnimations/ScreenLogo out.lua b/BGAnimations/ScreenLogo out.lua deleted file mode 100644 index be63d5ea..00000000 --- a/BGAnimations/ScreenLogo out.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0.3) end, -} \ No newline at end of file diff --git a/BGAnimations/ScreenPlayerOptionsPopup cancel.redir b/BGAnimations/ScreenPlayerOptionsPopup cancel.redir deleted file mode 100644 index 3e7ef366..00000000 --- a/BGAnimations/ScreenPlayerOptionsPopup cancel.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenSelectMusic out \ No newline at end of file diff --git a/BGAnimations/ScreenProfileLoad in.lua b/BGAnimations/ScreenProfileLoad in.lua deleted file mode 100644 index f402b546..00000000 --- a/BGAnimations/ScreenProfileLoad in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(1) end, -} \ No newline at end of file diff --git a/BGAnimations/ScreenProfileLoad out.redir b/BGAnimations/ScreenProfileLoad out.redir deleted file mode 100644 index 04b2ead7..00000000 --- a/BGAnimations/ScreenProfileLoad out.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/BGAnimations/ScreenProfileSave in.redir b/BGAnimations/ScreenProfileSave in.redir deleted file mode 100644 index 04b2ead7..00000000 --- a/BGAnimations/ScreenProfileSave in.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/BGAnimations/ScreenProfileSave out.lua b/BGAnimations/ScreenProfileSave out.lua deleted file mode 100644 index 18e2b206..00000000 --- a/BGAnimations/ScreenProfileSave out.lua +++ /dev/null @@ -1,7 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) - if GAMESTATE:IsAnExtraStage() then - s:sleep(2) - end - end -} \ No newline at end of file diff --git a/BGAnimations/ScreenSelectMode in.lua b/BGAnimations/ScreenSelectMode in.lua deleted file mode 100644 index 7d34cd56..00000000 --- a/BGAnimations/ScreenSelectMode in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0.5) end, -} \ No newline at end of file diff --git a/BGAnimations/ScreenSelectMode out.lua b/BGAnimations/ScreenSelectMode out.lua deleted file mode 100644 index 6421951d..00000000 --- a/BGAnimations/ScreenSelectMode out.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - StartTransitioningCommand=function(s) s:sleep(0.5) end, -}; diff --git a/BGAnimations/ScreenSelectMusic in.lua b/BGAnimations/ScreenSelectMusic in.lua deleted file mode 100644 index 7d34cd56..00000000 --- a/BGAnimations/ScreenSelectMusic in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0.5) end, -} \ No newline at end of file diff --git a/BGAnimations/ScreenSelectMusic out.lua b/BGAnimations/ScreenSelectMusic out.lua deleted file mode 100644 index 7ed1d362..00000000 --- a/BGAnimations/ScreenSelectMusic out.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.ActorFrame{ - OnCommand=function(s) s:sleep(1) end, -}; diff --git a/BGAnimations/ScreenSelectPlayCourseMode in.lua b/BGAnimations/ScreenSelectPlayCourseMode in.lua deleted file mode 100644 index 022aa8a3..00000000 --- a/BGAnimations/ScreenSelectPlayCourseMode in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0.75) end, -}; diff --git a/BGAnimations/ScreenSelectPlayCourseMode out.redir b/BGAnimations/ScreenSelectPlayCourseMode out.redir deleted file mode 100644 index 7186c869..00000000 --- a/BGAnimations/ScreenSelectPlayCourseMode out.redir +++ /dev/null @@ -1 +0,0 @@ -ScreenSelectStyle out \ No newline at end of file diff --git a/BGAnimations/ScreenSelectProfile in.lua b/BGAnimations/ScreenSelectProfile in.lua deleted file mode 100644 index 038fd97a..00000000 --- a/BGAnimations/ScreenSelectProfile in.lua +++ /dev/null @@ -1,5 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) - s:sleep(0.3) - end, -}; diff --git a/BGAnimations/ScreenSelectProfile out.lua b/BGAnimations/ScreenSelectProfile out.lua deleted file mode 100644 index e774ed84..00000000 --- a/BGAnimations/ScreenSelectProfile out.lua +++ /dev/null @@ -1,4 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(1) end, -}; - diff --git a/BGAnimations/ScreenSelectStyle in.lua b/BGAnimations/ScreenSelectStyle in.lua deleted file mode 100644 index 74928d76..00000000 --- a/BGAnimations/ScreenSelectStyle in.lua +++ /dev/null @@ -1,5 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) - s:sleep(0.75) - end, -}; diff --git a/BGAnimations/ScreenSelectStyle out.lua b/BGAnimations/ScreenSelectStyle out.lua deleted file mode 100644 index 4d50a049..00000000 --- a/BGAnimations/ScreenSelectStyle out.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(2) end, -} diff --git a/BGAnimations/ScreenSortList in.redir b/BGAnimations/ScreenSortList in.redir deleted file mode 100644 index 04b2ead7..00000000 --- a/BGAnimations/ScreenSortList in.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/BGAnimations/ScreenSortList out.redir b/BGAnimations/ScreenSortList out.redir deleted file mode 100644 index 04b2ead7..00000000 --- a/BGAnimations/ScreenSortList out.redir +++ /dev/null @@ -1 +0,0 @@ -_blank \ No newline at end of file diff --git a/BGAnimations/ScreenStageInformation out.lua b/BGAnimations/ScreenStageInformation out.lua deleted file mode 100644 index 86a0276c..00000000 --- a/BGAnimations/ScreenStageInformation out.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - StartTransitioningCommand=function(s) s:sleep(6) end, -} diff --git a/BGAnimations/ScreenTitleMenu in.lua b/BGAnimations/ScreenTitleMenu in.lua deleted file mode 100644 index e32d6546..00000000 --- a/BGAnimations/ScreenTitleMenu in.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0.2) end, -}; diff --git a/BGAnimations/ScreenTitleMenu out.lua b/BGAnimations/ScreenTitleMenu out.lua deleted file mode 100644 index f3a37e15..00000000 --- a/BGAnimations/ScreenTitleMenu out.lua +++ /dev/null @@ -1,3 +0,0 @@ -return Def.Actor{ - OnCommand=function(s) s:sleep(0) end, -}; diff --git a/BGAnimations/ScreenWithMenuElements cancel.lua b/BGAnimations/ScreenWithMenuElements cancel.lua new file mode 100644 index 00000000..c526d2d2 --- /dev/null +++ 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, +} \ No newline at end of file diff --git a/BGAnimations/ScreenWithMenuElements in.lua b/BGAnimations/ScreenWithMenuElements in.lua new file mode 100644 index 00000000..6968626d --- /dev/null +++ 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, +} \ No newline at end of file diff --git a/BGAnimations/ScreenWithMenuElements out.lua b/BGAnimations/ScreenWithMenuElements out.lua new file mode 100644 index 00000000..4ecd2016 --- /dev/null +++ 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, +} \ No newline at end of file diff --git a/metrics.ini b/metrics.ini index 07c25c4e..b18140ae 100644 --- 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 \ No newline at end of file +ShowFooter=false