From 522193f9c4cf15d4748a9509cc6132432c7ee712 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 3 Mar 2007 21:07:52 +0000 Subject: [PATCH] reduce eval redundancy --- stepmania/Themes/default/metrics.ini | 397 ++++++--------------------- 1 file changed, 80 insertions(+), 317 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 1b667baf3c..7c3abb135b 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -653,8 +653,8 @@ MeterP2Y=SCREEN_CENTER_Y+157 MeterP2X=SCREEN_CENTER_X-110 MeterP2OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 MeterP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 -DifficultyIconP1Y=SCREEN_CENTER_Y+160 DifficultyIconP1X=SCREEN_CENTER_X-175 +DifficultyIconP1Y=SCREEN_CENTER_Y+160 DifficultyIconP1OnCommand=shadowlength,2;zoomx,0;zoomy,0;linear,0.5;zoomx,1.0;zoomy,1.0; DifficultyIconP1OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0;shadowlength,0 DifficultyIconP2Y=SCREEN_CENTER_Y+160 @@ -892,33 +892,20 @@ SongOptionsX=SCREEN_CENTER_X+0 SongOptionsY=SCREEN_CENTER_Y+230 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;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;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;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;linear,0.5;addx,-200 -DifficultyP2ReverseOffCommand=croptop,0.5;linear,0.5;addx,200 +DifficultyP1X= +DifficultyP1Y= DifficultyP1OnCommand= DifficultyP1OffCommand=linear,0.5;addx,-200 DifficultyP1SetReverseCommand=x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200;cropbottom,0;croptop,0.5 DifficultyP1SetNoReverseCommand=x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200;cropbottom,0.5;croptop,0 +DifficultyP2X= +DifficultyP2Y= DifficultyP2OnCommand= DifficultyP2OffCommand=linear,0.5;addx,200 DifficultyP2SetReverseCommand=x,SCREEN_CENTER_X+254;y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200;cropbottom,0;croptop,0.5 DifficultyP2SetNoReverseCommand=x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200;cropbottom,0.5;croptop,0 - LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160 LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140 # This is used if one player is in reverse and the other isn't. @@ -1038,6 +1025,7 @@ PlayerType="PlayerShared" Fallback="ScreenWithMenuElements" Class="ScreenEvaluation" Summary=false +TimerSeconds=15 PlayerOptionsSeparator="," MaxComboNumDigits=4 StyleIcon=true @@ -1064,6 +1052,23 @@ ShowRecordsArea=true BannerWidth=256 BannerHeight=80 +GradeP1X=SCREEN_CENTER_X-226 +GradeP1Y=SCREEN_CENTER_Y-140 +GradeP1OnCommand=glowshift;scroll;effectperiod,2;addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 +GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 +GradeP2X=SCREEN_CENTER_X+226 +GradeP2Y=SCREEN_CENTER_Y-140 +GradeP2OnCommand=glowshift;scroll;effectperiod,2;addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 +GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 +GradeFrameP1X=SCREEN_CENTER_X-226 +GradeFrameP1Y=SCREEN_CENTER_Y-140 +GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 +GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 +GradeFrameP2X=SCREEN_CENTER_X+226 +GradeFrameP2Y=SCREEN_CENTER_Y-140 +GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 +GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 + W1LabelX=SCREEN_CENTER_X+0 W1LabelY=SCREEN_CENTER_Y-80 W1LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -1177,6 +1182,28 @@ MaxComboNumberP2Y=SCREEN_CENTER_Y+62 MaxComboNumberP2OnCommand=diffusealpha,0;linear,0.7;diffuse,1,1,0,1 MaxComboNumberP2OffCommand=linear,0.7;diffusealpha,0 +LargeBannerX=SCREEN_CENTER_X+0 +LargeBannerY=SCREEN_CENTER_Y-140 +LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +LargeBannerFrameX=SCREEN_CENTER_X+0 +LargeBannerFrameY=SCREEN_CENTER_Y-140 +LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT + +ScoreLabelX=SCREEN_CENTER_X+0 +ScoreLabelY=SCREEN_CENTER_Y+140 +ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT +ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT +ScoreNumberP1X=SCREEN_CENTER_X-160 +ScoreNumberP1Y=SCREEN_CENTER_Y+140 +ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 +ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2 +ScoreNumberP2X=SCREEN_CENTER_X+160 +ScoreNumberP2Y=SCREEN_CENTER_Y+140 +ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 +ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 + MachineRecordP1X=SCREEN_CENTER_X-250 MachineRecordP1Y=SCREEN_CENTER_Y+160 MachineRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift @@ -1194,6 +1221,34 @@ PersonalRecordP2Y=SCREEN_CENTER_Y+190 PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0 +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+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 + +SurvivedFrameP1X=SCREEN_CENTER_X-224 +SurvivedFrameP1Y=SCREEN_CENTER_Y+16 +SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 +SurvivedFrameP1OffCommand=linear,0.7;diffusealpha,0 +SurvivedFrameP2X=SCREEN_CENTER_X+224 +SurvivedFrameP2Y=SCREEN_CENTER_Y+16 +SurvivedFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 +SurvivedFrameP2OffCommand=linear,0.7;diffusealpha,0 +SurvivedNumberP1X=SCREEN_CENTER_X-224 +SurvivedNumberP1Y=SCREEN_CENTER_Y+0 +SurvivedNumberP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 +SurvivedNumberP1OffCommand=linear,0.7;diffusealpha,0 +SurvivedNumberP2X=SCREEN_CENTER_X+224 +SurvivedNumberP2Y=SCREEN_CENTER_Y+0 +SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 +SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 + +CheerDelaySeconds=2.5 + [ScreenNetEvaluation] Class="ScreenNetEvaluation" Fallback="ScreenEvaluationStage" @@ -1228,17 +1283,7 @@ ShowSurvivedArea=false ShowWinArea=false ShowMaxCombo=true ShowScoreArea=true -ShowTimeArea=true -TimerSeconds=15 - -LargeBannerX=SCREEN_CENTER_X+0 -LargeBannerY=SCREEN_CENTER_Y-140 -LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -LargeBannerFrameX=SCREEN_CENTER_X+0 -LargeBannerFrameY=SCREEN_CENTER_Y-140 -LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +ShowTimeArea=false ShowStage=true StageX=SCREEN_CENTER_X+0 @@ -1255,33 +1300,6 @@ 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-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+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 - -GradeFrameP1X=SCREEN_CENTER_X-226 -GradeFrameP1Y=SCREEN_CENTER_Y-140 -GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeFrameP2X=SCREEN_CENTER_X+226 -GradeFrameP2Y=SCREEN_CENTER_Y-140 -GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 - -GradeP1X=SCREEN_CENTER_X-226 -GradeP1Y=SCREEN_CENTER_Y-140 -GradeP1OnCommand=glowshift;scroll;effectperiod,2;addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeP2X=SCREEN_CENTER_X+226 -GradeP2Y=SCREEN_CENTER_Y-140 -GradeP2OnCommand=glowshift;scroll;effectperiod,2;addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 - BonusFrameP1X=SCREEN_CENTER_X-224 BonusFrameP1Y=SCREEN_CENTER_Y+16 BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 @@ -1383,45 +1401,22 @@ BarActual5P2OffCommand=linear,0.7;diffusealpha,0 BarActualMaxCommand=glowshift;effectperiod,0.5 -ScoreLabelX=SCREEN_CENTER_X+0 -ScoreLabelY=SCREEN_CENTER_Y+140 -ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT -ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT - ScoreNumberP1X=SCREEN_CENTER_X-129 ScoreNumberP1Y=SCREEN_CENTER_Y+140 -ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 -ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2 ScoreNumberP2X=SCREEN_CENTER_X+129 ScoreNumberP2Y=SCREEN_CENTER_Y+140 -ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 - -TimeLabelX=SCREEN_CENTER_X -TimeLabelY=SCREEN_CENTER_Y+160 -TimeLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.7;decelerate,0.3;addy,-SCREEN_HEIGHT -TimeLabelOffCommand=sleep,0.1;accelerate,0.3;addy,SCREEN_HEIGHT -TimeNumberP1X=SCREEN_CENTER_X-120 -TimeNumberP1Y=SCREEN_CENTER_Y+160 -TimeNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,SCREEN_WIDTH/2 -TimeNumberP1OffCommand=sleep,0.1;accelerate,0.3;addx,-SCREEN_WIDTH/2 -TimeNumberP2X=SCREEN_CENTER_X+120 -TimeNumberP2Y=SCREEN_CENTER_Y+160 -TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,-SCREEN_WIDTH/2 -TimeNumberP2OffCommand=sleep,0.1;accelerate,0.3;addx,SCREEN_WIDTH/2 TryExtraStageX=SCREEN_CENTER_X+0 TryExtraStageY=SCREEN_CENTER_Y+188 TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift TryExtraStageOffCommand=linear,0.7;diffusealpha,0 -CheerDelaySeconds=2.5 [ScreenEvaluationSummary] Fallback="ScreenEvaluationStage" NextScreen=GetEvaluationNextScreen( "ScreenNameEntry", "ScreenGameOver", "ScreenNameEntry" ) Summary=true ShowTimeArea=false -TimerSeconds=30 + SmallBanner1X=SCREEN_CENTER_X-60 SmallBanner1Y=SCREEN_CENTER_Y-160 SmallBanner1OnCommand=zoom,0.5;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -1450,15 +1445,6 @@ CategoryRecordP2X=SCREEN_CENTER_X+186 CategoryRecordP2Y=SCREEN_CENTER_Y+158 CategoryRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift CategoryRecordP2OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP1X=SCREEN_CENTER_X-186 -CourseRecordP1Y=SCREEN_CENTER_Y+158 -CourseRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP1OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP2X=SCREEN_CENTER_X+186 -CourseRecordP2Y=SCREEN_CENTER_Y+158 -CourseRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP2OffCommand=linear,0.7;diffusealpha,0 -CheerDelaySeconds=2.5 [ScreenEvaluationNonstop] Fallback="ScreenEvaluation" @@ -1472,68 +1458,6 @@ ShowMaxCombo=false ShowScoreArea=true ShowTimeArea=false ShowStage=false -TimerSeconds=30 -LargeBannerX=SCREEN_CENTER_X+0 -LargeBannerY=SCREEN_CENTER_Y-140 -LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -LargeBannerFrameX=SCREEN_CENTER_X+0 -LargeBannerFrameY=SCREEN_CENTER_Y-140 -LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -PlayerOptionsP1X=SCREEN_CENTER_X-120 -PlayerOptionsP1Y=SCREEN_CENTER_Y-100 -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 -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 -GradeFrameP1X=SCREEN_CENTER_X-226 -GradeFrameP1Y=SCREEN_CENTER_Y-140 -GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeFrameP2X=SCREEN_CENTER_X+226 -GradeFrameP2Y=SCREEN_CENTER_Y-140 -GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 -GradeP1X=SCREEN_CENTER_X-226 -GradeP1Y=SCREEN_CENTER_Y-140 -GradeP1OnCommand=glowshift;scroll;effectperiod,2;addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeP2X=SCREEN_CENTER_X+226 -GradeP2Y=SCREEN_CENTER_Y-140 -GradeP2OnCommand=glowshift;scroll;effectperiod,2;addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 -SurvivedFrameP1X=SCREEN_CENTER_X-224 -SurvivedFrameP1Y=SCREEN_CENTER_Y+16 -SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedFrameP2X=SCREEN_CENTER_X+224 -SurvivedFrameP2Y=SCREEN_CENTER_Y+16 -SurvivedFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP2OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP1X=SCREEN_CENTER_X-224 -SurvivedNumberP1Y=SCREEN_CENTER_Y+0 -SurvivedNumberP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP2X=SCREEN_CENTER_X+224 -SurvivedNumberP2Y=SCREEN_CENTER_Y+0 -SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -ScoreLabelX=SCREEN_CENTER_X+0 -ScoreLabelY=SCREEN_CENTER_Y+140 -ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT -ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT -ScoreNumberP1X=SCREEN_CENTER_X-160 -ScoreNumberP1Y=SCREEN_CENTER_Y+140 -ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 -ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2X=SCREEN_CENTER_X+160 -ScoreNumberP2Y=SCREEN_CENTER_Y+140 -ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 -CheerDelaySeconds=2.5 [ScreenEvaluationOni] Fallback="ScreenEvaluation" @@ -1547,23 +1471,6 @@ ShowMaxCombo=false ShowScoreArea=false ShowTimeArea=true ShowStage=false -TimerSeconds=30 -LargeBannerX=SCREEN_CENTER_X+0 -LargeBannerY=SCREEN_CENTER_Y-140 -LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -LargeBannerFrameX=SCREEN_CENTER_X+0 -LargeBannerFrameY=SCREEN_CENTER_Y-140 -LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -PlayerOptionsP1X=SCREEN_CENTER_X-120 -PlayerOptionsP1Y=SCREEN_CENTER_Y-100 -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 -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 PercentFrameP1X=SCREEN_CENTER_X-226 PercentFrameP1Y=SCREEN_CENTER_Y-140 PercentFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 @@ -1580,22 +1487,6 @@ PercentP2X=SCREEN_CENTER_X+252 PercentP2Y=SCREEN_CENTER_Y-108 PercentP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 PercentP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 -SurvivedFrameP1X=SCREEN_CENTER_X-224 -SurvivedFrameP1Y=SCREEN_CENTER_Y+16 -SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedFrameP2X=SCREEN_CENTER_X+224 -SurvivedFrameP2Y=SCREEN_CENTER_Y+16 -SurvivedFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP2OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP1X=SCREEN_CENTER_X-224 -SurvivedNumberP1Y=SCREEN_CENTER_Y+0 -SurvivedNumberP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP2X=SCREEN_CENTER_X+224 -SurvivedNumberP2Y=SCREEN_CENTER_Y+0 -SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 TimeLabelX=SCREEN_CENTER_X+0 TimeLabelY=SCREEN_CENTER_Y+140 TimeLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -1608,94 +1499,10 @@ TimeNumberP2X=SCREEN_CENTER_X+160 TimeNumberP2Y=SCREEN_CENTER_Y+140 TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 -CheerDelaySeconds=2.5 [ScreenEvaluationEndless] -Fallback="ScreenEvaluation" +Fallback="ScreenEvaluationOni" NextScreen=GetEvaluationNextScreen( "ScreenSelectCourseEndless", "ScreenNameEntry", "ScreenNameEntry" ) -ShowGradeArea=false -ShowPointsArea=true -ShowBonusArea=false -ShowSurvivedArea=true -ShowWinArea=false -ShowMaxCombo=false -ShowScoreArea=false -ShowTimeArea=true -ShowStage=false -TimerSeconds=30 -LargeBannerX=SCREEN_CENTER_X+0 -LargeBannerY=SCREEN_CENTER_Y-140 -LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -LargeBannerFrameX=SCREEN_CENTER_X+0 -LargeBannerFrameY=SCREEN_CENTER_Y-140 -LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -PlayerOptionsP1X=SCREEN_CENTER_X-120 -PlayerOptionsP1Y=SCREEN_CENTER_Y-100 -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 -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 -PercentFrameP1X=SCREEN_CENTER_X-226 -PercentFrameP1Y=SCREEN_CENTER_Y-140 -PercentFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -PercentFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -PercentFrameP2X=SCREEN_CENTER_X+226 -PercentFrameP2Y=SCREEN_CENTER_Y-140 -PercentFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -PercentFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 -PercentP1X=SCREEN_CENTER_X-200 -PercentP1Y=SCREEN_CENTER_Y-108 -PercentP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -PercentP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -PercentP2X=SCREEN_CENTER_X+252 -PercentP2Y=SCREEN_CENTER_Y-108 -PercentP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -PercentP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 -SurvivedFrameP1X=SCREEN_CENTER_X-224 -SurvivedFrameP1Y=SCREEN_CENTER_Y+16 -SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedFrameP2X=SCREEN_CENTER_X+224 -SurvivedFrameP2Y=SCREEN_CENTER_Y+16 -SurvivedFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP2OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP1X=SCREEN_CENTER_X-224 -SurvivedNumberP1Y=SCREEN_CENTER_Y+0 -SurvivedNumberP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP2X=SCREEN_CENTER_X+224 -SurvivedNumberP2Y=SCREEN_CENTER_Y+0 -SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -ScoreLabelX=SCREEN_CENTER_X+0 -ScoreLabelY=SCREEN_CENTER_Y+140 -ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT -ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT -ScoreNumberP1X=SCREEN_CENTER_X-160 -ScoreNumberP1Y=SCREEN_CENTER_Y+140 -ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 -ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2X=SCREEN_CENTER_X+160 -ScoreNumberP2Y=SCREEN_CENTER_Y+140 -ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 -TimeLabelX=SCREEN_CENTER_X+0 -TimeLabelY=SCREEN_CENTER_Y+140 -TimeLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT -TimeLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT -TimeNumberP1X=SCREEN_CENTER_X-160 -TimeNumberP1Y=SCREEN_CENTER_Y+140 -TimeNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 -TimeNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2 -TimeNumberP2X=SCREEN_CENTER_X+160 -TimeNumberP2Y=SCREEN_CENTER_Y+140 -TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 -TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 -CheerDelaySeconds=2.5 [ScreenEvaluationRave] Fallback="ScreenEvaluation" @@ -1708,19 +1515,9 @@ ShowWinArea=true ShowMaxCombo=false ShowScoreArea=true ShowTimeArea=false -TimerSeconds=15 FailedSoundTime=0 PassedSoundTime=0 -NumSequenceSounds=0 ShowStage=false -LargeBannerX=SCREEN_CENTER_X+0 -LargeBannerY=SCREEN_CENTER_Y-140 -LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -LargeBannerFrameX=SCREEN_CENTER_X+0 -LargeBannerFrameY=SCREEN_CENTER_Y-140 -LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT ShowStage=true StageX=SCREEN_CENTER_X+0 StageY=SCREEN_CENTER_Y-168 @@ -1742,30 +1539,10 @@ DifficultyMeterP2X=SCREEN_CENTER_X+106 DifficultyMeterP2Y=SCREEN_CENTER_Y-160 DifficultyMeterP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT DifficultyMeterP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -PlayerOptionsP1X=SCREEN_CENTER_X-120 -PlayerOptionsP1Y=SCREEN_CENTER_Y-100 -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 -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 -GradeFrameP1X=SCREEN_CENTER_X-226 -GradeFrameP1Y=SCREEN_CENTER_Y-140 -GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeFrameP2X=SCREEN_CENTER_X+226 -GradeFrameP2Y=SCREEN_CENTER_Y-140 -GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 -GradeP1X=SCREEN_CENTER_X-226 -GradeP1Y=SCREEN_CENTER_Y-140 -GradeP1OnCommand=glowshift;scroll;effectperiod,2;addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 -GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeP2X=SCREEN_CENTER_X+226 -GradeP2Y=SCREEN_CENTER_Y-140 -GradeP2OnCommand=glowshift;scroll;effectperiod,2;addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 +ScoreNumberP1X=SCREEN_CENTER_X-160 +ScoreNumberP1Y=SCREEN_CENTER_Y+140 +ScoreNumberP2X=SCREEN_CENTER_X+160 +ScoreNumberP2Y=SCREEN_CENTER_Y+140 WinFrameP1X=SCREEN_CENTER_X-224 WinFrameP1Y=SCREEN_CENTER_Y+16 WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 @@ -1782,19 +1559,6 @@ WinP2X=SCREEN_CENTER_X+224 WinP2Y=SCREEN_CENTER_Y+16 WinP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 WinP2OffCommand=linear,0.7;diffusealpha,0 -ScoreLabelX=SCREEN_CENTER_X+0 -ScoreLabelY=SCREEN_CENTER_Y+140 -ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT -ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT -ScoreNumberP1X=SCREEN_CENTER_X-160 -ScoreNumberP1Y=SCREEN_CENTER_Y+140 -ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 -ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2X=SCREEN_CENTER_X+160 -ScoreNumberP2Y=SCREEN_CENTER_Y+140 -ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 -CheerDelaySeconds=2.5 [MultiplayerEvalScoreRow] NumberOnCommandFunction= @@ -2453,7 +2217,6 @@ ReceptorNoSinkScoreCutoff=4 JudgmentTransformCommand=%JudgmentTransformCommand JudgmentOnCommand= ComboTransformCommand=%ComboTransformCommand -ComboOnCommand= AttackDisplayXOffsetOneSideP1=0 AttackDisplayXOffsetOneSideP2=0 AttackDisplayXOffsetBothSides=0