From 25837213a7d97937dc6190b3530e45d023d43a84 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 17 Aug 2008 00:13:51 +0000 Subject: [PATCH] DifficultyDisplay -> StepsDisplay (reduce confusion with DifficultyDisplayType) --- .../default.lua | 8 +- .../ScreenSelectMusic decorations/default.lua | 10 +-- stepmania/Themes/default/metrics.ini | 90 +++++++++---------- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index 10f0f1c15c..458199a08c 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -59,13 +59,13 @@ t[#t+1] = Def.ModIconRow { OffCommand=cmd(linear,0.5;zoomy,0); }; -t[#t+1] = Def.DifficultyDisplay { - InitCommand=cmd(x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+158;Load,"DifficultyDisplayEvaluation",PLAYER_1;SetFromGameState,PLAYER_1;player,PLAYER_1;); +t[#t+1] = Def.StepsDisplay { + InitCommand=cmd(x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+158;Load,"StepsDisplayEvaluation",PLAYER_1;SetFromGameState,PLAYER_1;player,PLAYER_1;); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); OffCommand=cmd(linear,0.5;zoomy,0); }; -t[#t+1] = Def.DifficultyDisplay { - InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+158;Load,"DifficultyDisplayEvaluation",PLAYER_2;SetFromGameState,PLAYER_2;player,PLAYER_2;); +t[#t+1] = Def.StepsDisplay { + InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+158;Load,"StepsDisplayEvaluation",PLAYER_2;SetFromGameState,PLAYER_2;player,PLAYER_2;); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); OffCommand=cmd(linear,0.5;zoomy,0); }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 770e5164e2..e4d5b422e0 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -1,10 +1,10 @@ -local function DifficultyDisplay(pn) +local function StepsDisplay(pn) local function set(self, player) self:SetFromGameState( player ); end - local t = Def.DifficultyDisplay { - InitCommand=cmd(Load,"DifficultyDisplay",GAMESTATE:GetPlayerState(pn);); + local t = Def.StepsDisplay { + InitCommand=cmd(Load,"StepsDisplay",GAMESTATE:GetPlayerState(pn);); }; if pn == PLAYER_1 then @@ -317,8 +317,8 @@ t[#t+1] = Def.CourseContentsList { }; for pn in ivalues(PlayerNumber) do - local MetricsName = "DifficultyDisplay" .. PlayerNumberToString(pn); - t[#t+1] = DifficultyDisplay(pn) .. { + local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn); + t[#t+1] = StepsDisplay(pn) .. { InitCommand=function(self) self:player(pn); name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end; }; end diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index bb49643493..5b333d7046 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -632,14 +632,14 @@ NextSongButton="MenuRight" UseOptionsList=false TwoPartSelection=false UsePlayerSelectMenu=false -DifficultyDisplayP1X= -DifficultyDisplayP1Y= -DifficultyDisplayP1OnCommand=visible,false -DifficultyDisplayP1OffCommand= -DifficultyDisplayP2X= -DifficultyDisplayP2Y= -DifficultyDisplayP2OnCommand=visible,false -DifficultyDisplayP2OffCommand= +StepsDisplayP1X= +StepsDisplayP1Y= +StepsDisplayP1OnCommand=visible,false +StepsDisplayP1OffCommand= +StepsDisplayP2X= +StepsDisplayP2Y= +StepsDisplayP2OnCommand=visible,false +StepsDisplayP2OffCommand= PaneDisplayP1X=SCREEN_CENTER_X-180 PaneDisplayP1Y=SCREEN_CENTER_Y+194 PaneDisplayP1OnCommand= @@ -966,18 +966,18 @@ SongOptionsX=SCREEN_CENTER_X+0 SongOptionsY=SCREEN_CENTER_Y+230 SongOptionsOnCommand=addy,100;linear,0.5;addy,-100 SongOptionsOffCommand=linear,0.5;addy,100 -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+174;addx,-200;linear,0.5;addx,200 -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+174;addx,-200;linear,0.5;addx,200 +StepsDisplayP1X=SCREEN_CENTER_X-250 +StepsDisplayP1Y= +StepsDisplayP1OnCommand= +StepsDisplayP1OffCommand=linear,0.5;addx,-200 +StepsDisplayP1SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200 +StepsDisplayP1SetNoReverseCommand=y,SCREEN_CENTER_Y+174;addx,-200;linear,0.5;addx,200 +StepsDisplayP2X=SCREEN_CENTER_X+250 +StepsDisplayP2Y= +StepsDisplayP2OnCommand= +StepsDisplayP2OffCommand=linear,0.5;addx,200 +StepsDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200 +StepsDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+174;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. @@ -1382,14 +1382,14 @@ RollsNumberP2Y=SCREEN_CENTER_Y+52+16*4 RollsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2 RollsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 -DifficultyDisplayP1X=SCREEN_CENTER_X-154 -DifficultyDisplayP1Y=SCREEN_CENTER_Y-110 -DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; -DifficultyDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DifficultyDisplayP2X=SCREEN_CENTER_X+154 -DifficultyDisplayP2Y=SCREEN_CENTER_Y-110 -DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; -DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +StepsDisplayP1X=SCREEN_CENTER_X-154 +StepsDisplayP1Y=SCREEN_CENTER_Y-110 +StepsDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; +StepsDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +StepsDisplayP2X=SCREEN_CENTER_X+154 +StepsDisplayP2Y=SCREEN_CENTER_Y-110 +StepsDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; +StepsDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT DetailFrameP1X=SCREEN_CENTER_X-222 DetailFrameP1Y=SCREEN_CENTER_Y+50 @@ -1668,14 +1668,14 @@ DifficultyIconP2X=SCREEN_CENTER_X+106 DifficultyIconP2Y=SCREEN_CENTER_Y-160 DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DifficultyDisplayP1X=SCREEN_CENTER_X-106 -DifficultyDisplayP1Y=SCREEN_CENTER_Y-160 -DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -DifficultyDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DifficultyDisplayP2X=SCREEN_CENTER_X+106 -DifficultyDisplayP2Y=SCREEN_CENTER_Y-160 -DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +StepsDisplayP1X=SCREEN_CENTER_X-106 +StepsDisplayP1Y=SCREEN_CENTER_Y-160 +StepsDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +StepsDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT +StepsDisplayP2X=SCREEN_CENTER_X+106 +StepsDisplayP2Y=SCREEN_CENTER_Y-160 +StepsDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +StepsDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT WinFrameP1X=SCREEN_CENTER_X-224 WinFrameP1Y=SCREEN_CENTER_Y+16 WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 @@ -1966,7 +1966,7 @@ MeterWidth=232 MeterHeight=24 Fallback="LifeMeterBar" -[DifficultyDisplay] +[StepsDisplay] FrameX=0 FrameY=0 FrameOnCommand= @@ -2000,8 +2000,8 @@ StepsTypeX=0 StepsTypeY=0 StepsTypeOnCommand= -[DifficultyDisplayEdit] -Fallback="DifficultyDisplay" +[StepsDisplayEdit] +Fallback="StepsDisplay" ShowMeter=true MeterX=-70 MeterY=0 @@ -2009,8 +2009,8 @@ MeterOnCommand=shadowlength,2;zoom,0.7 MeterOffCommand= ZeroMeterString= -[DifficultyDisplayListRow] -Fallback="DifficultyDisplay" +[StepsDisplayListRow] +Fallback="StepsDisplay" FrameX=0 FrameY=0 FrameOnCommand= @@ -2036,15 +2036,15 @@ AutogenX=102 AutogenOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077"); AutogenSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end -[DifficultyDisplayGameplay] -Fallback="DifficultyDisplay" +[StepsDisplayGameplay] +Fallback="StepsDisplay" MeterOnCommand=shadowlength,0; FrameOnCommand= ShowAutogen=false ShowStepsType=false -[DifficultyDisplayEvaluation] -Fallback="DifficultyDisplayGameplay" +[StepsDisplayEvaluation] +Fallback="StepsDisplayGameplay" [ScreenWithMenuElements] Fallback="Screen"