actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

A few more theme tweaks

Browse Source 
Fix the extra stage badge on evaluation, style fixes for ScreenGameOver, attempt to have ScreenContinue branch respect AutoSetStyle.
This commit is contained in:
ListenerJubatus
2018-08-05 10:01:59 -06:00
parent 7fdab01af1
commit 35f8e70d58
3 changed files with 55 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/default/BGAnimations/ScreenEvaluation overlay.lua
+36 -35
View File
@@ -36,42 +36,43 @@ else
end; end;
}; };
} }
end;
if GAMESTATE:HasEarnedExtraStage() then
t[#t+1] = Def.ActorFrame { if GAMESTATE:HasEarnedExtraStage() then
InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); t[#t+1] = Def.ActorFrame {
OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;);
LoadActor(THEME:GetPathG("", "_sortFrame")) .. { OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105),
InitCommand=cmd(diffusealpha,0.9;zoom,1.5); LoadActor(THEME:GetPathG("", "_sortFrame")) .. {
BeginCommand=function(self) InitCommand=cmd(diffusealpha,0.9;zoom,1.5);
self:playcommand("Set") BeginCommand=function(self)
end; self:playcommand("Set")
SetCommand=function(self) end;
local curStage = GAMESTATE:GetCurrentStage(); SetCommand=function(self)
self:diffuse(StageToColor(curStage)); local curStage = GAMESTATE:GetCurrentStage();
end self:diffuse(StageToColor(curStage));
}; end
LoadActor(THEME:GetPathG("", "_sortFrame")) .. { };
InitCommand=cmd(diffusealpha,0.9;zoom,1.5;diffuse,color("#FFFFFF");blend,'add';); LoadActor(THEME:GetPathG("", "_sortFrame")) .. {
BeginCommand=cmd(diffuseshift;effectcolor2,color("1,1,1,0.3");effectcolor2,color("1,1,1,0");effectperiod,2;); 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;); LoadFont("Common Italic Condensed") .. {
BeginCommand=function(self) InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true;maxwidth,220;);
self:playcommand("Set") BeginCommand=function(self)
end; self:playcommand("Set")
CurrentSongChangedMessageCommand= cmd(playcommand,"Set"), end;
SetCommand=function(self) CurrentSongChangedMessageCommand= cmd(playcommand,"Set"),
local curStage = GAMESTATE:GetCurrentStage(); SetCommand=function(self)
local text = string.upper(THEME:GetString("ScreenEvaluation", "ExtraUnlocked")) local curStage = GAMESTATE:GetCurrentStage();
self:settext(text) local text = string.upper(THEME:GetString("ScreenEvaluation", "ExtraUnlocked"))
-- StepMania is being stupid so we have to do this here; self:settext(text)
self:diffuse(StageToColor(curStage)):diffusetopedge(ColorLightTone(StageToColor(curStage))); -- StepMania is being stupid so we have to do this here;
self:diffusealpha(0):smooth(0.3):diffusealpha(1); self:diffuse(StageToColor(curStage)):diffusetopedge(ColorLightTone(StageToColor(curStage)));
end; self:diffusealpha(0):smooth(0.3):diffusealpha(1);
}; end;
} };
end; }
end; end;
return t; return t;
Themes/default/BGAnimations/ScreenGameOver underlay/default.lua
+4 -9
View File
@@ -19,8 +19,8 @@ return Def.ActorFrame {
}, },
LoadActor("_diamond") .. { LoadActor("_diamond") .. {
InitCommand=cmd(diffusealpha,0;blend,'BlendMode_Add'); InitCommand=cmd(diffusealpha,0;);
OnCommand=cmd(rotationz,0;zoom,0.5;diffusealpha,0.6;linear,2;zoom,1;diffusealpha,0); OnCommand=cmd(rotationz,0;zoom,1;sleep,1;diffusealpha,1;linear,3;zoom,1;diffusealpha,0);
}; };
LoadActor("_sound") .. { LoadActor("_sound") .. {
@@ -29,17 +29,12 @@ return Def.ActorFrame {
}; };
LoadActor(THEME:GetPathG("ScreenGameOver","gameover"))..{ 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")..{ LoadFont("Common Condensed")..{
Text=ScreenString("Play again soon!"); Text=ScreenString("Play again soon!");
InitCommand=cmd(y,68;shadowlength,2); 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;);
}, },
} }
Themes/default/Scripts/02 BranchOverrides.lua
+15
View File
@@ -3,4 +3,19 @@ Branch.OptionsEdit = function()
return "ScreenHowToInstallSongs" return "ScreenHowToInstallSongs"
end end
return "ScreenEditMenu" 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 end