diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 2f4973cc70..b43833c97e 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -885,7 +885,7 @@ PrevScreen=@SongSelectionScreen() // This is the minimum delay after the "in" transition before the // "out" transition will begin. (NextScreen is loaded during this // time.) -MinimumDelay=3 +MinimumDelay=1 AllowBack=1 OverlayOnCommand= OverlayOffCommand= @@ -927,41 +927,41 @@ OniGameOverP2OffCommand= OniGameOverP2DieCommand=diffusealpha,1;bounceend,0.5;y,SCREEN_CENTER_Y;bob;effectperiod,4;effectmagnitude,0,6,0 LifeFrameX=SCREEN_CENTER_X+0 LifeFrameY=SCREEN_CENTER_Y-204 -LifeFrameOnCommand=addy,-100;sleep,0.5;linear,1;addy,100 -LifeFrameOffCommand=linear,1;addy,-100 +LifeFrameOnCommand=addy,-100;linear,0.5;addy,100 +LifeFrameOffCommand=linear,0.5;addy,-100 ScoreFrameX=SCREEN_CENTER_X+0 ScoreFrameY=SCREEN_CENTER_Y+208 -ScoreFrameOnCommand=addy,100;sleep,0.5;linear,1;addy,-100 -ScoreFrameOffCommand=linear,1;addy,100 +ScoreFrameOnCommand=addy,100;linear,0.5;addy,-100 +ScoreFrameOffCommand=linear,0.5;addy,100 LifeP1X=SCREEN_CENTER_X-180 LifeP1Y=SCREEN_CENTER_Y-212 -LifeP1OnCommand=addy,-100;sleep,0.5;linear,1;addy,100 -LifeP1OffCommand=linear,1;addy,-100 +LifeP1OnCommand=addy,-100;linear,0.5;addy,100 +LifeP1OffCommand=linear,0.5;addy,-100 LifeP2X=SCREEN_CENTER_X+180 LifeP2Y=SCREEN_CENTER_Y-212 -LifeP2OnCommand=rotationy,180;addy,-100;sleep,0.5;linear,1;addy,100 +LifeP2OnCommand=rotationy,180;addy,-100;linear,0.5;addy,100 LifeP2OffCommand=linear,1;addy,-100 CombinedLifeX=SCREEN_CENTER_X+0 CombinedLifeY=SCREEN_CENTER_Y-212 -CombinedLifeOnCommand=addy,-100;sleep,0.5;linear,1;addy,100 -CombinedLifeOffCommand=linear,1;addy,-100 +CombinedLifeOnCommand=addy,-100;linear,0.5;addy,100 +CombinedLifeOffCommand=linear,0.5;addy,-100 ShowStage=not GAMESTATE:IsCourseMode() StageX=SCREEN_CENTER_X+0 StageY=SCREEN_CENTER_Y-206 -StageOnCommand=draworder,100;addy,-100;sleep,0.5;linear,1;addy,100 -StageOffCommand=linear,1;addy,-100 +StageOnCommand=draworder,100;addy,-100;linear,0.5;addy,100 +StageOffCommand=linear,0.5;addy,-100 StageFrameX= StageFrameY= StageFrameOnCommand=hidden,1 StageFrameOffCommand= SongNumberP1X=SCREEN_CENTER_X-25 SongNumberP1Y=SCREEN_CENTER_Y-206 -SongNumberP1OnCommand=addy,-100;sleep,0.5;linear,1;addy,100 -SongNumberP1OffCommand=linear,1;addy,-100 +SongNumberP1OnCommand=addy,-100;linear,0.5;addy,100 +SongNumberP1OffCommand=linear,0.5;addy,-100 SongNumberP2X=SCREEN_CENTER_X+25 SongNumberP2Y=SCREEN_CENTER_Y-206 -SongNumberP2OnCommand=addy,-100;sleep,0.5;linear,1;addy,100 -SongNumberP2OffCommand=linear,1;addy,-100 +SongNumberP2OnCommand=addy,-100;linear,0.5;addy,100 +SongNumberP2OffCommand=linear,0.5;addy,-100 CourseSongNumberX= CourseSongNumberY= CourseSongNumberOnCommand=hidden,1 @@ -971,11 +971,11 @@ CourseSongNumberChangeOutCommand= ShowScoreInRave=1 ScoreP1X=SCREEN_CENTER_X-208 ScoreP1Y=SCREEN_CENTER_Y+202 -ScoreP1OnCommand=addy,100;sleep,0.5;linear,1;addy,-100 +ScoreP1OnCommand=addy,100;linear,1;addy,-100 ScoreP1OffCommand=linear,1;addy,100 ScoreP2X=SCREEN_CENTER_X+210 ScoreP2Y=SCREEN_CENTER_Y+202 -ScoreP2OnCommand=addy,100;sleep,0.5;linear,1;addy,-100 +ScoreP2OnCommand=addy,100;linear,1;addy,-100 ScoreP2OffCommand=linear,1;addy,100 SecondaryScoreP1X=SCREEN_CENTER_X-20 SecondaryScoreP1Y=SCREEN_CENTER_Y+0 @@ -987,12 +987,12 @@ SecondaryScoreP2OnCommand= SecondaryScoreP2OffCommand= PlayerOptionsP1X=SCREEN_CENTER_X+0 PlayerOptionsP1Y=SCREEN_CENTER_Y+194 -PlayerOptionsP1OnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100 -PlayerOptionsP1OffCommand=linear,1;addy,100 +PlayerOptionsP1OnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100 +PlayerOptionsP1OffCommand=linear,0.5;addy,100 PlayerOptionsP2X=SCREEN_CENTER_X+0 PlayerOptionsP2Y=SCREEN_CENTER_Y+210 -PlayerOptionsP2OnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100 -PlayerOptionsP2OffCommand=linear,1;addy,100 +PlayerOptionsP2OnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100 +PlayerOptionsP2OffCommand=linear,0.5;addy,100 ScoreboardC1P1X=SCREEN_CENTER_X-260 ScoreboardC1P1Y=SCREEN_CENTER_Y-160 ScoreboardC1P1OnCommand=zoom,1 @@ -1027,24 +1027,24 @@ StepsDescriptionP2OnCommand=hidden,1 StepsDescriptionP2OffCommand= SongOptionsX=SCREEN_CENTER_X+0 SongOptionsY=SCREEN_CENTER_Y+230 -SongOptionsOnCommand=zoom,0.5;addy,100;sleep,0.5;linear,1;addy,-100 -SongOptionsOffCommand=linear,1;addy,100 +SongOptionsOnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100 +SongOptionsOffCommand=linear,0.5;addy,100 DifficultyP1X=SCREEN_CENTER_X-230 DifficultyP1Y=SCREEN_CENTER_Y+183 -DifficultyP1OnCommand=cropbottom,0.5;addx,-200;sleep,0.5;linear,1;addx,200 -DifficultyP1OffCommand=cropbottom,0.5;linear,1;addx,-200 +DifficultyP1OnCommand=cropbottom,0.5;addx,-200;linear,0.5;addx,200 +DifficultyP1OffCommand=cropbottom,0.5;linear,0.5;addx,-200 DifficultyP1ReverseX=SCREEN_CENTER_X-254 DifficultyP1ReverseY=SCREEN_CENTER_Y-196 -DifficultyP1ReverseOnCommand=croptop,0.5;addx,-200;sleep,0.5;linear,1;addx,200 -DifficultyP1ReverseOffCommand=croptop,0.5;linear,1;addx,-200 +DifficultyP1ReverseOnCommand=croptop,0.5;addx,-200;linear,0.5;addx,200 +DifficultyP1ReverseOffCommand=croptop,0.5;linear,0.5;addx,-200 DifficultyP2X=SCREEN_CENTER_X+230 DifficultyP2Y=SCREEN_CENTER_Y+183 -DifficultyP2OnCommand=cropbottom,0.5;addx,200;sleep,0.5;linear,1;addx,-200 -DifficultyP2OffCommand=cropbottom,0.5;linear,1;addx,200 +DifficultyP2OnCommand=cropbottom,0.5;addx,200;linear,0.5;addx,-200 +DifficultyP2OffCommand=cropbottom,0.5;linear,0.5;addx,200 DifficultyP2ReverseX=SCREEN_CENTER_X+254 DifficultyP2ReverseY=SCREEN_CENTER_Y-196 -DifficultyP2ReverseOnCommand=croptop,0.5;addx,200;sleep,0.5;linear,1;addx,-200 -DifficultyP2ReverseOffCommand=croptop,0.5;linear,1;addx,200 +DifficultyP2ReverseOnCommand=croptop,0.5;addx,200;linear,0.5;addx,-200 +DifficultyP2ReverseOffCommand=croptop,0.5;linear,0.5;addx,200 DifficultyMeterP1OffCommand= DifficultyMeterP1OnCommand=hidden,1 DifficultyMeterP1ReverseOffCommand=