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

working on eval

Browse Source
This commit is contained in:
Chris Danford
2008-04-05 23:45:47 +00:00
parent c1733c18c6
commit 4a60ff57df
7 changed files with 92 additions and 90 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
@@ -20,23 +20,23 @@ t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficulty" ) .. {
};
t[#t+1] = Def.OptionIconRow {
InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowEvaluation",PLAYER_1,player,PLAYER_1);
InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;Load,"OptionIconRowEvaluation",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+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowEvaluation",PLAYER_2;player,PLAYER_2);
InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;Load,"OptionIconRowEvaluation",PLAYER_2;player,PLAYER_2);
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-300;y,SCREEN_CENTER_Y;Load,"DifficultyDisplayEvaluation",PLAYER_1;player,PLAYER_1;);
InitCommand=cmd(x,SCREEN_CENTER_X-230;y,SCREEN_CENTER_Y+158;Load,"DifficultyDisplayEvaluation",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+300;y,SCREEN_CENTER_Y;Load,"DifficultyDisplayEvaluation",PLAYER_2;player,PLAYER_2;);
InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y+158;Load,"DifficultyDisplayEvaluation",PLAYER_2;SetFromGameState,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/ScreenGameplay decorations/default.lua
+2 -4
View File
@@ -19,14 +19,12 @@ t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "RightF
t[#t+1] = Def.OptionIconRow {
Condition=GAMESTATE:IsHumanPlayer(PLAYER_1);
InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_1);
InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",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 {
Condition=GAMESTATE:IsHumanPlayer(PLAYER_2);
InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;);
InitCommand=cmd(x,SCREEN_CENTER_X+300;y,SCREEN_CENTER_Y;Load,"OptionIconRowGameplay",PLAYER_2;player,PLAYER_2;);
OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1);
OffCommand=cmd(linear,0.5;zoomy,0);
};
stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir
+1 -1
View File
@@ -1 +1 @@
_venacti bold fixed-width 24
common normal
stepmania/Themes/default/Languages/en.ini
+4 -4
View File
@@ -1600,8 +1600,8 @@ None=None
W1=Fantastic
W2=Perfect
W3=Great
W4=Decent
W5=Barely
W4=Good
W5=Boo
[ThemeManager]
Reloaded metrics=Reloaded metrics
@@ -1882,8 +1882,8 @@ Demo=Demo
W1=Fantastic
W2=Perfect
W3=Great
W4=Decent
W5=Barely
W4=Good
W5=Boo
Miss=Miss
Held=Held
MaxCombo=MaxCombo
stepmania/Themes/default/metrics.ini
+75 -73
View File
@@ -115,7 +115,7 @@ TimerSeconds=-1
ShowStyleIcon=false
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-20
HelpOnCommand=zoom,0.5
HelpOnCommand=
HelpOffCommand=
IdleCommentSeconds=12
IdleTimeoutSeconds=30
@@ -572,7 +572,7 @@ StartX=0
StartY=0
SpacingX=150
CropWidth=146
TitleInitCommand=horizalign,left;vertalign,top;shadowlength,2;zoom,0.5;
TitleInitCommand=horizalign,left;vertalign,top;shadowlength,2;
[ScreenInstructions]
Class="ScreenInstructions"
@@ -991,11 +991,11 @@ RightFrameOnCommand=
RightFrameOffCommand=
PlayerOptionsP1X=SCREEN_CENTER_X+0
PlayerOptionsP1Y=SCREEN_CENTER_Y+194
PlayerOptionsP1OnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100
PlayerOptionsP1OnCommand=addy,100;linear,0.5;addy,-100
PlayerOptionsP1OffCommand=linear,0.5;addy,100
PlayerOptionsP2X=SCREEN_CENTER_X+0
PlayerOptionsP2Y=SCREEN_CENTER_Y+210
PlayerOptionsP2OnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100
PlayerOptionsP2OnCommand=addy,100;linear,0.5;addy,-100
PlayerOptionsP2OffCommand=linear,0.5;addy,100
ScoreboardC1P1X=SCREEN_CENTER_X-260
ScoreboardC1P1Y=SCREEN_CENTER_Y-160
@@ -1031,7 +1031,7 @@ StepsDescriptionP2OnCommand=visible,false
StepsDescriptionP2OffCommand=
SongOptionsX=SCREEN_CENTER_X+0
SongOptionsY=SCREEN_CENTER_Y+230
SongOptionsOnCommand=zoom,0.5;addy,100;linear,0.5;addy,-100
SongOptionsOnCommand=addy,100;linear,0.5;addy,-100
SongOptionsOffCommand=linear,0.5;addy,100
DifficultyDisplayP1X=SCREEN_CENTER_X-250
DifficultyDisplayP1Y=
@@ -1128,15 +1128,15 @@ SecondaryScoreP2OnCommand=
SecondaryScoreP2OffCommand=
PlayerOptionsP1X=SCREEN_CENTER_X+0
PlayerOptionsP1Y=SCREEN_CENTER_Y-194
PlayerOptionsP1OnCommand=zoom,0.5;addy,-100;sleep,0.5;linear,1;addy,100
PlayerOptionsP1OnCommand=addy,-100;sleep,0.5;linear,1;addy,100
PlayerOptionsP1OffCommand=linear,1;addy,-100
PlayerOptionsP2X=SCREEN_CENTER_X+0
PlayerOptionsP2Y=SCREEN_CENTER_Y-210
PlayerOptionsP2OnCommand=zoom,0.5;addy,-100;sleep,0.5;linear,1;addy,100
PlayerOptionsP2OnCommand=addy,-100;sleep,0.5;linear,1;addy,100
PlayerOptionsP2OffCommand=linear,1;addy,-100
SongOptionsX=SCREEN_CENTER_X+0
SongOptionsY=SCREEN_CENTER_Y-230
SongOptionsOnCommand=zoom,0.5;addy,-100;sleep,0.5;linear,1;addy,100
SongOptionsOnCommand=addy,-100;sleep,0.5;linear,1;addy,100
SongOptionsOffCommand=linear,1;addy,-100
DifficultyP1X=SCREEN_CENTER_X-260
DifficultyP1Y=SCREEN_CENTER_Y+180
@@ -1317,6 +1317,19 @@ MaxComboNumberP2Y=SCREEN_CENTER_Y-80+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
ScoreLabelX=SCREEN_CENTER_X+0
ScoreLabelY=SCREEN_CENTER_Y+140
ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT
ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT
ScoreNumberP1X=SCREEN_CENTER_X
ScoreNumberP1Y=SCREEN_CENTER_Y
ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2
ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2
ScoreNumberP2X=SCREEN_CENTER_X+160
ScoreNumberP2Y=SCREEN_CENTER_Y+140
ScoreNumberP2OnCommand=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
LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -1326,19 +1339,6 @@ LargeBannerFrameY=SCREEN_CENTER_Y-140
LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT
ScoreLabelX=SCREEN_CENTER_X+0
ScoreLabelY=SCREEN_CENTER_Y+140
ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT
ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT
ScoreNumberP1X=SCREEN_CENTER_X-160
ScoreNumberP1Y=SCREEN_CENTER_Y+140
ScoreNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2
ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2
ScoreNumberP2X=SCREEN_CENTER_X+160
ScoreNumberP2Y=SCREEN_CENTER_Y+140
ScoreNumberP2OnCommand=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
MachineRecordP1X=SCREEN_CENTER_X-250
MachineRecordP1Y=SCREEN_CENTER_Y+160
MachineRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
@@ -1358,11 +1358,11 @@ ProfileRecordP2OffCommand=linear,0.7;diffusealpha,0
PlayerOptionsP1X=SCREEN_CENTER_X-70
PlayerOptionsP1Y=SCREEN_CENTER_Y-182
PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
PlayerOptionsP1OnCommand=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;zoom,0.5;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT
PlayerOptionsP2OnCommand=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
@@ -1845,7 +1845,7 @@ CreditsP1X=SCREEN_CENTER_X-230
CreditsP1Y=SCREEN_BOTTOM-10
CreditsP2X=SCREEN_CENTER_X+230
CreditsP2Y=SCREEN_BOTTOM-10
CreditsInitCommand=shadowlength,0;zoom,0.5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");
CreditsInitCommand=shadowlength,0;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");
[ScreenDebugOverlay]
Class="ScreenDebugOverlay"
@@ -1871,25 +1871,25 @@ SongNameY=0
SongNameOnCommand=
SectionExpandedX=-18
SectionExpandedY=-2
SectionExpandedOnCommand=zoom,0.5;maxwidth,400;strokecolor,color("#00000077");shadowlength,0
SectionExpandedOnCommand=maxwidth,400;strokecolor,color("#00000077");shadowlength,0
SectionCollapsedX=-18
SectionCollapsedY=-2
SectionCollapsedOnCommand=zoom,0.5;maxwidth,400;strokecolor,color("#00000077");shadowlength,0
SectionCollapsedOnCommand=maxwidth,400;strokecolor,color("#00000077");shadowlength,0
SectionCountX=105
SectionCountY=0
SectionCountOnCommand=zoom,0.5;diffuse,color("#8e8b3f");shadowlength,0
SectionCountOnCommand=diffuse,color("#8e8b3f");shadowlength,0
RouletteX=-0
RouletteY=-2
RouletteOnCommand=zoom,0.5;maxwidth,400;rainbowscroll,true;strokecolor,color("#00000077");shadowlength,0
RouletteOnCommand=maxwidth,400;rainbowscroll,true;strokecolor,color("#00000077");shadowlength,0
CourseX=0
CourseY=-2
CourseOnCommand=shadowlength,0;zoom,0.5;maxwidth,400
CourseOnCommand=shadowlength,0;maxwidth,400
SortX=0
SortY=-2
SortOnCommand=shadowlength,0;zoom,0.5;maxwidth,400
SortOnCommand=shadowlength,0;maxwidth,400
ModeX=0
ModeY=-2
ModeOnCommand=shadowlength,0;zoom,0.5;maxwidth,400
ModeOnCommand=shadowlength,0;maxwidth,400
GradeP1X=90
GradeP1Y=-5
GradeP2X=110
@@ -1973,13 +1973,13 @@ RoomInfoDisplayOnCommand=diffuse,1.0,1.0,1.0,1.0;x,SCREEN_WIDTH+130;y,250;bounce
RoomInfoDisplayOffCommand=x,SCREEN_WIDTH-160;y,250;bouncebegin,0.5;x,SCREEN_WIDTH+130
DeployDelay=1.5
RetractDelay=5
RoomTitleOnCommand=x,-120;y,-140;zoom,0.5
RoomDescOnCommand=x,-120;y,-129;zoom,0.5
LastRoundOnCommand=x,-120;y,-107;zoom,0.5
SongTitleOnCommand=x,-110;y,-96;zoom,0.5
SongSubTitleOnCommand=x,-110;y,-85;zoom,0.5
SongArtistOnCommand=x,-110;y,-74;zoom,0.5
PlayersOnCommand=x,-120;y,-52;zoom,0.5
RoomTitleOnCommand=x,-120;y,-140
RoomDescOnCommand=x,-120;y,-129
LastRoundOnCommand=x,-120;y,-107
SongTitleOnCommand=x,-110;y,-96
SongSubTitleOnCommand=x,-110;y,-85
SongArtistOnCommand=x,-110;y,-74
PlayersOnCommand=x,-120;y,-52
PlayerListElementX=-110
PlayerListElementY=-41
PlayerListElementOffsetX=0
@@ -1993,7 +1993,7 @@ TextY=-5
TextWidth=200
DescX=-120
DescY=10
DescOnCommand=zoom,0.5
DescOnCommand=
DescWidth=400
[LifeMeterBar]
@@ -2042,12 +2042,12 @@ ShowMeter=true
ZeroMeterString="?"
MeterX=30
MeterY=0
MeterOnCommand=shadowlength,0;zoom,0.5
MeterOnCommand=shadowlength,0
MeterSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
ShowDescription=true
DescriptionX=-10
DescriptionY=0
DescriptionOnCommand=zoom,0.5;shadowlength,0;uppercase,true;
DescriptionOnCommand=shadowlength,0;uppercase,true;
DescriptionSetCommand=%function(self,param) if param.Difficulty then self:diffuse(DifficultyDisplayTypeToLightColor(param.DifficultyDisplayType)); self:strokecolor(DifficultyDisplayTypeToDarkColor(param.DifficultyDisplayType)); end end
ShowAutogen=true
AutogenX=0
@@ -2078,22 +2078,22 @@ MaxTicks=13
TicksSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end
TicksX=0
TicksY=0
TicksOnCommand=shadowlength,0;shadowcolor,color("#FFFFFF");zoom,0.5;
TicksOnCommand=shadowlength,0;shadowcolor,color("#FFFFFF");
ShowMeter=1
MeterX=92
MeterY=-1
MeterOnCommand=zoom,0.5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");
MeterOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");
ShowDescription=true
DescriptionX=-110
DescriptionY=-1
DescriptionOnCommand=zoom,0.5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");maxwidth,150
DescriptionOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077");maxwidth,150
DescriptionSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end
ZeroMeterString="?"
MeterSetCommand=%function(self,param) self:diffuse(DifficultyDisplayTypeToColor(param.DifficultyDisplayType)); end
[DifficultyDisplayGameplay]
Fallback="DifficultyDisplay"
MeterOnCommand=shadowlength,0;zoom,0.5
MeterOnCommand=shadowlength,0;
FrameOnCommand=
ShowAutogen=false
ShowStepsType=false
@@ -2120,7 +2120,7 @@ FooterOnCommand=
FooterOffCommand=
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-24
HelpOnCommand=draworder,97;zoom,0.5;zoomy,0;linear,0.5;zoomy,0.5
HelpOnCommand=draworder,1;zoomy,0;linear,0.5;zoomy,1
HelpOffCommand=linear,0.5;zoomy,0
MemoryCardDisplayP1X=SCREEN_LEFT+10;
MemoryCardDisplayP1Y=SCREEN_CENTER_Y+220
@@ -2190,11 +2190,11 @@ ExplanationP2X=SCREEN_CENTER_X+250
ExplanationP2Y=SCREEN_CENTER_Y+172
ExplanationTogetherX=SCREEN_CENTER_X-250
ExplanationTogetherY=SCREEN_CENTER_Y+172
ExplanationTogetherOnCommand=shadowlength,0;zoom,0.5;wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationTogetherOnCommand=shadowlength,0;wrapwidthpixels,1000;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationTogetherOffCommand=
ExplanationP1OnCommand=shadowlength,0;zoom,0.5;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationP1OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,left;cropright,1;linear,0.5;cropright,0
ExplanationP1OffCommand=
ExplanationP2OnCommand=shadowlength,0;zoom,0.5;wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
ExplanationP2OnCommand=shadowlength,0;wrapwidthpixels,500;horizalign,right;cropright,1;linear,0.5;cropright,0
ExplanationP2OffCommand=
DisqualifyP1X=
DisqualifyP1Y=
@@ -2251,7 +2251,7 @@ ItemsMinBaseZoom=0.6
ItemsLongRowP1X=SCREEN_CENTER_X-60
ItemsLongRowP2X=SCREEN_CENTER_X+100
ItemsLongRowSharedX=SCREEN_CENTER_X+20
ItemsOnCommand=zoom,0.5
ItemsOnCommand=
ItemGainFocusCommand=
ItemLoseFocusCommand=
ExitHideItem=false
@@ -2282,14 +2282,14 @@ LabelP1OffCommand=linear,0.5;diffusealpha,0
LabelP2OnCommand=x,SCREEN_CENTER_X+195;zoom,0.7;shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1
LabelP2OffCommand=linear,0.5;diffusealpha,0
PrimaryOnCommand=x,SCREEN_CENTER_X;y,-6;zoom,0.7;shadowlength,2
SecondaryOnCommand=x,SCREEN_CENTER_X;y,6;zoom,0.5;shadowlength,2
SecondaryOnCommand=x,SCREEN_CENTER_X;y,6;shadowlength,2
MappedToP1S1Command=x,SCREEN_CENTER_X-270
MappedToP1S2Command=x,SCREEN_CENTER_X-195
MappedToP1S3Command=x,SCREEN_CENTER_X-120
MappedToP2S1Command=x,SCREEN_CENTER_X+120
MappedToP2S2Command=x,SCREEN_CENTER_X+195
MappedToP2S3Command=x,SCREEN_CENTER_X+270
MappedToOnCommand=diffuse,#808080;zoom,0.5;shadowlength,0;maxwidth,150
MappedToOnCommand=diffuse,#808080;shadowlength,0;maxwidth,150
MappedToWaitingCommand=diffuse,#FF8080;pulse;effectperiod,0.5;effectmagnitude,0.8,1.3,0
MappedToMappedInputCommand=diffuse,#808080;diffuseshift;effectcolor2,#808080;effectcolor1,#FFFFFF
MappedToGainFocusCommand=diffuse,#808080;diffuseshift;effectcolor2,#808080;effectcolor1,#FFFFFF
@@ -2637,16 +2637,18 @@ Uppercase=false
[OptionIconRow]
NumOptionIcons=6
OptionIconOnCommand=
SpacingX=46
SpacingY=0
[OptionIconRowSelectMusic]
Fallback="OptionIconRow"
SpacingX=46
SpacingY=0
[OptionIconRowGameplay]
Fallback="OptionIconRow"
SpacingX=0
SpacingY=30
SpacingY=46
OptionIconOnCommand=rotationz,90;
[OptionIconRowEvaluation]
Fallback="OptionIconRowGameplay"
@@ -2694,11 +2696,11 @@ PercentP2OnCommand=horizalign,right;vertalign,bottom;glowshift;effectperiod,2;sh
PercentP2OffCommand=
PercentRemainderP1X=0
PercentRemainderP1Y=0
PercentRemainderP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;glowshift;effectperiod,2;shadowlength,0
PercentRemainderP1OnCommand=horizalign,left;vertalign,bottom;glowshift;effectperiod,2;shadowlength,0
PercentRemainderP1OffCommand=
PercentRemainderP2X=0
PercentRemainderP2Y=0
PercentRemainderP2OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;glowshift;effectperiod,2;shadowlength,0
PercentRemainderP2OnCommand=horizalign,left;vertalign,bottom;glowshift;effectperiod,2;shadowlength,0
PercentRemainderP2OffCommand=
DancePointsP1X=-26
DancePointsP1Y=-32
@@ -3372,7 +3374,7 @@ Fallback="EditCoursesMenu"
[ScreenOptionsSimple]
Fallback="ScreenOptionsMaster"
TitleX=SCREEN_CENTER_X-180
TitleOnCommand=zoom,0.5;horizalign,left;shadowlength,0
TitleOnCommand=horizalign,left;shadowlength,0
TitleGainFocusCommand=diffuseshift;effectcolor1,1.3,1.3,1.3,1;effectcolor2,0.3,0.3,0.3,1
TitleLoseFocusCommand=stopeffect
NavigationMode="menu"
@@ -3901,13 +3903,13 @@ TimerSeconds=-1
EditModifiers=""
EditHelpX=SCREEN_LEFT+4
EditHelpY=SCREEN_TOP+40
EditHelpOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
EditHelpOnCommand=horizalign,left;vertalign,top;shadowlength,0
InfoX=SCREEN_RIGHT-114
InfoY=SCREEN_TOP+40
InfoOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0;DrawOrder,-1
InfoOnCommand=horizalign,left;vertalign,top;shadowlength,0;DrawOrder,-1
PlayRecordHelpX=SCREEN_LEFT+20
PlayRecordHelpY=SCREEN_BOTTOM-20
PlayRecordHelpOnCommand=horizalign,left;vertalign,top;zoom,0.5;shadowlength,0
PlayRecordHelpOnCommand=horizalign,left;vertalign,top;shadowlength,0
[ScreenEditOptions]
Fallback="ScreenOptions"
@@ -4019,14 +4021,14 @@ IconsP2X=SCREEN_CENTER_X+280
IconsOnCommand=x,-30
BulletX=SCREEN_CENTER_X-232
TitleX=SCREEN_CENTER_X-150
TitleOnCommand=zoom,0.5;horizalign,left;shadowlength,2
TitleOnCommand=horizalign,left;shadowlength,2
ItemsStartX=SCREEN_CENTER_X-160
ItemsEndX=SCREEN_CENTER_X+280
ItemsGapX=14
ItemsLongRowP1X=SCREEN_CENTER_X-60
ItemsLongRowP2X=SCREEN_CENTER_X+100
ItemsLongRowSharedX=SCREEN_CENTER_X+150
ItemsOnCommand=zoom,0.5
ItemsOnCommand=
ColorSelected=color("0.5,1,0.5,1")
ColorNotSelected=color("1,1,1,1")
ColorDisabled=color("0.5,0.5,0.5,1")
@@ -4185,7 +4187,7 @@ WrapValueInRow=false
NavigationMode="menu"
ForceAllPlayers=true
InputMode="together"
TitleOnCommand=zoom,0.5;horizalign,left;shadowlength,0
TitleOnCommand=horizalign,left;shadowlength,0
TitleGainFocusCommand=diffuseshift;effectcolor1,1.3,1.3,1.3,1;effectcolor2,0.3,0.3,0.3,1
TitleLoseFocusCommand=stopeffect
BulletOnCommand=visible,false
@@ -4276,7 +4278,7 @@ FooterOnCommand=draworder,95;ZoomToWidth,SCREEN_WIDTH
FooterOffCommand=
HelpX=SCREEN_CENTER_X
HelpY=SCREEN_BOTTOM-24
HelpOnCommand=draworder,97;zoom,0.5;zoomy,0;linear,0.5;zoomy,0.5
HelpOnCommand=draworder,1;zoomy,0;linear,0.5;zoomy,1
HelpOffCommand=linear,0.5;zoomy,0
AllowCenter1Player=0
SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;zoom,0;decelerate,0.5;zoom,0.6
@@ -4289,7 +4291,7 @@ ShiftP2Y=0
CountFormat="%3.0f"
NumStepsTextX=4+74*-0.5
NumStepsTextY=16*-1
NumStepsTextOnCommand=shadowlength,0;zoom,0.5;
NumStepsTextOnCommand=shadowlength,0;
NumStepsTextOffCommand=linear,0.1;diffusealpha,0;
NumStepsLabelX=-16-4+74*-0.5
NumStepsLabelY=16*-1
@@ -4306,7 +4308,7 @@ NumStepsLevel7=1000;diffuse,#00C0FF -- 750-999 (AJ Blue)
NumStepsLevel8=9999;diffuse,#FF0000 -- 1000-9999 (Red)
JumpsTextX=4+74*-0.5
JumpsTextY=16*0
JumpsTextOnCommand=shadowlength,0;zoom,0.5;
JumpsTextOnCommand=shadowlength,0;
JumpsTextOffCommand=linear,0.1;diffusealpha,0;
JumpsLabelX=-16+74*-0.5
JumpsLabelY=16*0
@@ -4321,7 +4323,7 @@ JumpsLevel5=449;diffuse,#00C0FF -- 200-450 (AJ Blue)
JumpsLevel6=9999;diffuse,#FF0000 -- 450-inf (red)
HoldsTextX=4+74*-0.5
HoldsTextY=16*1
HoldsTextOnCommand=shadowlength,0;zoom,0.5;
HoldsTextOnCommand=shadowlength,0;
HoldsTextOffCommand=linear,0.1;diffusealpha,0;
HoldsLabelX=-16+74*-0.5
HoldsLabelY=16*1
@@ -4335,7 +4337,7 @@ HoldsLevel4=199;diffuse,#FF8800 -- 100-199 (orange)
HoldsLevel5=9999;diffuse,#FF0000 -- 200-inf (red)
MinesTextX=4+74*0.5
MinesTextY=16*-1
MinesTextOnCommand=shadowlength,0;zoom,0.5;
MinesTextOnCommand=shadowlength,0;
MinesTextOffCommand=linear,0.1;diffusealpha,0;
MinesLabelX=-16+74*0.5
MinesLabelY=16*-1
@@ -4350,7 +4352,7 @@ MinesLevel5=999;diffuse,#00C0FF -- 200-999 (AJ Blue)
MinesLevel6=9999;diffuse,#FF0000 -- 1000-inf (red)
HandsTextX=4+74*0.5
HandsTextY=16*0
HandsTextOnCommand=shadowlength,0;zoom,0.5;
HandsTextOnCommand=shadowlength,0;
HandsTextOffCommand=linear,0.1;diffusealpha,0;
HandsLabelX=-16+74*0.5
HandsLabelY=16*0
@@ -4364,7 +4366,7 @@ HandsLevel4=99;diffuse,#FF8800 -- 35-99 (orange)
HandsLevel5=9999;diffuse,#FF0000 -- 100-inf (red)
RollsTextX=4+74*0.5
RollsTextY=16*1
RollsTextOnCommand=shadowlength,0;zoom,0.5;
RollsTextOnCommand=shadowlength,0;
RollsTextOffCommand=linear,0.1;diffusealpha,0;
RollsLabelX=-16+74*0.5
RollsLabelY=16*1
@@ -4378,7 +4380,7 @@ RollsLevel4=199;diffuse,#FF8800 -- 100-199 (orange)
RollsLevel5=9999;diffuse,#FF0000 -- 200-inf (red)
MachineHighScoreTextX=100
MachineHighScoreTextY=10
MachineHighScoreTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
MachineHighScoreTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
MachineHighScoreTextOffCommand=linear,0.1;diffusealpha,0;
MachineHighScoreLabelX=0
MachineHighScoreLabelY=0
@@ -4398,7 +4400,7 @@ MachineHighScoreLevel11=99;diffuse,#00FF00 -- 90-99% (Green)
MachineHighScoreLevel12=101;diffuse,#00C0FF -- 100% (AJ Blue)
MachineHighNameTextX=100
MachineHighNameTextY=-10
MachineHighNameTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
MachineHighNameTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb");
MachineHighNameTextOffCommand=linear,0.1;diffusealpha,0;
MachineHighNameLabelX=
MachineHighNameLabelY=
stepmania/src/OptionIconRow.cpp
+2
View File
@@ -42,8 +42,10 @@ void OptionIconRow::Load( const RString &sMetricsGroup, PlayerNumber pn )
for( int i=0; i<NUM_OPTION_ICONS; i++ )
{
OptionIcon *p = new OptionIcon;
p->SetName( "OptionIcon" );
p->SetXY( i*SPACING_X, i*SPACING_Y );
p->Load( sMetricsGroup );
ActorUtil::LoadAllCommands( p, sMetricsGroup );
m_vpOptionIcon.push_back( p );
this->AddChild( p );
}
stepmania/src/ScreenEvaluation.cpp
+3 -3
View File
@@ -538,7 +538,7 @@ void ScreenEvaluation::Init()
FOREACH_EnabledPlayer( p )
{
m_textScore[p].LoadFromFont( THEME->GetPathF(m_sName, "score") );
m_textScore[p].LoadFromFont( THEME->GetPathF(m_sName, "Score") );
m_textScore[p].SetShadowLength( 0 );
m_textScore[p].SetName( ssprintf("ScoreNumberP%d",p+1) );
ActorUtil::LoadAllCommands( m_textScore[p], m_sName );
@@ -550,7 +550,7 @@ void ScreenEvaluation::Init()
if( SHOW_TOTAL_SCORE_AREA )
{
m_sprTotalScoreLabel.Load( THEME->GetPathG(m_sName,"totalscore label") );
m_sprTotalScoreLabel.Load( THEME->GetPathG(m_sName,"TotalScoreLabel") );
m_sprTotalScoreLabel->SetName( "TotalScoreLabel" );
ActorUtil::LoadAllCommands( *m_sprTotalScoreLabel, m_sName );
SET_XY( m_sprTotalScoreLabel );
@@ -564,7 +564,7 @@ void ScreenEvaluation::Init()
//iTotalScore += m_pStageStats->m_player[p].iScore;
m_textTotalScore[p].LoadFromFont( THEME->GetPathF(m_sName, "totalscore") );
m_textTotalScore[p].LoadFromFont( THEME->GetPathF(m_sName, "TotalScore") );
m_textTotalScore[p].SetShadowLength( 0 );
m_textTotalScore[p].SetName( ssprintf("TotalScoreNumberP%d",p+1) );
m_textTotalScore[p].SetText( ssprintf("%*.0i", NUM_SCORE_DIGITS+2, iTotalScore) );