From 5710c5bb5e8dd717c060c978a47c296eb07926d1 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Tue, 23 Aug 2005 21:43:32 +0000
Subject: [PATCH] merge Multiplayer into ScreenGameplay

---
 stepmania/Themes/default/metrics.ini | 52 ++++++++++++++++++++++++++--
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 3acf3b6ec9..029ed21056 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -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
\ No newline at end of file
+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