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 7b161dfc24..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/difficulty setting bar (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/_standard decoration required.lua b/stepmania/Themes/default/BGAnimations/_standard decoration required.lua index 3318b3905a..13adbdc343 100644 --- a/stepmania/Themes/default/BGAnimations/_standard decoration required.lua +++ b/stepmania/Themes/default/BGAnimations/_standard decoration required.lua @@ -2,14 +2,7 @@ local MetricsName, FileName = ...; local t = LoadActor( THEME:GetPathG(Var "LoadingScreen",FileName) ); if type(t) == "table" then t = t .. { - InitCommand=function(self) - local x1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "X"); - if x1 then self:x(x1); end - local y1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "Y"); - if y1 then self:y(y1); end - end; - OnCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OnCommand"); - OffCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OffCommand"); + InitCommand=function(self) self:name(MetricsName); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; }; end return t; diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficulty.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficulty.redir new file mode 100644 index 0000000000..6272ef61a7 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficulty.redir @@ -0,0 +1 @@ +common normal \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation TimingDifficultyFrame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenEvaluation TimingDifficultyFrame (doubleres).png new file mode 100644 index 0000000000..36f859f1ce Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenEvaluation TimingDifficultyFrame (doubleres).png differ 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]