From 65e1e84b11f3ecb6aeb1f57f6d66fd2ab1446aae Mon Sep 17 00:00:00 2001 From: ListenerJubatus Date: Tue, 2 Jan 2018 13:11:08 -0600 Subject: [PATCH] Fix mode wheel and sort display --- .../ScreenEvaluation underlay/default.lua | 4 +-- .../ScreenSelectMusic overlay.lua | 4 +-- .../default/Fonts/MusicWheelItem Mode.redir | 2 +- .../default/Fonts/MusicWheelItem sort.redir | 1 + .../MusicWheelItem Mode NormalPart.lua | 3 ++ .../MusicWheelItem Mode NormalPart.png | Bin 22189 -> 0 bytes .../Graphics/MusicWheelItem ModeItem.png | Bin 0 -> 22763 bytes .../MusicWheelItem Sort NormalPart.lua | 3 ++ Themes/default/Languages/en.ini | 27 ++++++++++++++++++ Themes/default/metrics.ini | 3 ++ 10 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 Themes/default/Fonts/MusicWheelItem sort.redir create mode 100644 Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua delete mode 100644 Themes/default/Graphics/MusicWheelItem Mode NormalPart.png create mode 100644 Themes/default/Graphics/MusicWheelItem ModeItem.png create mode 100644 Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua 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 060449a0c9748784a8ca838094f8b27d7d33cc9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22189 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

oGPl_e{nla77Yn3a%MO16Fr%EY_S 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 diff --git a/Themes/default/Graphics/MusicWheelItem ModeItem.png b/Themes/default/Graphics/MusicWheelItem ModeItem.png new file mode 100644 index 0000000000000000000000000000000000000000..88e5162cd9ad2af11599016869a206c6dab2a89f GIT binary patch literal 22763 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 literal 0 HcmV?d00001 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