diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_background.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_background.png index 1f70d00267..be0a86f582 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_background.png and b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_background.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Beginner.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Beginner.png index 1a527877c6..50e7009426 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Beginner.png and b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Beginner.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Challenge.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Challenge.png index 10de18d296..5a29185cac 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Challenge.png and b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Challenge.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Easy.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Easy.png index d029aa927a..682bc53ce1 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Easy.png and b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Easy.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Edit.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Edit.png index 87125989ea..19a3f16e81 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Edit.png and b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Edit.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Hard.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Hard.png index b72deec656..c54c8154c7 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Hard.png and b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Hard.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Medium.png b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Medium.png index 1f399e3fe6..1aab84c8aa 100644 Binary files a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Medium.png and b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/_barpeice Medium.png differ diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua index afc47353f7..b26cdbe22e 100644 --- a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua +++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua @@ -1,4 +1,25 @@ local t = Def.ActorFrame {}; +local function GetEdits( in_Song, in_StepsType ) + if in_Song then + local sSong = in_Song; + local sCurrentStyle = GAMESTATE:GetCurrentStyle(); + local sStepsType = in_StepsType; + local iNumEdits = 0; + if sSong:HasEdits( sStepsType ) then + local tAllSteps = sSong:GetAllSteps(); + for i,Step in pairs(tAllSteps) do + if Step:IsAnEdit() and s:GetStepsType() == sStepsType then + iNumEdits = iNumEdits + 1; + end + end + return iNumEdits; + else + return iNumEdits; + end + else + return 0; + end +end; t[#t+1] = Def.ActorFrame { LoadActor("_Background"); }; @@ -6,12 +27,12 @@ t[#t+1] = Def.ActorFrame { for idx,diff in pairs(Difficulty) do local sDifficulty = ToEnumShortString( diff ); local tLocation = { - Beginner = 16, - Easy = 16*2, - Medium = 16*3, - Hard = 16*4, - Challenge = 16*5, - Edit = 16*7, + Beginner = 32*-1.25, + Easy = 32*-0.25, + Medium = 32*0.75, + Hard = 32*1.75, + Challenge = 32*2.75, + Edit = 32*4.75, }; t[#t+1] = Def.ActorFrame { SetCommand=function(self) @@ -27,14 +48,12 @@ for idx,diff in pairs(Difficulty) do local steps = song:GetOneSteps( st, diff ); if steps then meter = steps:GetMeter(); - if meter >= 50 then - meter = "!"; - end; + -- if diff == 'Difficulty_Edit' then - meter = meter .. " Edit"; - end; - end; - end; + meter = GetEdits( song, st ) .. ' Edit'; + end + end + end c.Meter:settext( meter ); self:playcommand( bHasStepsTypeAndDifficulty and "Show" or "Hide" ); end; diff --git a/Themes/default/~res/ScreenSelectMusic DifficultyDisplayLarge.psd b/Themes/default/~res/ScreenSelectMusic DifficultyDisplayLarge.psd new file mode 100644 index 0000000000..2f819c3fcc Binary files /dev/null and b/Themes/default/~res/ScreenSelectMusic DifficultyDisplayLarge.psd differ