diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index a1b8c1c502..11d7027c45 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -43,20 +43,28 @@ if ShowStandardDecoration("ItsARecord") then for pn in ivalues(PlayerNumber) do local t2 = Def.ActorFrame { BeginCommand=function(self) - local index = SCREENMAN:GetTopScreen():GetStageStats():GetPlayerStageStats(pn):GetMachineHighScoreIndex(); + local pss = SCREENMAN:GetTopScreen():GetStageStats():GetPlayerStageStats(pn); + local index = pss:GetMachineHighScoreIndex(); + local hsl = PROFILEMAN:GetMachineProfile():GetHighScoreList(pSong,pSteps): + hsl:GetHighScores()[1]:GetName GetScore GetPercentDP if index == 0 then self:GetChild("Record"):visible( true ); self:GetChild("NoRecord"):visible( false ); else self:GetChild("Record"):visible( false ); self:GetChild("NoRecord"):visible( true ); + if hsl then + self:GetChild("NoRecord"):settext("WWWW:\n82.34%"); + else + self:GetChild("NoRecord"):settext(""); + end end end; LoadFont("_sf sports night ns upright 16px") .. { InitCommand=cmd(name,"Record";settext,"It's a New\nRecord!!!";diffuse,color("#fffc00");strokecolor,color("#807e00");vertspacing,-2;shadowlength,0;glowshift;); }; LoadFont("common normal") .. { - InitCommand=cmd(name,"NoRecord";settext,"WWWW:\n82.34%";strokecolor,color("#807e00");shadowlength,0;); + InitCommand=cmd(name,"NoRecord";strokecolor,color("#706f43");shadowlength,0;); }; } t[#t+1] = StandardDecorationFromTable( "ItsARecord" .. ToEnumShortString(pn), t2 ); diff --git a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png index 6d9b23376a..8ada8258e4 100755 Binary files a/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png and b/stepmania/Themes/default/BGAnimations/ScreenHowToPlay background/bg.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua index 985252606e..8f4b519a38 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/default.lua @@ -1,19 +1,20 @@ local t = LoadFallbackB(); -t[#t+1] = LoadActor( "help pane" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X+186;y,SCREEN_BOTTOM;vertalign,bottom;); -}; t[#t+1] = LoadActor( "settings pane" ) .. { InitCommand=cmd(x,SCREEN_CENTER_X-200;y,SCREEN_TOP;vertalign,top;); }; t[#t+1] = LoadFont("Common", "normal") .. { - InitCommand=cmd(x,SCREEN_CENTER_X-266;y,SCREEN_TOP+36;horizalign,left;shadowlengthx,0;shadowlengthy,2;playcommand,"Set"); + InitCommand=cmd(x,SCREEN_CENTER_X-202;y,SCREEN_TOP+40;shadowlengthx,0;shadowlengthy,2;playcommand,"Set"); SetCommand=function(self) local s = ""; + + local text = ProductVersion() .. " " .. VersionTime(); + s = s .. "\n" .. text; + local fmt = THEME:GetString( Var "LoadingScreen", "%d songs in %d groups" ); local text = string.format( fmt, SONGMAN:GetNumSongs(), SONGMAN:GetNumSongGroups() ) - s = s .. text; + s = s .. "\n" .. text; local fmt = THEME:GetString( Var "LoadingScreen", "%d courses in %d groups" ); local text = string.format( fmt, SONGMAN:GetNumCourses(), SONGMAN:GetNumCourseGroups() ) @@ -26,14 +27,14 @@ t[#t+1] = LoadFont("Common", "normal") .. { s = s .. "\n" .. text; end - local fmt = THEME:GetString( Var "LoadingScreen", "Current gametype:" ); + local fmt = THEME:GetString( Var "LoadingScreen", "Gametype:" ); local text = fmt .. " " .. GAMESTATE:GetCurrentGame():GetName(); s = s .. "\n" .. text; local fmt = THEME:GetString( Var "LoadingScreen", "Difficulty:" ); local text = fmt .. " " .. GetTimingDifficulty(); s = s .. "\n" .. text; - + self:settext( s ) end; }; @@ -41,12 +42,11 @@ t[#t+1] = LoadFont("Common", "normal") .. { InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+36;horizalign,left;diffuse,0.6,0.6,0.6,1;shadowlength,2); }; t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X-210;y,SCREEN_CENTER_Y+200;); - LoadActor( "stepmania logo" ) .. { - }; - LoadFont( "common normal" ) .. { - InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();diffuse,color("#000000");shadowlength,0;); - }; + InitCommand=cmd(x,SCREEN_CENTER_X+210;y,SCREEN_CENTER_Y+200;); + LoadActor( "stepmania logo" ) .. { + }; + LoadFont( "common normal" ) .. { + InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();diffuse,color("#000000");shadowlength,0;); + }; }; - return t; diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/help pane (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/help pane (doubleres).png deleted file mode 100644 index f8070659bd..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu decorations/help pane (doubleres).png and /dev/null differ diff --git a/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir b/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir index e3efea95aa..695562aab4 100644 --- a/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir +++ b/stepmania/Themes/default/Fonts/ScreenWithMenuElements StageDisplay.redir @@ -1 +1 @@ -_terminator two 18px \ No newline at end of file +_sf square head 13px \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/_sf square head 13px.ini b/stepmania/Themes/default/Fonts/_sf square head 13px.ini index c065cff15f..cf79adbdfc 100644 --- a/stepmania/Themes/default/Fonts/_sf square head 13px.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 13px.ini @@ -1,9 +1,9 @@ -[common] +[common] Baseline=11 Top=2 LineSpacing=13 -DrawExtraPixelsLeft=0 -DrawExtraPixelsRight=0 +DrawExtraPixelsLeft= +DrawExtraPixelsRight=2 AdvanceExtraPixels=0 DefaultStrokeColor=#FFFFFF00 diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua index 569ac2435d..d992e3061c 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua @@ -7,7 +7,7 @@ local ScreenName = Var "LoadingScreen"; function MakeBitmapTest() return LoadFont(ScreenName,"StageDisplay") .. { - InitCommand=cmd(shadowlength,0;uppercase,true;); + InitCommand=cmd(y,2;shadowlength,0;); }; end @@ -23,7 +23,7 @@ for s in ivalues(Stage) do StageIndex = ss:GetStageIndex(); end self:visible( Stage == s ); - self:settext( StageToLocalizedString(Stage) ); + self:settext( "3rd" ); self:diffuse( StageToColor(s) ); self:strokecolor( StageToStrokeColor(s) ); end; diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 316e9f8346..99a45d96c6 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1421,7 +1421,7 @@ Space=Space [ScreenTitleMenu] %d songs in %d groups=%d songs in %d groups %d courses in %d groups=%d courses in %d groups -Current gametype:=Current gametype: +Gametype:=Gametype: Difficulty:=Difficulty: Announcer=Announcer Play Online=Network Play diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 75bf8122c1..d1ebe3adc0 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -112,10 +112,7 @@ ScrollerOffCommand= TimerSeconds=-1 ShowStyleIcon=false ShowHelp=true -HelpX=SCREEN_CENTER_X+200 -HelpY=SCREEN_BOTTOM-40 HelpText=ScreenString("HelpTextOptionsSimple") -HelpOffCommand= IdleCommentSeconds=12 IdleTimeoutSeconds=30 IdleTimeoutScreen=THEME:GetMetric("Common","FirstAttractScreen")