diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png index d1bba7b439..e115400d89 100644 Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png and b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua index dd61a0e166..4ed5e4fd7e 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua @@ -1,19 +1,25 @@ -local t = Def.ActorFrame { +local font = LoadFont( "blaster" ); +local frame = LoadActor( "_score frame" ); +local text = GAMESTATE:GetPlayMode() == 'PlayMode_Oni' and "time" or "score"; +return Def.ActorFrame { + Def.ActorFrame { + frame; + font .. { + Text = "player 1 " .. text; + InitCommand = cmd(addy,14;addx,-20;zoom,0.4;shadowlength,0); + }; + InitCommand = cmd(x,SCREEN_LEFT-100;y,SCREEN_CENTER_Y+202); + OnCommand = cmd(linear,1;x,SCREEN_CENTER_X-208); + OffCommand = cmd(linear,1;x,SCREEN_LEFT-100) + }; + Def.ActorFrame { + frame; + font .. { + Text = "player 2 " .. text; + InitCommand = cmd(addy,14;addx,20;zoom,0.4;shadowlength,0); + }; + InitCommand = cmd(x,SCREEN_RIGHT+100;y,SCREEN_CENTER_Y+202); + OnCommand = cmd(linear,1;x,SCREEN_CENTER_X+210); + OffCommand = cmd(linear,1;x,SCREEN_RIGHT+100) + } }; - -if GAMESTATE:IsExtraStage() then - t[#t+1] = LoadActor("_extra score frame") .. { - InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-208); - OnCommand=cmd(addy,-100;sleep,0.5;linear,1;addy,100); - OffCommand=cmd(linear,1;addy,-100); - }; -else - local sFile = GAMESTATE:GetPlayMode() == "PlayMode_Oni" and "_oni score frame" or "_score frame"; - t[#t+1] = LoadActor(sFile) .. { - InitCommand=cmd(x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+208); - OnCommand=cmd(addy,100;linear,0.5;addy,-100); - OffCommand=cmd(linear,0.5;addy,100); - }; -end - -return t;