From ba3ea672c3044262456522e5183b74047d7d7c38 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 21 Dec 2003 04:19:51 +0000 Subject: [PATCH] remove more unused eval metrics remove separate "course record" and "category record" graphics keep track of personal category records cleanup eval time area --- stepmania/Themes/default/metrics.ini | 874 ------------------- stepmania/src/GameState.cpp | 55 +- stepmania/src/ProfileManager.h | 4 +- stepmania/src/ScreenEvaluation.cpp | 32 +- stepmania/src/ScreenNameEntryTraditional.cpp | 4 +- 5 files changed, 52 insertions(+), 917 deletions(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index dbb2951046..60d58f079b 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1452,34 +1452,6 @@ MemoryCardIcons=1 BannerWidth=248 BannerHeight=78 -LargeBannerX=320 -LargeBannerY=100 -LargeBannerOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,480 -LargeBannerFrameX=320 -LargeBannerFrameY=100 -LargeBannerFrameOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,480 -StageX=320 -StageY=72 -StageOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -StageOffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP1X=214 -DifficultyIconP1Y=80 -DifficultyIconP1OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP2X=426 -DifficultyIconP2Y=80 -DifficultyIconP2OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -PlayerOptionsP1X=200 -PlayerOptionsP1Y=140 -PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -PlayerOptionsP1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -PlayerOptionsP2X=440 -PlayerOptionsP2Y=140 -PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 SmallBanner1X=260 SmallBanner1Y=80 SmallBanner1OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 @@ -1516,22 +1488,6 @@ GradeP2X=546 GradeP2Y=100 GradeP2OnCommand=glowshift;effectperiod,2;addx,320;sleep,0.0;decelerate,0.3;addx,-320 GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -PercentFrameP1X=94 -PercentFrameP1Y=100 -PercentFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -PercentFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -PercentFrameP2X=546 -PercentFrameP2Y=100 -PercentFrameP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -PercentFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -PercentP1X=120 -PercentP1Y=132 -PercentP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -PercentP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -PercentP2X=572 -PercentP2Y=132 -PercentP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -PercentP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 MarvelousLabelX=320 MarvelousLabelY=160 MarvelousLabelOnCommand=addy,480;sleep,0.1;decelerate,0.3;addy,-480 @@ -1717,38 +1673,6 @@ BarActual5P2Y=302 BarActual5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 BarActual5P2OffCommand=linear,0.7;diffusealpha,0 BarActualMaxCommand=glowshift;effectperiod,0.5 -SurvivedFrameP1X=96 -SurvivedFrameP1Y=256 -SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedFrameP2X=544 -SurvivedFrameP2Y=256 -SurvivedFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP2OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP1X=96 -SurvivedNumberP1Y=240 -SurvivedNumberP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP2X=544 -SurvivedNumberP2Y=240 -SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -WinFrameP1X=96 -WinFrameP1Y=256 -WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP1OffCommand=linear,0.7;diffusealpha,0 -WinFrameP2X=544 -WinFrameP2Y=256 -WinFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP2OffCommand=linear,0.7;diffusealpha,0 -WinP1X=96 -WinP1Y=256 -WinP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP1OffCommand=linear,0.7;diffusealpha,0 -WinP2X=544 -WinP2Y=256 -WinP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP2OffCommand=linear,0.7;diffusealpha,0 ScoreLabelX=320 ScoreLabelY=380 ScoreLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 @@ -1761,18 +1685,6 @@ ScoreNumberP2X=480 ScoreNumberP2Y=380 ScoreNumberP2OnCommand=addx,320;sleep,0.8;decelerate,0.3;addx,-320 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,320 -TimeLabelX=320 -TimeLabelY=380 -TimeLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 -TimeLabelOffCommand=sleep,0.0;accelerate,0.3;addy,480 -TimeNumberP1X=160 -TimeNumberP1Y=380 -TimeNumberP1OnCommand=addx,-320;sleep,0.8;decelerate,0.3;addx,320 -TimeNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-320 -TimeNumberP2X=480 -TimeNumberP2Y=380 -TimeNumberP2OnCommand=addx,320;sleep,0.8;decelerate,0.3;addx,-320 -TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,320 MachineRecordP1X=70 MachineRecordP1Y=398 MachineRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift @@ -1805,26 +1717,9 @@ CourseRecordP2X=506 CourseRecordP2Y=398 CourseRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift CourseRecordP2OffCommand=linear,0.7;diffusealpha,0 -TryExtraStageX=320 -TryExtraStageY=428 -TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -TryExtraStageOffCommand=linear,0.7;diffusealpha,0 SpinGrades=1 CheerDelaySeconds=2.5 NoMarvelousShiftUp=15 -FailedScreen=ScreenGameOver -TotalScoreNumberP1Y=999 -TotalScoreNumberP2Y=999 -TotalScoreNumberP1X=999 -TotalScoreNumberP2X=999 -TotalScoreNumberP1OnCommand=hidden,1 -TotalScoreNumberP2OnCommand=hidden,1 -TotalScoreNumberP1OffCommand=hidden,1 -TotalScoreNumberP2OffCommand=hidden,1 -TotalScoreLabelY=999 -TotalScoreLabelX=999 -TotalScoreLabelOnCommand=hidden,1 -TotalScoreLabelOffCommand=hidden,1 [ScreenEvaluationNonstop] NextScreen=ScreenNameEntry @@ -1870,18 +1765,6 @@ LargeBannerFrameX=320 LargeBannerFrameY=100 LargeBannerFrameOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,480 -StageX=320 -StageY=72 -StageOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -StageOffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP1X=214 -DifficultyIconP1Y=80 -DifficultyIconP1OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP2X=426 -DifficultyIconP2Y=80 -DifficultyIconP2OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 PlayerOptionsP1X=200 PlayerOptionsP1Y=140 PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 @@ -1890,26 +1773,6 @@ PlayerOptionsP2X=440 PlayerOptionsP2Y=140 PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner1X=260 -SmallBanner1Y=80 -SmallBanner1OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner2X=290 -SmallBanner2Y=90 -SmallBanner2OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner3X=320 -SmallBanner3Y=100 -SmallBanner3OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner3OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner4X=350 -SmallBanner4Y=110 -SmallBanner4OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner4OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner5X=380 -SmallBanner5Y=120 -SmallBanner5OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner5OffCommand=sleep,0.8;accelerate,0.3;addy,480 GradeFrameP1X=94 GradeFrameP1Y=100 GradeFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 @@ -1926,22 +1789,6 @@ GradeP2X=546 GradeP2Y=100 GradeP2OnCommand=glowshift;effectperiod,2;addx,320;sleep,0.0;decelerate,0.3;addx,-320 GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -PercentFrameP1X=94 -PercentFrameP1Y=100 -PercentFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -PercentFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -PercentFrameP2X=546 -PercentFrameP2Y=100 -PercentFrameP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -PercentFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -PercentP1X=120 -PercentP1Y=132 -PercentP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -PercentP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -PercentP2X=572 -PercentP2Y=132 -PercentP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -PercentP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 MarvelousLabelX=320 MarvelousLabelY=160 MarvelousLabelOnCommand=addy,480;sleep,0.1;decelerate,0.3;addy,-480 @@ -2038,95 +1885,6 @@ MaxComboNumberP2X=580 MaxComboNumberP2Y=334 MaxComboNumberP2OnCommand=zoom,1.2;diffusealpha,0;linear,0.7;diffuse,1,1,0,1 MaxComboNumberP2OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP1X=96 -BonusFrameP1Y=256 -BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP1OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP2X=544 -BonusFrameP2Y=256 -BonusFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP2OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P1X=176 -BarPossible1P1Y=194 -BarPossible1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P2X=466 -BarPossible1P2Y=194 -BarPossible1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P1X=176 -BarPossible2P1Y=221 -BarPossible2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P2X=466 -BarPossible2P2Y=221 -BarPossible2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P1X=176 -BarPossible3P1Y=248 -BarPossible3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P2X=466 -BarPossible3P2Y=248 -BarPossible3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P1X=176 -BarPossible4P1Y=275 -BarPossible4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P2X=466 -BarPossible4P2Y=275 -BarPossible4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P1X=176 -BarPossible5P1Y=302 -BarPossible5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P2X=466 -BarPossible5P2Y=302 -BarPossible5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P2OffCommand=linear,0.7;diffusealpha,0 -BarActual1P1X=176 -BarActual1P1Y=194 -BarActual1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P1OffCommand=linear,0.7;diffusealpha,0 -BarActual1P2X=466 -BarActual1P2Y=194 -BarActual1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P2OffCommand=linear,0.7;diffusealpha,0 -BarActual2P1X=176 -BarActual2P1Y=221 -BarActual2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P1OffCommand=linear,0.7;diffusealpha,0 -BarActual2P2X=466 -BarActual2P2Y=221 -BarActual2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P2OffCommand=linear,0.7;diffusealpha,0 -BarActual3P1X=176 -BarActual3P1Y=248 -BarActual3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P1OffCommand=linear,0.7;diffusealpha,0 -BarActual3P2X=466 -BarActual3P2Y=248 -BarActual3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P2OffCommand=linear,0.7;diffusealpha,0 -BarActual4P1X=176 -BarActual4P1Y=275 -BarActual4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P1OffCommand=linear,0.7;diffusealpha,0 -BarActual4P2X=466 -BarActual4P2Y=275 -BarActual4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P2OffCommand=linear,0.7;diffusealpha,0 -BarActual5P1X=176 -BarActual5P1Y=302 -BarActual5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P1OffCommand=linear,0.7;diffusealpha,0 -BarActual5P2X=466 -BarActual5P2Y=302 -BarActual5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P2OffCommand=linear,0.7;diffusealpha,0 -BarActualMaxCommand=glowshift;effectperiod,0.5 SurvivedFrameP1X=96 SurvivedFrameP1Y=256 SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 @@ -2143,22 +1901,6 @@ SurvivedNumberP2X=544 SurvivedNumberP2Y=240 SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -WinFrameP1X=96 -WinFrameP1Y=256 -WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP1OffCommand=linear,0.7;diffusealpha,0 -WinFrameP2X=544 -WinFrameP2Y=256 -WinFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP2OffCommand=linear,0.7;diffusealpha,0 -WinP1X=96 -WinP1Y=256 -WinP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP1OffCommand=linear,0.7;diffusealpha,0 -WinP2X=544 -WinP2Y=256 -WinP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP2OffCommand=linear,0.7;diffusealpha,0 ScoreLabelX=320 ScoreLabelY=380 ScoreLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 @@ -2171,18 +1913,6 @@ ScoreNumberP2X=480 ScoreNumberP2Y=380 ScoreNumberP2OnCommand=addx,320;sleep,0.8;decelerate,0.3;addx,-320 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,320 -TimeLabelX=320 -TimeLabelY=380 -TimeLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 -TimeLabelOffCommand=sleep,0.0;accelerate,0.3;addy,480 -TimeNumberP1X=160 -TimeNumberP1Y=380 -TimeNumberP1OnCommand=addx,-320;sleep,0.8;decelerate,0.3;addx,320 -TimeNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-320 -TimeNumberP2X=480 -TimeNumberP2Y=380 -TimeNumberP2OnCommand=addx,320;sleep,0.8;decelerate,0.3;addx,-320 -TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,320 MachineRecordP1X=70 MachineRecordP1Y=398 MachineRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift @@ -2199,42 +1929,8 @@ PersonalRecordP2X=570 PersonalRecordP2Y=398 PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP1X=134 -CategoryRecordP1Y=398 -CategoryRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP1OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP2X=506 -CategoryRecordP2Y=398 -CategoryRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP2OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP1X=134 -CourseRecordP1Y=398 -CourseRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP1OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP2X=506 -CourseRecordP2Y=398 -CourseRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP2OffCommand=linear,0.7;diffusealpha,0 -TryExtraStageX=320 -TryExtraStageY=428 -TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -TryExtraStageOffCommand=linear,0.7;diffusealpha,0 -SpinGrades=1 CheerDelaySeconds=2.5 NoMarvelousShiftUp=15 -FailedScreen=ScreenGameOver -TotalScoreNumberP1Y=999 -TotalScoreNumberP2Y=999 -TotalScoreNumberP1X=999 -TotalScoreNumberP2X=999 -TotalScoreNumberP1OnCommand=hidden,1 -TotalScoreNumberP2OnCommand=hidden,1 -TotalScoreNumberP1OffCommand=hidden,1 -TotalScoreNumberP2OffCommand=hidden,1 -TotalScoreLabelY=999 -TotalScoreLabelX=999 -TotalScoreLabelOnCommand=hidden,1 -TotalScoreLabelOffCommand=hidden,1 [ScreenEvaluationOni] NextScreen=ScreenNameEntry @@ -2280,18 +1976,6 @@ LargeBannerFrameX=320 LargeBannerFrameY=100 LargeBannerFrameOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,480 -StageX=320 -StageY=72 -StageOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -StageOffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP1X=214 -DifficultyIconP1Y=80 -DifficultyIconP1OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP2X=426 -DifficultyIconP2Y=80 -DifficultyIconP2OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 PlayerOptionsP1X=200 PlayerOptionsP1Y=140 PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 @@ -2300,42 +1984,6 @@ PlayerOptionsP2X=440 PlayerOptionsP2Y=140 PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner1X=260 -SmallBanner1Y=80 -SmallBanner1OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner2X=290 -SmallBanner2Y=90 -SmallBanner2OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner3X=320 -SmallBanner3Y=100 -SmallBanner3OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner3OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner4X=350 -SmallBanner4Y=110 -SmallBanner4OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner4OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner5X=380 -SmallBanner5Y=120 -SmallBanner5OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner5OffCommand=sleep,0.8;accelerate,0.3;addy,480 -GradeFrameP1X=94 -GradeFrameP1Y=100 -GradeFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -GradeFrameP2X=546 -GradeFrameP2Y=100 -GradeFrameP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -GradeP1X=94 -GradeP1Y=100 -GradeP1OnCommand=glowshift;effectperiod,2;addx,-320;sleep,0.0;decelerate,0.3;addx,320 -GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -GradeP2X=546 -GradeP2Y=100 -GradeP2OnCommand=glowshift;effectperiod,2;addx,320;sleep,0.0;decelerate,0.3;addx,-320 -GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 PercentFrameP1X=94 PercentFrameP1Y=100 PercentFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 @@ -2448,95 +2096,6 @@ MaxComboNumberP2X=580 MaxComboNumberP2Y=334 MaxComboNumberP2OnCommand=zoom,1.2;diffusealpha,0;linear,0.7;diffuse,1,1,0,1 MaxComboNumberP2OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP1X=96 -BonusFrameP1Y=256 -BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP1OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP2X=544 -BonusFrameP2Y=256 -BonusFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP2OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P1X=176 -BarPossible1P1Y=194 -BarPossible1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P2X=466 -BarPossible1P2Y=194 -BarPossible1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P1X=176 -BarPossible2P1Y=221 -BarPossible2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P2X=466 -BarPossible2P2Y=221 -BarPossible2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P1X=176 -BarPossible3P1Y=248 -BarPossible3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P2X=466 -BarPossible3P2Y=248 -BarPossible3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P1X=176 -BarPossible4P1Y=275 -BarPossible4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P2X=466 -BarPossible4P2Y=275 -BarPossible4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P1X=176 -BarPossible5P1Y=302 -BarPossible5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P2X=466 -BarPossible5P2Y=302 -BarPossible5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P2OffCommand=linear,0.7;diffusealpha,0 -BarActual1P1X=176 -BarActual1P1Y=194 -BarActual1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P1OffCommand=linear,0.7;diffusealpha,0 -BarActual1P2X=466 -BarActual1P2Y=194 -BarActual1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P2OffCommand=linear,0.7;diffusealpha,0 -BarActual2P1X=176 -BarActual2P1Y=221 -BarActual2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P1OffCommand=linear,0.7;diffusealpha,0 -BarActual2P2X=466 -BarActual2P2Y=221 -BarActual2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P2OffCommand=linear,0.7;diffusealpha,0 -BarActual3P1X=176 -BarActual3P1Y=248 -BarActual3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P1OffCommand=linear,0.7;diffusealpha,0 -BarActual3P2X=466 -BarActual3P2Y=248 -BarActual3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P2OffCommand=linear,0.7;diffusealpha,0 -BarActual4P1X=176 -BarActual4P1Y=275 -BarActual4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P1OffCommand=linear,0.7;diffusealpha,0 -BarActual4P2X=466 -BarActual4P2Y=275 -BarActual4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P2OffCommand=linear,0.7;diffusealpha,0 -BarActual5P1X=176 -BarActual5P1Y=302 -BarActual5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P1OffCommand=linear,0.7;diffusealpha,0 -BarActual5P2X=466 -BarActual5P2Y=302 -BarActual5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P2OffCommand=linear,0.7;diffusealpha,0 -BarActualMaxCommand=glowshift;effectperiod,0.5 SurvivedFrameP1X=96 SurvivedFrameP1Y=256 SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 @@ -2553,34 +2112,6 @@ SurvivedNumberP2X=544 SurvivedNumberP2Y=240 SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -WinFrameP1X=96 -WinFrameP1Y=256 -WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP1OffCommand=linear,0.7;diffusealpha,0 -WinFrameP2X=544 -WinFrameP2Y=256 -WinFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP2OffCommand=linear,0.7;diffusealpha,0 -WinP1X=96 -WinP1Y=256 -WinP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP1OffCommand=linear,0.7;diffusealpha,0 -WinP2X=544 -WinP2Y=256 -WinP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP2OffCommand=linear,0.7;diffusealpha,0 -ScoreLabelX=320 -ScoreLabelY=380 -ScoreLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 -ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,480 -ScoreNumberP1X=160 -ScoreNumberP1Y=380 -ScoreNumberP1OnCommand=addx,-320;sleep,0.8;decelerate,0.3;addx,320 -ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-320 -ScoreNumberP2X=480 -ScoreNumberP2Y=380 -ScoreNumberP2OnCommand=addx,320;sleep,0.8;decelerate,0.3;addx,-320 -ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,320 TimeLabelX=320 TimeLabelY=380 TimeLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 @@ -2609,42 +2140,9 @@ PersonalRecordP2X=570 PersonalRecordP2Y=398 PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP1X=134 -CategoryRecordP1Y=398 -CategoryRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP1OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP2X=506 -CategoryRecordP2Y=398 -CategoryRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP2OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP1X=134 -CourseRecordP1Y=398 -CourseRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP1OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP2X=506 -CourseRecordP2Y=398 -CourseRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP2OffCommand=linear,0.7;diffusealpha,0 -TryExtraStageX=320 -TryExtraStageY=428 -TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -TryExtraStageOffCommand=linear,0.7;diffusealpha,0 -SpinGrades=1 CheerDelaySeconds=2.5 NoMarvelousShiftUp=15 FailedScreen=ScreenGameOver -TotalScoreNumberP1Y=999 -TotalScoreNumberP2Y=999 -TotalScoreNumberP1X=999 -TotalScoreNumberP2X=999 -TotalScoreNumberP1OnCommand=hidden,1 -TotalScoreNumberP2OnCommand=hidden,1 -TotalScoreNumberP1OffCommand=hidden,1 -TotalScoreNumberP2OffCommand=hidden,1 -TotalScoreLabelY=999 -TotalScoreLabelX=999 -TotalScoreLabelOnCommand=hidden,1 -TotalScoreLabelOffCommand=hidden,1 [ScreenEvaluationEndless] NextScreen=ScreenNameEntry @@ -2690,18 +2188,6 @@ LargeBannerFrameX=320 LargeBannerFrameY=100 LargeBannerFrameOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,480 -StageX=320 -StageY=72 -StageOnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -StageOffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP1X=214 -DifficultyIconP1Y=80 -DifficultyIconP1OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -DifficultyIconP2X=426 -DifficultyIconP2Y=80 -DifficultyIconP2OnCommand=addy,480;sleep,0.0;decelerate,0.3;addy,-480 -DifficultyIconP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 PlayerOptionsP1X=200 PlayerOptionsP1Y=140 PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 @@ -2710,42 +2196,6 @@ PlayerOptionsP2X=440 PlayerOptionsP2Y=140 PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner1X=260 -SmallBanner1Y=80 -SmallBanner1OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner2X=290 -SmallBanner2Y=90 -SmallBanner2OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner3X=320 -SmallBanner3Y=100 -SmallBanner3OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner3OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner4X=350 -SmallBanner4Y=110 -SmallBanner4OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner4OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner5X=380 -SmallBanner5Y=120 -SmallBanner5OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner5OffCommand=sleep,0.8;accelerate,0.3;addy,480 -GradeFrameP1X=94 -GradeFrameP1Y=100 -GradeFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -GradeFrameP2X=546 -GradeFrameP2Y=100 -GradeFrameP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -GradeP1X=94 -GradeP1Y=100 -GradeP1OnCommand=glowshift;effectperiod,2;addx,-320;sleep,0.0;decelerate,0.3;addx,320 -GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -GradeP2X=546 -GradeP2Y=100 -GradeP2OnCommand=glowshift;effectperiod,2;addx,320;sleep,0.0;decelerate,0.3;addx,-320 -GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 PercentFrameP1X=94 PercentFrameP1Y=100 PercentFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 @@ -2858,95 +2308,6 @@ MaxComboNumberP2X=580 MaxComboNumberP2Y=334 MaxComboNumberP2OnCommand=zoom,1.2;diffusealpha,0;linear,0.7;diffuse,1,1,0,1 MaxComboNumberP2OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP1X=96 -BonusFrameP1Y=256 -BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP1OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP2X=544 -BonusFrameP2Y=256 -BonusFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP2OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P1X=176 -BarPossible1P1Y=194 -BarPossible1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P2X=466 -BarPossible1P2Y=194 -BarPossible1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P1X=176 -BarPossible2P1Y=221 -BarPossible2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P2X=466 -BarPossible2P2Y=221 -BarPossible2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P1X=176 -BarPossible3P1Y=248 -BarPossible3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P2X=466 -BarPossible3P2Y=248 -BarPossible3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P1X=176 -BarPossible4P1Y=275 -BarPossible4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P2X=466 -BarPossible4P2Y=275 -BarPossible4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P1X=176 -BarPossible5P1Y=302 -BarPossible5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P2X=466 -BarPossible5P2Y=302 -BarPossible5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P2OffCommand=linear,0.7;diffusealpha,0 -BarActual1P1X=176 -BarActual1P1Y=194 -BarActual1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P1OffCommand=linear,0.7;diffusealpha,0 -BarActual1P2X=466 -BarActual1P2Y=194 -BarActual1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P2OffCommand=linear,0.7;diffusealpha,0 -BarActual2P1X=176 -BarActual2P1Y=221 -BarActual2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P1OffCommand=linear,0.7;diffusealpha,0 -BarActual2P2X=466 -BarActual2P2Y=221 -BarActual2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P2OffCommand=linear,0.7;diffusealpha,0 -BarActual3P1X=176 -BarActual3P1Y=248 -BarActual3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P1OffCommand=linear,0.7;diffusealpha,0 -BarActual3P2X=466 -BarActual3P2Y=248 -BarActual3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P2OffCommand=linear,0.7;diffusealpha,0 -BarActual4P1X=176 -BarActual4P1Y=275 -BarActual4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P1OffCommand=linear,0.7;diffusealpha,0 -BarActual4P2X=466 -BarActual4P2Y=275 -BarActual4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P2OffCommand=linear,0.7;diffusealpha,0 -BarActual5P1X=176 -BarActual5P1Y=302 -BarActual5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P1OffCommand=linear,0.7;diffusealpha,0 -BarActual5P2X=466 -BarActual5P2Y=302 -BarActual5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P2OffCommand=linear,0.7;diffusealpha,0 -BarActualMaxCommand=glowshift;effectperiod,0.5 SurvivedFrameP1X=96 SurvivedFrameP1Y=256 SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 @@ -2963,22 +2324,6 @@ SurvivedNumberP2X=544 SurvivedNumberP2Y=240 SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -WinFrameP1X=96 -WinFrameP1Y=256 -WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP1OffCommand=linear,0.7;diffusealpha,0 -WinFrameP2X=544 -WinFrameP2Y=256 -WinFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinFrameP2OffCommand=linear,0.7;diffusealpha,0 -WinP1X=96 -WinP1Y=256 -WinP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP1OffCommand=linear,0.7;diffusealpha,0 -WinP2X=544 -WinP2Y=256 -WinP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -WinP2OffCommand=linear,0.7;diffusealpha,0 ScoreLabelX=320 ScoreLabelY=380 ScoreLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 @@ -3019,42 +2364,9 @@ PersonalRecordP2X=570 PersonalRecordP2Y=398 PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP1X=134 -CategoryRecordP1Y=398 -CategoryRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP1OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP2X=506 -CategoryRecordP2Y=398 -CategoryRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP2OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP1X=134 -CourseRecordP1Y=398 -CourseRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP1OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP2X=506 -CourseRecordP2Y=398 -CourseRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP2OffCommand=linear,0.7;diffusealpha,0 -TryExtraStageX=320 -TryExtraStageY=428 -TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -TryExtraStageOffCommand=linear,0.7;diffusealpha,0 -SpinGrades=1 CheerDelaySeconds=2.5 NoMarvelousShiftUp=15 FailedScreen=ScreenGameOver -TotalScoreNumberP1Y=999 -TotalScoreNumberP2Y=999 -TotalScoreNumberP1X=999 -TotalScoreNumberP2X=999 -TotalScoreNumberP1OnCommand=hidden,1 -TotalScoreNumberP2OnCommand=hidden,1 -TotalScoreNumberP1OffCommand=hidden,1 -TotalScoreNumberP2OffCommand=hidden,1 -TotalScoreLabelY=999 -TotalScoreLabelX=999 -TotalScoreLabelOnCommand=hidden,1 -TotalScoreLabelOffCommand=hidden,1 [ScreenEvaluationRave] NextScreen=ScreenSelectMusic @@ -3123,26 +2435,6 @@ PlayerOptionsP2X=440 PlayerOptionsP2Y=140 PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;zoom,0.5;shadowlength,2;addy,480;sleep,0.0;decelerate,0.3;addy,-480 PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner1X=260 -SmallBanner1Y=80 -SmallBanner1OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner1OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner2X=290 -SmallBanner2Y=90 -SmallBanner2OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner2OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner3X=320 -SmallBanner3Y=100 -SmallBanner3OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner3OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner4X=350 -SmallBanner4Y=110 -SmallBanner4OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner4OffCommand=sleep,0.8;accelerate,0.3;addy,480 -SmallBanner5X=380 -SmallBanner5Y=120 -SmallBanner5OnCommand=zoom,0.5;addy,480;sleep,0.0;decelerate,0.3;addy,-480 -SmallBanner5OffCommand=sleep,0.8;accelerate,0.3;addy,480 GradeFrameP1X=94 GradeFrameP1Y=100 GradeFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 @@ -3159,22 +2451,6 @@ GradeP2X=546 GradeP2Y=100 GradeP2OnCommand=glowshift;effectperiod,2;addx,320;sleep,0.0;decelerate,0.3;addx,-320 GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -PercentFrameP1X=94 -PercentFrameP1Y=100 -PercentFrameP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -PercentFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -PercentFrameP2X=546 -PercentFrameP2Y=100 -PercentFrameP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -PercentFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 -PercentP1X=120 -PercentP1Y=132 -PercentP1OnCommand=addx,-320;sleep,0.0;decelerate,0.3;addx,320 -PercentP1OffCommand=sleep,0.8;accelerate,0.3;addx,-320 -PercentP2X=572 -PercentP2Y=132 -PercentP2OnCommand=addx,320;sleep,0.0;decelerate,0.3;addx,-320 -PercentP2OffCommand=sleep,0.8;accelerate,0.3;addx,320 MarvelousLabelX=320 MarvelousLabelY=160 MarvelousLabelOnCommand=addy,480;sleep,0.1;decelerate,0.3;addy,-480 @@ -3271,111 +2547,6 @@ MaxComboNumberP2X=580 MaxComboNumberP2Y=334 MaxComboNumberP2OnCommand=zoom,1.2;diffusealpha,0;linear,0.7;diffuse,1,1,0,1 MaxComboNumberP2OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP1X=96 -BonusFrameP1Y=256 -BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP1OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP2X=544 -BonusFrameP2Y=256 -BonusFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -BonusFrameP2OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P1X=176 -BarPossible1P1Y=194 -BarPossible1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible1P2X=466 -BarPossible1P2Y=194 -BarPossible1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.2;linear,1.0;zoomx,1 -BarPossible1P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P1X=176 -BarPossible2P1Y=221 -BarPossible2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible2P2X=466 -BarPossible2P2Y=221 -BarPossible2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.3;linear,1.0;zoomx,1 -BarPossible2P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P1X=176 -BarPossible3P1Y=248 -BarPossible3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible3P2X=466 -BarPossible3P2Y=248 -BarPossible3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.4;linear,1.0;zoomx,1 -BarPossible3P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P1X=176 -BarPossible4P1Y=275 -BarPossible4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible4P2X=466 -BarPossible4P2Y=275 -BarPossible4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarPossible4P2OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P1X=176 -BarPossible5P1Y=302 -BarPossible5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P1OffCommand=linear,0.7;diffusealpha,0 -BarPossible5P2X=466 -BarPossible5P2Y=302 -BarPossible5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.6;linear,1.0;zoomx,1 -BarPossible5P2OffCommand=linear,0.7;diffusealpha,0 -BarActual1P1X=176 -BarActual1P1Y=194 -BarActual1P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P1OffCommand=linear,0.7;diffusealpha,0 -BarActual1P2X=466 -BarActual1P2Y=194 -BarActual1P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.7;linear,1.0;zoomx,1 -BarActual1P2OffCommand=linear,0.7;diffusealpha,0 -BarActual2P1X=176 -BarActual2P1Y=221 -BarActual2P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P1OffCommand=linear,0.7;diffusealpha,0 -BarActual2P2X=466 -BarActual2P2Y=221 -BarActual2P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.8;linear,1.0;zoomx,1 -BarActual2P2OffCommand=linear,0.7;diffusealpha,0 -BarActual3P1X=176 -BarActual3P1Y=248 -BarActual3P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P1OffCommand=linear,0.7;diffusealpha,0 -BarActual3P2X=466 -BarActual3P2Y=248 -BarActual3P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,0.9;linear,1.0;zoomx,1 -BarActual3P2OffCommand=linear,0.7;diffusealpha,0 -BarActual4P1X=176 -BarActual4P1Y=275 -BarActual4P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P1OffCommand=linear,0.7;diffusealpha,0 -BarActual4P2X=466 -BarActual4P2Y=275 -BarActual4P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.0;linear,1.0;zoomx,1 -BarActual4P2OffCommand=linear,0.7;diffusealpha,0 -BarActual5P1X=176 -BarActual5P1Y=302 -BarActual5P1OnCommand=horizalign,left;rotationz,180;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P1OffCommand=linear,0.7;diffusealpha,0 -BarActual5P2X=466 -BarActual5P2Y=302 -BarActual5P2OnCommand=horizalign,left;rotationz,0;zoomx,0;sleep,1.1;linear,1.0;zoomx,1 -BarActual5P2OffCommand=linear,0.7;diffusealpha,0 -BarActualMaxCommand=glowshift;effectperiod,0.5 -SurvivedFrameP1X=96 -SurvivedFrameP1Y=256 -SurvivedFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedFrameP2X=544 -SurvivedFrameP2Y=256 -SurvivedFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedFrameP2OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP1X=96 -SurvivedNumberP1Y=240 -SurvivedNumberP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP1OffCommand=linear,0.7;diffusealpha,0 -SurvivedNumberP2X=544 -SurvivedNumberP2Y=240 -SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 -SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 WinFrameP1X=96 WinFrameP1Y=256 WinFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 @@ -3404,18 +2575,6 @@ ScoreNumberP2X=480 ScoreNumberP2Y=380 ScoreNumberP2OnCommand=addx,320;sleep,0.8;decelerate,0.3;addx,-320 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,320 -TimeLabelX=320 -TimeLabelY=380 -TimeLabelOnCommand=addy,480;sleep,0.8;decelerate,0.3;addy,-480 -TimeLabelOffCommand=sleep,0.0;accelerate,0.3;addy,480 -TimeNumberP1X=160 -TimeNumberP1Y=380 -TimeNumberP1OnCommand=addx,-320;sleep,0.8;decelerate,0.3;addx,320 -TimeNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-320 -TimeNumberP2X=480 -TimeNumberP2Y=380 -TimeNumberP2OnCommand=addx,320;sleep,0.8;decelerate,0.3;addx,-320 -TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,320 MachineRecordP1X=70 MachineRecordP1Y=398 MachineRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift @@ -3432,42 +2591,9 @@ PersonalRecordP2X=570 PersonalRecordP2Y=398 PersonalRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift PersonalRecordP2OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP1X=134 -CategoryRecordP1Y=398 -CategoryRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP1OffCommand=linear,0.7;diffusealpha,0 -CategoryRecordP2X=506 -CategoryRecordP2Y=398 -CategoryRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CategoryRecordP2OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP1X=134 -CourseRecordP1Y=398 -CourseRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP1OffCommand=linear,0.7;diffusealpha,0 -CourseRecordP2X=506 -CourseRecordP2Y=398 -CourseRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -CourseRecordP2OffCommand=linear,0.7;diffusealpha,0 -TryExtraStageX=320 -TryExtraStageY=428 -TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -TryExtraStageOffCommand=linear,0.7;diffusealpha,0 SpinGrades=1 CheerDelaySeconds=2.5 NoMarvelousShiftUp=15 -FailedScreen=ScreenGameOver -TotalScoreNumberP1Y=999 -TotalScoreNumberP2Y=999 -TotalScoreNumberP1X=999 -TotalScoreNumberP2X=999 -TotalScoreNumberP1OnCommand=hidden,1 -TotalScoreNumberP2OnCommand=hidden,1 -TotalScoreNumberP1OffCommand=hidden,1 -TotalScoreNumberP2OffCommand=hidden,1 -TotalScoreLabelY=999 -TotalScoreLabelX=999 -TotalScoreLabelOnCommand=hidden,1 -TotalScoreLabelOffCommand=hidden,1 [ScreenMusicScroll] ScrollDelay=0.2 diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index f136f2d90f..8a746a8d5a 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -1095,22 +1095,47 @@ void GameState::GetRankingFeats( PlayerNumber pn, vector &asFeatsO StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_StepsType; Course* pCourse = GAMESTATE->m_pCurCourse; ASSERT( pCourse ); - vector &vHighScores = pCourse->m_MemCardDatas[nt][MEMORY_CARD_MACHINE].vHighScores; - for( unsigned i=0; im_sName.c_str() ); - feat.pStringToFill = &vHighScores[i].sName; - feat.grade = GRADE_NO_DATA; - feat.iScore = vHighScores[i].iScore; - feat.fPercentDP = vHighScores[i].fPercentDP; - if( pCourse->HasBanner() ) - feat.Banner = pCourse->m_sBannerPath; - asFeatsOut.push_back( feat ); + // Find Machine Records + { + vector &vHighScores = pCourse->m_MemCardDatas[nt][MEMORY_CARD_MACHINE].vHighScores; + for( unsigned i=0; im_sName.c_str() ); + feat.pStringToFill = &vHighScores[i].sName; + feat.grade = GRADE_NO_DATA; + feat.iScore = vHighScores[i].iScore; + feat.fPercentDP = vHighScores[i].fPercentDP; + if( pCourse->HasBanner() ) + feat.Banner = pCourse->m_sBannerPath; + asFeatsOut.push_back( feat ); + } + } + + // Find Personal Records + vector &vHighScores = pCourse->m_MemCardDatas[nt][pn].vHighScores; + { + for( unsigned i=0; im_sName.c_str() ); + feat.pStringToFill = &vHighScores[i].sName; + feat.grade = GRADE_NO_DATA; + feat.iScore = vHighScores[i].iScore; + feat.fPercentDP = vHighScores[i].fPercentDP; + if( pCourse->HasBanner() ) + feat.Banner = pCourse->m_sBannerPath; + asFeatsOut.push_back( feat ); + } } } break; diff --git a/stepmania/src/ProfileManager.h b/stepmania/src/ProfileManager.h index 0e2e8ddeca..520e4f6eb9 100644 --- a/stepmania/src/ProfileManager.h +++ b/stepmania/src/ProfileManager.h @@ -114,10 +114,10 @@ public: } m_CategoryDatas[NUM_MEMORY_CARDS][NUM_STEPS_TYPES][NUM_RANKING_CATEGORIES]; - void AddHighScore( StepsType nt, RankingCategory rc, PlayerNumber pn, CategoryData::HighScore hs, int &iMachineIndexOut ) + void AddHighScore( StepsType nt, RankingCategory rc, PlayerNumber pn, CategoryData::HighScore hs, int &iPersonalIndexOut, int &iMachineIndexOut ) { hs.sName = RANKING_TO_FILL_IN_MARKER[pn]; - m_CategoryDatas[pn][nt][rc].AddHighScore( hs, iMachineIndexOut ); + m_CategoryDatas[pn][nt][rc].AddHighScore( hs, iPersonalIndexOut ); m_CategoryDatas[MEMORY_CARD_MACHINE][nt][rc].AddHighScore( hs, iMachineIndexOut ); } diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 734c8055c3..e146c52a4e 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -655,7 +655,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) if( SHOW_TOTAL_SCORE_AREA ) { - m_sprTotalScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation totalscore labels 1x2") ); + m_sprTotalScoreLabel.Load( THEME->GetPathToG("ScreenEvaluation totalscore label") ); m_sprTotalScoreLabel.SetState( 0 ); m_sprTotalScoreLabel.StopAnimating(); m_sprTotalScoreLabel.SetName( "TotalScoreLabel" ); @@ -689,7 +689,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) // if( SHOW_TIME_AREA ) { - m_sprTimeLabel.Load( THEME->GetPathToG("ScreenEvaluation score labels 1x2") ); + m_sprTimeLabel.Load( THEME->GetPathToG("ScreenEvaluation time label") ); m_sprTimeLabel.SetState( 1 ); m_sprTimeLabel.StopAnimating(); m_sprTimeLabel.SetName( "TimeLabel" ); @@ -701,10 +701,10 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) ) continue; // skip - m_textTime[p].LoadFromNumbers( THEME->GetPathToN("ScreenEvaluation score") ); + m_textTime[p].LoadFromNumbers( THEME->GetPathToN("ScreenEvaluation time") ); m_textTime[p].EnableShadow( false ); m_textTime[p].SetDiffuse( PlayerToColor(p) ); - m_textTime[p].SetName( ssprintf("ScoreNumberP%d",p+1) ); + m_textTime[p].SetName( ssprintf("TimeNumberP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_textTime[p] ); m_textTime[p].SetText( SecondsToTime(stageStats.fAliveSeconds[p]) ); this->AddChild( &m_textTime[p] ); @@ -719,24 +719,8 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) { if( iMachineHighScoreIndex[p] != -1 ) { - switch( m_Type ) - { - case stage: - m_sprMachineRecord[p].Load( THEME->GetPathToG("ScreenEvaluation machine record") ); - m_sprMachineRecord[p].SetName( ssprintf("MachineRecordP%d",p+1) ); - break; - case summary: - m_sprMachineRecord[p].Load( THEME->GetPathToG("ScreenEvaluation category record") ); - m_sprMachineRecord[p].SetName( ssprintf("CategoryRecordP%d",p+1) ); - break; - case course: - m_sprMachineRecord[p].Load( THEME->GetPathToG("ScreenEvaluation course record") ); - m_sprMachineRecord[p].SetName( ssprintf("CourseRecordP%d",p+1) ); - break; - default: - ASSERT(0); - } - + m_sprMachineRecord[p].Load( THEME->GetPathToG("ScreenEvaluation machine record") ); + m_sprMachineRecord[p].SetName( ssprintf("MachineRecordP%d",p+1) ); m_sprMachineRecord[p].SetState( iMachineHighScoreIndex[p] ); m_sprMachineRecord[p].StopAnimating(); SET_XY_AND_ON_COMMAND( m_sprMachineRecord[p] ); @@ -745,9 +729,9 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName) if( iPersonalHighScoreIndex[p] != -1 ) { m_sprPersonalRecord[p].Load( THEME->GetPathToG("ScreenEvaluation personal record") ); + m_sprPersonalRecord[p].SetName( ssprintf("PersonalRecordP%d",p+1) ); m_sprPersonalRecord[p].SetState( iPersonalHighScoreIndex[p] ); m_sprPersonalRecord[p].StopAnimating(); - m_sprPersonalRecord[p].SetName( ssprintf("PersonalRecordP%d",p+1) ); SET_XY_AND_ON_COMMAND( m_sprPersonalRecord[p] ); this->AddChild( &m_sprPersonalRecord[p] ); } @@ -888,7 +872,7 @@ void ScreenEvaluation::CommitScores( const StageStats &stageStats, int iPersonal hs.iScore = stageStats.iScore[p]; hs.fPercentDP = stageStats.GetPercentDancePoints( (PlayerNumber)p ); if( hs.fPercentDP > PREFSMAN->m_fMinPercentageForHighScore ) - PROFILEMAN->AddHighScore( nt, rc[p], (PlayerNumber)p, hs, iMachineHighScoreIndex[p] ); + PROFILEMAN->AddHighScore( nt, rc[p], (PlayerNumber)p, hs, iPersonalHighScoreIndex[p], iMachineHighScoreIndex[p] ); } break; diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp index 674e633882..df5c918724 100644 --- a/stepmania/src/ScreenNameEntryTraditional.cpp +++ b/stepmania/src/ScreenNameEntryTraditional.cpp @@ -84,14 +84,14 @@ ScreenNameEntryTraditional::ScreenNameEntryTraditional( CString sClassName ) : S hs.grade = GRADE_A; hs.iScore = 42; int a, b; - GAMESTATE->m_pCurNotes[i]->AddHighScore( (PlayerNumber)i, hs, a,b ); + GAMESTATE->m_pCurNotes[i]->AddHighScore( (PlayerNumber)i, hs, a, b ); if( i == 0 ) { ProfileManager::CategoryData::HighScore hs; hs.iScore = 1234567; StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_StepsType; - PROFILEMAN->AddHighScore( nt, RANKING_A, (PlayerNumber)i, hs, a ); + PROFILEMAN->AddHighScore( nt, RANKING_A, (PlayerNumber)i, hs, a, b ); } }