diff --git a/Themes/default/BGAnimations/ScreenEvaluation overlay.lua b/Themes/default/BGAnimations/ScreenEvaluation overlay.lua index 2035fb18da..e7c3a899f6 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation overlay.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation overlay.lua @@ -1,14 +1,15 @@ +local t = Def.ActorFrame {}; if not GAMESTATE:IsCourseMode() then - return Def.ActorFrame { + t[#t+1] = Def.ActorFrame { LoadActor(THEME:GetPathG("ScreenEvaluation", "StageDisplay")) .. { InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); + OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), } } else - return Def.ActorFrame { + t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); + OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), LoadActor(THEME:GetPathG("", "_sortFrame")) .. { InitCommand=cmd(diffusealpha,0.9;zoom,1.5); BeginCommand=function(self) @@ -35,4 +36,42 @@ else end; }; } -end; \ No newline at end of file + + if GAMESTATE:HasEarnedExtraStage() then + t[#t+1] = Def.ActorFrame { + InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); + OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), + LoadActor(THEME:GetPathG("", "_sortFrame")) .. { + InitCommand=cmd(diffusealpha,0.9;zoom,1.5); + BeginCommand=function(self) + self:playcommand("Set") + end; + SetCommand=function(self) + local curStage = GAMESTATE:GetCurrentStage(); + self:diffuse(StageToColor(curStage)); + end + }; + LoadActor(THEME:GetPathG("", "_sortFrame")) .. { + InitCommand=cmd(diffusealpha,0.9;zoom,1.5;diffuse,color("#FFFFFF");blend,'add';); + BeginCommand=cmd(diffuseshift;effectcolor2,color("1,1,1,0.3");effectcolor2,color("1,1,1,0");effectperiod,2;); + }; + LoadFont("Common Italic Condensed") .. { + InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true;maxwidth,220;); + BeginCommand=function(self) + self:playcommand("Set") + end; + CurrentSongChangedMessageCommand= cmd(playcommand,"Set"), + SetCommand=function(self) + local curStage = GAMESTATE:GetCurrentStage(); + local text = string.upper(THEME:GetString("ScreenEvaluation", "ExtraUnlocked")) + self:settext(text) + -- StepMania is being stupid so we have to do this here; + self:diffuse(StageToColor(curStage)):diffusetopedge(ColorLightTone(StageToColor(curStage))); + self:diffusealpha(0):smooth(0.3):diffusealpha(1); + end; + }; + } + end; +end; + +return t; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua index c2b4263261..811c454b13 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua @@ -403,20 +403,6 @@ if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then end; -t[#t+1] = Def.BitmapText { - Font = "Common Italic Condensed", - Condition=GAMESTATE:HasEarnedExtraStage(); - InitCommand=cmd(horizalign,center;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-244;zoom,1;diffuse,color("#EC3F99");diffusebottomedge,color("#AB3468");), - OnCommand=function(self) - local text = string.upper(THEME:GetString("ScreenEvaluation", "ExtraUnlocked")) - self:settext(text) - self:diffusealpha(0):zoomx(0.7):sleep(1.3):decelerate(0.3):diffusealpha(1):zoomx(1) - end; - OffCommand=function(self) - self:sleep(0.1):decelerate(0.3):diffusealpha(0) - end; - } - t[#t+1] = StandardDecorationFromFileOptional("LifeDifficulty","LifeDifficulty"); t[#t+1] = StandardDecorationFromFileOptional("TimingDifficulty","TimingDifficulty"); diff --git a/Themes/default/BGAnimations/ScreenGameplay in/default.lua b/Themes/default/BGAnimations/ScreenGameplay in/default.lua index 8965ce3c2e..63c0f8015c 100644 --- a/Themes/default/BGAnimations/ScreenGameplay in/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay in/default.lua @@ -1,18 +1,3 @@ -local playMode = GAMESTATE:GetPlayMode() -local slideTime = 1.1; -local slideWait = 1.25; -local bottomSlide = 0.76; -local easeTime = 0.10; - -local playMode = GAMESTATE:GetPlayMode() -local sStage = "" -sStage = GAMESTATE:GetCurrentStage() - -if playMode ~= 'PlayMode_Regular' and playMode ~= 'PlayMode_Rave' and playMode ~= 'PlayMode_Battle' then - sStage = playMode; -end; - - local t = Def.ActorFrame {}; t[#t+1] = Def.Sprite { InitCommand=cmd(Center;diffusealpha,1); @@ -23,158 +8,11 @@ t[#t+1] = Def.Sprite { else self:scale_or_crop_background() end - self:linear(1) + self:linear(0.2) self:diffusealpha(0) end; }; --- BG for credits -t[#t+1] = Def.ActorFrame { - OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); - -- Behind stage graphic - Def.Quad { - InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-110;zoomto,SCREEN_WIDTH,120;); - OnCommand=function(self) - self:diffuse(color("#000000")):diffusealpha(0.8); - end - }; - -- Behind song - Def.Quad { - InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM;zoomto,SCREEN_WIDTH,110;); - OnCommand=function(self) - self:diffuse(color("#000000")):diffusealpha(0.9); - end - }; -}; - - -local stage_num_actor= THEME:GetPathG("ScreenStageInformation", "Stage " .. ToEnumShortString(sStage), true) -if stage_num_actor ~= "" and FILEMAN:DoesFileExist(stage_num_actor) then - stage_num_actor= LoadActor(stage_num_actor) -else - -- Midiman: We need a "Stage Next" actor or something for stages after - -- the 6th. -Kyz - local curStage = GAMESTATE:GetCurrentStage(); - stage_num_actor= Def.BitmapText{ - Font= "Common Normal", Text= thified_curstage_index(false) .. " Stage", - InitCommand= function(self) - self:zoom(1.5) - self:strokecolor(Color.Black) - self:diffuse(StageToColor(curStage)); - self:diffusetopedge(ColorLightTone(StageToColor(curStage))); - end - } -end - -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+190); - OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); - - stage_num_actor .. { - OnCommand=cmd(zoom,1;diffusealpha,1); - }; -}; - --- Step author credits - if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then - t[#t+1] = Def.ActorFrame { - InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_LEFT+40;); - OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); - LoadFont("Common Italic Condensed") .. { - OnCommand=cmd(playcommand,"Set";horizalign,left;diffuse,color("#FFFFFF");); - SetCommand=function(self) - stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) - local song = GAMESTATE:GetCurrentSong(); - if song then - if stepsP1:GetAuthorCredit() ~= "" then - self:settext(string.upper(THEME:GetString("OptionTitles","Step Author")) .. ":"); - else - self:settext("") - end - else - self:settext("") - end - end - }; - LoadFont("Common Fallback Font") .. { - InitCommand=cmd(addy,22); - OnCommand=cmd(playcommand,"Set";horizalign,left;zoom,0.75;diffuse,color("#FFFFFF");); - SetCommand=function(self) - stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) - local song = GAMESTATE:GetCurrentSong(); - if song then - if stepsP1 ~= nil then - self:settext(stepsP1:GetAuthorCredit()) - else - self:settext("") - end - else - self:settext("") - end - end - }; - }; - end - - if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then - t[#t+1] = Def.ActorFrame { - InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_RIGHT-40;); - OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); - LoadFont("Common Italic Condensed") .. { - OnCommand=cmd(playcommand,"Set";horizalign,right;diffuse,color("#FFFFFF");); - SetCommand=function(self) - stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) - local song = GAMESTATE:GetCurrentSong(); - if song then - local diff = stepsP2:GetDifficulty(); - if stepsP2:GetAuthorCredit() ~= "" then - self:settext(string.upper(THEME:GetString("OptionTitles","Step Author")) .. ":"); - else - self:settext("") - end - else - self:settext("") - end - end - }; - - LoadFont("Common Fallback Font") .. { - InitCommand=cmd(addy,22); - OnCommand=cmd(playcommand,"Set";horizalign,right;zoom,0.75;diffuse,color("#FFFFFF");); - SetCommand=function(self) - stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) - local song = GAMESTATE:GetCurrentSong(); - if song then - if stepsP2 ~= nil then - self:settext(stepsP2:GetAuthorCredit()) - else - self:settext("") - end - else - self:settext("") - end - end - }; - }; - end - --- Song title and artist -t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-80); - OnCommand=cmd(smooth,bottomSlide;addy,240;sleep,0.2;diffusealpha,0;); - LoadFont("Common Fallback Font") .. { - Text=GAMESTATE:IsCourseMode() and GAMESTATE:GetCurrentCourse():GetDisplayFullTitle() or GAMESTATE:GetCurrentSong():GetDisplayFullTitle(); - InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); - OnCommand=cmd(zoom,1;); - }; - LoadFont("Common Fallback Font") .. { - Text=GAMESTATE:IsCourseMode() and ToEnumShortString( GAMESTATE:GetCurrentCourse():GetCourseType() ) or GAMESTATE:GetCurrentSong():GetDisplayArtist(); - InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); - OnCommand=cmd(zoom,0.75;addy,24;); - }; -}; - - -- Pause menu t[#t+1]= LoadActor(THEME:GetPathG("", "pause_menu")) diff --git a/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua index 6af2ca06e1..7b189a5637 100644 --- a/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua @@ -59,7 +59,7 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); local second_tween = string.find(pn, "P1") and 1 or -1 t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,life_x_position;y,SCREEN_CENTER_Y;rotationz,-90;); - OnCommand=cmd(addx,100*life_tween;sleep,1;decelerate,0.9;addx,100*second_tween); + OnCommand=cmd(addx,100*life_tween;sleep,0.25;decelerate,0.9;addx,100*second_tween); OffCommand=cmd(sleep,1;decelerate,0.9;addx,100*life_tween;); LoadActor(THEME:GetPathG("LifeMeter", "bar frame")) .. { }; diff --git a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua index 99c6383e03..b31a3834e4 100644 --- a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua @@ -1,7 +1,7 @@ local playMode = GAMESTATE:GetPlayMode() local slideTime = 1.1; local slideWait = 1.25; -local bottomSlide = 0.76; +local bottomSlide = 0.5; local easeTime = 0.10; local sStage = "" @@ -32,7 +32,7 @@ end -- BG for credits t[#t+1] = Def.ActorFrame { - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240); -- Behind stage graphic Def.Quad { InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-110;zoomto,SCREEN_WIDTH,120;); @@ -70,7 +70,7 @@ end t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+190); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); stage_num_actor .. { OnCommand=cmd(zoom,1;diffusealpha,1); @@ -81,7 +81,7 @@ t[#t+1] = Def.ActorFrame { if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then t[#t+1] = Def.ActorFrame { InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_LEFT+40;); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); LoadFont("Common Italic Condensed") .. { OnCommand=cmd(playcommand,"Set";horizalign,left;diffuse,color("#FFFFFF");); SetCommand=function(self) @@ -121,7 +121,7 @@ t[#t+1] = Def.ActorFrame { if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then t[#t+1] = Def.ActorFrame { InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_RIGHT-40;); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); LoadFont("Common Italic Condensed") .. { OnCommand=cmd(playcommand,"Set";horizalign,right;diffuse,color("#FFFFFF");); SetCommand=function(self) @@ -163,7 +163,7 @@ t[#t+1] = Def.ActorFrame { -- Song title and artist t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-80); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,0.75); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); LoadFont("Common Fallback Font") .. { Text=GAMESTATE:IsCourseMode() and GAMESTATE:GetCurrentCourse():GetDisplayFullTitle() or GAMESTATE:GetCurrentSong():GetDisplayFullTitle(); InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); @@ -193,4 +193,4 @@ t[#t+1] = Def.ActorFrame { }; }; -return t +return t \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index ac083920b9..a08f172c37 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -36,8 +36,6 @@ CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,1;shadowlength,1;diffus CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_2)); # - -# [ScreenJukebox] MinSecondsToStep=0 MinSecondsToMusic=0 @@ -987,20 +985,20 @@ ShowLifeMeterBarP2=GAMESTATE:GetPlayMode() ~= 'PlayMode_Rave' # LifeMeterBarP1X=SCREEN_LEFT+40; LifeMeterBarP1Y=SCREEN_CENTER_Y -LifeMeterBarP1OnCommand=player,PLAYER_1;rotationz,-90;addx,-100;sleep,1;decelerate,0.9;addx,100; +LifeMeterBarP1OnCommand=player,PLAYER_1;rotationz,-90;addx,-100;sleep,0.25;decelerate,0.9;addx,100; LifeMeterBarP1OffCommand=sleep,1;decelerate,0.9;addx,-100; LifeMeterBarP2X=SCREEN_RIGHT-40; LifeMeterBarP2Y=SCREEN_CENTER_Y -LifeMeterBarP2OnCommand=player,PLAYER_2;rotationz,-90;addx,100;sleep,1;decelerate,0.9;addx,-100; +LifeMeterBarP2OnCommand=player,PLAYER_2;rotationz,-90;addx,100;sleep,0.25;decelerate,0.9;addx,-100; LifeMeterBarP2OffCommand=sleep,1;decelerate,0.9;addx,100; # ScoreP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1MiscX") ScoreP1Y=SCREEN_TOP+40 -ScoreP1OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_1));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_1;addy,-100;sleep,1.3;decelerate,0.7;addy,100; +ScoreP1OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_1));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_1;addy,-100;sleep,0.5;decelerate,0.7;addy,100; ScoreP1OffCommand=sleep,1;decelerate,0.9;addy,-100; ScoreP2X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2MiscX") ScoreP2Y=SCREEN_TOP+40 -ScoreP2OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_2));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_2;addy,-100;sleep,1.3;decelerate,0.7;addy,100; +ScoreP2OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_2));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_2;addy,-100;sleep,0.5;decelerate,0.7;addy,100; ScoreP2OffCommand=sleep,1;decelerate,0.9;addy,-100; # StepsDisplayP1OnCommand=visible,false @@ -1099,13 +1097,13 @@ MeterHeight=80 NumGradeTiersUsed=17 GradeTier01IsAllW2s=false GradeTier02IsAllW2s=true -# ★★★★ +# ★★★★ GradePercentTier01=1.000000 -# ★★★ +# ★★★ GradePercentTier02=1.000000 -# ★★ +# ★★ GradePercentTier03=0.98 -# ★ +# ★ GradePercentTier04=0.96 # S+ GradePercentTier05=0.94