diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 91afb9b821..7477c44223 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -175,6 +175,30 @@ P5=P5 P6=P6 P7=P7 P8=P8 +P9=P9 +P10=P10 +P11=P11 +P12=P12 +P13=P13 +P14=P14 +P15=P15 +P16=P16 +P17=P17 +P18=P18 +P19=P19 +P20=P20 +P21=P21 +P22=P22 +P23=P23 +P24=P24 +P25=P25 +P26=P26 +P27=P27 +P28=P28 +P29=P29 +P30=P30 +P31=P31 +P32=P32 [MusicWheel] ArtistText=ARTIST diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua index a4e605524d..aef0647160 100644 --- a/stepmania/Themes/default/Scripts/Other.lua +++ b/stepmania/Themes/default/Scripts/Other.lua @@ -9,32 +9,12 @@ function FormatNumSongsPlayed( num ) end function JudgmentTransformCommand( self, pn, mp, iEnabledPlayerIndex, iNumEnabledPlayers, bUsingBothSides, bReverse, bCenetered ) - if GAMESTATE:GetMultiplayer() then - local x = 0 - local y = -20 - local judgmentHeight = 50 - - local iNumOnLeft = math.ceil( iNumEnabledPlayers/2 ) - local iNumOnRight = iNumEnabledPlayers - iNumOnLeft - local bOnLeft = iEnabledPlayerIndex < iNumOnLeft - local iIndexOnThisSide = (bOnLeft and iEnabledPlayerIndex) or (not bOnLeft and (iEnabledPlayerIndex-iNumOnLeft)) - local iNumOnThisSide = (bOnLeft and iNumOnLeft) or (not bOnLeft and iNumOnRight) - if bOnLeft then - x = -216 - else - x = 216 - end - y = y + (iIndexOnThisSide - (iNumOnThisSide-1)/2) * judgmentHeight - self:x( x ) - self:y( y ) - else - local x = 0 - local y = -30 - if bReverse then y = y * -1 end - if bCentered then y = y * 2 end - self:x( x ) - self:y( y ) - end + local x = 0 + local y = -30 + if bReverse then y = y * -1 end + if bCentered then y = y * 2 end + self:x( x ) + self:y( y ) end function GetEditModeSubScreens() diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index f0783d8172..b828fa7f1c 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -4630,37 +4630,6 @@ Class=ScreenJoinMultiplayer Fallback=ScreenWithMenuElements TimerSeconds=-1 -[ScreenGameplayMultiplayer] -Class=ScreenGameplayMultiplayer -Fallback=ScreenGameplay -PlayerDummyOnCommand= -PlayerDummyOffCommand= -PlayerDummyOnePlayerOneSideX=SCREEN_CENTER_X -PlayerP1OnePlayerOneSideX=SCREEN_CENTER_X -PlayerP2OnePlayerOneSideX=SCREEN_CENTER_X -PlayerP3OnePlayerOneSideX=SCREEN_CENTER_X -PlayerP4OnePlayerOneSideX=SCREEN_CENTER_X -PlayerP5OnePlayerOneSideX=SCREEN_CENTER_X -PlayerP6OnePlayerOneSideX=SCREEN_CENTER_X -PlayerP7OnePlayerOneSideX=SCREEN_CENTER_X -PlayerP8OnePlayerOneSideX=SCREEN_CENTER_X -ActiveAttackListDummyX= -ActiveAttackListDummyY= -ActiveAttackListDummyOnCommand=hidden,1 -ActiveAttackListDummyOffCommand= -ScoreP1X=SCREEN_LEFT -ScoreP1Y=SCREEN_CENTER_Y-20 -ScoreP1OnCommand=addx,-100;sleep,0.5;linear,1;addx,100 -ScoreP1OffCommand=linear,1;addx,-100 -ScoreP2X=SCREEN_LEFT -ScoreP2Y=SCREEN_CENTER_Y+20 -ScoreP2OnCommand=addx,-100;sleep,0.5;linear,1;addx,100 -ScoreP2OffCommand=linear,1;addx,-100 -PlayerScoreListX=SCREEN_CENTER_X -PlayerScoreListY=SCREEN_BOTTOM-36 -PlayerScoreListOnCommand=draworder,-1;addy,150;sleep,0.5;decelerate,0.5;addy,-150 -PlayerScoreListOffCommand=accelerate,0.5;addy,150 - [ScreenGameplaySyncMachine] Class=ScreenGameplaySyncMachine Fallback=ScreenGameplay @@ -4690,36 +4659,6 @@ HelpOffCommand=linear,0.5;zoomy,0 AllowCenter1Player=0 SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;zoom,0;decelerate,0.5;zoom,0.6 -[PlayerScoreItem Percent] -Fallback=ScoreDisplayPercentage Percent -PercentP1X=0 -PercentP1Y=2 -PercentP1OnCommand=x,3;zoomx,0.42;shadowlength,0;diffuse,PlayerColor(PLAYER_1) -PercentP1OffCommand= -DancePointsDigits=5 -PercentUseRemainder=0 - -[MultiplayerEvalScoreRow Percent] -Fallback=PlayerScoreItem Percent -PercentP1OnCommand=x,3;zoomx,0.6;shadowlength,0;diffuse,PlayerColor(PLAYER_1) - -[PlayerScoreList] -ItemPositionCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(indexOffset*72) end - -[MultiplayerEvalScoreRow] -NumberOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(indexOffset*40+112); self:zoomx(0.9); self:zoomy(1.2); self:shadowlength(0); end -ScoreOnCommand=x,-86 - -[ScreenEvaluationMultiplayer] -Class=ScreenEvaluationMultiplayer -Fallback=ScreenWithMenuElements -TimerSeconds=-1 -LabelOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(indexOffset*40+116); end -LineOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(SCREEN_CENTER_X); self:y(SCREEN_CENTER_Y+indexOffset*36+6); self:draworder(itemIndex); end -BulletOnCommandFunction=function(self,itemIndex,numItems) local indexOffset = itemIndex-(numItems-1)/2; self:x(SCREEN_CENTER_X-246); self:y(SCREEN_CENTER_Y+indexOffset*36+6); end -NextScreen=@SongSelectionScreen() - - [PaneDisplay] ShiftP1X=60 ShiftP1Y=0