remove DifficultyIcon, use DifficultyDisplay in gameplay, DifficultyListRow -> DifficultyDisplayListRow to make inheritance clear

stepmania/Themes/default/BGAnimations/_standard decoration.lua

@@ -1,6 +1,11 @@
 local MetricsName, FileName = ...;
 return LoadActor( THEME:GetPathG(Var "LoadingScreen",FileName) ) .. {
-	InitCommand=cmd(x,THEME:GetMetric(Var "LoadingScreen",MetricsName .. "X");y,THEME:GetMetric(Var "LoadingScreen",MetricsName .. "Y"););
+	InitCommand=function(self)
+			local x1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "X");
+			if x1 then self:x(x1); end
+			local y1 = THEME:GetMetric(Var "LoadingScreen",MetricsName .. "Y");
+			if y1 then self:y(y1); end
+		end;
 	OnCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OnCommand");
 	OffCommand=THEME:GetMetric(Var "LoadingScreen",MetricsName .. "OffCommand");
 };

stepmania/Themes/default/Languages/en.ini

@@ -35,6 +35,14 @@ The following packages were exported to your Desktop:=The following packages wer
 [CatalogXml]
 Saving %s ...=Saving %s ...
 
+[Difficulty]
+Beginner=Beginner
+Challenge=Expert
+Easy=Easy
+Edit=Edit
+Hard=Hard
+Medium=Medium
+
 [CourseDifficulty]
 Beginner=BEGINNER
 Challenge=CHALLENGE
@@ -56,14 +64,6 @@ Nonstop=Nonstop
 Oni=Oni
 Survival=Survival
 
-[Difficulty]
-Beginner=Beginner
-Challenge=Expert
-Easy=Easy
-Edit=Edit
-Hard=Hard
-Medium=Medium
-
 [EditInstallations]
 You must type a program directory before clicking Add.=You must type a program directory before clicking Add.
 '%s' is not a valid installation directory.='%s' is not a valid installation directory.

stepmania/Themes/default/metrics.ini

@@ -949,8 +949,8 @@ StageX=SCREEN_CENTER_X+0
 StageY=SCREEN_CENTER_Y-206
 StageOnCommand=draworder,100;addy,-100;linear,0.5;addy,100
 StageOffCommand=linear,0.5;addy,-100
-StageFrameX=
+StageFrameX=SCREEN_CENTER_X
-StageFrameY=
+StageFrameY=SCREEN_CENTER_Y-206
 StageFrameOnCommand=visible,false
 StageFrameOffCommand=
 SongNumberP1X=SCREEN_CENTER_X-25
@@ -1026,20 +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
-DifficultyP1X=
+DifficultyDisplayP1Y=
-DifficultyP1Y=
+DifficultyDisplayP1OnCommand=
-DifficultyP1OnCommand=
+DifficultyDisplayP1OffCommand=linear,0.5;addx,-200
-DifficultyP1OffCommand=linear,0.5;addx,-200
+DifficultyDisplayP1SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200
-DifficultyP1SetReverseCommand=x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-196;cropbottom,0;croptop,0.5;addx,-200;linear,0.5;addx,200
+DifficultyDisplayP1SetNoReverseCommand=y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200
-DifficultyP1SetNoReverseCommand=x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+183;cropbottom,0.5;croptop,0;addx,-200;linear,0.5;addx,200
+DifficultyDisplayP2X=SCREEN_CENTER_X+254
-
+DifficultyDisplayP2Y=
-DifficultyP2X=
+DifficultyDisplayP2OnCommand=
-DifficultyP2Y=
+DifficultyDisplayP2OffCommand=linear,0.5;addx,200
-DifficultyP2OnCommand=
+DifficultyDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200
-DifficultyP2OffCommand=linear,0.5;addx,200
+DifficultyDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+183;addx,-200;linear,0.5;addx,200
-DifficultyP2SetReverseCommand=x,SCREEN_CENTER_X+254;y,SCREEN_CENTER_Y-196;cropbottom,0;croptop,0.5;addx,-200;linear,0.5;addx,200
-DifficultyP2SetNoReverseCommand=x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+183;cropbottom,0.5;croptop,0;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.
@@ -1971,15 +1969,15 @@ MaxTicks=14
 TicksX=0
 TicksY=0
 TicksOnCommand=shadowlength,0;stoke
-TicksSetCommand=%function(self,param) self:diffuse(DifficultyColor(param.Difficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end
+TicksSetCommand=%function(self,param) self:diffuse(DifficultyToColor(param.Difficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end
 ShowTicks=false
 ShowMeter=true
-ShowEditDescription=false
+ShowDescription=false
 ZeroMeterString="?"
 MeterX=10
 MeterY=0
 MeterOnCommand=shadowlength,0
-MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyColor(param.Difficulty)) end end
+MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyToColor(param.Difficulty)) end end
 
 [DifficultyDisplayEdit]
 Fallback="DifficultyDisplay"
@@ -1990,6 +1988,12 @@ MeterOnCommand=shadowlength,2;zoom,0.7
 MeterOffCommand=
 ZeroMeterString= 
 
+[DifficultyDisplayGameplay]
+Fallback="DifficultyDisplay"
+MeterOnCommand=shadowlength,0;zoom,0.5
+FrameOnCommand=
+MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyToColor(param.Difficulty)) end end
+
 [ScreenWithMenuElements]
 Fallback="Screen"
 AllowDisabledPlayerInput=false
@@ -4392,7 +4396,7 @@ CursorP1HideCommand=linear,.3;diffusealpha,0
 CursorP2HideCommand=linear,.3;diffusealpha,0
 
 [DifficultyListRow]
-Fallback=DifficultyDisplay
+Fallback="DifficultyDisplay"
 FrameX=0
 FrameY=0
 FrameOnCommand=
@@ -4407,10 +4411,10 @@ ShowMeter=1
 MeterX=92
 MeterY=-1
 MeterOnCommand=zoom,0.5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");
-ShowEditDescription=false
+ShowDescription=false
-EditDescriptionX=-70
+DescriptionX=-70
-EditDescriptionY=0
+DescriptionY=0
-EditDescriptionOnCommand=horizalign,right;zoom,.5;shadowlength,2;maxwidth,150
+DescriptionOnCommand=horizalign,right;zoom,.5;shadowlength,2;maxwidth,150
 ZeroMeterString="?"
 MeterSetCommand=%function(self,param) self:diffuse(DifficultyAndStepsTypeToColor(param.Difficulty,param.StepsType)); end