From 35f8e70d58606222571d14f4985972b10a4600c7 Mon Sep 17 00:00:00 2001 From: ListenerJubatus Date: Sun, 5 Aug 2018 10:01:59 -0600 Subject: [PATCH] A few more theme tweaks Fix the extra stage badge on evaluation, style fixes for ScreenGameOver, attempt to have ScreenContinue branch respect AutoSetStyle. --- .../BGAnimations/ScreenEvaluation overlay.lua | 71 ++++++++++--------- .../ScreenGameOver underlay/default.lua | 13 ++-- Themes/default/Scripts/02 BranchOverrides.lua | 15 ++++ 3 files changed, 55 insertions(+), 44 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenEvaluation overlay.lua b/Themes/default/BGAnimations/ScreenEvaluation overlay.lua index e7c3a899f6..f2ff309de3 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation overlay.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation overlay.lua @@ -36,42 +36,43 @@ else end; }; } +end; + - 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; +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; return t; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua index f40af10fb0..420bcd44e6 100644 --- a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua @@ -19,8 +19,8 @@ return Def.ActorFrame { }, LoadActor("_diamond") .. { - InitCommand=cmd(diffusealpha,0;blend,'BlendMode_Add'); - OnCommand=cmd(rotationz,0;zoom,0.5;diffusealpha,0.6;linear,2;zoom,1;diffusealpha,0); + InitCommand=cmd(diffusealpha,0;); + OnCommand=cmd(rotationz,0;zoom,1;sleep,1;diffusealpha,1;linear,3;zoom,1;diffusealpha,0); }; LoadActor("_sound") .. { @@ -29,17 +29,12 @@ return Def.ActorFrame { }; LoadActor(THEME:GetPathG("ScreenGameOver","gameover"))..{ - OnCommand=cmd(zoomx,1.1;diffusealpha,0;decelerate,0.6;diffusealpha,1;zoomx,1;); + OnCommand=cmd(zoomx,1.1;diffusealpha,0;sleep,1;decelerate,0.6;diffusealpha,1;zoomx,1;); }, LoadFont("Common Condensed")..{ Text=ScreenString("Play again soon!"); InitCommand=cmd(y,68;shadowlength,2); - OnCommand=cmd(diffusealpha,0;sleep,2;linear,0.3;diffusealpha,1;); + OnCommand=cmd(diffusealpha,0;sleep,3;linear,0.3;diffusealpha,1;); }, - - Def.Quad { - InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,color("#a80b0b");diffusealpha,1;decelerate,0.4;diffusealpha,0;); - }, } diff --git a/Themes/default/Scripts/02 BranchOverrides.lua b/Themes/default/Scripts/02 BranchOverrides.lua index cc85a7f3ab..7d669fdddf 100644 --- a/Themes/default/Scripts/02 BranchOverrides.lua +++ b/Themes/default/Scripts/02 BranchOverrides.lua @@ -3,4 +3,19 @@ Branch.OptionsEdit = function() return "ScreenHowToInstallSongs" end return "ScreenEditMenu" +end, +AfterContinue = function() + if GAMESTATE:GetNumPlayersEnabled() == 0 then + return "ScreenGameOver" + end + + if STATSMAN:GetStagesPlayed() == 0 then + if THEME:GetMetric("Common","AutoSetStyle") == false then + return "ScreenSelectStyle" + else + return "ScreenProfileLoad" + end + end + + return "ScreenProfileLoad" end \ No newline at end of file