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

eval cleanup

Browse Source
This commit is contained in:
Chris Danford
2008-04-08 19:57:31 +00:00
parent d30e321969
commit a51ed62041
14 changed files with 144 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua
+8 -8
View File
@@ -30,31 +30,31 @@ end
local t = LoadFallbackB( "decorations" );
t[#t+1] = GraphDisplay(PLAYER_1) .. {
InitCommand = cmd(x,SCREEN_CENTER_X-224;y,SCREEN_CENTER_Y-50;draworder,1;);
InitCommand = cmd(x,SCREEN_CENTER_X-222;y,SCREEN_CENTER_Y-16;draworder,1;);
};
t[#t+1] = GraphDisplay(PLAYER_2) .. {
InitCommand = cmd(x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-50;draworder,1;);
InitCommand = cmd(x,SCREEN_CENTER_X+222;y,SCREEN_CENTER_Y-16;draworder,1;);
};
t[#t+1] = ComboGraph(PLAYER_1) .. {
InitCommand = cmd(x,SCREEN_CENTER_X-224;y,SCREEN_CENTER_Y-20;draworder,1;);
InitCommand = cmd(x,SCREEN_CENTER_X-222;y,SCREEN_CENTER_Y+10;draworder,1;);
};
t[#t+1] = ComboGraph(PLAYER_2) .. {
InitCommand = cmd(x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-20;draworder,1;);
InitCommand = cmd(x,SCREEN_CENTER_X+222;y,SCREEN_CENTER_Y+10;draworder,1;);
};
t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "TimingDifficultyFrame", "TimingDifficultyFrame" );
t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficulty" ) .. {
InitCommand=function(self) self:name("TimingDifficulty"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. {
InitCommand=function(self) self:name("TimingDifficultyNumber"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end;
};
t[#t+1] = Def.OptionIconRow {
InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;Load,"OptionIconRowEvaluation",PLAYER_1,player,PLAYER_1);
InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP1",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.OptionIconRow {
InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;Load,"OptionIconRowEvaluation",PLAYER_2;player,PLAYER_2);
InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP2",PLAYER_2;player,PLAYER_2);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0);
};
stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua
+1 -1
View File
@@ -5,6 +5,6 @@ return Def.ActorFrame {
LoadActor( THEME:GetPathB('','_standard decoration required'), "Header", "Header" );
LoadActor( THEME:GetPathB('','_standard decoration required'), "Footer", "Footer" );
LoadActor( THEME:GetPathB('','_standard decoration optional'), "StyleIcon", "StyleIcon" );
LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageFrame", "StageFrame" );
LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageDisplay", "StageDisplay" );
};
stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir
+1 -1
View File
@@ -1 +1 @@
common normal
_venacti bold fixed-width 24
stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficulty.redir → stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficultyNumber.redir
View File
stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

stepmania/Themes/default/Fonts/_terminator two 40.ini
+1 -1
View File
@@ -1,5 +1,4 @@
[main]
Baseline=34
Top=0
LineSpacing=40
DrawExtraPixelsLeft=0
@@ -8,6 +7,7 @@ AdvanceExtraPixels=0
FontBaseZoom=0.5
DefaultStrokeColor=#FFFFFF
[numbers]
Baseline=34
0=26
1=26
2=26
stepmania/Themes/default/Fonts/_venacti bold fixed-width 24 [numbers] 4x4.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

stepmania/Themes/default/Fonts/_venacti bold fixed-width 24.ini
+9 -2
View File
@@ -1,10 +1,11 @@
[common]
Baseline=24
[main]
Top=5
LineSpacing=29
DrawExtraPixelsLeft=2
FontBaseZoom=0.5
[numbers]
Baseline=24
0=16
1=16
2=16
@@ -20,3 +21,9 @@ DrawExtraPixelsLeft=2
12=16
13=7
14=14
15=16
line 0=1234
line 1=5678
line 2=90%.
line 3= :x/
stepmania/Themes/default/Graphics/ComboGraph ComboNumber.lua
+1
View File
@@ -1,2 +1,3 @@
return LoadFont("Common Normal") .. {
InitCommand=cmd(shadowlengthx,0;shadowlengthy,2;);
};
stepmania/Themes/default/Graphics/GraphDisplay Barely/default.lua
+2 -2
View File
@@ -1,8 +1,8 @@
return Def.ActorFrame {
LoadActor("arrow") .. {
InitCommand=cmd(y,-16;);
InitCommand=cmd(y,8;shadowlengthx,0;shadowlengthy,2;);
};
LoadFont("Common normal") .. {
InitCommand=cmd(y,-32;settext,"Barely";);
InitCommand=cmd(y,-8;settext,"Barely";shadowlengthx,0;shadowlengthy,2;);
};
};
stepmania/Themes/default/Graphics/ScreenEvaluation BannerFrame (doubleres).png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua
+6 -6
View File
@@ -2,21 +2,21 @@ return Def.ActorFrame {
LoadActor("frame") .. {
};
LoadActor( THEME:GetPathG("PaneDisplay","label Hands") ) .. {
InitCommand=cmd(x,-50;y,-20+16*0;);
InitCommand=cmd(horizalign,right;x,-22;y,-12+16*0;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA"););
};
LoadActor( THEME:GetPathG("PaneDisplay","label Holds") ) .. {
InitCommand=cmd(x,-50;y,-20+16*1;);
InitCommand=cmd(horizalign,right;x,-22;y,-12+16*1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA"););
};
LoadActor( THEME:GetPathG("PaneDisplay","label Jumps") ) .. {
InitCommand=cmd(x,-50;y,-20+16*2;);
InitCommand=cmd(horizalign,right;x,-22;y,-12+16*2;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA"););
};
LoadActor( THEME:GetPathG("PaneDisplay","label Mines") ) .. {
InitCommand=cmd(x,-50;y,-20+16*3;);
InitCommand=cmd(horizalign,right;x,-22;y,-12+16*3;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA"););
};
LoadActor( THEME:GetPathG("PaneDisplay","label NumSteps") ) .. {
InitCommand=cmd(x,-50;y,-20+16*4;);
InitCommand=cmd(horizalign,right;x,-22;y,-12+16*4;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA"););
};
LoadActor( THEME:GetPathG("PaneDisplay","label Rolls") ) .. {
InitCommand=cmd(x,-50;y,-20+16*5;);
InitCommand=cmd(horizalign,right;x,-22;y,-12+16*5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA"););
};
};
stepmania/Themes/default/Graphics/ScreenWithMenuElements StageFrame (doubleres).png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

stepmania/Themes/default/metrics.ini
+115 -105
View File
@@ -596,10 +596,6 @@ BannerY=0
BannerOnCommand=scaletoclipped,322,120;visible,false;ztest,1
BannerOffCommand=
ShowStageDisplay=true
StageDisplayX=SCREEN_CENTER_X+272
StageDisplayY=SCREEN_CENTER_Y-164
StageDisplayOnCommand=draworder,101;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
CDTitleX=SCREEN_CENTER_X+240
CDTitleY=SCREEN_CENTER_Y-50
CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Back";
@@ -1183,93 +1179,93 @@ ShowJudgmentLineMaxCombo=true
ShowPerDifficultyAward=false
ShowPeakComboAward=false
BannerWidth=256
BannerHeight=80
BannerWidth=268
BannerHeight=98
GradeP1X=SCREEN_CENTER_X-226
GradeP1Y=SCREEN_CENTER_Y-140
GradeP1X=SCREEN_CENTER_X-222
GradeP1Y=SCREEN_CENTER_Y-106
GradeP1OnCommand=glowshift;effectperiod,2;addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2
GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2
GradeP2X=SCREEN_CENTER_X+226
GradeP2Y=SCREEN_CENTER_Y-140
GradeP2X=SCREEN_CENTER_X+222
GradeP2Y=SCREEN_CENTER_Y-106
GradeP2OnCommand=glowshift;effectperiod,2;addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2
GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2
GradeFrameP1X=SCREEN_CENTER_X-226
GradeFrameP1Y=SCREEN_CENTER_Y-140
GradeFrameP1X=SCREEN_CENTER_X-222
GradeFrameP1Y=SCREEN_CENTER_Y-106
GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2
GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2
GradeFrameP2X=SCREEN_CENTER_X+226
GradeFrameP2Y=SCREEN_CENTER_Y-140
GradeFrameP2X=SCREEN_CENTER_X+222
GradeFrameP2Y=SCREEN_CENTER_Y-106
GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2
GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2
W1LabelX=SCREEN_CENTER_X+0
W1LabelY=SCREEN_CENTER_Y-80+30*0
W1LabelY=SCREEN_CENTER_Y-36+30*0
W1LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*0;decelerate,0.3;addy,-SCREEN_HEIGHT
W1LabelOffCommand=sleep,0.7-0.1*0;accelerate,0.3;addy,SCREEN_HEIGHT
W1NumberP1X=SCREEN_CENTER_X-100
W1NumberP1Y=SCREEN_CENTER_Y-80+30*0
W1NumberP1Y=SCREEN_CENTER_Y-36+30*0
W1NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
W1NumberP1OffCommand=sleep,0.7;accelerate,0.3;addx,-SCREEN_WIDTH/2
W1NumberP2X=SCREEN_CENTER_X+100
W1NumberP2Y=SCREEN_CENTER_Y-80+30*0
W1NumberP2Y=SCREEN_CENTER_Y-36+30*0
W1NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
W1NumberP2OffCommand=sleep,0.7-0.1*0;accelerate,0.3;addx,SCREEN_WIDTH/2
W2LabelX=SCREEN_CENTER_X+0
W2LabelY=SCREEN_CENTER_Y-80+30*1
W2LabelY=SCREEN_CENTER_Y-36+30*1
W2LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*1;decelerate,0.3;addy,-SCREEN_HEIGHT
W2LabelOffCommand=sleep,0.7-0.1*1;accelerate,0.3;addy,SCREEN_HEIGHT
W2NumberP1X=SCREEN_CENTER_X-100
W2NumberP1Y=SCREEN_CENTER_Y-80+30*1
W2NumberP1Y=SCREEN_CENTER_Y-36+30*1
W2NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2
W2NumberP1OffCommand=sleep,0.7-0.1*1;accelerate,0.3;addx,-SCREEN_WIDTH/2
W2NumberP2X=SCREEN_CENTER_X+100
W2NumberP2Y=SCREEN_CENTER_Y-80+30*1
W2NumberP2Y=SCREEN_CENTER_Y-36+30*1
W2NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2
W2NumberP2OffCommand=sleep,0.7-0.1*1;accelerate,0.3;addx,SCREEN_WIDTH/2
W3LabelX=SCREEN_CENTER_X+0
W3LabelY=SCREEN_CENTER_Y-80+30*2
W3LabelY=SCREEN_CENTER_Y-36+30*2
W3LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*2;decelerate,0.3;addy,-SCREEN_HEIGHT
W3LabelOffCommand=sleep,0.7-0.1*2;accelerate,0.3;addy,SCREEN_HEIGHT
W3NumberP1X=SCREEN_CENTER_X-100
W3NumberP1Y=SCREEN_CENTER_Y-80+30*2
W3NumberP1Y=SCREEN_CENTER_Y-36+30*2
W3NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2
W3NumberP1OffCommand=sleep,0.7-0.1*2;accelerate,0.3;addx,-SCREEN_WIDTH/2
W3NumberP2X=SCREEN_CENTER_X+100
W3NumberP2Y=SCREEN_CENTER_Y-80+30*2
W3NumberP2Y=SCREEN_CENTER_Y-36+30*2
W3NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2
W3NumberP2OffCommand=sleep,0.7-0.1*2;accelerate,0.3;addx,SCREEN_WIDTH/2
W4LabelX=SCREEN_CENTER_X+0
W4LabelY=SCREEN_CENTER_Y-80+30*3
W4LabelY=SCREEN_CENTER_Y-36+30*3
W4LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*3;decelerate,0.3;addy,-SCREEN_HEIGHT
W4LabelOffCommand=sleep,0.7-0.1*3;accelerate,0.3;addy,SCREEN_HEIGHT
W4NumberP1X=SCREEN_CENTER_X-100
W4NumberP1Y=SCREEN_CENTER_Y-80+30*3
W4NumberP1Y=SCREEN_CENTER_Y-36+30*3
W4NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2
W4NumberP1OffCommand=sleep,0.7-0.1*3;accelerate,0.3;addx,-SCREEN_WIDTH/2
W4NumberP2X=SCREEN_CENTER_X+100
W4NumberP2Y=SCREEN_CENTER_Y-80+30*3
W4NumberP2Y=SCREEN_CENTER_Y-36+30*3
W4NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2
W4NumberP2OffCommand=sleep,0.7-0.1*3;accelerate,0.3;addx,SCREEN_WIDTH/2
W5LabelX=SCREEN_CENTER_X
W5LabelY=SCREEN_CENTER_Y-80+30*4
W5LabelY=SCREEN_CENTER_Y-36+30*4
W5LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*4;decelerate,0.3;addy,-SCREEN_HEIGHT
W5LabelOffCommand=sleep,0.7-0.1*4;accelerate,0.3;addy,SCREEN_HEIGHT
W5NumberP1X=SCREEN_CENTER_X-100
W5NumberP1Y=SCREEN_CENTER_Y-80+30*4
W5NumberP1Y=SCREEN_CENTER_Y-36+30*4
W5NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,SCREEN_WIDTH/2
W5NumberP1OffCommand=sleep,0.7-0.1*4;accelerate,0.3;addx,-SCREEN_WIDTH/2
W5NumberP2X=SCREEN_CENTER_X+100
W5NumberP2Y=SCREEN_CENTER_Y-80+30*4
W5NumberP2Y=SCREEN_CENTER_Y-36+30*4
W5NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2
W5NumberP2OffCommand=sleep,0.7-0.1*4;accelerate,0.3;addx,SCREEN_WIDTH/2
@@ -1288,31 +1284,31 @@ HeldNumberP2OnCommand=
HeldNumberP2OffCommand=
MissLabelX=SCREEN_CENTER_X+0
MissLabelY=SCREEN_CENTER_Y-80+30*5
MissLabelY=SCREEN_CENTER_Y-36+30*5
MissLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*5;decelerate,0.3;addy,-SCREEN_HEIGHT
MissLabelOffCommand=sleep,0.7-0.1*5;accelerate,0.3;addy,SCREEN_HEIGHT
MissNumberP1X=SCREEN_CENTER_X-100
MissNumberP1Y=SCREEN_CENTER_Y-80+30*5
MissNumberP1Y=SCREEN_CENTER_Y-36+30*5
MissNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*5;decelerate,0.3;addx,SCREEN_WIDTH/2
MissNumberP1OffCommand=sleep,0.7-0.1*5;accelerate,0.3;addx,-SCREEN_WIDTH/2
MissNumberP2X=SCREEN_CENTER_X+100
MissNumberP2Y=SCREEN_CENTER_Y-80+30*5
MissNumberP2Y=SCREEN_CENTER_Y-36+30*5
MissNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*5;decelerate,0.3;addx,-SCREEN_WIDTH/2
MissNumberP2OffCommand=sleep,0.7-0.1*5;accelerate,0.3;addx,SCREEN_WIDTH/2
MaxComboMaxDigits=5
MaxComboLabelX=SCREEN_CENTER_X+0
MaxComboLabelY=SCREEN_CENTER_Y-80+30*6
MaxComboLabelY=SCREEN_CENTER_Y-36+30*6
MaxComboLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*6;decelerate,0.3;addy,-SCREEN_HEIGHT
MaxComboLabelOffCommand=sleep,0.7-0.1*6;accelerate,0.3;addy,SCREEN_HEIGHT
MaxComboNumberP1X=SCREEN_CENTER_X-100
MaxComboNumberP1Y=SCREEN_CENTER_Y-80+30*6
MaxComboNumberP1Y=SCREEN_CENTER_Y-36+30*6
MaxComboNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*6;decelerate,0.3;addx,SCREEN_WIDTH/2
MaxComboNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
MaxComboNumberP2X=SCREEN_CENTER_X+100
MaxComboNumberP2Y=SCREEN_CENTER_Y-80+30*6
MaxComboNumberP2Y=SCREEN_CENTER_Y-36+30*6
MaxComboNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*6;decelerate,0.3;addx,-SCREEN_WIDTH/2
MaxComboNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
@@ -1329,12 +1325,12 @@ ScoreNumberP2Y=SCREEN_CENTER_Y+206
ScoreNumberP2OnCommand=shadowlength,0;diffusetopedge,color("#fefefe");diffusebottomedge,color("#908d78");strokecolor,color("#00000000");shadowlengthx,0;shadowlengthy,2;addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2
ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
LargeBannerX=SCREEN_CENTER_X+0
LargeBannerY=SCREEN_CENTER_Y-140
LargeBannerX=SCREEN_CENTER_X-1
LargeBannerY=SCREEN_CENTER_Y-106-3
LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
LargeBannerFrameX=SCREEN_CENTER_X+0
LargeBannerFrameY=SCREEN_CENTER_Y-140
LargeBannerFrameY=SCREEN_CENTER_Y-106
LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
@@ -1357,11 +1353,11 @@ ProfileRecordP2OffCommand=linear,0.7;diffusealpha,0
PlayerOptionsP1X=SCREEN_CENTER_X-70
PlayerOptionsP1Y=SCREEN_CENTER_Y-182
PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
PlayerOptionsP1OnCommand=visible,false;horizalign,left;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
PlayerOptionsP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
PlayerOptionsP2X=SCREEN_CENTER_X+70
PlayerOptionsP2Y=SCREEN_CENTER_Y-90
PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
PlayerOptionsP2OnCommand=visible,false;horizalign,right;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
SurvivedFrameP1X=SCREEN_CENTER_X-224
@@ -1381,74 +1377,69 @@ SurvivedNumberP2Y=SCREEN_CENTER_Y+0
SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0
TimingDifficultyX=SCREEN_CENTER_X+120
TimingDifficultyY=SCREEN_CENTER_Y-200
TimingDifficultyOnCommand=draworder,2
TimingDifficultyOffCommand=
TimingDifficultyFrameX=SCREEN_CENTER_X+120
TimingDifficultyFrameY=SCREEN_CENTER_Y-200
TimingDifficultyNumberX=SCREEN_CENTER_X+114
TimingDifficultyNumberY=SCREEN_CENTER_Y-204
TimingDifficultyNumberOnCommand=draworder,2;shadowlength,0
TimingDifficultyNumberOffCommand=
TimingDifficultyFrameX=SCREEN_CENTER_X+114+3
TimingDifficultyFrameY=SCREEN_CENTER_Y-204+3
TimingDifficultyFrameOnCommand=draworder,2
TimingDifficultyFrameOffCommand=
NumStepsNumberP1X=SCREEN_CENTER_X-200
NumStepsNumberP1Y=SCREEN_CENTER_Y+10+20*-1
NumStepsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
NumStepsNumberP1X=SCREEN_CENTER_X-204
NumStepsNumberP1Y=SCREEN_CENTER_Y+52+16*-1
NumStepsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
NumStepsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
NumStepsNumberP2X=SCREEN_CENTER_X+200
NumStepsNumberP2Y=SCREEN_CENTER_Y+10+20*-1
NumStepsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
NumStepsNumberP2X=SCREEN_CENTER_X+240
NumStepsNumberP2Y=SCREEN_CENTER_Y+52+16*-1
NumStepsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
NumStepsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
JumpsNumberP1X=SCREEN_CENTER_X-200
JumpsNumberP1Y=SCREEN_CENTER_Y+10+20*0
JumpsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
JumpsNumberP1X=SCREEN_CENTER_X-204
JumpsNumberP1Y=SCREEN_CENTER_Y+52+16*0
JumpsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2
JumpsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
JumpsNumberP2X=SCREEN_CENTER_X+200
JumpsNumberP2Y=SCREEN_CENTER_Y+10+20*0
JumpsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
JumpsNumberP2X=SCREEN_CENTER_X+240
JumpsNumberP2Y=SCREEN_CENTER_Y+52+16*0
JumpsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2
JumpsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
HoldsNumberP1X=SCREEN_CENTER_X-200
HoldsNumberP1Y=SCREEN_CENTER_Y+10+20*1
HoldsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2
HoldsNumberP1X=SCREEN_CENTER_X-204
HoldsNumberP1Y=SCREEN_CENTER_Y+52+16*1
HoldsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2
HoldsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
HoldsNumberP2X=SCREEN_CENTER_X+200
HoldsNumberP2Y=SCREEN_CENTER_Y+10+20*1
HoldsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2
HoldsNumberP2X=SCREEN_CENTER_X+240
HoldsNumberP2Y=SCREEN_CENTER_Y+52+16*1
HoldsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2
HoldsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
MinesNumberP1X=SCREEN_CENTER_X-200
MinesNumberP1Y=SCREEN_CENTER_Y+10+20*2
MinesNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2
MinesNumberP1X=SCREEN_CENTER_X-204
MinesNumberP1Y=SCREEN_CENTER_Y+52+16*2
MinesNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2
MinesNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
MinesNumberP2X=SCREEN_CENTER_X+200
MinesNumberP2Y=SCREEN_CENTER_Y+10+20*2
MinesNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2
MinesNumberP2X=SCREEN_CENTER_X+240
MinesNumberP2Y=SCREEN_CENTER_Y+52+16*2
MinesNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2
MinesNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
HandsNumberP1X=SCREEN_CENTER_X-200
HandsNumberP1Y=SCREEN_CENTER_Y+10+20*3
HandsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2
HandsNumberP1X=SCREEN_CENTER_X-204
HandsNumberP1Y=SCREEN_CENTER_Y+52+16*3
HandsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2
HandsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
HandsNumberP2X=SCREEN_CENTER_X+200
HandsNumberP2Y=SCREEN_CENTER_Y+10+20*3
HandsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2
HandsNumberP2X=SCREEN_CENTER_X+240
HandsNumberP2Y=SCREEN_CENTER_Y+52+16*3
HandsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2
HandsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2
RollsNumberP1X=SCREEN_CENTER_X-200
RollsNumberP1Y=SCREEN_CENTER_Y+10+20*4
RollsNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,SCREEN_WIDTH/2
RollsNumberP1X=SCREEN_CENTER_X-204
RollsNumberP1Y=SCREEN_CENTER_Y+52+16*4
RollsNumberP1OnCommand=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
RollsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2
RollsNumberP2X=SCREEN_CENTER_X+200
RollsNumberP2Y=SCREEN_CENTER_Y+10+20*4
RollsNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2
RollsNumberP2X=SCREEN_CENTER_X+240
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
StageDisplayX=SCREEN_CENTER_X+0
StageDisplayY=SCREEN_CENTER_Y-168
StageDisplayOnCommand=draworder,1;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
StageDisplayOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
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;
@@ -1458,21 +1449,21 @@ 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
DetailFrameP1X=SCREEN_CENTER_X-224
DetailFrameP1Y=SCREEN_CENTER_Y+16
DetailFrameP1X=SCREEN_CENTER_X-222
DetailFrameP1Y=SCREEN_CENTER_Y+50
DetailFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
DetailFrameP1OffCommand=linear,0.7;diffusealpha,0
DetailFrameP2X=SCREEN_CENTER_X+224
DetailFrameP2Y=SCREEN_CENTER_Y+16
DetailFrameP2X=SCREEN_CENTER_X+222
DetailFrameP2Y=SCREEN_CENTER_Y+50
DetailFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
DetailFrameP2OffCommand=linear,0.7;diffusealpha,0
BonusFrameP1X=SCREEN_CENTER_X-224
BonusFrameP1Y=SCREEN_CENTER_Y+16
BonusFrameP1X=SCREEN_CENTER_X-222
BonusFrameP1Y=SCREEN_CENTER_Y+50
BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
BonusFrameP1OffCommand=linear,0.7;diffusealpha,0
BonusFrameP2X=SCREEN_CENTER_X+224
BonusFrameP2Y=SCREEN_CENTER_Y+16
BonusFrameP2X=SCREEN_CENTER_X+222
BonusFrameP2Y=SCREEN_CENTER_Y+50
BonusFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1
BonusFrameP2OffCommand=linear,0.7;diffusealpha,0
@@ -2104,9 +2095,18 @@ Fallback="DifficultyDisplayGameplay"
Fallback="Screen"
AllowDisabledPlayerInput=false
ShowStyleIcon=true
ShowStageDisplay=false
ShowStageDisplay=true
StageDisplayStageToShow=GAMESTATE:GetCurrentStage()
StageDisplayStageIndex=GAMESTATE:GetStageIndex()
StageDisplayX=SCREEN_CENTER_X+220
StageDisplayY=SCREEN_CENTER_Y-172
StageDisplayOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
ShowStageFrame=true
StageFrameX=SCREEN_CENTER_X+220
StageFrameY=SCREEN_CENTER_Y-172
StageFrameOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
StageFrameOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
MemoryCardIcons=true
CancelTransitionsOut=false
HeaderX=SCREEN_CENTER_X
@@ -2118,7 +2118,7 @@ FooterY=SCREEN_BOTTOM-34
FooterOnCommand=
FooterOffCommand=
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-24
HelpY=SCREEN_BOTTOM-40
HelpOnCommand=draworder,1;zoomy,0;linear,0.5;zoomy,1
HelpOffCommand=linear,0.5;zoomy,0
MemoryCardDisplayP1X=SCREEN_LEFT+10;
@@ -2132,10 +2132,10 @@ MemoryCardDisplayP2OnCommand=draworder,97;
MemoryCardDisplayP2OffCommand=
//MemoryCardDisplayP2OffCommand=bouncebegin,0.5;addx,25;
TimerMetricsGroup="MenuTimer"
TimerX=SCREEN_CENTER_X+270
TimerY=SCREEN_TOP-11
TimerOnCommand=draworder,97;linear,0.25;addy,33
TimerOffCommand=linear,0.25;addy,-44;
TimerX=SCREEN_CENTER_X+273
TimerY=SCREEN_TOP+26
TimerOnCommand=draworder,2;addy,-40;linear,0.25;addy,40
TimerOffCommand=linear,0.25;addy,-40;
TimerStealth=false
ForceTimer=false
FirstUpdateCommand=
@@ -2159,9 +2159,9 @@ StyleIconOffCommand=
WarningStart=6
WarningBeepStart=5
MaxStallSeconds=30
Text1OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,-13;y,2
Text1OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,-14;y,2
Text1FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.floor(fSeconds/10); return ""..digit end
Text2OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,17;y,2
Text2OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,14;y,2
Text2FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.mod(fSeconds,10); return ""..digit end
Warning6Command=stoptweening;sleep,0.8;linear,0.2;zoomx,0
Warning5Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0;glowshift;effectperiod,0.15;effectcolor1,1,0,0,0;effectcolor2,1,0,0,1
@@ -2647,10 +2647,20 @@ Fallback="OptionIconRow"
Fallback="OptionIconRow"
SpacingX=0
SpacingY=46
[OptionIconRowGameplayP1]
Fallback="OptionIconRowGameplay"
OptionIconOnCommand=rotationz,-90;
[OptionIconRowGameplayP2]
Fallback="OptionIconRowGameplay"
OptionIconOnCommand=rotationz,90;
[OptionIconRowEvaluation]
Fallback="OptionIconRowGameplay"
[OptionIconRowEvaluationP1]
Fallback="OptionIconRowGameplayP1"
[OptionIconRowEvaluationP2]
Fallback="OptionIconRowGameplayP2"
[TransitionOniFade]
BannerWidth=512