ScreenSelectCourse now uses ScreenSelectMusic. This removes a
lot of duplicate code (some of which was out of date, such as the wheel input behavior). Themes no longer have to tweak both of these screens individually; only the metrics for ScreenSelectMusic need to be changed, except where they're explicitly overridden.
This commit is contained in:
@@ -762,10 +762,10 @@ OverlayOnCommand=
|
||||
OverlayOffCommand=
|
||||
CourseContentsX=160
|
||||
CourseContentsY=336
|
||||
CourseContentsOnCommand=
|
||||
CourseContentsOffCommand=
|
||||
CourseContentsShowCommand=
|
||||
CourseContentsHideCommand=
|
||||
CourseContentsOnCommand=zoomy,0;bounceend,0.3;zoom,1
|
||||
CourseContentsOffCommand=zoomy,1;bouncebegin,0.3;zoomy,0
|
||||
CourseContentsShowCommand=bouncebegin,0.3;zoomy,1
|
||||
CourseContentsHideCommand=linear,0.3;zoomy,0
|
||||
TimerSeconds=60
|
||||
StyleIcon=1
|
||||
MemoryCardIcons=1
|
||||
@@ -777,6 +777,51 @@ DoRouletteOnMenuTimer=1
|
||||
AlignMusicBeat=0
|
||||
Codes=
|
||||
|
||||
[ScreenSelectCourse]
|
||||
Class=ScreenSelectMusic
|
||||
Fallback=ScreenSelectMusic
|
||||
BannerFrameX=160
|
||||
BannerFrameY=158
|
||||
BannerX=150
|
||||
BannerY=172
|
||||
BannerWidth=286
|
||||
BannerHeight=92
|
||||
BPMDisplayOnCommand=hidden,1
|
||||
CDTitleOnCommand=hidden,1
|
||||
ExplanationX=132
|
||||
ExplanationY=68
|
||||
ExplanationOnCommand=addx,-640;sleep,0.5;bounceend,0.5;addx,640
|
||||
ExplanationOffCommand=bouncebegin,0.5;addx,-640
|
||||
OptionIconsP1OnCommand=hidden,1
|
||||
OptionIconsP2OnCommand=hidden,1
|
||||
MeterFrameP1OnCommand=hidden,1
|
||||
MeterFrameP2OnCommand=hidden,1
|
||||
MeterP1OnCommand=hidden,1
|
||||
MeterP2OnCommand=hidden,1
|
||||
NumSongsX=58
|
||||
NumSongsY=114
|
||||
NumSongsOnCommand=shadowlength,0;addx,-640;bounceend,0.5;addx,640
|
||||
NumSongsOffCommand=bouncebegin,0.5;addx,-640
|
||||
SongOptionsOnCommand=hidden,1
|
||||
SortIconOnCommand=hidden,1
|
||||
TotalTimeX=192
|
||||
TotalTimeY=112
|
||||
TotalTimeOnCommand=shadowlength,0;addx,-640;bounceend,0.5;addx,640
|
||||
TotalTimeOffCommand=bouncebegin,0.5;addx,-640
|
||||
Codes=CourseCodeDetector
|
||||
|
||||
[ScreenSelectCourseNonstop]
|
||||
Fallback=ScreenSelectCourse
|
||||
DefaultSort=NONSTOP
|
||||
|
||||
[ScreenSelectCourseOni]
|
||||
Fallback=ScreenSelectCourse
|
||||
DefaultSort=ONI
|
||||
|
||||
[ScreenSelectCourseEndless]
|
||||
Fallback=ScreenSelectCourse
|
||||
DefaultSort=ENDLESS
|
||||
|
||||
[ScreenEz2SelectMusic]
|
||||
UseModeSwitcher=0
|
||||
BalloonX=492
|
||||
@@ -835,34 +880,6 @@ TimerSeconds=60
|
||||
StyleIcon=0
|
||||
MemoryCardIcons=0
|
||||
|
||||
[ScreenSelectCourse]
|
||||
Fallback=ScreenWithMenuElements
|
||||
PrevScreen=ScreenTitleMenu
|
||||
ExplanationX=132
|
||||
ExplanationY=68
|
||||
BannerFrameX=160
|
||||
BannerFrameY=158
|
||||
BannerX=150
|
||||
BannerY=172
|
||||
BannerWidth=286
|
||||
BannerHeight=92
|
||||
StagesX=58
|
||||
StagesY=114
|
||||
TimeX=192
|
||||
TimeY=112
|
||||
ContentsX=160
|
||||
ContentsY=336
|
||||
WheelX=480
|
||||
WheelY=248
|
||||
ScoreP1X=520
|
||||
ScoreP1Y=210
|
||||
ScoreP2X=520
|
||||
ScoreP2Y=286
|
||||
ScoreZoom=0.8
|
||||
TimerSeconds=60
|
||||
StyleIcon=1
|
||||
MemoryCardIcons=1
|
||||
|
||||
[ScreenStage]
|
||||
NextScreen=ScreenGameplay
|
||||
// This is the minimum delay after the "in" transition before the
|
||||
@@ -1782,7 +1799,7 @@ NoMarvelousShiftUp=15
|
||||
|
||||
[ScreenEvaluationNonstop]
|
||||
Fallback=ScreenEvaluation
|
||||
NextScreen=ScreenSelectCourse
|
||||
NextScreen=ScreenSelectCourseNonstop
|
||||
EndScreen=ScreenNameEntry
|
||||
FailedScreen=ScreenNameEntry
|
||||
Type=course
|
||||
@@ -1996,7 +2013,7 @@ NoMarvelousShiftUp=15
|
||||
|
||||
[ScreenEvaluationOni]
|
||||
Fallback=ScreenEvaluation
|
||||
NextScreen=ScreenSelectCourse
|
||||
NextScreen=ScreenSelectCourseOni
|
||||
EndScreen=ScreenNameEntry
|
||||
FailedScreen=ScreenNameEntry
|
||||
Type=course
|
||||
@@ -2209,7 +2226,7 @@ NoMarvelousShiftUp=15
|
||||
|
||||
[ScreenEvaluationEndless]
|
||||
Fallback=ScreenEvaluation
|
||||
NextScreen=ScreenSelectCourse
|
||||
NextScreen=ScreenSelectCourseEndless
|
||||
EndScreen=ScreenNameEntry
|
||||
FailedScreen=ScreenNameEntry
|
||||
Type=course
|
||||
@@ -3119,6 +3136,16 @@ SaveScreenshot=MenuLeft-MenuRight-Start
|
||||
CancelAllPlayerOptions=
|
||||
BackInEventMode=
|
||||
|
||||
[CourseCodeDetector]
|
||||
Fallback=CodeDetector
|
||||
// No sort changing when in course mode.
|
||||
NextSort1=
|
||||
NextSort2=
|
||||
NextSort3=
|
||||
NextSort4=
|
||||
SortMenu1=
|
||||
SortMenu2=
|
||||
|
||||
[GrooveRadar]
|
||||
Label1OffsetX=0 // stream
|
||||
Label1OffsetY=-92
|
||||
@@ -3898,11 +3925,15 @@ Line1=conf,Game
|
||||
|
||||
[ScreenBranchSelectSongOrCourse]
|
||||
Class=ScreenBranch
|
||||
Choices=1,2
|
||||
Condition1=IsCourseMode()
|
||||
Condition2=true
|
||||
NextScreen1=screen,ScreenSelectCourse
|
||||
NextScreen2=screen,ScreenSelectMusic
|
||||
Choices=1,2,3,4
|
||||
Condition1=PlayModeName() == "Nonstop"
|
||||
Condition2=PlayModeName() == "Oni"
|
||||
Condition3=PlayModeName() == "Endless"
|
||||
Condition4=true
|
||||
NextScreen1=screen,ScreenSelectCourseNonstop
|
||||
NextScreen2=screen,ScreenSelectCourseOni
|
||||
NextScreen3=screen,ScreenSelectCourseEndless
|
||||
NextScreen4=screen,ScreenSelectMusic
|
||||
|
||||
[ScreenPlayerOptions]
|
||||
Fallback=ScreenOptions
|
||||
|
||||
Reference in New Issue
Block a user