From f787cf32904074fa47e654345ead8bea7ad60868 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 17 Aug 2008 14:36:06 +0000 Subject: [PATCH] eval/score cleanup --- .../default.lua | 44 +++++++----------- ... 26px [numbers-stroke] 4x4 (doubleres).png | Bin 7290 -> 7135 bytes ...o score 26px [numbers] 4x4 (doubleres).png | Bin 7568 -> 8674 bytes .../Fonts/_terminator two score 26px.ini | 12 +++-- stepmania/Themes/default/metrics.ini | 40 +++++++++++++--- 5 files changed, 57 insertions(+), 39 deletions(-) diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index b4c75971f2..f78afa9fb2 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -41,38 +41,28 @@ if ShowStandardDecoration("ComboGraph") then end end -t[#t+1] = ComboGraph(PLAYER_1) .. { - InitCommand = cmd(x,SCREEN_CENTER_X-222;y,SCREEN_CENTER_Y+10;draworder,1;); -}; -t[#t+1] = ComboGraph(PLAYER_2) .. { - InitCommand = cmd(x,SCREEN_CENTER_X+222;y,SCREEN_CENTER_Y+10;draworder,1;); -}; - t[#t+1] = StandardDecorationFromFile( "TimingDifficultyFrame", "TimingDifficultyFrame" ); t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. { InitCommand=function(self) self:name("TimingDifficultyNumber"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; }; -t[#t+1] = Def.ModIconRow { - InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"ModIconRowEvaluationP1",PLAYER_1,player,PLAYER_1); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; -t[#t+1] = Def.ModIconRow { - InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"ModIconRowEvaluationP2",PLAYER_2;player,PLAYER_2); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; -t[#t+1] = Def.StepsDisplay { - InitCommand=cmd(x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+158;Load,"StepsDisplayEvaluation",PLAYER_1;SetFromGameState,PLAYER_1;player,PLAYER_1;); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; -t[#t+1] = Def.StepsDisplay { - InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+158;Load,"StepsDisplayEvaluation",PLAYER_2;SetFromGameState,PLAYER_2;player,PLAYER_2;); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; +if ShowStandardDecoration("ModIconRows") then + for pn in ivalues(PlayerNumber) do + local t2 = Def.ModIconRow { + InitCommand=cmd(Load,"ModIconRowEvaluation"..PlayerNumber:ToString()[pn],pn); + }; + t[#t+1] = StandardDecorationFromTable( "ModIconRow" .. PlayerNumber:ToString()[pn], t2 ); + end +end + +if ShowStandardDecoration("StepsDisplay") then + for pn in ivalues(PlayerNumber) do + local t2 = Def.StepsDisplay { + InitCommand=cmd(Load,"StepsDisplayEvaluation",pn;SetFromGameState,pn;); + }; + t[#t+1] = StandardDecorationFromTable( "StepsDisplay" .. PlayerNumber:ToString()[pn], t2 ); + end +end return t; \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png index a09adef8c22131fc197aff6a335c81a5fb21755e..d47a68175cdd3efbc281d76b0f32abd1be1cfed3 100644 GIT binary patch literal 7135 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 literal 7568 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 B=3xK; diff --git a/stepmania/Themes/default/Fonts/_terminator two score 26px.ini b/stepmania/Themes/default/Fonts/_terminator two score 26px.ini index 6afab5d7df..b86f4db6f5 100644 --- a/stepmania/Themes/default/Fonts/_terminator two score 26px.ini +++ b/stepmania/Themes/default/Fonts/_terminator two score 26px.ini @@ -1,17 +1,18 @@ [common] -Baseline=23 -Top=1 +Baseline=24 +Top=2 LineSpacing=26 DrawExtraPixelsLeft=1 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 -AddToAllWidths=2 +DefaultStrokeColor=#fff000 +AddToAllWidths=1 [numbers] Line 0=0123 Line 1=4567 Line 2=89%. -Line 3= :x +Line 3= :x, 0=17 1=17 @@ -25,6 +26,7 @@ Line 3= :x 9=17 10=22 11=5 -12=18 +12=17 13=5 14=21 +15=5 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 943ea8eeda..99a903baeb 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1259,12 +1259,12 @@ 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-192 -ScoreNumberP1Y=SCREEN_CENTER_Y+206 -ScoreNumberP1OnCommand=shadowlength,0;diffusetopedge,color("#fefefe");diffusebottomedge,color("#908d78");strokecolor,color("#00000000");shadowlengthx,0;shadowlengthy,2;addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 +ScoreNumberP1Y=SCREEN_CENTER_Y+180 +ScoreNumberP1OnCommand=shadowlength,0;diffuse,PlayerScoreColor("PlayerNumber_P1");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+192 -ScoreNumberP2Y=SCREEN_CENTER_Y+206 -ScoreNumberP2OnCommand=shadowlength,0;diffusetopedge,color("#fefefe");diffusebottomedge,color("#908d78");strokecolor,color("#00000000");shadowlengthx,0;shadowlengthy,2;addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 +ScoreNumberP2Y=SCREEN_CENTER_Y+180 +ScoreNumberP2OnCommand=shadowlength,0;diffuse,PlayerScoreColor("PlayerNumber_P2");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 LargeBannerX=SCREEN_CENTER_X-1 @@ -1511,14 +1511,32 @@ GraphDisplayP2OffCommand= ShowComboGraph=true ComboGraphP1X=SCREEN_CENTER_X-222 -ComboGraphP1Y=SCREEN_CENTER_Y-10 +ComboGraphP1Y=SCREEN_CENTER_Y+10 ComboGraphP1OnCommand=draworder,1 ComboGraphP1OffCommand= ComboGraphP2X=SCREEN_CENTER_X+222 -ComboGraphP2Y=SCREEN_CENTER_Y-10 +ComboGraphP2Y=SCREEN_CENTER_Y+10 ComboGraphP2OnCommand=draworder,1 ComboGraphP2OffCommand= +ModIconRowP1X=SCREEN_CENTER_X-316 +ModIconRowP1Y=SCREEN_CENTER_Y-130 +ModIconRowP1OnCommand=draworder,1;player,"PlayerNumber_P1";zoomy,0;linear,0.5;zoomy,1 +ModIconRowP1OffCommand=linear,0.5;zoomy,0 +ModIconRowP2X=SCREEN_CENTER_X+316 +ModIconRowP2Y=SCREEN_CENTER_Y-130 +ModIconRowP2OnCommand=draworder,1;player,"PlayerNumber_P2";zoomy,0;linear,0.5;zoomy,1 +ModIconRowP2OffCommand=linear,0.5;zoomy,0 + +StepsDisplayP1X=SCREEN_CENTER_X-230 +StepsDisplayP1Y=SCREEN_CENTER_Y+151 +StepsDisplayP1OnCommand=zoomy,0;linear,0.5;zoomy,1 +StepsDisplayP1OffCommand=linear,0.5;zoomy,0 +StepsDisplayP2X=SCREEN_CENTER_X+230 +StepsDisplayP2Y=SCREEN_CENTER_Y+151 +StepsDisplayP2OnCommand=zoomy,0;linear,0.5;zoomy,1 +StepsDisplayP2OffCommand=linear,0.5;zoomy,0 + BarActualMaxCommand=glowshift;effectperiod,0.5 CheerDelaySeconds=2.5 @@ -1560,6 +1578,8 @@ ShowScoreArea=true ShowTimeArea=false ShowStageDisplay=true ShowStageFrame=true +ShowModIconRows=true +ShowStepsDisplay=true TryExtraStageX=SCREEN_CENTER_X+0 TryExtraStageY=SCREEN_CENTER_Y+188 @@ -4530,8 +4550,14 @@ TextOnCommand=shadowlength,0; TextLoadCommand=%function(self,param) self:diffuse(PlayerScoreColor(param.PlayerState:GetPlayerNumber())); end [RollingNumbers] -TextFormat="%9.0f" +TextFormat="%09.0f" ApproachSeconds=0.2 +Commify=true +LeadingZeroMultiplyColor=color("#777777FF") + +[RollingNumbersEvaluation] +Fallback="RollingNumbers" +ApproachSeconds=2 [GraphDisplay] BodyWidth=140