From 089e44e6e7f6fb947268346104ddd5c0c3fdd4a9 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Fri, 4 Apr 2008 20:10:10 +0000 Subject: [PATCH] eval cleanup --- .../default.lua | 6 ++++++ .../difficulty setting bar (doubleres).png | Bin 2988 -> 0 bytes .../_standard decoration required.lua | 9 +-------- .../ScreenEvaluation TimingDifficulty.redir | 1 + ...luation TimingDifficultyFrame (doubleres).png | Bin 0 -> 5933 bytes stepmania/Themes/default/metrics.ini | 9 +++++++++ 6 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/difficulty setting bar (doubleres).png create mode 100644 stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficulty.redir create mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation TimingDifficultyFrame (doubleres).png diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index 91006d3165..88bc66f83f 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -13,4 +13,10 @@ t[#t+1] = LoadActor("life graph", PLAYER_1) .. { t[#t+1] = LoadActor("life graph", PLAYER_2) .. { InitCommand = cmd(x,p2x;y,p2y); }; + +t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "TimingDifficultyFrame", "TimingDifficultyFrame" ); +t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficulty" ) .. { + InitCommand=function(self) self:name("TimingDifficulty"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; +}; + return t; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/difficulty setting bar (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/difficulty setting bar (doubleres).png deleted file mode 100644 index 7b161dfc245941a06d1f761e362236cd10197d9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2988 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 P00000NkvXXu0mjfS;hW} literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index c3e9701022..c93db3c6c6 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1388,6 +1388,15 @@ SurvivedNumberP2Y=SCREEN_CENTER_Y+0 SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 +TimingDifficultyX=SCREEN_CENTER_X+120 +TimingDifficultyY=SCREEN_CENTER_Y-200 +TimingDifficultyOnCommand=draworder,2 +TimingDifficultyOffCommand= +TimingDifficultyFrameX=SCREEN_CENTER_X+120 +TimingDifficultyFrameY=SCREEN_CENTER_Y-200 +TimingDifficultyFrameOnCommand=draworder,2 +TimingDifficultyFrameOffCommand= + CheerDelaySeconds=2.5 [ScreenNetEvaluation]