diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 95a34e99e4..dcd6d3423d 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2609,7 +2609,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X+150 ItemOnCommand= ColorSelected=color("0.5,1,0.5,1") ColorNotSelected=color("1,1,1,1") -ColorDisabled=color("0.5,0.5,0.5,1") +ColorDisabled=color("0.65,0,0,1") TweenSeconds=0 [ScreenMiniMenuContext] @@ -3711,10 +3711,11 @@ RowInitCommand=halign,0.5;valign,0.5;zoom,0.8;x,75;y,45;shadowlength,1 OptionRowNormalMetricsGroup="OptionRowMiniMenuEditHelp" [OptionRowMiniMenuEditHelp] +# Help menu ( Keys & Stuff ) Fallback="OptionRowMiniMenu" TitleX=SCREEN_CENTER_X-312 -TitleOnCommand=halign,0;strokecolor,color("#222222CC");shadowlength,1;zoom,0.9 +TitleOnCommand=halign,0;strokecolor,color("#222222FF");shadowlength,1;zoom,0.75 RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ local indexOffset = itemIndex-(numItems-1)/2; \ @@ -3726,8 +3727,8 @@ ItemsEndX=SCREEN_CENTER_X+260 ItemsLongRowP1X=SCREEN_CENTER_X+260 ItemsLongRowP2X=SCREEN_CENTER_X+260 -ItemOnCommand=x,SCREEN_CENTER_X+176;halign,0;strokecolor,color("#222222CC");shadowlength,1;zoom,0.9 -ColorDisabled=color("1,1,1,1") +ItemOnCommand=x,SCREEN_CENTER_X+176;halign,0;strokecolor,color("#222222CC");shadowlength,1;zoom,0.75 +ColorDisabled=Color("Orange") [ScreenMiniMenuMainMenu] Fallback="ScreenMiniMenu" diff --git a/Themes/default/BGAnimations/ScreenEvaluation overlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation overlay/default.lua index 13c78bc09b..f60350e627 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation overlay/default.lua @@ -61,4 +61,8 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,WideScale(math.floor(SCREEN_CENTER_X*0.3)-8,math.floor(SCREEN_CENTER_X*0.5)-8);y,SCREEN_CENTER_Y); CreateStats( PLAYER_1 ); }; +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(x,WideScale(math.floor(SCREEN_CENTER_X*1.7)+8,math.floor(SCREEN_CENTER_X*1.5)+8);y,SCREEN_CENTER_Y); + CreateStats( PLAYER_2 ); +}; return t \ No newline at end of file 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/metrics.ini b/Themes/default/metrics.ini index 71636f5de9..c9211322dd 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -878,26 +878,26 @@ SortOrderSongChosenCommand=linear,0.25;diffusealpha,0; SortOrderOffCommand=bouncebegin,0.15;zoomy,0; # ShowStageDisplay=true -StageDisplayX=SCREEN_CENTER_X-160-64 -StageDisplayY=SCREEN_TOP+160-96+4 -StageDisplayOnCommand=draworder,105;fov,90;zoom,0.75;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.75 +StageDisplayX=SCREEN_LEFT+192+32 +StageDisplayY=SCREEN_TOP+24+3 +StageDisplayOnCommand=skewx,-0.125;draworder,105;fov,90;zoom,0.675;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.675 StageDisplayOffCommand=linear,0.25;zoomy,0; # ShowDifficultyDisplay=not GetGamePrefB("AutoSetStyle") and not GAMESTATE:IsCourseMode() # ShowDifficultyDisplay=not GetUserPrefB("UserPrefAutoSetStyle") and not GAMESTATE:IsCourseMode() -DifficultyDisplayX=SCREEN_CENTER_X-160+64 -DifficultyDisplayY=SCREEN_TOP+160-96+4 +DifficultyDisplayX=SCREEN_CENTER_X-160 +DifficultyDisplayY=SCREEN_TOP+160-96+2 DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1 DifficultyDisplayOffCommand=linear,0.25;zoomy,0; # BannerX=SCREEN_CENTER_X-160 -BannerY=SCREEN_TOP+160-36 +BannerY=SCREEN_TOP+160-36+4 BannerOnCommand=draworder,-1;scaletoclipped,256,80;visible,true;ztest,1;addy,-SCREEN_CENTER_Y;decelerate,0.35;addy,SCREEN_CENTER_Y BannerOffCommand=bouncebegin,0.15;zoomx,0; # ShowBannerFrame=true BannerFrameX=SCREEN_CENTER_X-160 -BannerFrameY=SCREEN_TOP+160-36 +BannerFrameY=SCREEN_TOP+160-36+4 BannerFrameOnCommand=draworder,105;addy,-SCREEN_CENTER_Y;decelerate,0.35;addy,SCREEN_CENTER_Y BannerFrameOffCommand=bouncebegin,0.15;zoomx,0; # @@ -1200,7 +1200,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X+200 ItemOnCommand=zoom,0.6375 ColorSelected=color("1,1,1,1") -ColorNotSelected=color("0.9,0.9,0.9,1") +ColorNotSelected=color("0.5,0.5,0.5,1") [ScreenMiniMenuContext] PageOnCommand=visible,false 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 diff --git a/src/TimingData.h b/src/TimingData.h index 048b5d885c..21add1ba39 100644 --- a/src/TimingData.h +++ b/src/TimingData.h @@ -667,7 +667,7 @@ struct SpeedSegment * @brief Sets up the SpeedSegment with specified values. * @param i The row this activates. * @param p The percentage to use. */ - SpeedSegment(int i, float p): m_iStartRow(0), + SpeedSegment(int i, float p): m_iStartRow(i), m_fPercent(p), m_fWait(0), m_usMode(0) {} /**