merge Multiplayer into ScreenGameplay

This commit is contained in:
Chris Danford
2005-08-23 21:43:32 +00:00
parent f71cb1cdcf
commit 5710c5bb5e
+49 -3
View File
@@ -885,7 +885,7 @@ OverlayOnCommand=
OverlayOffCommand=
[ScreenGameplay]
Class=ScreenGameplay
Class=ScreenGameplayNormal
Fallback=ScreenWithMenuElementsBlank
ShowEvaluationOnFail=0
StaticBGY=SCREEN_CENTER_Y+0
@@ -1097,7 +1097,6 @@ PlayerP2OnePlayerTwoSidesX=SCREEN_CENTER_X
StopCourseEarly=0
[ScreenGameplayExtra]
Class=ScreenGameplay
Fallback=ScreenGameplay
LifeFrameX=SCREEN_CENTER_X+0
LifeFrameY=SCREEN_CENTER_Y+202
@@ -2911,6 +2910,31 @@ DancePointsDigits=5
PercentUseRemainder=0
ApplyScoreDisplayOptions=1
PercentP3X=+20
PercentP3Y=0
PercentP3OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
PercentP3OffCommand=
PercentP4X=-20
PercentP4Y=0
PercentP4OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
PercentP4OffCommand=
PercentP5X=+20
PercentP5Y=0
PercentP5OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
PercentP5OffCommand=
PercentP6X=-20
PercentP6Y=0
PercentP6OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
PercentP6OffCommand=
PercentP7X=+20
PercentP7Y=0
PercentP7OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_1)
PercentP7OffCommand=
PercentP8X=-20
PercentP8Y=0
PercentP8OnCommand=@"shadowlength,0;diffuse,"..PlayerColor(PLAYER_2)
PercentP8OffCommand=
[ScoreKeeperRave]
AttackDurationSeconds=10
@@ -4176,6 +4200,9 @@ Fallback=DifficultyMeter
[ScreenEvaluation DifficultyMeterP2]
Fallback=DifficultyMeter
[ScreenGameplayMultiplayer DifficultyMeterP1]
Fallback=DifficultyMeter
[ScreenEdit]
EditMode=2
Fallback=ScreenWithMenuElementsBlank
@@ -4506,4 +4533,23 @@ NumFixedProfiles=1
[ScreenJoinMultiplayer]
Class=ScreenJoinMultiplayer
Fallback=ScreenWithMenuElements
TimerSeconds=0
TimerSeconds=0
[ScreenGameplayMultiplayer]
Class=ScreenGameplayMultiplayer
Fallback=ScreenGameplay
PlayerDummyOnCommand=
PlayerDummyOffCommand=
PlayerDummyOnePlayerOneSideX=SCREEN_CENTER_X
ActiveAttackListDummyX=
ActiveAttackListDummyY=
ActiveAttackListDummyOnCommand=hidden,1
ActiveAttackListDummyOffCommand=
ScoreP1X=SCREEN_LEFT+100
ScoreP1Y=SCREEN_CENTER_Y-20
ScoreP1OnCommand=addx,-100;sleep,0.5;linear,1;addx,100
ScoreP1OffCommand=linear,1;addx,-100
ScoreP2X=SCREEN_LEFT+100
ScoreP2Y=SCREEN_CENTER_Y+20
ScoreP2OnCommand=addx,-100;sleep,0.5;linear,1;addx,100
ScoreP2OffCommand=linear,1;addx,-100