diff --git a/.hgtags b/.hgtags new file mode 100644 index 0000000000..3ffd940839 --- /dev/null +++ b/.hgtags @@ -0,0 +1,74 @@ +2b486f5c6155ac1d2405a352de6921e8aade6978 v1.0_public-beta-2 +a0ab080a1a7251073d6df12e34e285d49ddc3f3b v1.0_public-beta-1 +3d956bfda144bff7ed93b84b778d99ece9d5ee67 v1.0_beta-3 +3d956bfda144bff7ed93b84b778d99ece9d5ee67 v1.0_beta-3 +0000000000000000000000000000000000000000 v1.0_beta-3 +0000000000000000000000000000000000000000 v1.0_beta-3 +c4234469e56c61affe98af27a32a612a06c7e69f v1.0_beta-3 +cfb1178d14e20f40991232847bc79b5dc0ec496c v1.0_beta-4 +3690884d954224ecb12f4a85b2efda3a341de986 v1.0_rc1 +76a438f8e5fd745fe919e26f9acbda9a54a087ba v1.0_rc1.5 +069ba4f90f6bbdc4292fe9c8791693e2289e7bd6 v1.0_rc2 +069ba4f90f6bbdc4292fe9c8791693e2289e7bd6 v1.0_rc2 +0000000000000000000000000000000000000000 v1.0_rc2 +0000000000000000000000000000000000000000 v1.0_rc2 +35cee1fcf7cd1e1112b460ba66014c8a4ca08ed4 v1.0_rc2 +b2e897dd741254b1affb65697ef55dab0d279adc v1.0_final +4509b74e44afb2a8806466db25c1ff462e9cb450 v1.1 +92e77e3129f0337cabd77609d6333e19722ee4e8 v1.2 +92e77e3129f0337cabd77609d6333e19722ee4e8 v1.2 +0000000000000000000000000000000000000000 v1.2 +0000000000000000000000000000000000000000 v1.2 +f6031262f449efcc9250dcc4468a63252409a2b5 v1.2 +636669c17c9ffb2a58582ecda4b2d93da76a03b5 v1.2.1 +636669c17c9ffb2a58582ecda4b2d93da76a03b5 v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +881332088f075b4169d5cd1e8d9bde5b77f63efa v1.2.1 +881332088f075b4169d5cd1e8d9bde5b77f63efa v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +96778d78263e51eea18f8d80db37c379cacf40b2 v1.2.1 +96778d78263e51eea18f8d80db37c379cacf40b2 v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +f55b1d5725c5df328b7d3f66770212eba6975842 v1.2.1 +f55b1d5725c5df328b7d3f66770212eba6975842 v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +0000000000000000000000000000000000000000 v1.2.1 +9198aaaa81acf98c640bcff272c739332692f2b9 v1.2.1 +5ea7a482c711e44bd5859716466a264e4d4f88d9 v1.2.2 +04d359c5382d38f223f11743465360cf442825be v1.2.3 +04d359c5382d38f223f11743465360cf442825be v1.2.3 +0000000000000000000000000000000000000000 v1.2.3 +0000000000000000000000000000000000000000 v1.2.3 +6c811d8b7c69f5a7f338053aaf18131fe0a8d8d2 v1.2.3 +6c811d8b7c69f5a7f338053aaf18131fe0a8d8d2 v1.2.3 +0000000000000000000000000000000000000000 v1.2.3 +0000000000000000000000000000000000000000 v1.2.3 +27114b12c56fbebadde5b99ed0beb648ad4fbbda v1.2.3 +8b2ad148d380fe9abc13a32d81243106c693f12b v1.2.4 +0000000000000000000000000000000000000000 v1.2.4 +3cbe3dbac5c79ecdba4762b844f6d63e32a0bfc4 v1.2.4 +16cee271b70eb88df30dbe0c55370eb4e8f19ae4 v1.2.5 +41d46106af55ab0a83894bd488b653fd27e2c3fe vSM5-Preview1 +9e25b6ca284c8dcb380dcee8ae4d49e0cdd4156a vSM5-Preview1a +eba17367c03eacd1f97f649daa37d2718c4a9aea SM5-Preview2 +eba17367c03eacd1f97f649daa37d2718c4a9aea SM5-Preview2 +0000000000000000000000000000000000000000 SM5-Preview2 +0000000000000000000000000000000000000000 SM5-Preview2 +01627e2601b1b0cfc15757821ce5caa0ddbce837 SM5-Preview2 +b2157ade6fc1a70421f702231ea7d070fb738c1c SM5-Preview3 +2f533c86df4fa6a833203c23c1724afed8d8a08d SM5-Preview4 +93d74ef78a322df2e919af48661192839ac9626c SM5-alpha1 +eb859dff1d8b613cf5d63ab8cfb0ca06af5f980e SM5-alpha1a +73393dfaab62f60b9c703975e681cb3d262b042b SM5-alpha2 +42cbefb640285ea3760d25f3a60953ef5a238ea7 SM5-alpha3 +2e59618ab429e9668de31b9a15dd2492ec72756f SM5-beta1 +e10d0b1ef13a5f6d6d5a233b96972aa3cd124773 SM5-beta1a +1ac77d19bc8fd275e69ea55c4fcbedd1e8ebc4be SM5-beta2 +4b7db08665154fdef523e168c1c20bb3e601c5ec SM5-beta2a +4b7db08665154fdef523e168c1c20bb3e601c5ec SM5-beta2a +0000000000000000000000000000000000000000 SM5-beta2a +0000000000000000000000000000000000000000 SM5-beta2a +027ec02e8d07d523ae2828d6f76e0b73c997d21a SM5-beta2a diff --git a/Themes/_fallback/Scripts/02 Other.lua b/Themes/_fallback/Scripts/02 Other.lua index e84f3b1875..21044760a0 100644 --- a/Themes/_fallback/Scripts/02 Other.lua +++ b/Themes/_fallback/Scripts/02 Other.lua @@ -43,26 +43,22 @@ function FormatNumSongsPlayed( num ) end function JudgmentTransformCommand( self, params ) - local x = 0 local y = -30 if params.bReverse then y = y * -1 end -- This makes no sense and wasn't even being used due to misspelling. -- if bCentered then y = y * 2 end - self:x( x ) + self:x( 0 ) self:y( y ) end function JudgmentTransformSharedCommand( self, params ) - local x = -120 local y = -30 if params.bReverse then y = 30 end - if params.Player == PLAYER_1 then x = 120 end - self:x( x ) + self:x( 0 ) self:y( y ) end function ComboTransformCommand( self, params ) - local x = 0 local y = 30 if params.bReverse then y = y * -1 end @@ -73,7 +69,7 @@ function ComboTransformCommand( self, params ) y = y + 40 end end - self:x( x ) + self:x( 0 ) self:y( y ) end diff --git a/Themes/_fallback/Scripts/02 Utilities.lua b/Themes/_fallback/Scripts/02 Utilities.lua index 9bd1500e7c..d7d5a40605 100644 --- a/Themes/_fallback/Scripts/02 Utilities.lua +++ b/Themes/_fallback/Scripts/02 Utilities.lua @@ -218,8 +218,8 @@ end function Center1Player() local styleType = GAMESTATE:GetCurrentStyle():GetStyleType() - -- always center in OnePlayerTwoSides. - if styleType == "StyleType_OnePlayerTwoSides" then + -- always center in OnePlayerTwoSides ( Doubles ) or TwoPlayersSharedSides ( Couples ) + if styleType == "StyleType_OnePlayerTwoSides" or "StyleType_TwoPlayersSharedSides" then return true -- only Center1P if Pref enabled and OnePlayerOneSide. -- (implicitly excludes Rave, Battle, Versus, Routine) @@ -230,6 +230,16 @@ function Center1Player() end end +function IsRoutine() + local styleType = GAMESTATE:GetCurrentStyle():GetStyleType() + + if styleType == "StyleType_TwoPlayersSharedSides" then + return true + end + + return false +end + Date = { Today = function() return string.format("%i%02i%02i", Year(), (MonthOfYear()+1), DayOfMonth()) diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 89efb67329..09ef18f81f 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1159,7 +1159,6 @@ RequireStepOnMines=false InitialHoldLife=IsGame("pump") and 0.05 or 1 MaxHoldLife=1 RollBodyIncrementsCombo=false -#ScoreMissedHoldsAndRolls=not IsGame("pump") ScoreMissedHoldsAndRolls=not IsGame("pump") and not IsGame("dance") PercentUntilColorCombo=0.25 ComboStoppedAt=50 @@ -1816,7 +1815,7 @@ UpdateOnMessage="" # NumChoicesOnPage1=100 DefaultChoice="GameStart" -ChoiceNames="GameStart,Options,Edit,Jukebox,ReportBug,IRC,Exit" +ChoiceNames="GameStart,Options,Edit,Jukebox,GameSelect,Exit" ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame() #ChoiceQuickPlay="applydefaultoptions;text,Quick Play;" ChoiceOptions="screen,ScreenOptionsService;text,Options" @@ -2085,8 +2084,8 @@ ChangeGroupsWithGameButtons=false PreviousGroupButton="MenuUp" NextGroupButton="MenuDown" # -TwoPartSelection=IsGame("pump") -TwoPartConfirmsOnly=IsGame("pump") +TwoPartSelection=false +TwoPartConfirmsOnly=false TwoPartTimerSeconds=30 # SampleMusicDelay=0.25 diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index f1f9335318..bf1b1f0fce 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -11,7 +11,7 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(hide_if,hideFancyElements;); LoadActor("_checkerboard") .. { InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3.5;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256); - OnCommand=cmd(texcoordvelocity,0,0.5;diffuse,color("#ffd400");diffusealpha,0.5;fadetop,1); + OnCommand=cmd(texcoordvelocity,0,0.25;diffuse,color("#ffd400");diffusealpha,0.5;fadetop,1); }; }; LoadActor("_particleLoader") .. { diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua index 16cbba83d7..7cb7bf5edc 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua @@ -14,14 +14,14 @@ t[#t+1] = Def.ActorFrame { -- GainFocusCommand=cmd(visible,true); -- LoseFocusCommand=cmd(visible,false); LoadActor(THEME:GetPathG("ScreenSelectPlayMode","BackgroundFrame")) .. { - InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.7); + InitCommand=cmd(diffuse,Color("Black");diffusealpha,0.45); GainFocusCommand=cmd(visible,true); LoseFocusCommand=cmd(visible,false); }; LoadActor("_HighlightFrame") .. { InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0); - GainFocusCommand=cmd(finishtweening;diffusealpha,1;glow,Color.Alpha(Color.White,1);linear,0.1;glow,Color.Invisible); - LoseFocusCommand=cmd(finishtweening;diffusealpha,0;glow,Color.Invisible); + GainFocusCommand=cmd(finishtweening;diffuse,ColorLightTone(ModeIconColors[gc:GetName()]);linear,1;diffuse,ModeIconColors[gc:GetName()]); + LoseFocusCommand=cmd(finishtweening;diffusealpha,0); OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible")); }; }; @@ -29,18 +29,11 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame { FOV=90; InitCommand=cmd(x,-192;zoom,0.9); - -- Main Shadow - LoadActor( gc:GetName() ) .. { - InitCommand=cmd(x,2;y,2;diffuse,Color("Black");diffusealpha,0;zoom,0.75); - GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.1;diffusealpha,0;zoom,1;decelerate,0.05;diffusealpha,0.5;pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); - LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.2;diffusealpha,0;zoom,0.75;); - OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,0.5;rotationy,360;); - }; -- Main Emblem LoadActor( gc:GetName() ) .. { InitCommand=cmd(diffusealpha,0;zoom,0.75); - GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.1;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.05;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); - LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.2;diffusealpha,0;zoom,0.75;glow,Color("Invisible")); + GainFocusCommand=cmd(finishtweening;stopeffect;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.5;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); + LoseFocusCommand=cmd(finishtweening;stopeffect;smooth,0.4;diffusealpha,0;zoom,0.75;glow,Color("Invisible")); OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,0.5;rotationy,360;glow,Color("Invisible")); }; }; @@ -49,20 +42,20 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,-192/2;y,-10); Def.Quad { InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,ModeIconColors[gc:GetName()];diffusealpha,0;fadeleft,0.35;faderight,0.35); - GainFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,1); + GainFocusCommand=cmd(stoptweening;linear,0.5;diffusealpha,1); LoseFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,0); }; LoadFont("_helveticaneuelt std extblk cn 42px") .. { Text=gc:GetText(); InitCommand=cmd(horizalign,left;diffuse,ModeIconColors[gc:GetName()];shadowcolor,ColorDarkTone(ModeIconColors[gc:GetName()]);shadowlength,2;diffusealpha,0;skewx,-0.125); - GainFocusCommand=cmd(stoptweening;x,-32;decelerate,0.1;diffusealpha,1;x,0); - LoseFocusCommand=cmd(stoptweening;x,0;accelerate,0.1;diffusealpha,0;x,32;diffusealpha,0); + GainFocusCommand=cmd(finishtweening;x,-16;diffuse,ColorLightTone(ModeIconColors[gc:GetName()]);decelerate,0.45;diffusealpha,1;x,0;diffuse,ModeIconColors[gc:GetName()]); + LoseFocusCommand=cmd(finishtweening;x,0;accelerate,0.4;diffusealpha,0;x,32;diffusealpha,0); }; LoadFont("_helveticaneuelt std extblk cn 42px") .. { Text=THEME:GetString(Var "LoadingScreen", gc:GetName() .. "Explanation"); InitCommand=cmd(horizalign,right;x,320;y,30;shadowlength,1;diffusealpha,0;skewx,-0.125;zoom,0.5); - GainFocusCommand=cmd(stoptweening;x,320+32;decelerate,0.1;diffusealpha,1;x,320); - LoseFocusCommand=cmd(stoptweening;x,320;accelerate,0.1;diffusealpha,0;x,320-32;diffusealpha,0); + GainFocusCommand=cmd(finishtweening;x,320+16;decelerate,0.45;diffusealpha,1;x,320); + LoseFocusCommand=cmd(finishtweening;x,320;accelerate,0.4;diffusealpha,0;x,320-32;diffusealpha,0); }; }; t.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;decelerate,0.25;zoom,1); diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 29f8a9f05c..3f13a5f27d 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -686,9 +686,6 @@ NetworkStatusY=SCREEN_BOTTOM-64 NetworkStatusOnCommand=halign,0; NetworkStatusOffCommand=linear,0.5;cropright,1 # -# -ChoiceNames="GameStart,Options,Edit,Jukebox,Exit" -DefaultChoice="GameStart" [ScreenQuickSetupOverview] IconStartX=SCREEN_CENTER_X-160 @@ -1408,12 +1405,12 @@ SongTitleOffCommand= # SongMeterDisplayP1X=Center1Player() and SCREEN_CENTER_X or SCREEN_LEFT+16 SongMeterDisplayP1Y=Center1Player() and SCREEN_TOP+60 or SCREEN_CENTER_Y-32 -SongMeterDisplayP1OnCommand=draworder,5;rotationz,Center1Player() and 0 or -90;zoom,0;addx,-24;sleep,1.5;decelerate,0.5;zoom,1;addx,24 +SongMeterDisplayP1OnCommand=draworder,5;rotationz,Center1Player() and 0 or -90;zoom,0;addx,-24;sleep,1.5;decelerate,0.5;zoom,1;addx,24;hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_1 SongMeterDisplayP1OffCommand= # SongMeterDisplayP2X=Center1Player() and SCREEN_CENTER_X or SCREEN_RIGHT-16 SongMeterDisplayP2Y=Center1Player() and SCREEN_TOP+60 or SCREEN_CENTER_Y-32 -SongMeterDisplayP2OnCommand=draworder,5;rotationz,Center1Player() and 0 or -90;zoom,0;addx,24;sleep,1.5;decelerate,0.5;zoom,1;addx,-24 +SongMeterDisplayP2OnCommand=draworder,5;rotationz,Center1Player() and 0 or -90;zoom,0;addx,24;sleep,1.5;decelerate,0.5;zoom,1;addx,-24;hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_2 SongMeterDisplayP2OffCommand= # ShowBPMDisplay=true @@ -1439,13 +1436,13 @@ ScoreFrameOffCommand= LifeP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") # LifeP1X=(GAMESTATE:GetCurrentStyle():GetStyleType() == 'StyleType_OnePlayerTwoSides' or (PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1)) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") LifeP1Y=SCREEN_TOP+24 -LifeP1OnCommand=finishtweening;addy,-48;sleep,1.25;bounceend,0.35;addy,48; +LifeP1OnCommand=finishtweening;addy,-48;sleep,1.25;bounceend,0.35;addy,48;hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_1 #~ LifeP1OnCommand=addx,-SCREEN_CENTER_X;sleep,1.25;decelerate,0.35*0.25;addx,SCREEN_CENTER_X*1.5;accelerate,0.35*0.25;addx,-SCREEN_CENTER_X*0.25;bounceend,0.35*0.25;addx,-SCREEN_CENTER_X*0.25 LifeP1OffCommand= LifeP2X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX") # LifeP2X=(GAMESTATE:GetCurrentStyle():GetStyleType() == 'StyleType_OnePlayerTwoSides' or (PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1)) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX") LifeP2Y=SCREEN_TOP+24 -LifeP2OnCommand=finishtweening;zoomx,-1;addy,-48;sleep,1.25;bounceend,0.35;addy,48; +LifeP2OnCommand=finishtweening;zoomx,-1;addy,-48;sleep,1.25;bounceend,0.35;addy,48;hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_2 #~ LifeP2OnCommand=zoomx,-1;addx,SCREEN_CENTER_X;sleep,1.25;decelerate,0.35*0.25;addx,-SCREEN_CENTER_X*1.5;accelerate,0.35*0.25;addx,SCREEN_CENTER_X*0.25;bounceend,0.35*0.25;addx,SCREEN_CENTER_X*0.25 LifeP2OffCommand= CombinedLifeX=SCREEN_CENTER_X @@ -1497,12 +1494,12 @@ DeltaSecondsP2OffCommand= ScoreP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") # ScoreP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") ScoreP1Y=SCREEN_BOTTOM-48 -ScoreP1OnCommand=draworder,101;visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_1);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48 +ScoreP1OnCommand=draworder,101;visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_1);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48;hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_1 ScoreP1OffCommand= ScoreP2X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX") # ScoreP2X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX") ScoreP2Y=SCREEN_BOTTOM-48 -ScoreP2OnCommand=draworder,101;visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_2);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48 +ScoreP2OnCommand=draworder,101;visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_2);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48;hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_2 ScoreP2OffCommand= # StepsDescriptionP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")