actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

DifficultyDisplay -> StepsDisplay (reduce confusion with DifficultyDisplayType)

Browse Source
This commit is contained in:
Chris Danford
2008-08-17 00:13:51 +00:00
parent 7fa3fe6919
commit 25837213a7
3 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua
+4 -4
View File
@@ -59,13 +59,13 @@ t[#t+1] = Def.ModIconRow {
OffCommand=cmd(linear,0.5;zoomy,0); OffCommand=cmd(linear,0.5;zoomy,0);
}; };
t[#t+1] = Def.DifficultyDisplay { t[#t+1] = Def.StepsDisplay {
InitCommand=cmd(x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+158;Load,"DifficultyDisplayEvaluation",PLAYER_1;SetFromGameState,PLAYER_1;player,PLAYER_1;); 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); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0); OffCommand=cmd(linear,0.5;zoomy,0);
}; };
t[#t+1] = Def.DifficultyDisplay { t[#t+1] = Def.StepsDisplay {
InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+158;Load,"DifficultyDisplayEvaluation",PLAYER_2;SetFromGameState,PLAYER_2;player,PLAYER_2;); 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); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0); OffCommand=cmd(linear,0.5;zoomy,0);
}; };
stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua
+5 -5
View File
@@ -1,10 +1,10 @@
local function DifficultyDisplay(pn) local function StepsDisplay(pn)
local function set(self, player) local function set(self, player)
self:SetFromGameState( player ); self:SetFromGameState( player );
end end
local t = Def.DifficultyDisplay { local t = Def.StepsDisplay {
InitCommand=cmd(Load,"DifficultyDisplay",GAMESTATE:GetPlayerState(pn);); InitCommand=cmd(Load,"StepsDisplay",GAMESTATE:GetPlayerState(pn););
}; };
if pn == PLAYER_1 then if pn == PLAYER_1 then
@@ -317,8 +317,8 @@ t[#t+1] = Def.CourseContentsList {
}; };
for pn in ivalues(PlayerNumber) do for pn in ivalues(PlayerNumber) do
local MetricsName = "DifficultyDisplay" .. PlayerNumberToString(pn); local MetricsName = "StepsDisplay" .. PlayerNumberToString(pn);
t[#t+1] = DifficultyDisplay(pn) .. { t[#t+1] = StepsDisplay(pn) .. {
InitCommand=function(self) self:player(pn); name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end; InitCommand=function(self) self:player(pn); name(MetricsName); ActorUtil.LoadAllCommandsAndSetXYAndOnCommand(self,Var "LoadingScreen"); end;
}; };
end end
stepmania/Themes/default/metrics.ini
+45 -45
View File
@@ -632,14 +632,14 @@ NextSongButton="MenuRight"
UseOptionsList=false UseOptionsList=false
TwoPartSelection=false TwoPartSelection=false
UsePlayerSelectMenu=false UsePlayerSelectMenu=false
DifficultyDisplayP1X= StepsDisplayP1X=
DifficultyDisplayP1Y= StepsDisplayP1Y=
DifficultyDisplayP1OnCommand=visible,false StepsDisplayP1OnCommand=visible,false
DifficultyDisplayP1OffCommand= StepsDisplayP1OffCommand=
DifficultyDisplayP2X= StepsDisplayP2X=
DifficultyDisplayP2Y= StepsDisplayP2Y=
DifficultyDisplayP2OnCommand=visible,false StepsDisplayP2OnCommand=visible,false
DifficultyDisplayP2OffCommand= StepsDisplayP2OffCommand=
PaneDisplayP1X=SCREEN_CENTER_X-180 PaneDisplayP1X=SCREEN_CENTER_X-180
PaneDisplayP1Y=SCREEN_CENTER_Y+194 PaneDisplayP1Y=SCREEN_CENTER_Y+194
PaneDisplayP1OnCommand= PaneDisplayP1OnCommand=
@@ -966,18 +966,18 @@ SongOptionsX=SCREEN_CENTER_X+0
SongOptionsY=SCREEN_CENTER_Y+230 SongOptionsY=SCREEN_CENTER_Y+230
SongOptionsOnCommand=addy,100;linear,0.5;addy,-100 SongOptionsOnCommand=addy,100;linear,0.5;addy,-100
SongOptionsOffCommand=linear,0.5;addy,100 SongOptionsOffCommand=linear,0.5;addy,100
DifficultyDisplayP1X=SCREEN_CENTER_X-250 StepsDisplayP1X=SCREEN_CENTER_X-250
DifficultyDisplayP1Y= StepsDisplayP1Y=
DifficultyDisplayP1OnCommand= StepsDisplayP1OnCommand=
DifficultyDisplayP1OffCommand=linear,0.5;addx,-200 StepsDisplayP1OffCommand=linear,0.5;addx,-200
DifficultyDisplayP1SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200 StepsDisplayP1SetReverseCommand=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 StepsDisplayP1SetNoReverseCommand=y,SCREEN_CENTER_Y+174;addx,-200;linear,0.5;addx,200
DifficultyDisplayP2X=SCREEN_CENTER_X+250 StepsDisplayP2X=SCREEN_CENTER_X+250
DifficultyDisplayP2Y= StepsDisplayP2Y=
DifficultyDisplayP2OnCommand= StepsDisplayP2OnCommand=
DifficultyDisplayP2OffCommand=linear,0.5;addx,200 StepsDisplayP2OffCommand=linear,0.5;addx,200
DifficultyDisplayP2SetReverseCommand=y,SCREEN_CENTER_Y-196;addx,-200;linear,0.5;addx,200 StepsDisplayP2SetReverseCommand=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 StepsDisplayP2SetNoReverseCommand=y,SCREEN_CENTER_Y+174;addx,-200;linear,0.5;addx,200
LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160 LyricsSetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+160
LyricsSetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-140 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. # 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 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 RollsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
DifficultyDisplayP1X=SCREEN_CENTER_X-154 StepsDisplayP1X=SCREEN_CENTER_X-154
DifficultyDisplayP1Y=SCREEN_CENTER_Y-110 StepsDisplayP1Y=SCREEN_CENTER_Y-110
DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; StepsDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100;
DifficultyDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT StepsDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
DifficultyDisplayP2X=SCREEN_CENTER_X+154 StepsDisplayP2X=SCREEN_CENTER_X+154
DifficultyDisplayP2Y=SCREEN_CENTER_Y-110 StepsDisplayP2Y=SCREEN_CENTER_Y-110
DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; StepsDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100;
DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT StepsDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
DetailFrameP1X=SCREEN_CENTER_X-222 DetailFrameP1X=SCREEN_CENTER_X-222
DetailFrameP1Y=SCREEN_CENTER_Y+50 DetailFrameP1Y=SCREEN_CENTER_Y+50
@@ -1668,14 +1668,14 @@ DifficultyIconP2X=SCREEN_CENTER_X+106
DifficultyIconP2Y=SCREEN_CENTER_Y-160 DifficultyIconP2Y=SCREEN_CENTER_Y-160
DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT DifficultyIconP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
DifficultyDisplayP1X=SCREEN_CENTER_X-106 StepsDisplayP1X=SCREEN_CENTER_X-106
DifficultyDisplayP1Y=SCREEN_CENTER_Y-160 StepsDisplayP1Y=SCREEN_CENTER_Y-160
DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT StepsDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
DifficultyDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT StepsDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
DifficultyDisplayP2X=SCREEN_CENTER_X+106 StepsDisplayP2X=SCREEN_CENTER_X+106
DifficultyDisplayP2Y=SCREEN_CENTER_Y-160 StepsDisplayP2Y=SCREEN_CENTER_Y-160
DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT StepsDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT StepsDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
WinFrameP1X=SCREEN_CENTER_X-224 WinFrameP1X=SCREEN_CENTER_X-224
WinFrameP1Y=SCREEN_CENTER_Y+16 WinFrameP1Y=SCREEN_CENTER_Y+16
WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
@@ -1966,7 +1966,7 @@ MeterWidth=232
MeterHeight=24 MeterHeight=24
Fallback="LifeMeterBar" Fallback="LifeMeterBar"
[DifficultyDisplay] [StepsDisplay]
FrameX=0 FrameX=0
FrameY=0 FrameY=0
FrameOnCommand= FrameOnCommand=
@@ -2000,8 +2000,8 @@ StepsTypeX=0
StepsTypeY=0 StepsTypeY=0
StepsTypeOnCommand= StepsTypeOnCommand=
[DifficultyDisplayEdit] [StepsDisplayEdit]
Fallback="DifficultyDisplay" Fallback="StepsDisplay"
ShowMeter=true ShowMeter=true
MeterX=-70 MeterX=-70
MeterY=0 MeterY=0
@@ -2009,8 +2009,8 @@ MeterOnCommand=shadowlength,2;zoom,0.7
MeterOffCommand= MeterOffCommand=
ZeroMeterString= ZeroMeterString=
[DifficultyDisplayListRow] [StepsDisplayListRow]
Fallback="DifficultyDisplay" Fallback="StepsDisplay"
FrameX=0 FrameX=0
FrameY=0 FrameY=0
FrameOnCommand= FrameOnCommand=
@@ -2036,15 +2036,15 @@ AutogenX=102
AutogenOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077"); AutogenOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");
AutogenSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end AutogenSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end
[DifficultyDisplayGameplay] [StepsDisplayGameplay]
Fallback="DifficultyDisplay" Fallback="StepsDisplay"
MeterOnCommand=shadowlength,0; MeterOnCommand=shadowlength,0;
FrameOnCommand= FrameOnCommand=
ShowAutogen=false ShowAutogen=false
ShowStepsType=false ShowStepsType=false
[DifficultyDisplayEvaluation] [StepsDisplayEvaluation]
Fallback="DifficultyDisplayGameplay" Fallback="StepsDisplayGameplay"
[ScreenWithMenuElements] [ScreenWithMenuElements]
Fallback="Screen" Fallback="Screen"