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 a09adef8c2..d47a68175c 100644 Binary files a/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers-stroke] 4x4 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png index 0b923bd981..2cb6e71260 100644 Binary files a/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png and b/stepmania/Themes/default/Fonts/_terminator two score 26px [numbers] 4x4 (doubleres).png differ 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