gameplay difficulty area cleanup

stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua

@@ -22,7 +22,7 @@ local function DifficultyDisplay(pn)
 	end
 
 	local t = Def.DifficultyDisplay {
-		Type="DifficultyDisplay"; -- metrics section
+		InitCommand=cmd(Load,"DifficultyDisplay",GAMESTATE:GetPlayerState(pn););
 	};
 
 	if pn == PLAYER_1 then

stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/difficulties.lua

@@ -1,7 +1,7 @@
 local t = Def.ActorFrame {
 };
 for idx, diff in pairs(Difficulty) do -- 0, Difficulty_Beginner
-	t[#t+1] = LoadActor( "_DifficultyDisplay 6x1" ) .. {
+	t[#t+1] = LoadActor( "_Difficulty icons 6x1" ) .. {
 		InitCommand=cmd(pause;setstate,Difficulty:Reverse()[diff]);
 		ShowCommand=cmd(stoptweening;linear,0.1;diffusealpha,1);
 		HideCommand=cmd(stoptweening;linear,0.1;diffusealpha,0);

stepmania/Themes/default/Fonts/DifficultyDisplay meter.redir

@@ -1 +1 @@
-BPMDisplay bpm
+common normal

stepmania/Themes/default/metrics.ini

@@ -1026,18 +1026,18 @@ SongOptionsX=SCREEN_CENTER_X+0
 SongOptionsY=SCREEN_CENTER_Y+230
 SongOptionsOnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100
 SongOptionsOffCommand=linear,0.5;addy,100
-DifficultyDisplayP1X=SCREEN_CENTER_X-254
+DifficultyDisplayP1X=SCREEN_CENTER_X-250
 DifficultyDisplayP1Y=
 DifficultyDisplayP1OnCommand=
 DifficultyDisplayP1OffCommand=linear,0.5;addx,-200
 DifficultyDisplayP1SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200
-DifficultyDisplayP1SetNoReverseCommand=y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200
+DifficultyDisplayP1SetNoReverseCommand=y,SCREEN_CENTER_Y+176;addx,-200;linear,0.5;addx,200
-DifficultyDisplayP2X=SCREEN_CENTER_X+254
+DifficultyDisplayP2X=SCREEN_CENTER_X+250
 DifficultyDisplayP2Y=
 DifficultyDisplayP2OnCommand=
 DifficultyDisplayP2OffCommand=linear,0.5;addx,200
 DifficultyDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200
-DifficultyDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200
+DifficultyDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+176;addx,-200;linear,0.5;addx,200
 LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160
 LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140
 # This is used if one player is in reverse and the other isn't.
@@ -1964,6 +1964,8 @@ Fallback="LifeMeterBar"
 FrameX=0
 FrameY=0
 FrameOnCommand=
+FrameLoadCommand=%function(self,param) local bFlip = param.PlayerState and param.PlayerState:GetPlayerNumber() ~= PLAYER_1; self:zoomx(bFlip and -1 or 1); end
+FrameSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)) end end
 NumTicks=10
 MaxTicks=14
 TicksX=0
@@ -1972,12 +1974,15 @@ TicksOnCommand=shadowlength,0;stoke
 TicksSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end
 ShowTicks=false
 ShowMeter=true
-ShowDescription=false
 ZeroMeterString="?"
-MeterX=10
+MeterX=30
 MeterY=0
-MeterOnCommand=shadowlength,0
+MeterOnCommand=shadowlength,0;zoom,0.5
 MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)) end end
+ShowDescription=true
+DescriptionX=-10
+DescriptionY=0
+DescriptionOnCommand=zoom,0.5;shadowlength,0;
 ShowAutogen=true
 AutogenX=0
 AutogenY=0
@@ -2024,7 +2029,6 @@ MeterSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(
 Fallback="DifficultyDisplay"
 MeterOnCommand=shadowlength,0;zoom,0.5
 FrameOnCommand=
-MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)) end end
 ShowAutogen=false
 ShowStepsType=false
 
@@ -4419,4 +4423,4 @@ FrameY=0
 TextX=0
 TextY=0
 TextOnCommand=zoom,0.5;shadowlength,0;
-TextInitCommand=%function(self,param) self:diffuse(PlayerColor(param.PlayerState:GetPlayerNumber())) end
+TextLoadCommand=%function(self,param) self:diffuse(PlayerColor(param.PlayerState:GetPlayerNumber())) end