Revert/Merge (manually modified aplowman's commit)

This commit is contained in:
Charles Lohr
2005-01-27 04:18:37 +00:00
parent 7df474b776
commit d6e911df60
+36 -125
View File
@@ -700,8 +700,8 @@ StyleIcon=1
MemoryCardIcons=1
SampleMusicDelay=0.25
PrevScreen=ScreenTitleBranch
NextScreen=ScreenBranchGameplay
NextOptionsScreen=ScreenBranchFirstOptions
NextScreen=ScreenStage
NextOptionsScreen=@SelectFirstOptionsScreen()
DoRouletteOnMenuTimer=1
AlignMusicBeat=0
Codes=
@@ -768,6 +768,7 @@ TimerSeconds=0
[ScreenNetRoom]
MusicSelectScreen=ScreenSMOnlineSelectMusic
TitleBGColor=0.5,0.0,0.5,1.0
TitleBGWidth=100
TitleBGHeight=40
TitleBGY=420
@@ -802,7 +803,7 @@ CreateRoomOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0;zoom,0.5
CreateRoomOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
NumRoomsShow=10
PrevScreen=ScreenTitleBranch
NextScreen=ScreenStage
NextScreen=ScreenGameplayBranch
Fallback=ScreenNetSelectMusic
[ScreenSMOnlineSelectMusic]
@@ -811,50 +812,44 @@ Class=ScreenNetSelectMusic
Fallback=ScreenNetSelectMusic
[ScreenNetSelectMusic]
ChatInputBoxY=SCREEN_CENTER_Y+90
WheelX=SCREEN_CENTER_X+160
WheelY=SCREEN_CENTER_Y+4
WheelOnCommand=
WheelOffCommand=
BPMDisplayX=SCREEN_CENTER_X-200
BPMDisplayY=SCREEN_CENTER_Y+180
BPMDisplayOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
OptionIconsP1X=SCREEN_CENTER_X-290
OptionIconsP1Y=SCREEN_CENTER_Y-175
OptionIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1
OptionIconsP1OffCommand=linear,0.5;zoomy,0
OptionIconsP2X=SCREEN_CENTER_X-290
OptionIconsP2Y=SCREEN_CENTER_Y-145
OptionIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1
OptionIconsP2OffCommand=linear,0.5;zoomy,0
ChatInputBoxY=SCREEN_CENTER_Y+110
ChatInputBoxX=SCREEN_CENTER_X-150
ChatInputBoxOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6
ChatInputBoxOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6
ChatInputBoxWidth=300
ChatInputBoxHeight=50
ChatInputBoxColor=0.5,0.5,1.0,0.7 //transparent cyan
ChatOutputBoxY=SCREEN_CENTER_Y-48
ChatOutputBoxY=SCREEN_CENTER_Y-28
ChatOutputBoxX=SCREEN_CENTER_X-150
ChatOutputBoxOnCommand=diffusealpha,0;linear,0.5;diffusealpha,1
ChatOutputBoxOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.0;zoomy,0.0
ChatOutputBoxWidth=300
ChatOutputBoxHeight=200
ChatOutputBoxColor=1.0,0.5,0.5,0.7 //transparent reddish
ChatInputY=SCREEN_CENTER_Y+70
ChatInputY=SCREEN_CENTER_Y+90
ChatInputX=SCREEN_CENTER_X-300
ChatInputOnCommand=zoomx,0.0;zoomy,0.0;diffusealpha,0;linear,0.5;diffusealpha,0.8;zoomx,0.5;zoomy,0.5
ChatInputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.25;zoomy,0.25
ChatOutputY=SCREEN_CENTER_Y+64
ChatOutputY=SCREEN_CENTER_Y+84
ChatOutputX=SCREEN_CENTER_X-300
ChatOutputOnCommand=zoomx,1.0;zoomy,1.0;diffusealpha,0;linear,0.5;diffusealpha,0.8;zoomx,0.5;zoomy,0.5
ChatOutputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.25;zoomy,0.25
GroupsListY=SCREEN_CENTER_Y-90
GroupsListX=SCREEN_CENTER_X+160
GroupsListOnCommand=zoomx,0.0;diffusealpha,0;linear,0.5;diffusealpha,1;zoomx,1.0
GroupsListOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.0
GroupsBGColor=0.7,0.7,0.7,0.7 //grayish
GroupsBGWidth=300
GroupsBGHeight=150
GroupsBGY=SCREEN_CENTER_Y-90
GroupsBGX=SCREEN_CENTER_X+160
GroupsBGOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
GroupsBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
SongsListY=SCREEN_CENTER_Y+110
SongsListX=SCREEN_CENTER_X+160
SongsListOnCommand=addy,400;bounceend,0.5;addy,-400
SongsListOffCommand=bouncebegin,0.5;addy,400
SongsBGColor=0.7,0.7,0.7,0.7
SongsBGWidth=300
SongsBGHeight=220
SongsBGX=SCREEN_CENTER_X+160
SongsBGY=SCREEN_CENTER_Y+110
SongsBGOnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6
SongsBGOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6
UsersBGColor=0.7,0.7,0.7,0.7
UsersBGWidth=640
UsersBGHeight=50
@@ -873,17 +868,6 @@ Users1Color=1.0,1.0,1.0,1.0 //Inactive; Undefined
Users2Color=0.5,0.5,1.0,1.0 //Active, In NetScreen
Users3Color=0.5,1.0,0.5,1.0 //Active, In Options
Users4Color=1.0,0.5,0.5,1.0 //Active, in Evaluation
SelectionColor=0.0,1.0,0.2,0.4
SelectionHeight=30
SelectionWidth=300
SelectionY=SCREEN_CENTER_Y-90
SelectionX=SCREEN_CENTER_X+160
SelectionOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0;diffusealpha,0.7
SelectionOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
SelectionTo1Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,480;y,150
SelectionTo2Command=linear,0.3;zoomy,1.0;zoomx,1.0;x,480;y,350
SelectionTo3Command=linear,0.3;x,260;y,400;zoomx,0.4;zoomy,2.0
SelectionTo4Command=linear,0.3;x,80;y,70;zoomx,0.4;zoomy,2.2
optionsY=SCREEN_CENTER_Y-170
optionsX=SCREEN_CENTER_X-240
optionsOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,0.7;zoomx,0.7
@@ -911,28 +895,6 @@ DiffBGY=SCREEN_CENTER_Y+160
DiffBGX=SCREEN_CENTER_X-60
DiffBGOnCommand=zoomz,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
DiffBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
ExInfoBGColor=0.7,0.7,0.7,0.7
ExInfoBGWidth=200
ExInfoBGHeight=60
ExInfoBGY=SCREEN_CENTER_Y+160
ExInfoBGX=SCREEN_CENTER_X-220
ExInfoBGOnCommand=zoomz,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
ExInfoBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
SongsArtistY=SCREEN_CENTER_Y+140
SongsArtistX=SCREEN_CENTER_X-220
SongsArtistWidth=200
SongsArtistOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
SongsArtistOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
SongsSubtitleY=SCREEN_CENTER_Y+160
SongsSubtitleX=SCREEN_CENTER_X-220
SongsSubtitleWidth=200
SongsSubtitleOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
SongsSubtitleOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
SongsGroupY=SCREEN_CENTER_Y+180
SongsGroupX=SCREEN_CENTER_X-220
SongsGroupWidth=200
SongsGroupOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0
SongsGroupOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0
ChatOutputLines=18
NumStylesShow=1
NumSongsShow=4
@@ -940,7 +902,7 @@ NumGroupsShow=3
StyleIcon=
MemoryCardIcons=
TimerSeconds=
HelpText=
HelpText=Up: Options, Down: Change Difficulty, Left + Right: Change Sort
PrevScreen=ScreenTitleBranch
NextScreen=ScreenStage
NoSongsScreen=ScreenTitleBranch
@@ -998,24 +960,16 @@ DifficultyRatingOrientation=0
DifficultyRatingSpacing=40.0
PreviewMusicMode=0 // 0 = play music as you select, 1 = no music plays, select once and preview music plays, select again for confirm, 2 = no music plays at all, 3 = play music as select, press twice to confirm, 4 = static menu music plays, no confirm
PrevScreen=ScreenTitleBranch
NextScreen=ScreenBranchGameplay
NextOptionsScreen=ScreenBranchFirstOptions
NextScreen=ScreenStage
NextOptionsScreen=@SelectFirstOptionsScreen()
TimerSeconds=60
TimerStealth=0
StyleIcon=0
MemoryCardIcons=0
[ScreenBranchGameplay]
Class=ScreenBranch
Choices=1,2
Condition1=IsExtraStage() or IsExtraStage2()
Condition2=true
NextScreen1=screen,ScreenStageExtra
NextScreen2=screen,ScreenStage
[ScreenStage]
NextScreen=ScreenGameplay
PrevScreen=ScreenBranchSelectSongOrCourse
NextScreen=@SelectGameplayScreen()
PrevScreen=@SongSelectionScreen()
// This is the minimum delay after the "in" transition before the
// "out" transition will begin. (NextScreen is loaded during this
// time.)
@@ -1046,16 +1000,11 @@ BackgroundOffCommand=
OverlayOnCommand=
OverlayOffCommand=
[ScreenStageExtra]
Class=ScreenStage
Fallback=ScreenStage
NextScreen=ScreenGameplayExtra
[ScreenGameplay]
ShowEvaluationOnFail=0
StaticBGY=SCREEN_CENTER_Y+0
StaticBGX=SCREEN_CENTER_X+0
PrevScreen=ScreenBranchSelectSongOrCourse
PrevScreen=@SongSelectionScreen()
NextScreen=@SelectEvaluationScreen()
InitialBackgroundBrightnessRegular=1
InitialBackgroundBrightnessNonstop=1
@@ -3340,7 +3289,7 @@ TimerSeconds=24
MaxRankingNameLength=4
StyleIcon=1
MemoryCardIcons=1
NextScreen=ScreenBranchEnding
NextScreen=@SelectEndingScreen()
PlayerP1OnePlayerOneSideX=SCREEN_CENTER_X-160
PlayerP2OnePlayerOneSideX=SCREEN_CENTER_X+160
PlayerP1TwoPlayersTwoSidesX=SCREEN_CENTER_X-160
@@ -3348,14 +3297,6 @@ PlayerP2TwoPlayersTwoSidesX=SCREEN_CENTER_X+160
PlayerP1OnePlayerTwoSidesX=SCREEN_CENTER_X
PlayerP2OnePlayerTwoSidesX=SCREEN_CENTER_X
[ScreenBranchEnding]
Class=ScreenBranch
Choices=Credits,MusicScroll
ConditionCredits=GetBestFinalGrade() <= Grade("AA")
ConditionMusicScroll=true
NextScreenCredits=screen,ScreenCredits
NextScreenMusicScroll=screen,ScreenMusicScroll
[EditMenu]
Arrows1X=SCREEN_CENTER_X-130
Arrows2X=SCREEN_CENTER_X+270
@@ -3530,18 +3471,6 @@ LineNames=1
OptionMenuFlags=together
Line1=conf,Game
[ScreenBranchSelectSongOrCourse]
Class=ScreenBranch
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,ScreenSelectBranchForNet
[ScreenEvaluationExitBranch]
Class=ScreenBranch
Choices=1,2,3
@@ -3552,19 +3481,9 @@ NextScreen1=screen,ScreenNetRoom
NextScreen2=screen,ScreenNetSelectMusic
NextScreen3=screen,ScreenSelectMusic
[ScreenSelectBranchForNet]
Class=ScreenBranch
Choices=1,2,3
Condition1=IsNetSMOnline()
Condition2=IsNetConnected()
Condition3=true
NextScreen1=screen,ScreenSMOnlineLogin
NextScreen2=screen,ScreenNetSelectMusic
NextScreen3=screen,ScreenSelectMusic
[ScreenPlayerOptions]
Fallback=ScreenOptions
PrevScreen=ScreenBranchSelectSongOrCourse
PrevScreen=@SongSelectionScreen()
NextScreen=ScreenSongOptions
TimerSeconds=30
StyleIcon=0
@@ -3600,7 +3519,7 @@ CancelAllP2ShowCommand=
Fallback=ScreenOptions
Class=ScreenOptionsMaster
PrevScreen=ScreenSelectMusic
NextScreen=ScreenBranchGameplay
NextScreen=ScreenStage
TimerSeconds=30
StyleIcon=0
MemoryCardIcons=0
@@ -3613,18 +3532,10 @@ Line3=list,NoteSkins
Line4=list,Persp
Line5=Steps
[ScreenBranchFirstOptions]
Class=ScreenBranch
Choices=1,2
Condition1=PlayModeName() == "Rave"
Condition2=true
NextScreen1=screen,ScreenRaveOptions
NextScreen2=screen,ScreenPlayerOptions
[ScreenSongOptions]
Fallback=ScreenOptions
PrevScreen=ScreenBranchFirstOptions
NextScreen=ScreenBranchGameplay
PrevScreen=@SelectFirstOptionsScreen()
NextScreen=ScreenStage
Game=Change the current game type with this option.
TimerSeconds=30
StyleIcon=0
@@ -3709,7 +3620,7 @@ TimerSeconds=40
StyleIcon=1
MemoryCardIcons=1
PrevScreen=ScreenTitleBranch
NextScreen=ScreenBranchSelectSongOrCourse
NextScreen=@SongSelectionScreen()
[BeginnerHelper]
# All X,Y coordinates are relative to the HelperX,Y