diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png deleted file mode 100644 index dc0f3d0654..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/_standard decoration.lua b/stepmania/Themes/default/BGAnimations/_standard decoration.lua index 19760de4c0..99bda8b6f5 100644 --- a/stepmania/Themes/default/BGAnimations/_standard decoration.lua +++ b/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"); }; \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow meter.redir b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow meter.redir rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow meter.redir diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1 (stroke).png b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1 (stroke).png old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1 (stroke).png rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1 (stroke).png diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1.png b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1.png old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow ticks 2x1.png rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks 2x1.png diff --git a/stepmania/Themes/default/Fonts/DifficultyListRow ticks.ini b/stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Fonts/DifficultyListRow ticks.ini rename to stepmania/Themes/default/Fonts/DifficultyDisplayListRow ticks.ini diff --git a/stepmania/Themes/default/Graphics/DifficultyDisplayGameplay frame (doubleres).png b/stepmania/Themes/default/Graphics/DifficultyDisplayGameplay frame (doubleres).png new file mode 100644 index 0000000000..d4a57d51da Binary files /dev/null and b/stepmania/Themes/default/Graphics/DifficultyDisplayGameplay frame (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/DifficultyListRow difficulty.lua b/stepmania/Themes/default/Graphics/DifficultyDisplayListRow difficulty.lua old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Graphics/DifficultyListRow difficulty.lua rename to stepmania/Themes/default/Graphics/DifficultyDisplayListRow difficulty.lua diff --git a/stepmania/Themes/default/Graphics/DifficultyListRow frame.lua b/stepmania/Themes/default/Graphics/DifficultyDisplayListRow frame.lua old mode 100755 new mode 100644 similarity index 100% rename from stepmania/Themes/default/Graphics/DifficultyListRow frame.lua rename to stepmania/Themes/default/Graphics/DifficultyDisplayListRow frame.lua diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay difficulty icons 2x6.png b/stepmania/Themes/default/Graphics/ScreenGameplay difficulty icons 2x6.png deleted file mode 100644 index 9b95de2f62..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenGameplay difficulty icons 2x6.png and /dev/null differ diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index ecd6946ca8..5c50129658 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/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. diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index b8587762b8..db469673b1 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/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= -StageFrameY= +StageFrameX=SCREEN_CENTER_X +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 - -DifficultyP1X= -DifficultyP1Y= -DifficultyP1OnCommand= -DifficultyP1OffCommand=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 -DifficultyP1SetNoReverseCommand=x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+183;cropbottom,0.5;croptop,0;addx,-200;linear,0.5;addx,200 - -DifficultyP2X= -DifficultyP2Y= -DifficultyP2OnCommand= -DifficultyP2OffCommand=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 +DifficultyDisplayP1X=SCREEN_CENTER_X-254 +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 +DifficultyDisplayP2X=SCREEN_CENTER_X+254 +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 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 -EditDescriptionX=-70 -EditDescriptionY=0 -EditDescriptionOnCommand=horizalign,right;zoom,.5;shadowlength,2;maxwidth,150 +ShowDescription=false +DescriptionX=-70 +DescriptionY=0 +DescriptionOnCommand=horizalign,right;zoom,.5;shadowlength,2;maxwidth,150 ZeroMeterString="?" MeterSetCommand=%function(self,param) self:diffuse(DifficultyAndStepsTypeToColor(param.Difficulty,param.StepsType)); end