judgment name cleanup

This commit is contained in:
Chris Danford
2005-10-09 07:01:48 +00:00
parent feb1bfb0fc
commit b3925c7f14
5 changed files with 139 additions and 145 deletions
+18 -18
View File
@@ -10,7 +10,7 @@ HoldBodyAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway.
HoldTailAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway. HoldTailAnimationLengthInBeats=4 // doesn't matter. Only 1 frame anyway.
StartDrawingHoldBodyOffsetFromHead=0 StartDrawingHoldBodyOffsetFromHead=0
StopDrawingHoldBodyOffsetFromTail=-32 // top of tail StopDrawingHoldBodyOffsetFromTail=-32 // top of tail
HoldNGGrayPercent=0.25 HoldLetGoGrayPercent=0.25
UseLighting=0 UseLighting=0
ReverseDrawOrder=1101 ReverseDrawOrder=1101
HoldHeadIsAboveWavyParts=1 HoldHeadIsAboveWavyParts=1
@@ -20,28 +20,28 @@ HoldTailIsAboveWavyParts=1
NoneCommand= NoneCommand=
HitMineCommand=blend,add;diffuse,1,1,1,1;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 HitMineCommand=blend,add;diffuse,1,1,1,1;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0
MissCommand= MissCommand=
BooCommand=diffuse,0.8,0.0,0.6,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
GoodCommand=diffuse,0.3,0.8,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
GreatCommand=diffuse,0.0,1.0,0.4,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
PerfectCommand=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
MarvelousCommand=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
NGCommand= LetGoCommand=
OKCommand=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 HeldCommand=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
[GhostArrowBright] [GhostArrowBright]
NoneCommand= NoneCommand=
HitMineCommand=blend,add;diffuse,1,1,1,1;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0 HitMineCommand=blend,add;diffuse,1,1,1,1;zoom,1;rotationz,0;linear,0.3;rotationz,90;linear,0.3;rotationz,180;diffusealpha,0
MissCommand= MissCommand=
BooCommand=diffuse,0.8,0.0,0.6,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W5Command=diffuse,0.8,0.0,0.6,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
GoodCommand=diffuse,0.3,0.8,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W4Command=diffuse,0.3,0.8,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
GreatCommand=diffuse,0.0,1.0,0.4,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W3Command=diffuse,0.0,1.0,0.4,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
PerfectCommand=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W2Command=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
MarvelousCommand=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 W1Command=diffuse,1.0,1.0,1.0,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
NGCommand= LetGoCommand=
OKCommand=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0 HeldCommand=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.06;zoom,1.1;linear,0.06;diffusealpha,0
[ReceptorArrow] [ReceptorArrow]
GreatCommand= W3Command=
PerfectCommand= W2Command=
MarvelousCommand= W1Command=
+98 -104
View File
@@ -16,8 +16,8 @@ MaxCourseEntriesBeforeShowVarious=6
[Gameplay] [Gameplay]
ComboIsPerRow=GAMESTATE:GetPlayMode() == PLAY_MODE_ONI ComboIsPerRow=GAMESTATE:GetPlayMode() == PLAY_MODE_ONI
MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == PLAY_MODE_ONI and TNS_PERFECT or TNS_GREAT MinScoreToContinueCombo=GAMESTATE:GetPlayMode() == PLAY_MODE_ONI and TNS_W2 or TNS_W3
MinScoreToMaintainCombo=TNS_GREAT MinScoreToMaintainCombo=TNS_W3
[Screen] [Screen]
ScreenInitCommand= ScreenInitCommand=
@@ -1206,14 +1206,14 @@ MaxComboNumDigits=4
StyleIcon=1 StyleIcon=1
ShowBannerArea=1 ShowBannerArea=1
ShowJudgmentLabels=1 ShowJudgmentLabels=1
ShowMarvelous=1 ShowW1=1
ShowPerfect=1 ShowW2=1
ShowGreat=1 ShowW3=1
ShowGood=1 ShowW4=1
ShowBoo=1 ShowW5=1
ShowMiss=1 ShowMiss=1
ShowStatsLabels=1 ShowStatsLabels=1
ShowOK=1 ShowHeld=1
ShowTotalError=0 ShowTotalError=0
ShowJumps=0 ShowJumps=0
ShowHolds=0 ShowHolds=0
@@ -1227,66 +1227,66 @@ ShowTotalScoreArea=0
ShowRecordsArea=1 ShowRecordsArea=1
BannerWidth=248 BannerWidth=248
BannerHeight=78 BannerHeight=78
MarvelousLabelX=SCREEN_CENTER_X+0 W1LabelX=SCREEN_CENTER_X+0
MarvelousLabelY=SCREEN_CENTER_Y-80 W1LabelY=SCREEN_CENTER_Y-80
MarvelousLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1;decelerate,0.3;addy,-SCREEN_HEIGHT W1LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1;decelerate,0.3;addy,-SCREEN_HEIGHT
MarvelousLabelOffCommand=sleep,0.7;accelerate,0.3;addy,SCREEN_HEIGHT W1LabelOffCommand=sleep,0.7;accelerate,0.3;addy,SCREEN_HEIGHT
MarvelousNumberP1X=SCREEN_CENTER_X-90 W1NumberP1X=SCREEN_CENTER_X-90
MarvelousNumberP1Y=SCREEN_CENTER_Y-80 W1NumberP1Y=SCREEN_CENTER_Y-80
MarvelousNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,SCREEN_WIDTH/2 W1NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,SCREEN_WIDTH/2
MarvelousNumberP1OffCommand=sleep,0.7;accelerate,0.3;addx,-SCREEN_WIDTH/2 W1NumberP1OffCommand=sleep,0.7;accelerate,0.3;addx,-SCREEN_WIDTH/2
MarvelousNumberP2X=SCREEN_CENTER_X+90 W1NumberP2X=SCREEN_CENTER_X+90
MarvelousNumberP2Y=SCREEN_CENTER_Y-80 W1NumberP2Y=SCREEN_CENTER_Y-80
MarvelousNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,-SCREEN_WIDTH/2 W1NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.1;decelerate,0.3;addx,-SCREEN_WIDTH/2
MarvelousNumberP2OffCommand=sleep,0.7;accelerate,0.3;addx,SCREEN_WIDTH/2 W1NumberP2OffCommand=sleep,0.7;accelerate,0.3;addx,SCREEN_WIDTH/2
PerfectLabelX=SCREEN_CENTER_X+0 W2LabelX=SCREEN_CENTER_X+0
PerfectLabelY=SCREEN_CENTER_Y-48 W2LabelY=SCREEN_CENTER_Y-48
PerfectLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.2;decelerate,0.3;addy,-SCREEN_HEIGHT W2LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.2;decelerate,0.3;addy,-SCREEN_HEIGHT
PerfectLabelOffCommand=sleep,0.6;accelerate,0.3;addy,SCREEN_HEIGHT W2LabelOffCommand=sleep,0.6;accelerate,0.3;addy,SCREEN_HEIGHT
PerfectNumberP1X=SCREEN_CENTER_X-90 W2NumberP1X=SCREEN_CENTER_X-90
PerfectNumberP1Y=SCREEN_CENTER_Y-48 W2NumberP1Y=SCREEN_CENTER_Y-48
PerfectNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,SCREEN_WIDTH/2 W2NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,SCREEN_WIDTH/2
PerfectNumberP1OffCommand=sleep,0.6;accelerate,0.3;addx,-SCREEN_WIDTH/2 W2NumberP1OffCommand=sleep,0.6;accelerate,0.3;addx,-SCREEN_WIDTH/2
PerfectNumberP2X=SCREEN_CENTER_X+90 W2NumberP2X=SCREEN_CENTER_X+90
PerfectNumberP2Y=SCREEN_CENTER_Y-48 W2NumberP2Y=SCREEN_CENTER_Y-48
PerfectNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,-SCREEN_WIDTH/2 W2NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.2;decelerate,0.3;addx,-SCREEN_WIDTH/2
PerfectNumberP2OffCommand=sleep,0.6;accelerate,0.3;addx,SCREEN_WIDTH/2 W2NumberP2OffCommand=sleep,0.6;accelerate,0.3;addx,SCREEN_WIDTH/2
GreatLabelX=SCREEN_CENTER_X+0 W3LabelX=SCREEN_CENTER_X+0
GreatLabelY=SCREEN_CENTER_Y-16 W3LabelY=SCREEN_CENTER_Y-16
GreatLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.3;decelerate,0.3;addy,-SCREEN_HEIGHT W3LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.3;decelerate,0.3;addy,-SCREEN_HEIGHT
GreatLabelOffCommand=sleep,0.5;accelerate,0.3;addy,SCREEN_HEIGHT W3LabelOffCommand=sleep,0.5;accelerate,0.3;addy,SCREEN_HEIGHT
GreatNumberP1X=SCREEN_CENTER_X-90 W3NumberP1X=SCREEN_CENTER_X-90
GreatNumberP1Y=SCREEN_CENTER_Y-16 W3NumberP1Y=SCREEN_CENTER_Y-16
GreatNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,SCREEN_WIDTH/2 W3NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,SCREEN_WIDTH/2
GreatNumberP1OffCommand=sleep,0.5;accelerate,0.3;addx,-SCREEN_WIDTH/2 W3NumberP1OffCommand=sleep,0.5;accelerate,0.3;addx,-SCREEN_WIDTH/2
GreatNumberP2X=SCREEN_CENTER_X+90 W3NumberP2X=SCREEN_CENTER_X+90
GreatNumberP2Y=SCREEN_CENTER_Y-16 W3NumberP2Y=SCREEN_CENTER_Y-16
GreatNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,-SCREEN_WIDTH/2 W3NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.3;decelerate,0.3;addx,-SCREEN_WIDTH/2
GreatNumberP2OffCommand=sleep,0.5;accelerate,0.3;addx,SCREEN_WIDTH/2 W3NumberP2OffCommand=sleep,0.5;accelerate,0.3;addx,SCREEN_WIDTH/2
GoodLabelX=SCREEN_CENTER_X+0 W4LabelX=SCREEN_CENTER_X+0
GoodLabelY=SCREEN_CENTER_Y+16 W4LabelY=SCREEN_CENTER_Y+16
GoodLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.4;decelerate,0.3;addy,-SCREEN_HEIGHT W4LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.4;decelerate,0.3;addy,-SCREEN_HEIGHT
GoodLabelOffCommand=sleep,0.4;accelerate,0.3;addy,SCREEN_HEIGHT W4LabelOffCommand=sleep,0.4;accelerate,0.3;addy,SCREEN_HEIGHT
GoodNumberP1X=SCREEN_CENTER_X-90 W4NumberP1X=SCREEN_CENTER_X-90
GoodNumberP1Y=SCREEN_CENTER_Y+16 W4NumberP1Y=SCREEN_CENTER_Y+16
GoodNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,SCREEN_WIDTH/2 W4NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,SCREEN_WIDTH/2
GoodNumberP1OffCommand=sleep,0.4;accelerate,0.3;addx,-SCREEN_WIDTH/2 W4NumberP1OffCommand=sleep,0.4;accelerate,0.3;addx,-SCREEN_WIDTH/2
GoodNumberP2X=SCREEN_CENTER_X+90 W4NumberP2X=SCREEN_CENTER_X+90
GoodNumberP2Y=SCREEN_CENTER_Y+16 W4NumberP2Y=SCREEN_CENTER_Y+16
GoodNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,-SCREEN_WIDTH/2 W4NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.4;decelerate,0.3;addx,-SCREEN_WIDTH/2
GoodNumberP2OffCommand=sleep,0.4;accelerate,0.3;addx,SCREEN_WIDTH/2 W4NumberP2OffCommand=sleep,0.4;accelerate,0.3;addx,SCREEN_WIDTH/2
BooLabelX=SCREEN_CENTER_X+0 W5LabelX=SCREEN_CENTER_X+0
BooLabelY=SCREEN_CENTER_Y+48 W5LabelY=SCREEN_CENTER_Y+48
BooLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.5;decelerate,0.3;addy,-SCREEN_HEIGHT W5LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.5;decelerate,0.3;addy,-SCREEN_HEIGHT
BooLabelOffCommand=sleep,0.3;accelerate,0.3;addy,SCREEN_HEIGHT W5LabelOffCommand=sleep,0.3;accelerate,0.3;addy,SCREEN_HEIGHT
BooNumberP1X=SCREEN_CENTER_X-90 W5NumberP1X=SCREEN_CENTER_X-90
BooNumberP1Y=SCREEN_CENTER_Y+48 W5NumberP1Y=SCREEN_CENTER_Y+48
BooNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,SCREEN_WIDTH/2 W5NumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,SCREEN_WIDTH/2
BooNumberP1OffCommand=sleep,0.3;accelerate,0.3;addx,-SCREEN_WIDTH/2 W5NumberP1OffCommand=sleep,0.3;accelerate,0.3;addx,-SCREEN_WIDTH/2
BooNumberP2X=SCREEN_CENTER_X+90 W5NumberP2X=SCREEN_CENTER_X+90
BooNumberP2Y=SCREEN_CENTER_Y+48 W5NumberP2Y=SCREEN_CENTER_Y+48
BooNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,-SCREEN_WIDTH/2 W5NumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.5;decelerate,0.3;addx,-SCREEN_WIDTH/2
BooNumberP2OffCommand=sleep,0.3;accelerate,0.3;addx,SCREEN_WIDTH/2 W5NumberP2OffCommand=sleep,0.3;accelerate,0.3;addx,SCREEN_WIDTH/2
MissLabelX=SCREEN_CENTER_X+0 MissLabelX=SCREEN_CENTER_X+0
MissLabelY=SCREEN_CENTER_Y+80 MissLabelY=SCREEN_CENTER_Y+80
MissLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.6;decelerate,0.3;addy,-SCREEN_HEIGHT MissLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.6;decelerate,0.3;addy,-SCREEN_HEIGHT
@@ -1299,18 +1299,18 @@ MissNumberP2X=SCREEN_CENTER_X+90
MissNumberP2Y=SCREEN_CENTER_Y+80 MissNumberP2Y=SCREEN_CENTER_Y+80
MissNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.6;decelerate,0.3;addx,-SCREEN_WIDTH/2 MissNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.6;decelerate,0.3;addx,-SCREEN_WIDTH/2
MissNumberP2OffCommand=sleep,0.2;accelerate,0.3;addx,SCREEN_WIDTH/2 MissNumberP2OffCommand=sleep,0.2;accelerate,0.3;addx,SCREEN_WIDTH/2
OKLabelX=SCREEN_CENTER_X+0 HeldLabelX=SCREEN_CENTER_X+0
OKLabelY=SCREEN_CENTER_Y+112 HeldLabelY=SCREEN_CENTER_Y+112
OKLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.7;decelerate,0.3;addy,-SCREEN_HEIGHT HeldLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.7;decelerate,0.3;addy,-SCREEN_HEIGHT
OKLabelOffCommand=sleep,0.1;accelerate,0.3;addy,SCREEN_HEIGHT HeldLabelOffCommand=sleep,0.1;accelerate,0.3;addy,SCREEN_HEIGHT
OKNumberP1X=SCREEN_CENTER_X-90 HeldNumberP1X=SCREEN_CENTER_X-90
OKNumberP1Y=SCREEN_CENTER_Y+112 HeldNumberP1Y=SCREEN_CENTER_Y+112
OKNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,SCREEN_WIDTH/2 HeldNumberP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,SCREEN_WIDTH/2
OKNumberP1OffCommand=sleep,0.1;accelerate,0.3;addx,-SCREEN_WIDTH/2 HeldNumberP1OffCommand=sleep,0.1;accelerate,0.3;addx,-SCREEN_WIDTH/2
OKNumberP2X=SCREEN_CENTER_X+90 HeldNumberP2X=SCREEN_CENTER_X+90
OKNumberP2Y=SCREEN_CENTER_Y+112 HeldNumberP2Y=SCREEN_CENTER_Y+112
OKNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,-SCREEN_WIDTH/2 HeldNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.7;decelerate,0.3;addx,-SCREEN_WIDTH/2
OKNumberP2OffCommand=sleep,0.1;accelerate,0.3;addx,SCREEN_WIDTH/2 HeldNumberP2OffCommand=sleep,0.1;accelerate,0.3;addx,SCREEN_WIDTH/2
MaxComboMaxDigits=4 MaxComboMaxDigits=4
MaxComboLabelX= MaxComboLabelX=
MaxComboLabelY= MaxComboLabelY=
@@ -1529,7 +1529,6 @@ TryExtraStageOnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
TryExtraStageOffCommand=linear,0.7;diffusealpha,0 TryExtraStageOffCommand=linear,0.7;diffusealpha,0
SpinGrades=1 SpinGrades=1
CheerDelaySeconds=2.5 CheerDelaySeconds=2.5
NoMarvelousShiftUp=15
[ScreenEvaluationSummary] [ScreenEvaluationSummary]
Fallback=ScreenEvaluation Fallback=ScreenEvaluation
@@ -1699,7 +1698,6 @@ CourseRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift
CourseRecordP2OffCommand=linear,0.7;diffusealpha,0 CourseRecordP2OffCommand=linear,0.7;diffusealpha,0
SpinGrades=1 SpinGrades=1
CheerDelaySeconds=2.5 CheerDelaySeconds=2.5
NoMarvelousShiftUp=15
[ScreenEvaluationNonstop] [ScreenEvaluationNonstop]
Fallback=ScreenEvaluation Fallback=ScreenEvaluation
@@ -1776,7 +1774,6 @@ ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN
ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
SpinGrades=1 SpinGrades=1
CheerDelaySeconds=2.5 CheerDelaySeconds=2.5
NoMarvelousShiftUp=15
[ScreenEvaluationOni] [ScreenEvaluationOni]
Fallback=ScreenEvaluation Fallback=ScreenEvaluation
@@ -1852,7 +1849,6 @@ TimeNumberP2Y=SCREEN_CENTER_Y+140
TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2
TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
CheerDelaySeconds=2.5 CheerDelaySeconds=2.5
NoMarvelousShiftUp=15
[ScreenEvaluationEndless] [ScreenEvaluationEndless]
Fallback=ScreenEvaluation Fallback=ScreenEvaluation
@@ -1940,7 +1936,6 @@ TimeNumberP2Y=SCREEN_CENTER_Y+140
TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 TimeNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2
TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 TimeNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
CheerDelaySeconds=2.5 CheerDelaySeconds=2.5
NoMarvelousShiftUp=15
[ScreenEvaluationRave] [ScreenEvaluationRave]
Fallback=ScreenEvaluation Fallback=ScreenEvaluation
@@ -2041,7 +2036,6 @@ ScoreNumberP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN
ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2
SpinGrades=1 SpinGrades=1
CheerDelaySeconds=2.5 CheerDelaySeconds=2.5
NoMarvelousShiftUp=15
[ScreenMusicScroll] [ScreenMusicScroll]
Class=ScreenMusicScroll Class=ScreenMusicScroll
@@ -2650,16 +2644,16 @@ BrightnessFadeCommand=
ClampOutputPercent=0 ClampOutputPercent=0
[Judgment] [Judgment]
MarvelousCommand=shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 W1Command=shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
PerfectCommand=shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 W2Command=shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0
GreatCommand=shadowlength,4;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 W3Command=shadowlength,4;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0
GoodCommand=shadowlength,4;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 W4Command=shadowlength,4;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0
BooCommand=shadowlength,4;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0 W5Command=shadowlength,4;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0
MissCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0 MissCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0
[HoldJudgment] [HoldJudgment]
NGCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0;diffusealpha,0 LetGoCommand=shadowlength,4;diffusealpha,1;zoom,1;y,-10;linear,0.8;y,10;sleep,0.5;linear,0;diffusealpha,0
OKCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0 HeldCommand=shadowlength,4;diffusealpha,1;zoom,1.25;linear,0.3;zoomx,1;zoomy,1;sleep,0.5;linear,0;diffusealpha,0
[Combo] [Combo]
ShowComboAt=4 ShowComboAt=4
@@ -2673,9 +2667,9 @@ NumberMinZoom=0.5
NumberMaxZoom=0.9 NumberMaxZoom=0.9
NumberMaxZoomAt=300 NumberMaxZoomAt=300
PulseCommand=%function(self) local origZoom=self:GetZoom(); self:zoom(1.2*origZoom); self:linear(0.05); self:zoom(origZoom); end PulseCommand=%function(self) local origZoom=self:GetZoom(); self:zoom(1.2*origZoom); self:linear(0.05); self:zoom(origZoom); end
FullComboGreatsCommand= FullComboW3Command=
FullComboPerfectsCommand= FullComboW2Command=
FullComboMarvelousesCommand= FullComboW1Command=
FullComboBrokenCommand= FullComboBrokenCommand=
ShowMissCombo=0 ShowMissCombo=0
@@ -2715,11 +2709,11 @@ TapJudgmentsUnderField=0
HoldJudgmentsUnderField=0 HoldJudgmentsUnderField=0
[ProTimingDisplay] [ProTimingDisplay]
MarvelousCommand=shadowlength,4;diffuse,1,1,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 W1Command=shadowlength,4;diffuse,1,1,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
PerfectCommand=shadowlength,4;diffuse,1,.8,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0 W2Command=shadowlength,4;diffuse,1,.8,0,1;zoom,2.6;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0
GreatCommand=shadowlength,4;diffuse,.6,.9,0,1;zoom,2.4;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0 W3Command=shadowlength,4;diffuse,.6,.9,0,1;zoom,2.4;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0
GoodCommand=shadowlength,4;diffuse,0,1,1,1;zoom,2.2;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0 W4Command=shadowlength,4;diffuse,0,1,1,1;zoom,2.2;linear,0.05;zoom,2;sleep,0.8;linear,0;diffusealpha,0
BooCommand=shadowlength,4;diffuse,1,.1,1,1;zoom,2.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0 W5Command=shadowlength,4;diffuse,1,.1,1,1;zoom,2.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0
MissCommand=shadowlength,4;diffuse,1,.3,0,1;zoom,2.0;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0 MissCommand=shadowlength,4;diffuse,1,.3,0,1;zoom,2.0;y,-20;linear,0.8;y,20;sleep,0.8;linear,0;diffusealpha,0
AvoidMineCommand= AvoidMineCommand=
HitMineCommand= HitMineCommand=
@@ -3073,7 +3067,7 @@ Line7=conf,ProgressiveNonstopLifebar
Line8=conf,DefaultFailType Line8=conf,DefaultFailType
Line9=conf,ShowSongOptions Line9=conf,ShowSongOptions
Line10=conf,ShowNameEntry Line10=conf,ShowNameEntry
Line11=conf,MarvelousTiming Line11=conf,AllowW1
[ScreenGraphicOptions] [ScreenGraphicOptions]
@@ -3484,7 +3478,7 @@ PlayerX=SCREEN_CENTER_X+160
PlayerY=SCREEN_CENTER_Y PlayerY=SCREEN_CENTER_Y
PlayerOnCommand= PlayerOnCommand=
SongBPM=100 SongBPM=100
NumPerfects=4 NumW2s=4
NumMisses=6 NumMisses=6
[ScreenDemonstration] [ScreenDemonstration]
@@ -4123,7 +4117,7 @@ GradePercentTier04=0.800000
GradePercentTier05=0.650000 GradePercentTier05=0.650000
GradePercentTier06=0.450000 GradePercentTier06=0.450000
GradePercentTier07=-99999.000000 GradePercentTier07=-99999.000000
GradeTier02IsAllPerfects=1 GradeTier02IsAllW2s=1
NumGradeTiersUsed=7 NumGradeTiersUsed=7
[HighScore] [HighScore]
+18 -18
View File
@@ -51,23 +51,23 @@ Icon8OnCommand=addx,-SCREEN_WIDTH;sleep,0.20;decelerate,0.3;addx,SCREEN_WIDTH
Icon8OffCommand=bouncebegin,0.5;zoomy,0 Icon8OffCommand=bouncebegin,0.5;zoomy,0
[Judgment] [Judgment]
BooOddCommand= W5OddCommand=
GoodOddCommand= W4OddCommand=
GreatOddCommand= W3OddCommand=
MarvelousOddCommand= W1OddCommand=
MissOddCommand= MissOddCommand=
PerfectOddCommand= W2OddCommand=
BooEvenCommand= W5EvenCommand=
GoodEvenCommand= W4EvenCommand=
GreatEvenCommand= W3EvenCommand=
MarvelousEvenCommand= W1EvenCommand=
MissEvenCommand= MissEvenCommand=
PerfectEvenCommand= W2EvenCommand=
MarvelousCommand=y,42;shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 W1Command=y,42;shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8
PerfectCommand=y,42;shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 W2Command=y,42;shadowlength,4;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0
GreatCommand=y,42;shadowlength,4;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 W3Command=y,42;shadowlength,4;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0
GoodCommand=y,42;shadowlength,4;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0 W4Command=y,42;shadowlength,4;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.8;linear,0;diffusealpha,0
BooCommand=y,42;shadowlength,4;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0 W5Command=y,42;shadowlength,4;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,4,8,8;sleep,0.8;linear,0;diffusealpha,0
MissCommand=shadowlength,4;diffusealpha,1;zoom,1;y,27;linear,0.8;y,62;sleep,0.8;linear,0;diffusealpha,0 MissCommand=shadowlength,4;diffusealpha,1;zoom,1;y,27;linear,0.8;y,62;sleep,0.8;linear,0;diffusealpha,0
[Combo] [Combo]
@@ -85,9 +85,9 @@ NumberMaxZoom=0.58
NumberMaxZoomAt=300 NumberMaxZoomAt=300
PulseZoom=1.2 PulseZoom=1.2
TweenSeconds=0.05 TweenSeconds=0.05
FullComboGreatsCommand= FullComboW3Command=
FullComboPerfectsCommand= FullComboW2Command=
FullComboMarvelousesCommand= FullComboW1Command=
FullComboBrokenCommand= FullComboBrokenCommand=
[ScreenOptionsMaster] [ScreenOptionsMaster]
+3 -3
View File
@@ -41,7 +41,7 @@ struct NoteMetricCache_t
bool m_bHoldTailIsAboveWavyParts; bool m_bHoldTailIsAboveWavyParts;
int m_iStartDrawingHoldBodyOffsetFromHead; int m_iStartDrawingHoldBodyOffsetFromHead;
int m_iStopDrawingHoldBodyOffsetFromTail; int m_iStopDrawingHoldBodyOffsetFromTail;
float m_fHoldNGGrayPercent; float m_fHoldLetGoGrayPercent;
bool m_bTapNoteUseLighting; bool m_bTapNoteUseLighting;
bool m_bTapAdditionUseLighting; bool m_bTapAdditionUseLighting;
bool m_bTapMineUseLighting; bool m_bTapMineUseLighting;
@@ -67,7 +67,7 @@ void NoteMetricCache_t::Load( const CString &sButton )
m_bHoldTailIsAboveWavyParts = NOTESKIN->GetMetricB(sButton,"HoldTailIsAboveWavyParts"); m_bHoldTailIsAboveWavyParts = NOTESKIN->GetMetricB(sButton,"HoldTailIsAboveWavyParts");
m_iStartDrawingHoldBodyOffsetFromHead = NOTESKIN->GetMetricI(sButton,"StartDrawingHoldBodyOffsetFromHead"); m_iStartDrawingHoldBodyOffsetFromHead = NOTESKIN->GetMetricI(sButton,"StartDrawingHoldBodyOffsetFromHead");
m_iStopDrawingHoldBodyOffsetFromTail = NOTESKIN->GetMetricI(sButton,"StopDrawingHoldBodyOffsetFromTail"); m_iStopDrawingHoldBodyOffsetFromTail = NOTESKIN->GetMetricI(sButton,"StopDrawingHoldBodyOffsetFromTail");
m_fHoldNGGrayPercent = NOTESKIN->GetMetricF(sButton,"HoldNGGrayPercent"); m_fHoldLetGoGrayPercent = NOTESKIN->GetMetricF(sButton,"HoldLetGoGrayPercent");
m_bTapNoteUseLighting = NOTESKIN->GetMetricB(sButton,"TapNoteUseLighting"); m_bTapNoteUseLighting = NOTESKIN->GetMetricB(sButton,"TapNoteUseLighting");
m_bTapAdditionUseLighting = NOTESKIN->GetMetricB(sButton,"TapAdditionUseLighting"); m_bTapAdditionUseLighting = NOTESKIN->GetMetricB(sButton,"TapAdditionUseLighting");
m_bTapMineUseLighting = NOTESKIN->GetMetricB(sButton,"TapMineUseLighting"); m_bTapMineUseLighting = NOTESKIN->GetMetricB(sButton,"TapMineUseLighting");
@@ -906,7 +906,7 @@ void NoteDisplay::DrawHold( const TapNote &tn, int iCol, int iRow, bool bIsBeing
/* Hack: Z effects need a finer grain step. */ /* Hack: Z effects need a finer grain step. */
const int fYStep = WavyPartsNeedZBuffer? 4: 16; //bWavy ? 16 : 128; // use small steps only if wavy const int fYStep = WavyPartsNeedZBuffer? 4: 16; //bWavy ? 16 : 128; // use small steps only if wavy
const float fColorScale = tn.HoldResult.fLife + (1-tn.HoldResult.fLife)*cache->m_fHoldNGGrayPercent; const float fColorScale = tn.HoldResult.fLife + (1-tn.HoldResult.fLife)*cache->m_fHoldLetGoGrayPercent;
bool bFlipHeadAndTail = bReverse && cache->m_bFlipHeadAndTailWhenReverse; bool bFlipHeadAndTail = bReverse && cache->m_bFlipHeadAndTailWhenReverse;
+2 -2
View File
@@ -170,8 +170,8 @@ Grade PlayerStageStats::GetGrade() const
Grade grade = GetGradeFromPercent( fPercent ); Grade grade = GetGradeFromPercent( fPercent );
LOG->Trace( "GetGrade: Grade: %s, %i", GradeToString(grade).c_str(), GRADE_TIER02_IS_ALL_PERFECTS ); LOG->Trace( "GetGrade: Grade: %s, %i", GradeToString(grade).c_str(), GRADE_TIER02_IS_ALL_W2S );
if( GRADE_TIER02_IS_ALL_PERFECTS ) if( GRADE_TIER02_IS_ALL_W2S )
{ {
if( iTapNoteScores[TNS_W1] > 0 && if( iTapNoteScores[TNS_W1] > 0 &&
iTapNoteScores[TNS_W2] == 0 && iTapNoteScores[TNS_W2] == 0 &&