Can't forget theme stuff.

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
+ItemOnCommand=x,SCREEN_CENTER_X+176;halign,0;strokecolor,color("#222222CC");shadowlength,1;zoom,0.75
-ColorDisabled=color("1,1,1,1")
+ColorDisabled=Color("Orange")
 
 [ScreenMiniMenuMainMenu]
 Fallback="ScreenMiniMenu"

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

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,
+		Beginner	= 32*-1.25,
-		Easy 		= 16*2,
+		Easy 		= 32*-0.25,
-		Medium		= 16*3,
+		Medium		= 32*0.75,
-		Hard		= 16*4,
+		Hard		= 32*1.75,
-		Challenge	= 16*5,
+		Challenge	= 32*2.75,
-		Edit 		= 16*7,
+		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";
+					meter = GetEdits( song, st ) .. ' Edit';
-					end;
+					end
-				end;
+				end
-			end;
+			end
 			c.Meter:settext( meter );
 			self:playcommand( bHasStepsTypeAndDifficulty and "Show" or "Hide" );
 		end;

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
+StageDisplayX=SCREEN_LEFT+192+32
-StageDisplayY=SCREEN_TOP+160-96+4
+StageDisplayY=SCREEN_TOP+24+3
-StageDisplayOnCommand=draworder,105;fov,90;zoom,0.75;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.75
+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
+DifficultyDisplayX=SCREEN_CENTER_X-160
-DifficultyDisplayY=SCREEN_TOP+160-96+4
+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

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) {}
 	
 	/**