From 0c6e8bc360e9b52aded519f9e24cf16e9602a6ec Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Tue, 18 May 2010 17:54:49 -0500 Subject: [PATCH] back to cvs/3.9 grading [Midiman, though I also agreed to it and shake said the graphics were meant for the old grading] change horizalign and vertalign to halign and valign, respectively --- Themes/_fallback/metrics.ini | 82 +++++++++++++++++------------------- 1 file changed, 39 insertions(+), 43 deletions(-) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 3afa2ff90a..fe92ad79ec 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -239,8 +239,8 @@ LabelMaxZoom=0.75*1 # Things the combo does when you bang on it, and what the text does PulseCommand=%function(self,param) self:stoptweening(); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); end PulseLabelCommand=%function(self,param) self:stoptweening(); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); end -NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;skewx,-0.125; -LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom +NumberOnCommand=y,240-216-1.5;shadowlength,1;halign,1;valign,1;skewx,-0.125; +LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");halign,0;valign,1 [HoldJudgment] # System Direction @@ -567,19 +567,19 @@ TitleOnCommand=visible,false [OptionsCursor] LeftX= LeftY= -LeftOnCommand=horizalign,right; +LeftOnCommand=halign,1; MiddleX= MiddleY= MiddleOnCommand= RightX= RightY= -RightOnCommand=horizalign,left; +RightOnCommand=halign,0; CanGoLeftX= CanGoLeftY= -CanGoLeftOnCommand=horizalign,right; +CanGoLeftOnCommand=halign,1; CanGoRightX= CanGoRightY= -CanGoRightOnCommand=horizalign,left; +CanGoRightOnCommand=halign,0; [OptionsCursorP1] Fallback="OptionsCursor" @@ -804,22 +804,18 @@ RoutineNoteSkinP1="midi-routine-p1" RoutineNoteSkinP2="midi-routine-p2" [PlayerStageStats] -NumGradeTiersUsed=6 -# 100% - Perfect +# Original CVS Grading +GradePercentTier01=1.000000 +GradePercentTier02=1.000000 +GradePercentTier03=0.930000 +GradePercentTier04=0.800000 +GradePercentTier05=0.650000 +GradePercentTier06=0.450000 +GradePercentTier07=-99999.000000 GradeTier01IsAllW2s=false -GradePercentTier01=1.00 -# Almost 100% - Full Combo -GradeTier02IsAllW2s=false -GradeTier02IsFullCombo=true -GradePercentTier02=0.90 -# Almost 100% - No Combo -GradePercentTier03=0.80 -# Pretty Good -GradePercentTier04=0.65 -# Barely - "Try Harder!" -GradePercentTier05=0.50 -# No Pass -GradePercentTier06=-99999.000000 +GradeTier02IsAllW2s=true +GradeTier02IsFullCombo=false +NumGradeTiersUsed=7 [Player] # In The Groove @@ -1115,7 +1111,7 @@ Class="ScreenStatsOverlay" Fallback="Screen" StatsX=SCREEN_RIGHT-8 StatsY=SCREEN_TOP+10 -StatsOnCommand=horizalign,right;vertalign,top;shadowlength,1;zoom,0.5 +StatsOnCommand=halign,1;valign,0;shadowlength,1;zoom,0.5 ShowSkips=true SkipX=SCREEN_RIGHT-100 SkipY=SCREEN_BOTTOM-100 @@ -1778,15 +1774,15 @@ RowOffCommand= RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-146+36*offsetFromCenter) end ExplanationP1X=SCREEN_CENTER_X-240 ExplanationP1Y=SCREEN_CENTER_Y+174 -ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,500;zoom,0.5;horizalign,left;cropright,1;linear,0.5;cropright,0 +ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,(SCREEN_WIDTH*0.78)*1.5;zoom,0.5;halign,0;cropright,1;linear,0.5;cropright,0 ExplanationP1OffCommand= ExplanationP2X=SCREEN_CENTER_X+240 ExplanationP2Y=SCREEN_CENTER_Y+174 -ExplanationP2OnCommand=shadowlength,0;wrapwidthpixels,500;zoom,0.5;horizalign,right;cropright,1;linear,0.5;cropright,0 +ExplanationP2OnCommand=shadowlength,0;wrapwidthpixels,(SCREEN_WIDTH*0.78)*1.5;zoom,0.5;halign,1;cropright,1;linear,0.5;cropright,0 ExplanationP2OffCommand= ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherY=SCREEN_CENTER_Y+184 -ExplanationTogetherOnCommand=shadowlength,0;zoom,0.75;wrapwidthpixels,600;cropright,1;linear,0.5;cropright,0 +ExplanationTogetherOnCommand=shadowlength,0;zoom,0.75;wrapwidthpixels,(SCREEN_WIDTH*0.9375)*1.25;cropright,1;linear,0.5;cropright,0 ExplanationTogetherOffCommand= DisqualifyP1X= DisqualifyP1Y= @@ -2236,7 +2232,7 @@ IconsP2X=SCREEN_CENTER_X+280 IconsOnCommand=x,-30 FrameX=SCREEN_CENTER_X-232 TitleX=SCREEN_CENTER_X-150 -TitleOnCommand=horizalign,left;shadowlength,2; +TitleOnCommand=halign,0;shadowlength,2; ItemsStartX=SCREEN_CENTER_X-150 ItemsEndX=SCREEN_CENTER_X+280 ItemsGapX=14 @@ -2610,11 +2606,11 @@ Bullet4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0 Bullet5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0 NameStartX=SCREEN_CENTER_X-140 NameStartY=SCREEN_CENTER_Y-100 -Name1OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH -Name2OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH -Name3OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH -Name4OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH -Name5OnCommand=diffusealpha,1;horizalign,left;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH +Name1OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH +Name2OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH +Name3OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH +Name4OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH +Name5OnCommand=diffusealpha,1;halign,0;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH Name1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0 Name2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0 Name3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0 @@ -2622,11 +2618,11 @@ Name4OffCommand=sleep,0.5;linear,0.5;diffusealpha,0 Name5OffCommand=sleep,0.6;linear,0.5;diffusealpha,0 ScoreStartX=SCREEN_CENTER_X+200 ScoreStartY=SCREEN_CENTER_Y-100 -Score1OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH -Score2OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH -Score3OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH -Score4OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH -Score5OnCommand=diffusealpha,1;horizalign,right;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH +Score1OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.2;bounceend,1;addx,-SCREEN_WIDTH +Score2OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.3;bounceend,1;addx,-SCREEN_WIDTH +Score3OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.4;bounceend,1;addx,-SCREEN_WIDTH +Score4OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.5;bounceend,1;addx,-SCREEN_WIDTH +Score5OnCommand=diffusealpha,1;halign,1;addx,SCREEN_WIDTH;sleep,0.6;bounceend,1;addx,-SCREEN_WIDTH Score1OffCommand=sleep,0.2;linear,0.5;diffusealpha,0 Score2OffCommand=sleep,0.3;linear,0.5;diffusealpha,0 Score3OffCommand=sleep,0.4;linear,0.5;diffusealpha,0 @@ -3138,13 +3134,13 @@ TimerSeconds=-1 EditModifiers="" EditHelpX=SCREEN_LEFT+4 EditHelpY=SCREEN_TOP+16 -EditHelpOnCommand=horizalign,left;vertalign,top;zoom,0.675;shadowlength,1 +EditHelpOnCommand=halign,0;valign,0;zoom,0.675;shadowlength,1 InfoX=SCREEN_RIGHT-128 InfoY=SCREEN_TOP+16 -InfoOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,1 +InfoOnCommand=halign,0;valign,0;zoom,0.5;shadowlength,1 PlayRecordHelpX=SCREEN_LEFT+20 PlayRecordHelpY=SCREEN_BOTTOM-20 -PlayRecordHelpOnCommand=horizalign,left;vertalign,top;shadowlength,1 +PlayRecordHelpOnCommand=halign,0;valign,0;shadowlength,1 [ScreenEditOptions] Fallback="ScreenOptions" @@ -3321,7 +3317,7 @@ ChatInputBoxHeight=64 ChatInputX=(SCREEN_CENTER_X*0.5)*0.125 ChatInputY=SCREEN_CENTER_Y+90 ChatTextInputWidth=SCREEN_CENTER_X*1.8 -ChatInputOnCommand=horizalign,left;vertalign,top;zoom,0.5;diffusealpha,0;linear,0.55;diffusealpha,1 +ChatInputOnCommand=halign,0;valign,0;zoom,0.5;diffusealpha,0;linear,0.55;diffusealpha,1 ChatInputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0 #====# ChatOutputBoxX=SCREEN_CENTER_X*0.5 @@ -3335,7 +3331,7 @@ ChatOutputX=(SCREEN_CENTER_X*0.5)*0.125 ChatOutputY=SCREEN_CENTER_Y+64 ChatTextOutputWidth=SCREEN_CENTER_X*1.8 ChatOutputLines=14 -ChatOutputOnCommand=horizalign,left;vertalign,bottom;zoom,0.5;diffusealpha,0;linear,0.55;diffusealpha,1 +ChatOutputOnCommand=halign,0;valign,1;zoom,0.5;diffusealpha,0;linear,0.55;diffusealpha,1 ChatOutputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0 UsersX=SCREEN_CENTER_X-265 @@ -3393,12 +3389,12 @@ optionsOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 StepsDisplayP1X=SCREEN_CENTER_X-223 StepsDisplayP1Y=SCREEN_CENTER_Y+150 -StepsDisplayP1OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 +StepsDisplayP1OnCommand=halign,1;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 StepsDisplayP1OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 StepsDisplayP2X=SCREEN_CENTER_X-110 StepsDisplayP2Y=SCREEN_CENTER_Y+150 -StepsDisplayP2OnCommand=horizalign,right;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 +StepsDisplayP2OnCommand=halign,1;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 StepsDisplayP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 DiffBGX=SCREEN_CENTER_X-60