diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index d259766ed2..5a808c0f87 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -31,13 +31,13 @@ local t = LoadFallbackB(); if ShowStandardDecoration("GraphDisplay") then for pn in ivalues(PlayerNumber) do - t[#t+1] = StandardDecorationFromTable( "GraphDisplay" .. PlayerNumber:ToString()[pn], GraphDisplay(pn) ); + t[#t+1] = StandardDecorationFromTable( "GraphDisplay" .. ToEnumShortString(pn), GraphDisplay(pn) ); end end if ShowStandardDecoration("ComboGraph") then for pn in ivalues(PlayerNumber) do - t[#t+1] = StandardDecorationFromTable( "ComboGraph" .. PlayerNumber:ToString()[pn], ComboGraph(pn) ); + t[#t+1] = StandardDecorationFromTable( "ComboGraph" .. ToEnumShortString(pn), ComboGraph(pn) ); end end @@ -61,7 +61,7 @@ if ShowStandardDecoration("ItsARecord") then InitCommand=cmd(name,"NoRecord";settext,"WWWW:\n82.34%";strokecolor,color("#807e00");shadowlength,0;); }; } - t[#t+1] = StandardDecorationFromTable( "ItsARecord" .. PlayerNumber:ToString()[pn], t2 ); + t[#t+1] = StandardDecorationFromTable( "ItsARecord" .. ToEnumShortString(pn), t2 ); end end @@ -76,9 +76,9 @@ end if ShowStandardDecoration("ModIconRows") then for pn in ivalues(PlayerNumber) do local t2 = Def.ModIconRow { - InitCommand=cmd(Load,"ModIconRowEvaluation"..PlayerNumber:ToString()[pn],pn); + InitCommand=cmd(Load,"ModIconRowEvaluation"..ToEnumShortString(pn),pn); }; - t[#t+1] = StandardDecorationFromTable( "ModIconRow" .. PlayerNumber:ToString()[pn], t2 ); + t[#t+1] = StandardDecorationFromTable( "ModIconRow" .. ToEnumShortString(pn), t2 ); end end @@ -87,7 +87,19 @@ if ShowStandardDecoration("StepsDisplay") then local t2 = Def.StepsDisplay { InitCommand=cmd(Load,"StepsDisplayEvaluation",pn;SetFromGameState,pn;); }; - t[#t+1] = StandardDecorationFromTable( "StepsDisplay" .. PlayerNumber:ToString()[pn], t2 ); + t[#t+1] = StandardDecorationFromTable( "StepsDisplay" .. ToEnumShortString(pn), t2 ); + end +end + +for i in ivalues(EarnedExtraStage) do + if i ~= "EarnedExtraStage_No" then + t[#t+1] = StandardDecorationFromFile( "TryExtraStage", "Try"..ToEnumShortString(i) ) .. { + BeginCommand=function(self) + local screen = SCREENMAN:GetTopScreen(); + local ss = screen:GetStageStats(); + self:visible( i == ss:GetEarnedExtraStage() ); + end; + }; end end diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra1 (doubleres).png b/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra1 (doubleres).png new file mode 100644 index 0000000000..fb99d7e1de Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra1 (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra1.png b/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra1.png deleted file mode 100644 index d4408c8b13..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra1.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra2 (doubleres).png b/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra2 (doubleres).png new file mode 100644 index 0000000000..617f711410 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra2 (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra2.png b/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra2.png deleted file mode 100644 index 2ffb1eb03e..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenEvaluation TryExtra2.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageFrame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageFrame (doubleres).png index bf3357f1fb..0499e6d7ee 100644 Binary files a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageFrame (doubleres).png and b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageFrame (doubleres).png differ diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 7e27a2b7b1..b3226ee989 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1126,19 +1126,19 @@ BannerWidth=268 BannerHeight=98 GradeP1X=SCREEN_CENTER_X-222 -GradeP1Y=SCREEN_CENTER_Y-106 +GradeP1Y=SCREEN_CENTER_Y-104 GradeP1OnCommand=glowshift;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+222 -GradeP2Y=SCREEN_CENTER_Y-106 +GradeP2Y=SCREEN_CENTER_Y-104 GradeP2OnCommand=glowshift;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-222 -GradeFrameP1Y=SCREEN_CENTER_Y-106 +GradeFrameP1Y=SCREEN_CENTER_Y-104 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+222 -GradeFrameP2Y=SCREEN_CENTER_Y-106 +GradeFrameP2Y=SCREEN_CENTER_Y-104 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 @@ -1567,7 +1567,7 @@ ShowStepsDisplay=true ShowItsARecord=true TryExtraStageX=SCREEN_CENTER_X+0 -TryExtraStageY=SCREEN_CENTER_Y+188 +TryExtraStageY=SCREEN_CENTER_Y-166 TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift TryExtraStageOffCommand=linear,0.7;diffusealpha,0 @@ -2076,12 +2076,12 @@ Fallback="Screen" AllowDisabledPlayerInput=false ShowStyleIcon=true ShowStageDisplay=false -StageDisplayX=SCREEN_CENTER_X+220 +StageDisplayX=SCREEN_CENTER_X+234 StageDisplayY=SCREEN_CENTER_Y-172 StageDisplayOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 ShowStageFrame=false -StageFrameX=SCREEN_CENTER_X+220 +StageFrameX=SCREEN_CENTER_X+234 StageFrameY=SCREEN_CENTER_Y-172 StageFrameOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 StageFrameOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6