finish eval elements

stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua

@@ -1,17 +1,46 @@
+function GraphDisplay( pn )
+	local t = Def.ActorFrame {
+		Def.GraphDisplay {
+			InitCommand=cmd(Load,"GraphDisplay";);
+			BeginCommand=function(self)
+				local screen = SCREENMAN:GetTopScreen();
+				local ss = screen:GetStageStats();
+				self:Set( ss, ss:GetPlayerStageStats(pn) );
+			end,
+		};
+	};
+	return t;
+end
+
+function ComboGraph( pn )
+	local t = Def.ActorFrame {
+		Def.ComboGraph {
+			InitCommand=cmd(Load,"ComboGraph";);
+			BeginCommand=function(self)
+				local screen = SCREENMAN:GetTopScreen();
+				local ss = screen:GetStageStats();
+				self:Set( ss, ss:GetPlayerStageStats(pn) );
+			end,
+		};
+	};
+	return t;
+end
+
+
 local t = LoadFallbackB( "decorations" );
 
-local p1x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1X' )
-local p1y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP1Y' )
-local p2x = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2X' )
-local p2y = THEME:GetMetric( 'ScreenEvaluationStage', 'BonusFrameP2Y' )
-p1y = p1y + 75 -- It starts 75 pixels down from the top of the Bonus frame.
-p2y = p2y + 75
-
-t[#t+1] = LoadActor("life graph", PLAYER_1) .. {
-	InitCommand = cmd(x,p1x;y,p1y);
+t[#t+1] = GraphDisplay(PLAYER_1) .. {
+	InitCommand = cmd(x,SCREEN_CENTER_X-224;y,SCREEN_CENTER_Y-50;draworder,1;);
 };
-t[#t+1] = LoadActor("life graph", PLAYER_2) .. {
-	InitCommand = cmd(x,p2x;y,p2y);
+t[#t+1] = GraphDisplay(PLAYER_2) .. {
+	InitCommand = cmd(x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-50;draworder,1;);
+};
+
+t[#t+1] = ComboGraph(PLAYER_1) .. {
+	InitCommand = cmd(x,SCREEN_CENTER_X-224;y,SCREEN_CENTER_Y-20;draworder,1;);
+};
+t[#t+1] = ComboGraph(PLAYER_2) .. {
+	InitCommand = cmd(x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-20;draworder,1;);
 };
 
 t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "TimingDifficultyFrame", "TimingDifficultyFrame" );

stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/life graph.lua

@@ -1,21 +0,0 @@
-local Player = ...
-assert( Player );
-
-local t = Def.ActorFrame {
-	Def.GraphDisplay {
-		OnCommand=function(self)
-			local Stats = STATSMAN:GetCurStageStats();
-			self:LoadFromStats( Stats, Stats:GetPlayerStageStats(Player) )
-		end,
-		Texture = LoadActor("life filling") .. {
-			InitCommand=cmd(ztest,1;diffusealpha,0),
-			OnCommand=cmd(linear,0.5;diffusealpha,1),
-			OffCommand=cmd(linear,0.5;diffusealpha,0),
-		},
-		Line = Def.GraphLine { InitCommand=cmd(visible,false) },
-		Body = Def.GraphBody { InitCommand=cmd(zwrite,1;blend,"BlendMode_NoEffect") },
-		SongBoundary = Def.Actor { InitCommand=cmd(visible,false) },
-		Barely = Def.Actor { InitCommand=cmd(visible,false) },
-	}
-}
-return t

stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir

@@ -0,0 +1 @@
+_terminator two 54 score

stepmania/Themes/default/Fonts/ScreenEvaluation score.redir

@@ -1 +0,0 @@
-BPMDisplay bpm

stepmania/Themes/default/Fonts/ScreenEvaluation totalscore.redir

@@ -1 +0,0 @@
-BPMDisplay bpm

stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua

@@ -0,0 +1,2 @@
+return LoadFont("Common Normal") .. {
+};

stepmania/Themes/default/Graphics/GraphDisplay Barely/default.lua

@@ -0,0 +1,8 @@
+return Def.ActorFrame {
+	LoadActor("arrow") .. {
+		InitCommand=cmd(y,-16;);
+	};
+	LoadFont("Common normal") .. {
+		InitCommand=cmd(y,-32;settext,"Barely";);
+	};
+};

stepmania/Themes/default/Graphics/GraphDisplay SongBoundary.lua

@@ -0,0 +1,3 @@
+return Def.Quad {
+	InitCommand=cmd(zoomtowidth,2;zoomtoheight,76;diffuse,color("#FFFFFF77"););
+};

stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua

@@ -0,0 +1,22 @@
+return Def.ActorFrame {
+	LoadActor("frame") .. {
+	};
+	LoadActor( THEME:GetPathG("PaneDisplay","label Hands") ) .. {
+		InitCommand=cmd(x,-50;y,-20+16*0;);
+	};
+	LoadActor( THEME:GetPathG("PaneDisplay","label Holds") ) .. {
+		InitCommand=cmd(x,-50;y,-20+16*1;);
+	};
+	LoadActor( THEME:GetPathG("PaneDisplay","label Jumps") ) .. {
+		InitCommand=cmd(x,-50;y,-20+16*2;);
+	};
+	LoadActor( THEME:GetPathG("PaneDisplay","label Mines") ) .. {
+		InitCommand=cmd(x,-50;y,-20+16*3;);
+	};
+	LoadActor( THEME:GetPathG("PaneDisplay","label NumSteps") ) .. {
+		InitCommand=cmd(x,-50;y,-20+16*4;);
+	};
+	LoadActor( THEME:GetPathG("PaneDisplay","label Rolls") ) .. {
+		InitCommand=cmd(x,-50;y,-20+16*5;);
+	};
+};

stepmania/Themes/default/metrics.ini

@@ -1182,7 +1182,6 @@ ShowJudgmentLineMiss=true
 ShowJudgmentLineMaxCombo=true
 ShowPerDifficultyAward=false
 ShowPeakComboAward=false
-ShowTotalScoreArea=false
 
 BannerWidth=256
 BannerHeight=80
@@ -1321,13 +1320,13 @@ 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
-ScoreNumberP1Y=SCREEN_CENTER_Y
-ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2
+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
 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
+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
 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 LargeBannerX=SCREEN_CENTER_X+0
@@ -1391,48 +1390,57 @@ TimingDifficultyFrameY=SCREEN_CENTER_Y-200
 TimingDifficultyFrameOnCommand=draworder,2
 TimingDifficultyFrameOffCommand=
 
+NumStepsNumberP1X=SCREEN_CENTER_X-200
+NumStepsNumberP1Y=SCREEN_CENTER_Y+10+20*-1
+NumStepsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
+NumStepsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
+NumStepsNumberP2X=SCREEN_CENTER_X+200
+NumStepsNumberP2Y=SCREEN_CENTER_Y+10+20*-1
+NumStepsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
+NumStepsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
+
 JumpsNumberP1X=SCREEN_CENTER_X-200
-JumpsNumberP1Y=SCREEN_CENTER_Y-80+20*0
+JumpsNumberP1Y=SCREEN_CENTER_Y+10+20*0
 JumpsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
 JumpsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
 JumpsNumberP2X=SCREEN_CENTER_X+200
-JumpsNumberP2Y=SCREEN_CENTER_Y-80+20*0
+JumpsNumberP2Y=SCREEN_CENTER_Y+10+20*0
 JumpsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
 JumpsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 HoldsNumberP1X=SCREEN_CENTER_X-200
-HoldsNumberP1Y=SCREEN_CENTER_Y-80+20*1
+HoldsNumberP1Y=SCREEN_CENTER_Y+10+20*1
 HoldsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2
 HoldsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
 HoldsNumberP2X=SCREEN_CENTER_X+200
-HoldsNumberP2Y=SCREEN_CENTER_Y-80+20*1
+HoldsNumberP2Y=SCREEN_CENTER_Y+10+20*1
 HoldsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2
 HoldsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 MinesNumberP1X=SCREEN_CENTER_X-200
-MinesNumberP1Y=SCREEN_CENTER_Y-80+20*2
+MinesNumberP1Y=SCREEN_CENTER_Y+10+20*2
 MinesNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2
 MinesNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
 MinesNumberP2X=SCREEN_CENTER_X+200
-MinesNumberP2Y=SCREEN_CENTER_Y-80+20*2
+MinesNumberP2Y=SCREEN_CENTER_Y+10+20*2
 MinesNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2
 MinesNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 HandsNumberP1X=SCREEN_CENTER_X-200
-HandsNumberP1Y=SCREEN_CENTER_Y-80+20*3
+HandsNumberP1Y=SCREEN_CENTER_Y+10+20*3
 HandsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2
 HandsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
 HandsNumberP2X=SCREEN_CENTER_X+200
-HandsNumberP2Y=SCREEN_CENTER_Y-80+20*3
+HandsNumberP2Y=SCREEN_CENTER_Y+10+20*3
 HandsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2
 HandsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
 RollsNumberP1X=SCREEN_CENTER_X-200
-RollsNumberP1Y=SCREEN_CENTER_Y-80+20*4
+RollsNumberP1Y=SCREEN_CENTER_Y+10+20*4
 RollsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,SCREEN_WIDTH/2
 RollsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
 RollsNumberP2X=SCREEN_CENTER_X+200
-RollsNumberP2Y=SCREEN_CENTER_Y-80+20*4
+RollsNumberP2Y=SCREEN_CENTER_Y+10+20*4
 RollsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2
 RollsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
 
@@ -1560,11 +1568,6 @@ BarActual5P2OffCommand=linear,0.7;diffusealpha,0
 
 BarActualMaxCommand=glowshift;effectperiod,0.5
 
-ScoreNumberP1X=SCREEN_CENTER_X-129
-ScoreNumberP1Y=SCREEN_CENTER_Y+140
-ScoreNumberP2X=SCREEN_CENTER_X+129
-ScoreNumberP2Y=SCREEN_CENTER_Y+140
-
 CheerDelaySeconds=2.5
 
 [ScreenNetEvaluation]
@@ -1736,10 +1739,6 @@ DifficultyDisplayP2X=SCREEN_CENTER_X+106
 DifficultyDisplayP2Y=SCREEN_CENTER_Y-160
 DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
 DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
-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
@@ -4525,3 +4524,10 @@ TextLoadCommand=%function(self,param) self:diffuse(PlayerColor(param.PlayerState
 [RollingNumbers]
 TextFormat="%9.0f"
 ApproachSeconds=0.2
+
+[GraphDisplay]
+BodyWidth=140
+BodyHeight=38
+
+[ComboGraph]
+BodyWidth=140