diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua index 4926bd0126..61a4020e65 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua @@ -260,7 +260,7 @@ if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then -- Difficulty banner local grade_parts_offs = -320 t[#t+1] = Def.ActorFrame { - InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-94;visible,not GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-96;visible,not GAMESTATE:IsCourseMode();); OnCommand=cmd(zoomx,0.3;diffusealpha,0;sleep,0.5;decelerate,0.4;zoomx,1;diffusealpha,1;); OffCommand=cmd(decelerate,0.4;diffusealpha,0;); LoadFont("Common Fallback") .. { @@ -298,7 +298,7 @@ if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then if GAMESTATE:IsCourseMode() == false then local grade_parts_offs = 320 t[#t+1] = Def.ActorFrame { - InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-94;visible,not GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-96;visible,not GAMESTATE:IsCourseMode();); OnCommand=cmd(zoomx,0.3;diffusealpha,0;sleep,0.5;decelerate,0.4;zoomx,1;diffusealpha,1;); OffCommand=cmd(decelerate,0.4;diffusealpha,0;); LoadFont("Common Fallback") .. { diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua index fd966a25de..1fbc9dab35 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua @@ -2,7 +2,7 @@ local t = Def.ActorFrame {}; -- Sort order t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;;); + InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); OffCommand=cmd(linear,0.3;diffusealpha,0;); LoadActor(THEME:GetPathG("", "_sortFrame")) .. { InitCommand=cmd(diffusealpha,0.9;zoom,1.5); @@ -22,7 +22,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Condensed") .. { - InitCommand=cmd(zoom,1;maxwidth,SCREEN_WIDTH;addx,115;diffuse,color("#FFFFFF");uppercase,true;horizalign,right;); + InitCommand=cmd(zoom,1;maxwidth,SCREEN_WIDTH;addx,115;diffuse,color("#FFFFFF");uppercase,true;horizalign,right;maxwidth,157;); OnCommand=cmd(queuecommand,"Set"); SortOrderChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); diff --git a/Themes/default/Fonts/MusicWheelItem Mode.redir b/Themes/default/Fonts/MusicWheelItem Mode.redir index 5c6053f7f1..cad9228849 100644 --- a/Themes/default/Fonts/MusicWheelItem Mode.redir +++ b/Themes/default/Fonts/MusicWheelItem Mode.redir @@ -1 +1 @@ -Common Normal \ No newline at end of file +Common Fallback \ No newline at end of file diff --git a/Themes/default/Fonts/MusicWheelItem sort.redir b/Themes/default/Fonts/MusicWheelItem sort.redir new file mode 100644 index 0000000000..cad9228849 --- /dev/null +++ b/Themes/default/Fonts/MusicWheelItem sort.redir @@ -0,0 +1 @@ +Common Fallback \ No newline at end of file diff --git a/Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua b/Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua new file mode 100644 index 0000000000..8f4f71d7f2 --- /dev/null +++ b/Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua @@ -0,0 +1,3 @@ +return LoadActor(THEME:GetPathG("MusicWheelItem", "ModeItem")) .. { + OnCommand=cmd(diffuse,ScreenColor(SCREENMAN:GetTopScreen():GetName());); +}; \ No newline at end of file diff --git a/Themes/default/Graphics/MusicWheelItem Mode NormalPart.png b/Themes/default/Graphics/MusicWheelItem Mode NormalPart.png deleted file mode 100644 index 060449a0c9..0000000000 Binary files a/Themes/default/Graphics/MusicWheelItem Mode NormalPart.png and /dev/null differ diff --git a/Themes/default/Graphics/MusicWheelItem ModeItem.png b/Themes/default/Graphics/MusicWheelItem ModeItem.png new file mode 100644 index 0000000000..88e5162cd9 Binary files /dev/null and b/Themes/default/Graphics/MusicWheelItem ModeItem.png differ diff --git a/Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua b/Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua new file mode 100644 index 0000000000..8f4f71d7f2 --- /dev/null +++ b/Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua @@ -0,0 +1,3 @@ +return LoadActor(THEME:GetPathG("MusicWheelItem", "ModeItem")) .. { + OnCommand=cmd(diffuse,ScreenColor(SCREENMAN:GetTopScreen():GetName());); +}; \ No newline at end of file diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 63845d7698..510aa3d9a4 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -80,6 +80,16 @@ SpeedLabel=Speed LengthLabel=Length StageLabel=Stage +[MusicWheel] +ChallengeMeterText=Expert Meter +DoubleChallengeMeterText=Expert Meter (Double) +PopularityText=Most Played + +[SortOrder] +Popularity=Most Played +ChallengeMeter=Expert Meter +DoubleChallengeMeter=Double Expert Meter + [ScreenSelectCourse] HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move::&MENUUP;&MENUUP;/&MENUDOWN;&MENUDOWN; Change Difficulty &UP;&DOWN;&UP;&DOWN; for other course types @@ -262,6 +272,23 @@ Explanation-AdditionalFolders=If you have other installs of StepMania, you can u Explanation-ReloadSongs=Reload the songs. This is required if you've added/changed/deleted songs while StepMania is running. Explanation-Exit=Return to the title menu. +[TapNoteScore] +W1=Flawless +W2=Perfect +W3=Great +W4=Good +W5=Bad + +[JudgmentLine] +W1=Flawless +W2=Perfect +W3=Great +W4=Good +W5=Bad +Held=Held +MaxCombo=Max Combo +Miss=Miss + [OptionNames] Custom=Special Many=Many diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index f4b6c2f697..9673278c74 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -849,6 +849,9 @@ CourseOnCommand=zoom,1.0;horizalign,left;shadowlength,1;maxwidth,SCREEN_WIDTH*0. ModeX=-210 ModeOnCommand=zoom,1.0;horizalign,left;shadowlength,1;maxwidth,SCREEN_WIDTH*0.31;strokecolor,color("#42292E") +SortX=-210 +SortOnCommand=zoom,1.0;horizalign,left;shadowlength,1;maxwidth,SCREEN_WIDTH*0.31;strokecolor,color("#42292E") + [TextBanner] TitleX=150 TitleY=0