From e9b12113fdf560bcbce56d1d195b1c19be71c83c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 8 Apr 2008 02:27:45 +0000 Subject: [PATCH] finish eval elements --- .../default.lua | 51 +++++++++++---- .../life graph.lua | 21 ------- .../Fonts/ScreenEvaluation ScoreNumber.redir | 1 + .../Fonts/ScreenEvaluation score.redir | 1 - .../Fonts/ScreenEvaluation totalscore.redir | 1 - .../ComboGraph Backing (doubleres).png} | Bin .../Graphics/ComboGraph ComboNumber.lua | 2 + .../ComboGraph MaxCombo (doubleres).png | Bin 0 -> 174 bytes .../ComboGraph NormalCombo (doubleres).png} | Bin .../GraphDisplay Backing (doubleres).png | Bin 0 -> 2808 bytes .../GraphDisplay Barely/arrow (doubleres).png | Bin 0 -> 661 bytes .../Graphics/GraphDisplay Barely/default.lua | 8 +++ .../GraphDisplay Body (doubleres).png} | Bin .../Graphics/GraphDisplay SongBoundary.lua | 3 + .../default.lua | 22 +++++++ .../frame (doubleres).png} | Bin .../ScreenEvaluation TotalScoreLabel.redir | Bin 14 -> 0 bytes stepmania/Themes/default/metrics.ini | 58 ++++++++++-------- 18 files changed, 108 insertions(+), 60 deletions(-) delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/life graph.lua create mode 100644 stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir delete mode 100644 stepmania/Themes/default/Fonts/ScreenEvaluation score.redir delete mode 100644 stepmania/Themes/default/Fonts/ScreenEvaluation totalscore.redir rename stepmania/Themes/default/{BGAnimations/ScreenEvaluationStage decorations/combo graph empty (doubleres).png => Graphics/ComboGraph Backing (doubleres).png} (100%) create mode 100644 stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua create mode 100644 stepmania/Themes/default/Graphics/ComboGraph MaxCombo (doubleres).png rename stepmania/Themes/default/{BGAnimations/ScreenEvaluationStage decorations/combo graph filled (doubleres).png => Graphics/ComboGraph NormalCombo (doubleres).png} (100%) create mode 100644 stepmania/Themes/default/Graphics/GraphDisplay Backing (doubleres).png create mode 100644 stepmania/Themes/default/Graphics/GraphDisplay Barely/arrow (doubleres).png create mode 100644 stepmania/Themes/default/Graphics/GraphDisplay Barely/default.lua rename stepmania/Themes/default/{BGAnimations/ScreenEvaluationStage decorations/life filling (doubleres).png => Graphics/GraphDisplay Body (doubleres).png} (100%) create mode 100644 stepmania/Themes/default/Graphics/GraphDisplay SongBoundary.lua create mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua rename stepmania/Themes/default/Graphics/{ScreenEvaluation DetailFrame p1 (doubleres).png => ScreenEvaluation DetailFrame p1/frame (doubleres).png} (100%) delete mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation TotalScoreLabel.redir diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index edbb9fefb7..87ff7e1f6b 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/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" ); diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/life graph.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/life graph.lua deleted file mode 100644 index 822c42f1d9..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/life graph.lua +++ /dev/null @@ -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 diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir new file mode 100644 index 0000000000..ab225f65b9 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenEvaluation ScoreNumber.redir @@ -0,0 +1 @@ +_terminator two 54 score \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation score.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation score.redir deleted file mode 100644 index 159640f767..0000000000 --- a/stepmania/Themes/default/Fonts/ScreenEvaluation score.redir +++ /dev/null @@ -1 +0,0 @@ -BPMDisplay bpm \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation totalscore.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation totalscore.redir deleted file mode 100644 index 159640f767..0000000000 --- a/stepmania/Themes/default/Fonts/ScreenEvaluation totalscore.redir +++ /dev/null @@ -1 +0,0 @@ -BPMDisplay bpm \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/combo graph empty (doubleres).png b/stepmania/Themes/default/Graphics/ComboGraph Backing (doubleres).png similarity index 100% rename from stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/combo graph empty (doubleres).png rename to stepmania/Themes/default/Graphics/ComboGraph Backing (doubleres).png diff --git a/stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua b/stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua new file mode 100644 index 0000000000..93e17dacca --- /dev/null +++ b/stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua @@ -0,0 +1,2 @@ +return LoadFont("Common Normal") .. { +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ComboGraph MaxCombo (doubleres).png b/stepmania/Themes/default/Graphics/ComboGraph MaxCombo (doubleres).png new file mode 100644 index 0000000000000000000000000000000000000000..b02f458a66ca2e7f69fb86cd7f1d585fa6fa3e28 GIT binary patch literal 174 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 KMNUMnLSTXv*)rw; literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/Graphics/GraphDisplay Barely/arrow (doubleres).png b/stepmania/Themes/default/Graphics/GraphDisplay Barely/arrow (doubleres).png new file mode 100644 index 0000000000000000000000000000000000000000..66f8577cfdd72547610672499c05e7c54c6f2993 GIT binary patch literal 661 zcmV;G0&4wRCwCN zS3PSYQ53zp?zY=ogjAMG3d{W~wpj?I4de#|7DN%VGHe!W4p$4FuLo zbOpgm3yU>z_a3=Vo)bmid?Xi+ym`($_sq;a_sv9-$t1mJL|w<%j0eWQknkWm))CXj zKN+VXU+{_G6XP2uBJv0zWD$)UGSOli*cm6