diff --git a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua index 64359745c4..eb2e8c82c1 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua @@ -94,5 +94,6 @@ for pn in ivalues(PlayerNumber) do end t[#t+1] = StandardDecorationFromFileOptional("LifeDifficulty","LifeDifficulty"); +t[#t+1] = StandardDecorationFromFileOptional("TimingDifficulty","TimingDifficulty"); return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua b/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua index bdecf326b0..e14dacf3cb 100644 --- a/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua +++ b/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua @@ -5,6 +5,7 @@ t[#t+1] = StandardDecorationFromFileOptional("Logo","Logo"); t[#t+1] = StandardDecorationFromFileOptional("VersionInfo","VersionInfo"); t[#t+1] = StandardDecorationFromFileOptional("CurrentGametype","CurrentGametype"); t[#t+1] = StandardDecorationFromFileOptional("LifeDifficulty","LifeDifficulty"); +t[#t+1] = StandardDecorationFromFileOptional("TimingDifficulty","TimingDifficulty"); t[#t+1] = StandardDecorationFromFileOptional("NetworkStatus","NetworkStatus"); return t \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenEvaluation TimingDifficulty.lua b/Themes/default/Graphics/ScreenEvaluation TimingDifficulty.lua new file mode 100644 index 0000000000..a5658f1fd3 --- /dev/null +++ b/Themes/default/Graphics/ScreenEvaluation TimingDifficulty.lua @@ -0,0 +1,7 @@ +return LoadFont("Common Normal") .. { + Text=GetLifeDifficulty(); + AltText=""; + BeginCommand=function(self) + self:settextf( Screen.String("TimingDifficulty"), GetTimingDifficulty() ); + end +}; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua new file mode 100644 index 0000000000..a5658f1fd3 --- /dev/null +++ b/Themes/default/Graphics/ScreenTitleMenu TimingDifficulty.lua @@ -0,0 +1,7 @@ +return LoadFont("Common Normal") .. { + Text=GetLifeDifficulty(); + AltText=""; + BeginCommand=function(self) + self:settextf( Screen.String("TimingDifficulty"), GetTimingDifficulty() ); + end +}; \ No newline at end of file diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 0e49e7a1a1..b729d21f5a 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -9,6 +9,7 @@ Offline=Offline Connected to %s=Connected to %s CurrentGametype=Current Gametype: %s LifeDifficulty=Life Difficulty: %s +TimingDifficulty=Timing Difficulty: %s [ScreenQuickSetupOverview] Explanation=Quick Setup provides a easy way to set commonly-changed and useful preferences. [ScreenProfileLoad] @@ -37,6 +38,7 @@ HelpText= [ScreenEvaluation] HelpText=&BACK; Exit &START; Move On &MENULEFT;+&MENURIGHT; or &SELECT; Snapshot LifeDifficulty=Life Difficulty: %s +TimingDifficulty=Timing Difficulty: %s [OptionTitles] UserPrefGameplayShowScore=Show Score UserPrefGameplayShowStepsDisplay=Show Steps diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 47eea0a50d..41d577fc12 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -712,7 +712,13 @@ ShowLifeDifficulty=true LifeDifficultyX=SCREEN_WIDTH*0.99 LifeDifficultyY=(SCREEN_HEIGHT*0.1575)-12 LifeDifficultyOnCommand=vertalign,bottom;horizalign,right;zoom,0.5; -LifeDifficultyOffCommand=linear,0.5;cropright,1 +LifeDifficultyOffCommand= +# +ShowTimingDifficulty=true +TimingDifficultyX=SCREEN_WIDTH*0.99 +TimingDifficultyY=(SCREEN_HEIGHT*0.1575)-24 +TimingDifficultyOnCommand=vertalign,bottom;horizalign,right;zoom,0.5; +TimingDifficultyOffCommand= # ShowVersionInfo=true VersionInfoX=SCREEN_WIDTH*0.9875 @@ -1515,9 +1521,14 @@ StepsDisplayP2OffCommand=bouncebegin,0.15;zoomx,0; ShowLifeDifficulty=true LifeDifficultyX=SCREEN_CENTER_X LifeDifficultyY=SCREEN_TOP+32 -LifeDifficultyOnCommand=zoom,0.75;draworder,105 +LifeDifficultyOnCommand=zoom,0.5;draworder,105 LifeDifficultyOffCommand=linear,0.5;cropright,1 # +ShowTimingDifficulty=true +TimingDifficultyX=SCREEN_CENTER_X +TimingDifficultyY=SCREEN_TOP+20 +TimingDifficultyOnCommand=zoom,0.5;draworder,105 +TimingDifficultyOffCommand=linear,0.5;cropright,1 [ScreenEvaluationNormal] Fallback="ScreenEvaluation" #