diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 72c8313460..725ca1e47f 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -543,10 +543,10 @@ ScoreP2OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 ScoreP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 # Don't use relative motion here. It's usually possible to change the # sort again while this command is still executing. -ScoreP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,520 -ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,520 -ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,520 -ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,520 +ScoreP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58 +ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 +ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58 +ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 MachineRankX= MachineRankY= MachineRankOnCommand=hidden,1 @@ -960,12 +960,12 @@ CourseSongNumberOffCommand= CourseSongNumberChangeInCommand= CourseSongNumberChangeOutCommand= ShowScoreInRave=1 -ScoreP1X=SCREEN_CENTER_X-214 -ScoreP1Y=SCREEN_CENTER_Y+204 +ScoreP1X=SCREEN_CENTER_X-208 +ScoreP1Y=SCREEN_CENTER_Y+202 ScoreP1OnCommand=addy,100;sleep,0.5;linear,1;addy,-100 ScoreP1OffCommand=linear,1;addy,100 -ScoreP2X=SCREEN_CENTER_X+214 -ScoreP2Y=SCREEN_CENTER_Y+204 +ScoreP2X=SCREEN_CENTER_X+210 +ScoreP2Y=SCREEN_CENTER_Y+202 ScoreP2OnCommand=addy,100;sleep,0.5;linear,1;addy,-100 ScoreP2OffCommand=linear,1;addy,100 SecondaryScoreP1X=SCREEN_CENTER_X-20 @@ -1218,17 +1218,20 @@ ShowHolds=0 ShowMines=0 ShowHands=0 ShowRolls=0 -ShowGraphArea=0 +ShowGraphArea=1 ShowPerDifficultyAward=0 ShowPeakComboAward=0 ShowTotalScoreArea=0 ShowRecordsArea=1 -BannerWidth=248 -BannerHeight=78 + +BannerWidth=256 +BannerHeight=80 + W1LabelX=SCREEN_CENTER_X+0 W1LabelY=SCREEN_CENTER_Y-80 W1LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1;decelerate,0.3;addy,-SCREEN_HEIGHT W1LabelOffCommand=sleep,0.7;accelerate,0.3;addy,SCREEN_HEIGHT + W1NumberP1X=SCREEN_CENTER_X-90 W1NumberP1Y=SCREEN_CENTER_Y-80 W1NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,SCREEN_WIDTH/2 @@ -1237,105 +1240,120 @@ W1NumberP2X=SCREEN_CENTER_X+90 W1NumberP2Y=SCREEN_CENTER_Y-80 W1NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,-SCREEN_WIDTH/2 W1NumberP2OffCommand=sleep,0.7;accelerate,0.3;addx,SCREEN_WIDTH/2 + W2LabelX=SCREEN_CENTER_X+0 -W2LabelY=SCREEN_CENTER_Y-48 +W2LabelY=SCREEN_CENTER_Y-60 W2LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.2;decelerate,0.3;addy,-SCREEN_HEIGHT W2LabelOffCommand=sleep,0.6;accelerate,0.3;addy,SCREEN_HEIGHT -W2NumberP1X=SCREEN_CENTER_X-90 -W2NumberP1Y=SCREEN_CENTER_Y-48 + +W2NumberP1X=SCREEN_CENTER_X-85 +W2NumberP1Y=SCREEN_CENTER_Y-60 W2NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,SCREEN_WIDTH/2 W2NumberP1OffCommand=sleep,0.6;accelerate,0.3;addx,-SCREEN_WIDTH/2 -W2NumberP2X=SCREEN_CENTER_X+90 -W2NumberP2Y=SCREEN_CENTER_Y-48 +W2NumberP2X=SCREEN_CENTER_X+85 +W2NumberP2Y=SCREEN_CENTER_Y-60 W2NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,-SCREEN_WIDTH/2 W2NumberP2OffCommand=sleep,0.6;accelerate,0.3;addx,SCREEN_WIDTH/2 + W3LabelX=SCREEN_CENTER_X+0 -W3LabelY=SCREEN_CENTER_Y-16 +W3LabelY=SCREEN_CENTER_Y-40 W3LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.3;decelerate,0.3;addy,-SCREEN_HEIGHT W3LabelOffCommand=sleep,0.5;accelerate,0.3;addy,SCREEN_HEIGHT -W3NumberP1X=SCREEN_CENTER_X-90 -W3NumberP1Y=SCREEN_CENTER_Y-16 + +W3NumberP1X=SCREEN_CENTER_X-80 +W3NumberP1Y=SCREEN_CENTER_Y-40 W3NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,SCREEN_WIDTH/2 W3NumberP1OffCommand=sleep,0.5;accelerate,0.3;addx,-SCREEN_WIDTH/2 -W3NumberP2X=SCREEN_CENTER_X+90 -W3NumberP2Y=SCREEN_CENTER_Y-16 +W3NumberP2X=SCREEN_CENTER_X+80 +W3NumberP2Y=SCREEN_CENTER_Y-40 W3NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,-SCREEN_WIDTH/2 W3NumberP2OffCommand=sleep,0.5;accelerate,0.3;addx,SCREEN_WIDTH/2 + W4LabelX=SCREEN_CENTER_X+0 -W4LabelY=SCREEN_CENTER_Y+16 +W4LabelY=SCREEN_CENTER_Y-20 W4LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.4;decelerate,0.3;addy,-SCREEN_HEIGHT W4LabelOffCommand=sleep,0.4;accelerate,0.3;addy,SCREEN_HEIGHT -W4NumberP1X=SCREEN_CENTER_X-90 -W4NumberP1Y=SCREEN_CENTER_Y+16 + +W4NumberP1X=SCREEN_CENTER_X-75 +W4NumberP1Y=SCREEN_CENTER_Y-20 W4NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,SCREEN_WIDTH/2 W4NumberP1OffCommand=sleep,0.4;accelerate,0.3;addx,-SCREEN_WIDTH/2 -W4NumberP2X=SCREEN_CENTER_X+90 -W4NumberP2Y=SCREEN_CENTER_Y+16 +W4NumberP2X=SCREEN_CENTER_X+75 +W4NumberP2Y=SCREEN_CENTER_Y-20 W4NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,-SCREEN_WIDTH/2 W4NumberP2OffCommand=sleep,0.4;accelerate,0.3;addx,SCREEN_WIDTH/2 -W5LabelX=SCREEN_CENTER_X+0 -W5LabelY=SCREEN_CENTER_Y+48 + +W5LabelX=SCREEN_CENTER_X +W5LabelY=SCREEN_CENTER_Y W5LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.5;decelerate,0.3;addy,-SCREEN_HEIGHT W5LabelOffCommand=sleep,0.3;accelerate,0.3;addy,SCREEN_HEIGHT -W5NumberP1X=SCREEN_CENTER_X-90 -W5NumberP1Y=SCREEN_CENTER_Y+48 + +W5NumberP1X=SCREEN_CENTER_X-70 +W5NumberP1Y=SCREEN_CENTER_Y W5NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,SCREEN_WIDTH/2 W5NumberP1OffCommand=sleep,0.3;accelerate,0.3;addx,-SCREEN_WIDTH/2 -W5NumberP2X=SCREEN_CENTER_X+90 -W5NumberP2Y=SCREEN_CENTER_Y+48 +W5NumberP2X=SCREEN_CENTER_X+70 +W5NumberP2Y=SCREEN_CENTER_Y W5NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,-SCREEN_WIDTH/2 W5NumberP2OffCommand=sleep,0.3;accelerate,0.3;addx,SCREEN_WIDTH/2 + MissLabelX=SCREEN_CENTER_X+0 -MissLabelY=SCREEN_CENTER_Y+80 +MissLabelY=SCREEN_CENTER_Y+20 MissLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.6;decelerate,0.3;addy,-SCREEN_HEIGHT MissLabelOffCommand=sleep,0.2;accelerate,0.3;addy,SCREEN_HEIGHT -MissNumberP1X=SCREEN_CENTER_X-90 -MissNumberP1Y=SCREEN_CENTER_Y+80 + +MissNumberP1X=SCREEN_CENTER_X-65 +MissNumberP1Y=SCREEN_CENTER_Y+20 MissNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.6;decelerate,0.3;addx,SCREEN_WIDTH/2 MissNumberP1OffCommand=sleep,0.2;accelerate,0.3;addx,-SCREEN_WIDTH/2 -MissNumberP2X=SCREEN_CENTER_X+90 -MissNumberP2Y=SCREEN_CENTER_Y+80 +MissNumberP2X=SCREEN_CENTER_X+65 +MissNumberP2Y=SCREEN_CENTER_Y+20 MissNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.6;decelerate,0.3;addx,-SCREEN_WIDTH/2 MissNumberP2OffCommand=sleep,0.2;accelerate,0.3;addx,SCREEN_WIDTH/2 + HeldLabelX=SCREEN_CENTER_X+0 -HeldLabelY=SCREEN_CENTER_Y+112 +HeldLabelY=SCREEN_CENTER_Y+40 HeldLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.7;decelerate,0.3;addy,-SCREEN_HEIGHT HeldLabelOffCommand=sleep,0.1;accelerate,0.3;addy,SCREEN_HEIGHT -HeldNumberP1X=SCREEN_CENTER_X-90 -HeldNumberP1Y=SCREEN_CENTER_Y+112 + +HeldNumberP1X=SCREEN_CENTER_X-60 +HeldNumberP1Y=SCREEN_CENTER_Y+40 HeldNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,SCREEN_WIDTH/2 HeldNumberP1OffCommand=sleep,0.1;accelerate,0.3;addx,-SCREEN_WIDTH/2 -HeldNumberP2X=SCREEN_CENTER_X+90 -HeldNumberP2Y=SCREEN_CENTER_Y+112 +HeldNumberP2X=SCREEN_CENTER_X+60 +HeldNumberP2Y=SCREEN_CENTER_Y+40 HeldNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,-SCREEN_WIDTH/2 HeldNumberP2OffCommand=sleep,0.1;accelerate,0.3;addx,SCREEN_WIDTH/2 -MaxComboMaxDigits=4 + +MaxComboMaxDigits=5 MaxComboLabelX= MaxComboLabelY= MaxComboLabelOnCommand=hidden,1 MaxComboLabelOffCommand= + MaxComboNumberP1X=SCREEN_CENTER_X-186 -MaxComboNumberP1Y=SCREEN_CENTER_Y+94 -MaxComboNumberP1OnCommand=zoom,1.2;diffusealpha,0;linear,0.7;diffuse,1,1,0,1 +MaxComboNumberP1Y=SCREEN_CENTER_Y+62 +MaxComboNumberP1OnCommand=diffusealpha,0;linear,0.7;diffuse,1,1,0,1 MaxComboNumberP1OffCommand=linear,0.7;diffusealpha,0 MaxComboNumberP2X=SCREEN_CENTER_X+260 -MaxComboNumberP2Y=SCREEN_CENTER_Y+94 -MaxComboNumberP2OnCommand=zoom,1.2;diffusealpha,0;linear,0.7;diffuse,1,1,0,1 +MaxComboNumberP2Y=SCREEN_CENTER_Y+62 +MaxComboNumberP2OnCommand=diffusealpha,0;linear,0.7;diffuse,1,1,0,1 MaxComboNumberP2OffCommand=linear,0.7;diffusealpha,0 -MachineRecordP1X=SCREEN_CENTER_X-250 -MachineRecordP1Y=SCREEN_CENTER_Y+158 + +MachineRecordP1X=SCREEN_CENTER_X-75 +MachineRecordP1Y=SCREEN_CENTER_Y+100 MachineRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift MachineRecordP1OffCommand=linear,0.7;diffusealpha,0 -MachineRecordP2X=SCREEN_CENTER_X+120 -MachineRecordP2Y=SCREEN_CENTER_Y+158 +MachineRecordP2X=SCREEN_CENTER_X+140 +MachineRecordP2Y=SCREEN_CENTER_Y+100 MachineRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift MachineRecordP2OffCommand=linear,0.7;diffusealpha,0 -PersonalRecordP1X=SCREEN_CENTER_X-120 -PersonalRecordP1Y=SCREEN_CENTER_Y+158 +PersonalRecordP1X=SCREEN_CENTER_X-75 +PersonalRecordP1Y=SCREEN_CENTER_Y+70 PersonalRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift PersonalRecordP1OffCommand=linear,0.7;diffusealpha,0 -PersonalRecordP2X=SCREEN_CENTER_X+250 -PersonalRecordP2Y=SCREEN_CENTER_Y+158 +PersonalRecordP2X=SCREEN_CENTER_X+140 +PersonalRecordP2Y=SCREEN_CENTER_Y+70 PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0 @@ -1391,21 +1409,21 @@ StageY=SCREEN_CENTER_Y-168 StageOnCommand=draworder,1;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT StageOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DifficultyIconP1X=SCREEN_CENTER_X-106 -DifficultyIconP1Y=SCREEN_CENTER_Y-160 -DifficultyIconP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +DifficultyIconP1X=SCREEN_CENTER_X-154 +DifficultyIconP1Y=SCREEN_CENTER_Y-110 +DifficultyIconP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; DifficultyIconP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DifficultyIconP2X=SCREEN_CENTER_X+106 -DifficultyIconP2Y=SCREEN_CENTER_Y-160 -DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +DifficultyIconP2X=SCREEN_CENTER_X+154 +DifficultyIconP2Y=SCREEN_CENTER_Y-110 +DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -PlayerOptionsP1X=SCREEN_CENTER_X-120 -PlayerOptionsP1Y=SCREEN_CENTER_Y-100 +PlayerOptionsP1X=SCREEN_CENTER_X-70 +PlayerOptionsP1Y=SCREEN_CENTER_Y-182 PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT PlayerOptionsP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -PlayerOptionsP2X=SCREEN_CENTER_X+120 -PlayerOptionsP2Y=SCREEN_CENTER_Y-100 +PlayerOptionsP2X=SCREEN_CENTER_X+70 +PlayerOptionsP2Y=SCREEN_CENTER_Y-90 PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.5;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT @@ -2668,16 +2686,16 @@ BrightnessFadeCommand= ClampOutputPercent=0 [Judgment] -W1Command=shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 -W2Command=shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 -W3Command=shadowlength,4;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 -W4Command=shadowlength,4;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 -W5Command=shadowlength,4;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0 -MissCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0 +W1Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 +W2Command=shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 +W3Command=shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 +W4Command=shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 +W5Command=shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0 +MissCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0 [HoldJudgment] -LetGoCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0;diffusealpha,0 -HeldCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0 +LetGoCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0;diffusealpha,0 +HeldCommand=shadowlength,0;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0 [Combo] ShowComboAt=2 @@ -4568,4 +4586,4 @@ NextScreen=@SongSelectionScreen() [ScreenOptionsManageEditSteps] Class=ScreenOptionsManageEditSteps -Fallback=ScreenOptionsSimple +Fallback=ScreenOptionsSimple \ No newline at end of file