diff --git a/Themes/default/BGAnimations/ScreenContinue underlay.lua b/Themes/default/BGAnimations/ScreenContinue underlay.lua new file mode 100644 index 0000000000..5f28e4d1ce --- /dev/null +++ b/Themes/default/BGAnimations/ScreenContinue underlay.lua @@ -0,0 +1,29 @@ +local timer_seconds = THEME:GetMetric(Var "LoadingScreen","TimerSeconds"); +local t = Def.ActorFrame {}; + +-- Fade +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center); + Def.Quad { + InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); + OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;linear,0.5;diffusealpha,0.25; + sleep,timer_seconds/2; + linear,timer_seconds/2-0.5;diffusealpha,1); + }; + -- Warning Fade + Def.Quad { + InitCommand=cmd(y,16;scaletoclipped,SCREEN_WIDTH,250); + OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5; + linear,timer_seconds;zoomtoheight,200*0.75); + } +}; +-- +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center;y,SCREEN_CENTER_Y-48;zoom,1.5); + LoadFont("Common Fallback Font") .. { + Text="Continue?"; + OnCommand=cmd(diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211");); + }; +}; +-- +return t \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenEvaluationSummary overlay.redir b/Themes/default/BGAnimations/ScreenEvaluationSummary overlay.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenEvaluationSummary overlay.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua index 5b5f82f840..aab54b5692 100644 --- a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua @@ -52,7 +52,7 @@ for i, v in ipairs(eval_lines) do local cur_line = "JudgmentLine_" .. v t[#t+1] = Def.ActorFrame{ - InitCommand=cmd(x,_screen.cx;y,(_screen.cy/1.6)+(spacing)), + InitCommand=cmd(x,_screen.cx;y,(_screen.cy/1.48)+(spacing)), Def.Quad { InitCommand=cmd(zoomto,400,36;diffuse,JudgmentLineToColor(cur_line);fadeleft,0.5;faderight,0.5;); OnCommand=function(self) @@ -92,7 +92,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do local spacing = 38*i eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(x,_screen.cx + step_count_offs;y,(_screen.cy/1.6)+(spacing);diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;diffusealpha,1.0;shadowlength,1), + InitCommand=cmd(x,_screen.cx + step_count_offs;y,(_screen.cy/1.48)+(spacing);diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;diffusealpha,1.0;shadowlength,1), OnCommand=function(self) self:settext(GetJLineValue(v, p)) if string.find(p, "P1") then @@ -122,7 +122,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do }, Def.Quad { - InitCommand=cmd(vertalign,top;y,60+grade_area_offset;zoomto,190,136;diffuse,color("#fce1a1");), + InitCommand=cmd(vertalign,top;y,60+grade_area_offset;zoomto,190,66;diffuse,color("#fce1a1");), OnCommand=function(self) self:diffusealpha(0):decelerate(0.4):diffusealpha(0.4) end, @@ -141,7 +141,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Primary score. eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65)+grade_area_offset;diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180), + InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65-26)+grade_area_offset;diffuse,ColorMidTone(PlayerColor(p));zoom,1;shadowlength,1;maxwidth,180), OnCommand=function(self) self:settext(GetPlScore(p, "primary")):diffusealpha(0):sleep(0.5):decelerate(0.3):diffusealpha(1) end; @@ -152,7 +152,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do -- Secondary score. eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65)+30+grade_area_offset;diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;shadowlength,1), + InitCommand=cmd(horizalign,center;x,_screen.cx + (grade_parts_offs);y,(_screen.cy-65-26)+30+grade_area_offset;diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;shadowlength,1), OnCommand=function(self) self:settext(GetPlScore(p, "secondary")):diffusealpha(0):sleep(0.6):decelerate(0.3):diffusealpha(1) end; diff --git a/Themes/default/BGAnimations/ScreenGameplay go/go.png b/Themes/default/BGAnimations/ScreenGameplay go/go.png index 9faec9cbc2..1fb8eebfe9 100644 Binary files a/Themes/default/BGAnimations/ScreenGameplay go/go.png and b/Themes/default/BGAnimations/ScreenGameplay go/go.png differ diff --git a/Themes/default/BGAnimations/ScreenGameplay ready/ready.png b/Themes/default/BGAnimations/ScreenGameplay ready/ready.png index 54ce64c077..8b5ad4f982 100644 Binary files a/Themes/default/BGAnimations/ScreenGameplay ready/ready.png and b/Themes/default/BGAnimations/ScreenGameplay ready/ready.png differ diff --git a/Themes/default/Fonts/MenuTimerContinue numbers.redir b/Themes/default/Fonts/MenuTimerContinue numbers.redir index 7dee04edd0..0f87af5a1a 100644 --- a/Themes/default/Fonts/MenuTimerContinue numbers.redir +++ b/Themes/default/Fonts/MenuTimerContinue numbers.redir @@ -1 +1 @@ -_roboto Bold 80px \ No newline at end of file +MenuTimer numbers \ No newline at end of file diff --git a/Themes/default/Graphics/MenuTimerContinue frame (doubleres).png b/Themes/default/Graphics/MenuTimerContinue frame (doubleres).png new file mode 100644 index 0000000000..3ccc4a2151 Binary files /dev/null and b/Themes/default/Graphics/MenuTimerContinue frame (doubleres).png differ diff --git a/Themes/default/Graphics/ScreenSelectProfile CardBackground (doubleres).png b/Themes/default/Graphics/ScreenSelectProfile CardBackground (doubleres).png index d1262cc5e5..70631a9e78 100644 Binary files a/Themes/default/Graphics/ScreenSelectProfile CardBackground (doubleres).png and b/Themes/default/Graphics/ScreenSelectProfile CardBackground (doubleres).png differ diff --git a/Themes/default/Scripts/02 Colors.lua b/Themes/default/Scripts/02 Colors.lua index ac5c359b60..e2129c05a1 100644 --- a/Themes/default/Scripts/02 Colors.lua +++ b/Themes/default/Scripts/02 Colors.lua @@ -82,19 +82,19 @@ GameColor = { Difficulty_Routine = color("#ff9a00") -- orange }, Stage = { - Stage_1st = color("#F6C455"), - Stage_2nd = color("#EDA858"), - Stage_3rd = color("#E69259"), - Stage_4th = color("#DD775B"), - Stage_5th = color("#D55E5D"), - Stage_6th = color("#CD445F"), - Stage_Next = color("#73ff00"), - Stage_Final = color("#4BC6EB"), + Stage_1st = color("#9d324e"), + Stage_2nd = color("#9d3262"), + Stage_3rd = color("#9d3280"), + Stage_4th = color("#9d329d"), + Stage_5th = color("#7b329d"), + Stage_6th = color("#52329d"), + Stage_Next = color("#52329d"), + Stage_Final = color("#325c9d"), Stage_Extra1 = color("#B60052"), Stage_Extra2 = color("#FF499B"), - Stage_Nonstop = color("#FFD782"), - Stage_Oni = color("#FF714D"), - Stage_Endless = color("#6040A7"), + Stage_Nonstop = color("#9d324e"), + Stage_Oni = color("#9d3232"), + Stage_Endless = color("#9d3232"), Stage_Event = color("#9d324e"), Stage_Demo = color("#9d324e") }, diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index a08f172c37..db57bc2993 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -209,6 +209,22 @@ ShowHeader=false ShowFooter=false ShowHelp=false +[ScreenContinue] +ShowHeader=false +ShowFooter=false +ContinueEnabled=true +# +TimerSeconds=20 +TimerMetricsGroup="MenuTimerContinue" +TimerX=SCREEN_CENTER_X +TimerY=SCREEN_CENTER_Y+42 +TimerOnCommand=visible,true +TimerOffCommand= +# +[MenuTimerContinue] +Fallback="MenuTimer" +Text1OnCommand=stopeffect;stoptweening;shadowlength,0;diffuse,color("#fcb62c"); + [ScreenHighScores] Fallback="ScreenWithMenuElements" ShowFooter=false @@ -656,7 +672,12 @@ DifficultyListTweenOffCommand= ShowSongTime=true SongTimeX= SongTimeY=SCREEN_CENTER_Y-78+2-6 -SongTimeOnCommand=horizalign,left;zoom,1.0;diffuse,color("#DFE2E9");maxwidth,128; +SongTimeOnCommand=horizalign,left;zoom,1.0;diffuse,color("#DFE2E9");diffusebottomedge,color("#DFE2E9");maxwidth,128; +# +SongTimeResetCommand=diffuse,color("#DFE2E9"); +SongTimeAutogenCommand=diffuse,color("#ffaf99"); +SongTimeLongCommand=diffuse,color("#c9ddff"); +SongTimeMarathonCommand=diffuse,color("#d2c9ff"); ShowBPMDisplay=true BPMDisplayX=SCREEN_CENTER_X-179-63 @@ -1097,13 +1118,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 @@ -1151,6 +1172,35 @@ StageDisplayUseShortString=false ShowTimingDifficulty=false ShowLifeDifficulty=false StageDisplayUseShortString=false +# +#--Banner--# + +SmallBanner1X=SCREEN_CENTER_X-40 +SmallBanner1Y=SCREEN_CENTER_Y-150-30 +SmallBanner1OnCommand=visible,true;draworder,100;zoom,1;zoomy,0;decelerate,0.4;zoomy,1; +SmallBanner1OffCommand=sleep,0.2;decelerate,0.3;zoomy,0; +#--# +SmallBanner2X=SCREEN_CENTER_X-20 +SmallBanner2Y=SCREEN_CENTER_Y-145-30 +SmallBanner2OnCommand=visible,true;draworder,80;zoom,1;zoomy,0;sleep,0.1;decelerate,0.4;zoomy,1; +SmallBanner2OffCommand=sleep,0.3;decelerate,0.3;zoomy,0; +#--# +SmallBanner3X=SCREEN_CENTER_X +SmallBanner3Y=SCREEN_CENTER_Y-140-30 +SmallBanner3OnCommand=visible,true;draworder,60;zoom,1;zoomy,0;sleep,0.2;decelerate,0.4;zoomy,1; +SmallBanner3OffCommand=sleep,0.4;decelerate,0.3;zoomy,0; +#--# +SmallBanner4X=SCREEN_CENTER_X+20 +SmallBanner4Y=SCREEN_CENTER_Y-135-30 +SmallBanner4OnCommand=visible,true;draworder,40;zoom,1;zoomy,0;sleep,0.3;decelerate,0.4;zoomy,1; +SmallBanner4OffCommand=sleep,0.5;decelerate,0.3;zoomy,0; +#--# +SmallBanner5X=SCREEN_CENTER_X+40 +SmallBanner5Y=SCREEN_CENTER_Y-130-30 +SmallBanner5OnCommand=visible,true;draworder,20;zoom,1;zoomy,0;sleep,0.4;decelerate,0.4;zoomy,1; +SmallBanner5OffCommand=sleep,0.6;decelerate,0.3;zoomy,0; +#--# + [ScreenGameOver] ShowHeader=false