diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores background/bg (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHighScores background/bg (doubleres).png new file mode 100644 index 0000000000..aa4104e152 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHighScores background/bg (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHighScores background/default.lua new file mode 100644 index 0000000000..567945fe50 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenHighScores background/default.lua @@ -0,0 +1,3 @@ +return LoadActor( "bg" ) .. { + InitCommand = cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;) +} diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua new file mode 100644 index 0000000000..5b1cc34c6f --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua @@ -0,0 +1,25 @@ +local t = Def.ActorFrame { + LoadActor("mockup") .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffusealpha,0.2;); + }; + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-200;); + LoadActor("difficulty pill") .. { + InitCommand=cmd(x,-100;); + }; + LoadActor("difficulty pill") .. { + InitCommand=cmd(x,-50;); + }; + LoadActor("difficulty pill") .. { + InitCommand=cmd(x,0;); + }; + LoadActor("difficulty pill") .. { + InitCommand=cmd(x,50;); + }; + LoadActor("difficulty pill") .. { + InitCommand=cmd(x,100;); + }; + }; +} + +return t; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/difficulty pill (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/difficulty pill (doubleres).png new file mode 100644 index 0000000000..ac88521336 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/difficulty pill (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/mockup (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/mockup (doubleres).png new file mode 100644 index 0000000000..1d6e516ec2 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenHighScores decorations/mockup (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenHighScores underlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenHighScores underlay/default.lua new file mode 100644 index 0000000000..afe47defed --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenHighScores underlay/default.lua @@ -0,0 +1,4 @@ +return LoadFont("common normal") .. { + Text = "Best Ranking", + InitCommand = cmd(horizalign,'HorizAlign_Left';x,SCREEN_LEFT+48;y,SCREEN_TOP+32;shadowlength,0) +} diff --git a/stepmania/Themes/default/Fonts/ScreenHighScores Name.redir b/stepmania/Themes/default/Fonts/ScreenHighScores Name.redir new file mode 100644 index 0000000000..e3efea95aa --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenHighScores Name.redir @@ -0,0 +1 @@ +_terminator two 18px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenHighScores Score.redir b/stepmania/Themes/default/Fonts/ScreenHighScores Score.redir new file mode 100644 index 0000000000..e3efea95aa --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenHighScores Score.redir @@ -0,0 +1 @@ +_terminator two 18px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenRanking StepsType.redir b/stepmania/Themes/default/Fonts/ScreenRanking StepsType.redir new file mode 100644 index 0000000000..6272ef61a7 --- /dev/null +++ b/stepmania/Themes/default/Fonts/ScreenRanking StepsType.redir @@ -0,0 +1 @@ +common normal \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua new file mode 100644 index 0000000000..3470ebc29e --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua @@ -0,0 +1,98 @@ +local t = Def.ActorFrame { + InitCommand=cmd(runcommandsonleaves,cmd(ztest,true)); +}; + +--t[#t+1] = LoadActor("frame") .. { +--}; + + +t[#t+1] = Def.TextBanner { + InitCommand=cmd(x,-224;y,0;Load,"TextBanner";); + SetCommand=function(self, params) + if params.Song then + self:SetFromSong( params.Song ); + else + self:SetFromString( params.Course:GetTitle() ); + end + end; +}; + +local NumColumns = THEME:GetMetric(Var "LoadingScreen", "NumColumns"); + +local c; +local Scores = Def.ActorFrame { + InitCommand = function(self) + c = self:GetChildren(); + end; +}; +t[#t+1] = Scores; + +for idx=1,NumColumns do + local x_pos = -60 + 80 * (idx-1); + Scores[#Scores+1] = LoadFont(Var "LoadingScreen","Name") .. { + Name = idx .. "Name"; + InitCommand=cmd(x,x_pos;y,6;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,68;); + }; + Scores[#Scores+1] = LoadFont(Var "LoadingScreen","Score") .. { + Name = idx .. "Score"; + InitCommand=cmd(x,x_pos;y,-10;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,68;); + }; + Scores[#Scores+1] = LoadActor("filled") .. { + Name = idx .. "Filled"; + InitCommand=cmd(x,x_pos;); + }; + Scores[#Scores+1] = LoadActor("empty") .. { + Name = idx .. "Empty"; + InitCommand=cmd(x,x_pos;); + }; + +end + +local sNoScoreName = THEME:GetMetric("Common", "NoScoreName"); + +Scores.SetCommand=function(self, params) + local pProfile = PROFILEMAN:GetMachineProfile(); + + for name, child in pairs(c) do + child:visible(false); + end + --for idx=1,NumColumns do + -- c[idx .. "Empty"]:visible(true); + --end + + local Current = params.Song or params.Course; + if Current then + for idx, CurrentItem in pairs(params.Entries) do + if CurrentItem then + local hsl = pProfile:GetHighScoreList(Current, CurrentItem); + local hs = hsl and hsl:GetHighScores(); + --[[Warn( tostring(CurrentItem:GetStepsType()) .. ", " .. + tostring(CurrentItem:GetDifficulty()) .. ": " .. + tostring(hsl) .. ", " .. + tostring(#hs) );]] + local name = c[idx .. "Name"]; + local score = c[idx .. "Score"]; + local filled = c[idx .. "Filled"]; + local empty = c[idx .. "Empty"]; + + --assert( c[sNameType], sNameType ); + --assert( c[sScoreType], sScoreType ); + + if hs and #hs > 0 then + name:visible( true ); + score:visible( true ); + filled:visible( true ); + empty:visible( false ); + name:settext( hs[1]:GetName() ); + score:settext( FormatPercentScore( hs[1]:GetPercentDP() ) ); + else + empty:visible( true ); + --name:settext( sNoScoreName ); + --score:settext( FormatPercentScore( 0 ) ); + end + end + end; + end +end; + +return t; diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/empty (doubleres).png b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/empty (doubleres).png new file mode 100644 index 0000000000..51816916cb Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/empty (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/filled (doubleres).png b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/filled (doubleres).png new file mode 100644 index 0000000000..6c01938c30 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/filled (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png new file mode 100644 index 0000000000..ef8997c601 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenHighScores ScrollerItem/frame (doubleres).png differ