diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua index 554a0b1e22..046bccb804 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay jump.lua @@ -1,13 +1,13 @@ return Def.ActorFrame { - LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80); + LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80); Def.Quad { Name="Underline"; - InitCommand=cmd(y,-10); + InitCommand=cmd(y,-12); OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25); }; LoadFont("Common Bold") .. { Text="Information"; - InitCommand=cmd(y,-24); + InitCommand=cmd(y,-26); OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25)) }; LoadFont("Common Normal") .. { diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua index d13cf36766..b1aeb93ecf 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay miss.lua @@ -1,13 +1,13 @@ return Def.ActorFrame { - LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80); + LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80); Def.Quad { Name="Underline"; - InitCommand=cmd(y,-10); + InitCommand=cmd(y,-12); OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25); }; LoadFont("Common Bold") .. { Text="Information"; - InitCommand=cmd(y,-24); + InitCommand=cmd(y,-26); OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25)) }; LoadFont("Common Normal") .. { diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua index ad31a5d3a3..d5f026270f 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_howtoplay tap.lua @@ -1,13 +1,13 @@ return Def.ActorFrame { - LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",392+8,80); + LoadActor(THEME:GetPathB("_frame","3x3"),"rounded black",380,80); Def.Quad { Name="Underline"; - InitCommand=cmd(y,-10); + InitCommand=cmd(y,-12); OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;zoomtowidth,192;fadeleft,0.25;faderight,0.25); }; LoadFont("Common Bold") .. { Text="Information"; - InitCommand=cmd(y,-24); + InitCommand=cmd(y,-26); OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25)) }; LoadFont("Common Normal") .. { diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua deleted file mode 100644 index ca12423f28..0000000000 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message jump.lua +++ /dev/null @@ -1,6 +0,0 @@ -return Def.ActorFrame{ - LoadActor("jumpmessage") .. { - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); - }; -}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua deleted file mode 100644 index b573579a14..0000000000 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message miss.lua +++ /dev/null @@ -1,6 +0,0 @@ -return Def.ActorFrame{ - LoadActor("missmessage") .. { - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,22.7;linear,0;diffusealpha,0); - }; -}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua deleted file mode 100644 index 1b53a61643..0000000000 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/_message tap.lua +++ /dev/null @@ -1,6 +0,0 @@ -return Def.ActorFrame{ - LoadActor("tapmessage") .. { - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); - }; -}; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua index 7d360c871b..025e7cf485 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua @@ -49,43 +49,46 @@ return Def.ActorFrame { Text=ScreenString("How To Play StepMania"), InitCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;shadowlength,1;strokecolor,Color("Outline")); BeginCommand=function(self) - self:AddAttribute(12, {Length=9, Diffuse=Color.Blue}); + self:AddAttribute(12, {Length=9, Diffuse=Color.White}); end; OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25);diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60); }; LoadActor("_howtoplay feet") .. { - InitCommand=cmd(shadowlength,1;strokecolor,Color.Outline); - OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0); + InitCommand=cmd(shadowlength,1;strokecolor,Color.Outline); + OnCommand=cmd(z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;addx,-SCREEN_WIDTH;sleep,2.4;decelerate,0.3;addx,SCREEN_WIDTH;sleep,2;linear,0.3;zoomy,0); }; - - LoadActor("_howtoplay tap")..{ - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); - OnCommand=cmd(sleep,6;queuecommand,"Show"); - }; - LoadActor("_howtoplay tap")..{ - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); - OnCommand=cmd(sleep,9.7;queuecommand,"Show"); - }; - LoadActor("_howtoplay tap")..{ - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); - OnCommand=cmd(sleep,12.7;queuecommand,"Show"); - }; - LoadActor("_howtoplay tap")..{ - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); - OnCommand=cmd(sleep,15.7;queuecommand,"Show"); - }; - LoadActor("_howtoplay jump")..{ - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); - OnCommand=cmd(sleep,18.7;queuecommand,"Show"); - }; - LoadActor("_howtoplay miss")..{ - InitCommand=cmd(x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y+40;diffusealpha,0;); - ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); - OnCommand=cmd(sleep,22.7;queuecommand,"Show"); + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X+120;y,SCREEN_CENTER_Y+40); + + LoadActor("_howtoplay tap")..{ + InitCommand=cmd(diffusealpha,0); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + OnCommand=cmd(sleep,6;queuecommand,"Show"); + }; + LoadActor("_howtoplay tap")..{ + InitCommand=cmd(diffusealpha,0); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + OnCommand=cmd(sleep,9.7;queuecommand,"Show"); + }; + LoadActor("_howtoplay tap")..{ + InitCommand=cmd(diffusealpha,0); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + OnCommand=cmd(sleep,12.7;queuecommand,"Show"); + }; + LoadActor("_howtoplay tap")..{ + InitCommand=cmd(diffusealpha,0); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + OnCommand=cmd(sleep,15.7;queuecommand,"Show"); + }; + LoadActor("_howtoplay jump")..{ + InitCommand=cmd(diffusealpha,0); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + OnCommand=cmd(sleep,18.7;queuecommand,"Show"); + }; + LoadActor("_howtoplay miss")..{ + InitCommand=cmd(diffusealpha,0); + ShowCommand=cmd(linear,0;diffusealpha,1;sleep,2;linear,0;diffusealpha,0); + OnCommand=cmd(sleep,22.7;queuecommand,"Show"); + }; }; }; diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 7561541c36..4fb8fff57e 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -532,7 +532,7 @@ PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ self:effectcolor1(color("0.5,0.5,0.5,1")); \ self:effectclock('beat'); \ self:effecttiming(rate*0.75,rate*0.125,rate*0.125,0); \ - self:effectoffset(1.25-offset); \ + self:effectoffset(1-offset); \ end; # PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ # local fItemWidth = ( 256 / numItems ) \ @@ -1871,6 +1871,7 @@ MachineRecordP2X=SCREEN_CENTER_X+220 #MachineRecordP2Y=SCREEN_BOTTOM-156 MachineRecordP2Y=SCREEN_TOP+146 MachineRecordP2OnCommand= + MachineRecordP2OffCommand= # PersonalRecordP1X=SCREEN_CENTER_X-160