diff --git a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua index f478a6d3c2..64359745c4 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation decorations/default.lua @@ -93,4 +93,6 @@ for pn in ivalues(PlayerNumber) do }; end +t[#t+1] = StandardDecorationFromFileOptional("LifeDifficulty","LifeDifficulty"); + 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 3a13500b45..bdecf326b0 100644 --- a/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua +++ b/Themes/default/BGAnimations/ScreenTitleMenu underlay.lua @@ -4,6 +4,7 @@ local t = Def.ActorFrame {}; 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("NetworkStatus","NetworkStatus"); return t \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenEvaluation LifeDifficulty.lua b/Themes/default/Graphics/ScreenEvaluation LifeDifficulty.lua new file mode 100644 index 0000000000..cfc20c06e8 --- /dev/null +++ b/Themes/default/Graphics/ScreenEvaluation LifeDifficulty.lua @@ -0,0 +1,7 @@ +return LoadFont("Common Normal") .. { + Text=GetLifeDifficulty(); + AltText=""; + BeginCommand=function(self) + self:settextf( Screen.String("LifeDifficulty"), GetLifeDifficulty() ); + end +}; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua new file mode 100644 index 0000000000..cfc20c06e8 --- /dev/null +++ b/Themes/default/Graphics/ScreenTitleMenu LifeDifficulty.lua @@ -0,0 +1,7 @@ +return LoadFont("Common Normal") .. { + Text=GetLifeDifficulty(); + AltText=""; + BeginCommand=function(self) + self:settextf( Screen.String("LifeDifficulty"), GetLifeDifficulty() ); + end +}; \ No newline at end of file diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index fa833fa640..0e49e7a1a1 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -8,6 +8,7 @@ Network OK=Network OK Offline=Offline Connected to %s=Connected to %s CurrentGametype=Current Gametype: %s +LifeDifficulty=Life Difficulty: %s [ScreenQuickSetupOverview] Explanation=Quick Setup provides a easy way to set commonly-changed and useful preferences. [ScreenProfileLoad] @@ -35,6 +36,7 @@ HelpText= HelpText= [ScreenEvaluation] HelpText=&BACK; Exit &START; Move On &MENULEFT;+&MENURIGHT; or &SELECT; Snapshot +LifeDifficulty=Life Difficulty: %s [OptionTitles] UserPrefGameplayShowScore=Show Score UserPrefGameplayShowStepsDisplay=Show Steps diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index d2e6645dea..47eea0a50d 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -708,6 +708,12 @@ CurrentGametypeY=SCREEN_HEIGHT*0.1575 CurrentGametypeOnCommand=vertalign,bottom; CurrentGametypeOffCommand=linear,0.5;cropright,1 # +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 +# ShowVersionInfo=true VersionInfoX=SCREEN_WIDTH*0.9875 VersionInfoY=SCREEN_HEIGHT*0.8825 @@ -1505,7 +1511,13 @@ StepsDisplayP2X=SCREEN_CENTER_X+160 StepsDisplayP2Y=SCREEN_BOTTOM-50 StepsDisplayP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP2");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y StepsDisplayP2OffCommand=bouncebegin,0.15;zoomx,0; - +# +ShowLifeDifficulty=true +LifeDifficultyX=SCREEN_CENTER_X +LifeDifficultyY=SCREEN_TOP+32 +LifeDifficultyOnCommand=zoom,0.75;draworder,105 +LifeDifficultyOffCommand=linear,0.5;cropright,1 +# [ScreenEvaluationNormal] Fallback="ScreenEvaluation" #