diff --git a/Themes/default/BGAnimations/Screen cancel/default.lua b/Themes/default/BGAnimations/Screen cancel/default.lua index 542f71f863..fa945f224e 100644 --- a/Themes/default/BGAnimations/Screen cancel/default.lua +++ b/Themes/default/BGAnimations/Screen cancel/default.lua @@ -1,7 +1,7 @@ return Def.ActorFrame { Def.Quad { InitCommand=cmd(Center;zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,color("0,0,0,0.5");sleep,0.15;diffusealpha,1;sleep,0.15); + OnCommand=cmd(diffuse,color("0,0,0,0.5");sleep,5/60;diffusealpha,1;sleep,5/60); }; LoadActor(THEME:GetPathS("_Screen","cancel")) .. { StartTransitioningCommand=cmd(play); diff --git a/Themes/default/BGAnimations/Screen in/default.lua b/Themes/default/BGAnimations/Screen in/default.lua index 6272fd0d2a..ec91cd3aec 100644 --- a/Themes/default/BGAnimations/Screen in/default.lua +++ b/Themes/default/BGAnimations/Screen in/default.lua @@ -1,8 +1,8 @@ local fSleepTime = THEME:GetMetric( Var "LoadingScreen","ScreenInDelay"); + return Def.ActorFrame { - OnCommand=cmd(sleep,0.15+fSleepTime); Def.Quad { InitCommand=cmd(Center;zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,color("0,0,0,1");sleep,fSleepTime;linear,0.15;diffusealpha,0); + OnCommand=cmd(diffuse,color("0,0,0,1");sleep,fSleepTime;linear,0.01;diffusealpha,0); }; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/Screen out/default.lua b/Themes/default/BGAnimations/Screen out/default.lua index 3363ce0a2a..d62b6e1e06 100644 --- a/Themes/default/BGAnimations/Screen out/default.lua +++ b/Themes/default/BGAnimations/Screen out/default.lua @@ -1,8 +1,8 @@ local fSleepTime = THEME:GetMetric( Var "LoadingScreen","ScreenOutDelay"); + return Def.ActorFrame { - OnCommand=cmd(sleep,0.15+fSleepTime); Def.Quad { InitCommand=cmd(Center;zoomto,SCREEN_WIDTH+1,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,color("0,0,0,0");sleep,fSleepTime;linear,0.15;diffusealpha,1); + OnCommand=cmd(diffuse,color("0,0,0,0");sleep,fSleepTime;linear,0.01;diffusealpha,1); }; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua b/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua index 12057b869a..6262bb40af 100644 --- a/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua +++ b/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua @@ -7,10 +7,9 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffuse,color("#FFCB05");diffusebottomedge,color("#F0BA00")); }; Def.ActorFrame { - OnCommand=cmd(spin;effectmagnitude,0,0,10); Def.ActorFrame { - InitCommand=cmd(rotationx,30;hide_if,hideFancyElements;); - OnCommand=cmd(sleep,2;queuecommand,"Shift"); + InitCommand=cmd(hide_if,hideFancyElements;); + OffCommand=cmd(decelerate,0.25;rotationx,-90/4*3.5;y,SCREEN_CENTER_Y); ShiftCommand=cmd( smooth,1.25;z,256; sleep,2; diff --git a/Themes/default/Graphics/CombinedLifeMeterTug frame.lua b/Themes/default/Graphics/CombinedLifeMeterTug frame.lua index 33bdc6d350..0d9a822490 100644 --- a/Themes/default/Graphics/CombinedLifeMeterTug frame.lua +++ b/Themes/default/Graphics/CombinedLifeMeterTug frame.lua @@ -1,3 +1,3 @@ return LoadActor(THEME:GetPathG("_combined","life frame"))..{ - InitCommand=cmd(diffuseleftedge,PlayerColor(PLAYER_1);diffuserightedge,PlayerColor(PLAYER_2);); + InitCommand=cmd(diffuse,PlayerColor(PLAYER_1);diffuserightedge,PlayerColor(PLAYER_2)); }; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua index 67b34b97a8..c5cea3d73f 100644 --- a/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua +++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyDisplay/default.lua @@ -65,14 +65,14 @@ for idx,diff in pairs(Difficulty) do LoadActor("_barpeice " .. sDifficulty ) .. { Name="BarPeice"; ShowCommand=cmd(stoptweening;linear,0.1;diffuse,CustomDifficultyToColor( sDifficulty )); - HideCommand=cmd(stoptweening;decelerate,0.2;diffuse,CustomDifficultyToDarkColor( sDifficulty )); + HideCommand=cmd(stoptweening;decelerate,0.05;diffuse,CustomDifficultyToDarkColor( sDifficulty )); InitCommand=cmd(diffuse,CustomDifficultyToColor( sDifficulty )); }; LoadFont("StepsDisplay","Meter") .. { Name="Meter"; Text=(sDifficulty == "Edit") and "0 Edits" or "0"; ShowCommand=cmd(stoptweening;linear,0.1;diffuse,CustomDifficultyToColor( sDifficulty )); - HideCommand=cmd(stoptweening;decelerate,0.2;diffuse,CustomDifficultyToDarkColor( sDifficulty )); + HideCommand=cmd(stoptweening;decelerate,0.05;diffuse,CustomDifficultyToDarkColor( sDifficulty )); InitCommand=cmd(x,-64-8+tLocation[sDifficulty];shadowlength,1;zoom,0.75;diffuse,CustomDifficultyToColor( sDifficulty )); }; }; diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua index c432acd4b3..3c8c90295a 100644 --- a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua +++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua @@ -27,13 +27,13 @@ return Def.ActorFrame { PlayerJoinedMessageCommand=function(self, params) if params.Player == PLAYER_1 then self:visible(true); - (cmd(zoom,0;bounceend,0.3;zoom,1))(self); + (cmd(zoom,0;bounceend,1;zoom,1))(self); end; end; PlayerUnjoinedMessageCommand=function(self, params) if params.Player == PLAYER_1 then self:visible(true); - (cmd(bouncebegin,0.3;zoom,0))(self); + (cmd(bouncebegin,1;zoom,0))(self); end; end; LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. { @@ -54,13 +54,13 @@ return Def.ActorFrame { PlayerJoinedMessageCommand=function(self, params) if params.Player == PLAYER_2 then self:visible(true); - (cmd(zoom,0;bounceend,0.3;zoom,1))(self); + (cmd(zoom,0;bounceend,1;zoom,1))(self); end; end; PlayerUnjoinedMessageCommand=function(self, params) if params.Player == PLAYER_2 then self:visible(true); - (cmd(bouncebegin,0.3;zoom,0))(self); + (cmd(bouncebegin,1;zoom,0))(self); end; end; LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. { @@ -77,10 +77,10 @@ return Def.ActorFrame { }; }; CursorP1Frame = Def.Actor{ - ChangeCommand=cmd(stoptweening;decelerate,0.125); + ChangeCommand=cmd(stoptweening;decelerate,0.05); }; CursorP2Frame = Def.Actor{ - ChangeCommand=cmd(stoptweening;decelerate,0.125); + ChangeCommand=cmd(stoptweening;decelerate,0.05); }; }; }; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectMusic SegmentDisplay/default.lua b/Themes/default/Graphics/ScreenSelectMusic SegmentDisplay/default.lua index 41e665fb47..bd3b8b90ee 100644 --- a/Themes/default/Graphics/ScreenSelectMusic SegmentDisplay/default.lua +++ b/Themes/default/Graphics/ScreenSelectMusic SegmentDisplay/default.lua @@ -3,8 +3,8 @@ local iconPath = "_timingicons" local leftColX = -144 local rightColX = -leftColX -local showCmd = cmd(stoptweening;accelerate,0.125;diffusealpha,1) -local hideCmd = cmd(stoptweening;accelerate,0.125;diffusealpha,0) +local showCmd = cmd(stoptweening;accelerate,0.1;diffusealpha,1) +local hideCmd = cmd(stoptweening;accelerate,0.1;diffusealpha,0) local SegmentTypes = { Stops = { Frame = 0, xPos = leftColX, yPos = 0 }, diff --git a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua index 4d0238c703..dfd7a92e6c 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode Icon/default.lua @@ -1,8 +1,8 @@ local gc = Var("GameCommand"); local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { - GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.125;zoom,1); - LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.125;zoom,0.6); + GainFocusCommand=cmd(stoptweening;bob;effectmagnitude,0,6,0;decelerate,0.05;zoom,1); + LoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.1;zoom,0.6); LoadActor("_background base")..{ InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()]); diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua index fab1a01a7f..16cbba83d7 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua @@ -20,7 +20,7 @@ t[#t+1] = Def.ActorFrame { }; LoadActor("_HighlightFrame") .. { InitCommand=cmd(diffuse,ModeIconColors[gc:GetName()];diffusealpha,0); - GainFocusCommand=cmd(finishtweening;diffusealpha,1;glow,Color.Alpha(Color.White,1);linear,0.25;glow,Color.Invisible); + GainFocusCommand=cmd(finishtweening;diffusealpha,1;glow,Color.Alpha(Color.White,1);linear,0.1;glow,Color.Invisible); LoseFocusCommand=cmd(finishtweening;diffusealpha,0;glow,Color.Invisible); OffFocusedCommand=cmd(finishtweening;glow,Color("White");decelerate,1;glow,Color("Invisible")); }; @@ -32,16 +32,16 @@ t[#t+1] = Def.ActorFrame { -- Main Shadow LoadActor( gc:GetName() ) .. { InitCommand=cmd(x,2;y,2;diffuse,Color("Black");diffusealpha,0;zoom,0.75); - GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.125;diffusealpha,0;zoom,1;decelerate,0.25;diffusealpha,0.5;pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); - LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.25;diffusealpha,0;zoom,0.75;); - OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,1;rotationy,360*2;); + GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.1;diffusealpha,0;zoom,1;decelerate,0.05;diffusealpha,0.5;pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); + LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.2;diffusealpha,0;zoom,0.75;); + OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,0.5;rotationy,360;); }; -- Main Emblem LoadActor( gc:GetName() ) .. { InitCommand=cmd(diffusealpha,0;zoom,0.75); - GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.125;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.25;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); - LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.25;diffusealpha,0;zoom,0.75;glow,Color("Invisible")); - OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,1;rotationy,360*2;glow,Color("Invisible")); + GainFocusCommand=cmd(stoptweening;stopeffect;smooth,0.1;diffusealpha,1;zoom,1;glow,Color("White");decelerate,0.05;glow,Color("Invisible");pulse;effecttiming,0.75,0.125,0.125,0.75;effectmagnitude,0.95,1,1;); + LoseFocusCommand=cmd(stoptweening;stopeffect;smooth,0.2;diffusealpha,0;zoom,0.75;glow,Color("Invisible")); + OffFocusedCommand=cmd(finishtweening;stopeffect;glow,ModeIconColors[gc:GetName()];decelerate,0.5;rotationy,360;glow,Color("Invisible")); }; }; -- Text Frame @@ -49,22 +49,22 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,-192/2;y,-10); Def.Quad { InitCommand=cmd(horizalign,left;y,20;zoomto,320,2;diffuse,ModeIconColors[gc:GetName()];diffusealpha,0;fadeleft,0.35;faderight,0.35); - GainFocusCommand=cmd(stoptweening;linear,0.2;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;linear,0.2;diffusealpha,0); + GainFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;linear,0.1;diffusealpha,0); }; LoadFont("_helveticaneuelt std extblk cn 42px") .. { Text=gc:GetText(); InitCommand=cmd(horizalign,left;diffuse,ModeIconColors[gc:GetName()];shadowcolor,ColorDarkTone(ModeIconColors[gc:GetName()]);shadowlength,2;diffusealpha,0;skewx,-0.125); - GainFocusCommand=cmd(stoptweening;x,-16;decelerate,0.25;diffusealpha,1;x,0); - LoseFocusCommand=cmd(stoptweening;x,0;accelerate,0.25;diffusealpha,0;x,16;diffusealpha,0); + GainFocusCommand=cmd(stoptweening;x,-32;decelerate,0.1;diffusealpha,1;x,0); + LoseFocusCommand=cmd(stoptweening;x,0;accelerate,0.1;diffusealpha,0;x,32;diffusealpha,0); }; LoadFont("_helveticaneuelt std extblk cn 42px") .. { Text=THEME:GetString(Var "LoadingScreen", gc:GetName() .. "Explanation"); InitCommand=cmd(horizalign,right;x,320;y,30;shadowlength,1;diffusealpha,0;skewx,-0.125;zoom,0.5); - GainFocusCommand=cmd(stoptweening;x,320-16;decelerate,0.25;diffusealpha,1;x,320); - LoseFocusCommand=cmd(stoptweening;x,320;accelerate,0.25;diffusealpha,0;x,320+16;diffusealpha,0); + GainFocusCommand=cmd(stoptweening;x,320+32;decelerate,0.1;diffusealpha,1;x,320); + LoseFocusCommand=cmd(stoptweening;x,320;accelerate,0.1;diffusealpha,0;x,320-32;diffusealpha,0); }; }; -t.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;bounceend,0.25;zoom,1); +t.GainFocusCommand=cmd(finishtweening;visible,true;zoom,1.1;decelerate,0.25;zoom,1); t.LoseFocusCommand=cmd(finishtweening;visible,false;zoom,1); return t \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/Themes/default/Graphics/ScreenTitleMenu scroll.lua index 12b22aa41a..481db13bb6 100644 --- a/Themes/default/Graphics/ScreenTitleMenu scroll.lua +++ b/Themes/default/Graphics/ScreenTitleMenu scroll.lua @@ -4,13 +4,13 @@ return Def.ActorFrame { Def.Quad{ InitCommand=cmd(zoomto,256,26;fadeleft,0.45;faderight,0.45); OnCommand=cmd(diffuseshift;effectcolor1,color("0,0,0,0.5");effectcolor2,color("0,0,0,0.5")); - GainFocusCommand=cmd(stoptweening;decelerate,0.125;zoomto,256,26;diffusealpha,1); - LoseFocusCommand=cmd(stoptweening;accelerate,0.125;zoomto,SCREEN_WIDTH,0;diffusealpha,0); + GainFocusCommand=cmd(stoptweening;decelerate,0.1;zoomto,256,26;diffusealpha,1); + LoseFocusCommand=cmd(stoptweening;accelerate,0.1;zoomto,SCREEN_WIDTH,0;diffusealpha,0); }; LoadFont("Common Normal") .. { Text=THEME:GetString("ScreenTitleMenu",gc:GetText()); OnCommand=cmd(shadowlength,1); - GainFocusCommand=cmd(stoptweening;linear,0.125;zoom,1;diffuse,color("1,1,1,1")); - LoseFocusCommand=cmd(stoptweening;linear,0.125;zoom,0.75;diffuse,color("0.5,0.5,0.5,1")); + GainFocusCommand=cmd(stoptweening;linear,0.1;zoom,1;diffuse,color("1,1,1,1")); + LoseFocusCommand=cmd(stoptweening;linear,0.1;zoom,0.75;diffuse,color("0.5,0.5,0.5,1")); }; }; \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index dcae09f7d1..5f7b24c870 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -111,8 +111,8 @@ NumShownItems=8 [FadingBanner] BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;accelerate,0.05;glow,Color.Alpha( Color("White"), 0.45 );decelerate,0.075;diffusealpha,0;glow,Color("Invisible"); BannerOnCommand= -BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;linear,0.15;glow,Color.Alpha(Color("White"),0.25);decelerate,0.15;glow,Color.Invisible;diffusealpha,0 -BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.15;diffusealpha,0 +BannerFadeFromCachedCommand=diffusealpha,1;stoptweening;linear,0.1;glow,Color.Alpha(Color("White"),0.25);decelerate,0.15;glow,Color.Invisible;diffusealpha,0 +BannerFadeOffCommand=diffusealpha,1;stoptweening;linear,0.1;diffusealpha,0 BannerResetFadeCommand=diffusealpha,1 BannerRouletteCommand= @@ -158,8 +158,8 @@ DancePointsP2OnCommand=zoom,0.7;zoomx,-0.7;shadowlength,0;diffuse,PlayerColor(PL [OptionRow] TitleOnCommand=shadowlength,0;skewx,-0.1;uppercase,true;wrapwidthpixels,136;maxheight,42;zoom,0.6 -TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375; -# TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat' +TitleGainFocusCommand=stoptweening;zoom,0.6375*1.125;bounceend,0.1;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375; +# TitleGainFocusCommand=stoptweening;zoom,0.6375*1.25;bounceend,0.05;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5);strokecolor,Color("Black");zoom,0.6375;thump;effectmagnitude,1,1.05,1;effectclock,'beat' TitleLoseFocusCommand=diffuse,Color("White");strokecolor,Color("Black");stopeffect; # ItemsStartX=SCREEN_CENTER_X-140 @@ -172,7 +172,7 @@ ItemsLongRowSharedX=SCREEN_CENTER_X ItemOnCommand=shadowlength,1;zoom,0.55 ItemGainFocusCommand= ItemLoseFocusCommand= -TweenSeconds=0.1 +TweenSeconds=0.05 [OptionRowService] [OptionRowExit] @@ -181,8 +181,8 @@ FrameX=SCREEN_CENTER_X ItemsMinBaseZoom=1 ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) -ItemGainFocusCommand=stoptweening;linear,0.2;zoom,1;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75) -ItemLoseFocusCommand=stoptweening;decelerate,0.5;zoom,0.8; +ItemGainFocusCommand=stoptweening;linear,0.1;zoom,1;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75) +ItemLoseFocusCommand=stoptweening;decelerate,0.05;zoom,0.8; ColorSelected=Color("Red") ColorNotSelected=Color("Red") ColorDisabled=Color("Red") @@ -251,11 +251,11 @@ LockedInitialVelocity=15 ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:x( (1-math.cos(offsetFromCenter/math.pi))*44 ); self:y( offsetFromCenter*46 ); end MusicWheelSortOnCommand=fov,90; MusicWheelSortOffCommand=fov,90; -MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.15;zoomy,1 -MusicWheelItemSortOffCommand=linear,0.175;zoomy,0 +MusicWheelItemSortOnCommand=zoomy,0;bounceend,0.05;zoomy,1 +MusicWheelItemSortOffCommand=linear,0.05;zoomy,0 HighlightOnCommand=diffuseshift;effecttiming,(1/8),0,(7/8),0;effectcolor2,Color("White");effectcolor1,color("1,1,1,0.5");effectclock,'beatnooffset' -HighlightSortOnCommand=stoptweening;decelerate,0.125;glow,Color("Stealth");zoom,1 -HighlightSortOffCommand=stoptweening;accelerate,0.125;glow,Color("Orange");zoom,1.05 +HighlightSortOnCommand=stoptweening;decelerate,0.05;glow,Color("Stealth");zoom,1 +HighlightSortOffCommand=stoptweening;accelerate,0.05;glow,Color("Orange");zoom,1.05 WheelItemOnDelayOffset=0.04 WheelItemOffDelayOffset=0.04 @@ -412,7 +412,7 @@ PercentTotalSize=5 CapitalizeDifficultyNames=false NumShownItems=5 ItemsSpacingY=24 -MoveCommand=decelerate,0.3 +MoveCommand=decelerate,0.05 FrameX= @@ -670,7 +670,7 @@ ShowCurrentGametype=true CurrentGametypeX=SCREEN_LEFT+16 CurrentGametypeY=SCREEN_TOP+84 CurrentGametypeOnCommand=vertalign,bottom;horizalign,left;zoom,0.5;shadowlength,1 -CurrentGametypeOffCommand=linear,0.5;cropleft,1 +CurrentGametypeOffCommand= # ShowSystemDirection=false SystemDirectionX=SCREEN_LEFT+40 @@ -735,73 +735,73 @@ ShowIcon=true WrapScroller=false UseIconMetrics=true # -IconGainFocusCommand=stoptweening;bounceend,0.125;zoom,1; -IconLoseFocusCommand=stoptweening;decelerate,0.25;zoom,0.8; +IconGainFocusCommand=stoptweening;bounceend,0.05;zoom,1; +IconLoseFocusCommand=stoptweening;decelerate,0.1;zoom,0.8; # IconChoiceSingleX=SCREEN_CENTER_X-160 IconChoiceSingleY=SCREEN_CENTER_Y-96 IconChoiceSingleOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceSingleOffCommand=linear,0.1175;zoomx,0 +IconChoiceSingleOffCommand=linear,0.05;zoomx,0 # IconChoiceDoubleX=SCREEN_CENTER_X-160 IconChoiceDoubleY=SCREEN_CENTER_Y IconChoiceDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceDoubleOffCommand=linear,0.1175;zoomx,0 +IconChoiceDoubleOffCommand=linear,0.05;zoomx,0 #### IconChoiceSoloX=SCREEN_CENTER_X-160 IconChoiceSoloY=SCREEN_CENTER_Y+96 IconChoiceSoloOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceSoloOffCommand=linear,0.1175;zoomx,0 +IconChoiceSoloOffCommand=linear,0.05;zoomx,0 # IconChoiceHalfDoubleX=SCREEN_CENTER_X-160 IconChoiceHalfDoubleY=SCREEN_CENTER_Y+96 IconChoiceHalfDoubleOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceHalfDoubleOffCommand=linear,0.1175;zoomx,0 +IconChoiceHalfDoubleOffCommand=linear,0.05;zoomx,0 #### IconChoiceVersusX=SCREEN_CENTER_X+160 IconChoiceVersusY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y-96 or SCREEN_CENTER_Y-48 IconChoiceVersusOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceVersusOffCommand=linear,0.1175;zoomx,0 +IconChoiceVersusOffCommand=linear,0.05;zoomx,0 # IconChoiceCoupleX=SCREEN_CENTER_X+160 IconChoiceCoupleY=string.find(THEME:GetMetric("ScreenSelectStyle","ChoiceNames"),"Routine") and SCREEN_CENTER_Y or SCREEN_CENTER_Y+48 IconChoiceCoupleOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceCoupleOffCommand=linear,0.1175;zoomx,0 +IconChoiceCoupleOffCommand=linear,0.05;zoomx,0 # IconChoiceRoutineX=SCREEN_CENTER_X+160 IconChoiceRoutineY=SCREEN_CENTER_Y+96 IconChoiceRoutineOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceRoutineOffCommand=linear,0.1175;zoomx,0 +IconChoiceRoutineOffCommand=linear,0.05;zoomx,0 # IconChoicekb7X=SCREEN_CENTER_X IconChoicekb7Y=SCREEN_CENTER_Y IconChoicekb7OnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoicekb7OffCommand=linear,0.1175;zoomx,0 +IconChoicekb7OffCommand=linear,0.05;zoomx,0 # IconChoice5KeysX=SCREEN_CENTER_X-160 IconChoice5KeysY=SCREEN_CENTER_Y-48 IconChoice5KeysOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoice5KeysOffCommand=linear,0.1175;zoomx,0 +IconChoice5KeysOffCommand=linear,0.05;zoomx,0 # IconChoice7KeysX=SCREEN_CENTER_X-160 IconChoice7KeysY=SCREEN_CENTER_Y+48 IconChoice7KeysOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoice7KeysOffCommand=linear,0.1175;zoomx,0 +IconChoice7KeysOffCommand=linear,0.05;zoomx,0 # IconChoice10KeysX=SCREEN_CENTER_X+160 IconChoice10KeysY=SCREEN_CENTER_Y-48 IconChoice10KeysOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoice10KeysOffCommand=linear,0.1175;zoomx,0 +IconChoice10KeysOffCommand=linear,0.05;zoomx,0 # IconChoice14KeysX=SCREEN_CENTER_X+160 IconChoice14KeysY=SCREEN_CENTER_Y+48 IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoice14KeysOffCommand=linear,0.1175;zoomx,0 +IconChoice14KeysOffCommand=linear,0.05;zoomx,0 [ScreenSelectPlayMode] PersistScreens="ScreenSelectPlayMode,ScreenSelectMusic" # -ScreenOutDelay=3 +ScreenOutDelay=1.5 # DefaultChoice="Easy" # ChoiceNames="Normal,Extended" @@ -813,7 +813,7 @@ WrapScroller=true ScrollerX=SCREEN_CENTER_X ScrollerY=SCREEN_CENTER_Y-60 ScrollerOnCommand=SetFastCatchup,true; -ScrollerOffCommand=decelerate,0.8;y,SCREEN_CENTER_Y;sleep,1.5;linear,0.1;zoomy,0 +ScrollerOffCommand=decelerate,0.35;y,SCREEN_CENTER_Y;sleep,1.15;linear,0.1;zoomy,0 # ShowBackgroundFrame=false BackgroundFrameX=SCREEN_CENTER_X @@ -886,14 +886,14 @@ AlternateHelpDisplaySelectMenuClosedMessageCommand=stoptweening;maxwidth,480/0.6 # MusicWheelX=SCREEN_CENTER_X+160 MusicWheelY=SCREEN_CENTER_Y -MusicWheelOnCommand=draworder,-5;fov,90;vanishpoint,SCREEN_CENTER_X+160,SCREEN_CENTER_Y;addx,SCREEN_CENTER_X;decelerate,0.35;addx,-SCREEN_CENTER_X +MusicWheelOnCommand=draworder,-5;fov,90;vanishpoint,SCREEN_CENTER_X+160,SCREEN_CENTER_Y;addx,SCREEN_CENTER_X;decelerate,0.1;addx,-SCREEN_CENTER_X MusicWheelOffCommand=bouncebegin,0.15;zoomx,0; # ShowNewSong=not GAMESTATE:IsCourseMode() NewSongX=SCREEN_CENTER_X-160+128-30 NewSongY=SCREEN_TOP+160-2 NewSongOnCommand=finishtweening;diffuse,Color("Orange");diffusetopedge,Color("Yellow");strokecolor,Color("Black");zoom,0.675;draworder,106;playcommand,"Set" -NewSongOffCommand=bouncebegin,0.135;zoom,0;diffusealpha,0 +NewSongOffCommand=bouncebegin,0.1;zoom,0;diffusealpha,0 NewSongShowCommand=finishtweening;diffusealpha,1;glowshift;effectclock,'bgm';effectperiod,4;textglowmode,'TextGlowMode_Inner'; NewSongHideCommand=finishtweening;;diffusealpha,0;stopeffect; # @@ -912,8 +912,8 @@ SortOrderFrameX=SCREEN_CENTER_X+128+32 SortOrderFrameY=SCREEN_TOP+24 SortOrderFrameOnCommand=draworder,105;shadowlength,1 SortOrderFrameSortCommand= -SortOrderFrameSongChosenCommand=linear,0.25;diffusealpha,0; -SortOrderFrameOffCommand=bouncebegin,0.15;zoomy,0; +SortOrderFrameSongChosenCommand=linear,0.1;diffusealpha,0; +SortOrderFrameOffCommand=bouncebegin,0.05;zoomy,0; # ShowSortOrder=true SortOrderX=SCREEN_CENTER_X+128+32-48+4 @@ -921,100 +921,100 @@ SortOrderY=SCREEN_TOP+24 SortOrderOnCommand=draworder,105;horizalign,left;strokecolor,Color("Outline");zoom,0.675;maxwidth,114/0.675; SortOrderSortCommand=finishtweening;zoom,0.675*1.25;diffuse,Color("Yellow");diffusebottomedge,Color("Orange");decelerate,0.5;zoom,0.675;diffuse,Color("White"); SortOrderSongChosenCommand=linear,0.25;diffusealpha,0; -SortOrderOffCommand=bouncebegin,0.15;zoomy,0; +SortOrderOffCommand=bouncebegin,0.05;zoomy,0; # ShowStageDisplay=true StageDisplayX=SCREEN_LEFT+200+88 StageDisplayY=SCREEN_TOP+24+3 -StageDisplayOnCommand=skewx,-0.125;draworder,105;fov,90;zoom,0.675;zoomy,0;sleep,0.35;smooth,0.35;zoomy,0.675 -StageDisplayOffCommand=linear,0.25;zoomy,0; +StageDisplayOnCommand=skewx,-0.125;draworder,105;fov,90;zoom,0.675;zoomy,0;sleep,0.2;smooth,0.1;zoomy,0.675 +StageDisplayOffCommand=linear,0.05;zoomy,0; # ShowDifficultyDisplay=not ThemePrefs.Get("AutoSetStyle") and not GAMESTATE:IsCourseMode() DifficultyDisplayX=SCREEN_CENTER_X-160 DifficultyDisplayY=SCREEN_TOP+160-96+2 -DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.35;smooth,0.35;zoomy,1 -DifficultyDisplayOffCommand=linear,0.25;zoomy,0; +DifficultyDisplayOnCommand=draworder,105;fov,90;zoom,1;zoomy,0;sleep,0.2;smooth,0.1;zoomy,1 +DifficultyDisplayOffCommand=linear,0.05;zoomy,0; # BannerX=SCREEN_CENTER_X-160 BannerY=SCREEN_TOP+160-36+4 -BannerOnCommand=draworder,-1;scaletoclipped,256,80;visible,true;ztest,1;addy,-SCREEN_CENTER_Y;decelerate,0.35;addy,SCREEN_CENTER_Y +BannerOnCommand=draworder,-1;scaletoclipped,256,80;visible,true;ztest,1;addy,-SCREEN_CENTER_Y;decelerate,0.1;addy,SCREEN_CENTER_Y BannerOffCommand=bouncebegin,0.15;zoomx,0; # ShowBannerFrame=true BannerFrameX=SCREEN_CENTER_X-160 BannerFrameY=SCREEN_TOP+160-36+4 -BannerFrameOnCommand=draworder,105;addy,-SCREEN_CENTER_Y;decelerate,0.35;addy,SCREEN_CENTER_Y +BannerFrameOnCommand=draworder,105;addy,-SCREEN_CENTER_Y;decelerate,0.1;addy,SCREEN_CENTER_Y BannerFrameOffCommand=bouncebegin,0.15;zoomx,0; # ShowBPMDisplay=true BPMDisplayX=SCREEN_CENTER_X-160-90+2 BPMDisplayY=SCREEN_TOP+160+(36/2)+8 -BPMDisplayOnCommand=finishtweening;maxwidth,128;horizalign,left;strokecolor,Color.Outline;addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1 -BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0; +BPMDisplayOnCommand=finishtweening;maxwidth,128;horizalign,left;strokecolor,Color.Outline;addx,320;zoomx,0;decelerate,0.1;addx,-320;zoomx,1 +BPMDisplayOffCommand=bouncebegin,0.05;zoomx,0; # ShowBPMLabel=true BPMLabelX=SCREEN_CENTER_X-160-90 BPMLabelY=SCREEN_TOP+160+(36/2)+6 -BPMLabelOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X -BPMLabelOffCommand=bouncebegin,0.15;zoomx,0; +BPMLabelOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X +BPMLabelOffCommand=bouncebegin,0.05;zoomx,0; # ShowSegmentDisplay=not GAMESTATE:IsCourseMode() SegmentDisplayX=SCREEN_CENTER_X-160 SegmentDisplayY=SCREEN_TOP+160-36+4 -SegmentDisplayOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X -SegmentDisplayOffCommand=bouncebegin,0.15;zoomx,0; +SegmentDisplayOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X +SegmentDisplayOffCommand=bouncebegin,0.05;zoomx,0; # ShowDifficultyList=not GAMESTATE:IsCourseMode(); DifficultyListX=SCREEN_CENTER_X-160 DifficultyListY=SCREEN_TOP+216 -DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X; -DifficultyListOffCommand=bouncebegin,0.15;zoomx,0; +DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X; +DifficultyListOffCommand=bouncebegin,0.05;zoomx,0; # -DifficultyListTweenOnCommand=stoptweening;bounceend,0.135;zoomx,1 -DifficultyListTweenOffCommand=stoptweening;bouncebegin,0.135;zoomx,0 +DifficultyListTweenOnCommand=stoptweening;bounceend,0.1;zoomx,1 +DifficultyListTweenOffCommand=stoptweening;bouncebegin,0.1;zoomx,0 # Shrink the difficultylist for viewing panedisplays; -# DifficultyListSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.125;zoom,0.5; -# DifficultyListSelectMenuClosedMessageCommand=stoptweening;accelerate,0.0725;zoom,1; +# DifficultyListSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.1;zoom,0.5; +# DifficultyListSelectMenuClosedMessageCommand=stoptweening;accelerate,0.05;zoom,1; # ShowPaneDisplayFrameP1=true PaneDisplayFrameP1X=SCREEN_CENTER_X-160 PaneDisplayFrameP1Y=SCREEN_BOTTOM-112-2 -PaneDisplayFrameP1OnCommand=player,PLAYER_1;diffuse,Color("Orange");zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 -PaneDisplayFrameP1OffCommand=bouncebegin,0.15;zoomx,0; +PaneDisplayFrameP1OnCommand=player,PLAYER_1;diffuse,Color("Orange");zoomy,0;sleep,0.1;decelerate,0.1;zoomy,1 +PaneDisplayFrameP1OffCommand=bouncebegin,0.05;zoomx,0; PaneDisplayFrameP1PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_1 then self:playcommand("On") end end # ShowPaneDisplayTextP1=true PaneDisplayTextP1X=SCREEN_CENTER_X-160 PaneDisplayTextP1Y=SCREEN_BOTTOM-122-2 -PaneDisplayTextP1OnCommand=player,PLAYER_1;zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 -PaneDisplayTextP1OffCommand=bouncebegin,0.15;zoomx,0; +PaneDisplayTextP1OnCommand=player,PLAYER_1;zoomy,0;sleep,0.1;decelerate,0.1;zoomy,1 +PaneDisplayTextP1OffCommand=bouncebegin,0.05;zoomx,0; PaneDisplayTextP1PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_1 then self:playcommand("On") end end # ShowPaneDisplayFrameP2=true PaneDisplayFrameP2X=SCREEN_CENTER_X+160 PaneDisplayFrameP2Y=SCREEN_BOTTOM-112-2 -PaneDisplayFrameP2OnCommand=player,PLAYER_2;diffuse,Color("Orange");zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 -PaneDisplayFrameP2OffCommand=bouncebegin,0.15;zoomx,0; +PaneDisplayFrameP2OnCommand=player,PLAYER_2;diffuse,Color("Orange");zoomy,0;sleep,0.1;decelerate,0.1;zoomy,1 +PaneDisplayFrameP2OffCommand=bouncebegin,0.05;zoomx,0; PaneDisplayFrameP2PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_2 then self:playcommand("On") end end # ShowPaneDisplayTextP2=true PaneDisplayTextP2X=SCREEN_CENTER_X+160 PaneDisplayTextP2Y=SCREEN_BOTTOM-122-2 -PaneDisplayTextP2OnCommand=player,PLAYER_2;zoomy,0;sleep,0.5;decelerate,0.25;zoomy,1 -PaneDisplayTextP2OffCommand=bouncebegin,0.15;zoomx,0; +PaneDisplayTextP2OnCommand=player,PLAYER_2;zoomy,0;sleep,0.1;decelerate,0.1;zoomy,1 +PaneDisplayTextP2OffCommand=bouncebegin,0.05;zoomx,0; PaneDisplayTextP2PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_2 then self:playcommand("On") end end # ShowCourseContentsList=false CourseContentsListX=SCREEN_CENTER_X-160 CourseContentsListY=SCREEN_TOP+216+6 -CourseContentsListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X -CourseContentsListOffCommand=bouncebegin,0.15;zoomx,0; +CourseContentsListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X +CourseContentsListOffCommand=bouncebegin,0.05;zoomx,0; # ShowNumCourseSongs=GAMESTATE:IsCourseMode() NumCourseSongsX=SCREEN_CENTER_X-160+128 NumCourseSongsY=SCREEN_TOP+160+(36/2)+8 NumCourseSongsOnCommand=zoom,0.75;strokecolor,Color("Outline");shadowlength,1 -NumCourseSongsOffCommand=bouncebegin,0.15;zoom,0;diffusealpha,0; +NumCourseSongsOffCommand=bouncebegin,0.05;zoom,0;diffusealpha,0; # ShowSongOptions=true SongOptionsX=SCREEN_CENTER_X @@ -1022,9 +1022,9 @@ SongOptionsY=SCREEN_CENTER_Y SongOptionsOnCommand=visible,false;draworder,1000 SongOptionsOffCommand= #-- -SongOptionsShowCommand=visible,true;uppercase,true;zoom,1.2;settext,THEME:GetString("ScreenSelectMusic","Press Start For Options");decelerate,0.3;zoom,1; -SongOptionsEnterCommand=uppercase,true;settext,THEME:GetString("ScreenSelectMusic","Entering Options");sleep,0.5;linear,0.3;zoomy,0; -SongOptionsHideCommand=linear,0.3;zoomy,0; +SongOptionsShowCommand=visible,true;uppercase,true;zoom,1.2;settext,THEME:GetString("ScreenSelectMusic","Press Start For Options");decelerate,0.2;zoom,1; +SongOptionsEnterCommand=uppercase,true;settext,THEME:GetString("ScreenSelectMusic","Entering Options");sleep,0.2;linear,0.2;zoomy,0; +SongOptionsHideCommand=linear,0.1;zoomy,0; # ShowSongOptionsFrame=true SongOptionsFrameX=SCREEN_CENTER_X @@ -1040,11 +1040,9 @@ CDTitleX=SCREEN_CENTER_X-160+90 CDTitleY=SCREEN_TOP+160+(36/2)+8 CDTitleFrontCommand=diffuse,color('0.5,0.5,0.5,1');cullmode,'CullMode_Front' CDTitleBackCommand=cullmode,'CullMode_Back' -#CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;spin;effectmagnitude,0,180,0; +#CDTitleOnCommand=draworder,106;shadowlength,1;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.1;zoom,0.75;spin;effectmagnitude,0,180,0; CDTitleOnCommand=diffusealpha,0 -CDTitleOffCommand=bouncebegin,0.15;zoomx,0; -# -# +CDTitleOffCommand=bouncebegin,0.05;zoomx,0; # ScoreP1SortChangeCommand=stoptweening; ScoreP2SortChangeCommand=stoptweening; @@ -1054,28 +1052,28 @@ ScoreFrameP2SortChangeCommand=stoptweening; ShowStepsDisplayP1=GAMESTATE:IsHumanPlayer(PLAYER_1) StepsDisplayP1X=SCREEN_CENTER_X-160 StepsDisplayP1Y=SCREEN_BOTTOM-60 -StepsDisplayP1OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP1");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y -StepsDisplayP1OffCommand=bouncebegin,0.15;zoomx,0; -# StepsDisplayP1CurrentStepsP1ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.1;zoom,1 +StepsDisplayP1OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP1");addy,SCREEN_CENTER_Y;decelerate,0.1;addy,-SCREEN_CENTER_Y +StepsDisplayP1OffCommand=bouncebegin,0.05;zoomx,0; +# StepsDisplayP1CurrentStepsP1ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.05;zoom,1 # ShowStepsDisplayP2=GAMESTATE:IsHumanPlayer(PLAYER_2) StepsDisplayP2X=SCREEN_CENTER_X+160 StepsDisplayP2Y=SCREEN_BOTTOM-60 -StepsDisplayP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP2");addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y -StepsDisplayP2OffCommand=bouncebegin,0.15;zoomx,0; -# StepsDisplayP2CurrentStepsP2ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.1;zoom,1 +StepsDisplayP2OnCommand=visible,THEME:GetMetric(Var "LoadingScreen","ShowStepsDisplayP2");addy,SCREEN_CENTER_Y;decelerate,0.1;addy,-SCREEN_CENTER_Y +StepsDisplayP2OffCommand=bouncebegin,0.05;zoomx,0; +# StepsDisplayP2CurrentStepsP2ChangedMessageCommand=stoptweening;zoom,1.2;decelerate,0.05;zoom,1 # ShowPercentScoreP1=true PercentScoreP1X=SCREEN_CENTER_X-80-1 PercentScoreP1Y=SCREEN_BOTTOM-60 -PercentScoreP1OnCommand=player,PLAYER_1;addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y -PercentScoreP1OffCommand=bouncebegin,0.15;zoomx,0; +PercentScoreP1OnCommand=player,PLAYER_1;addy,SCREEN_CENTER_Y;decelerate,0.1;addy,-SCREEN_CENTER_Y +PercentScoreP1OffCommand=bouncebegin,0.05;zoomx,0; # ShowPercentScoreP2=true PercentScoreP2X=SCREEN_CENTER_X+240-1 PercentScoreP2Y=SCREEN_BOTTOM-60 -PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.35;addy,-SCREEN_CENTER_Y -PercentScoreP2OffCommand=bouncebegin,0.15;zoomx,0; +PercentScoreP2OnCommand=player,PLAYER_2;addy,SCREEN_CENTER_Y;decelerate,0.1;addy,-SCREEN_CENTER_Y +PercentScoreP2OffCommand=bouncebegin,0.05;zoomx,0; [ScreenSelectCourse] MusicWheelType=GAMESTATE:GetPlayMode() == 'PlayMode_Oni' and "OniWheel" or "CourseWheel" @@ -1218,7 +1216,7 @@ StepsTypeY=7 StepsTypeOnCommand=zoom,0.45 [ScreenOptions] -CursorTweenSeconds=0.1 +CursorTweenSeconds=0.05 DisqualifyP1X=SCREEN_CENTER_X-176 DisqualifyP1Y=SCREEN_BOTTOM-98 @@ -1243,7 +1241,7 @@ LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15; # ShowScrollBar=true ScrollBarHeight=320 -ScrollBarTime=0.1 +ScrollBarTime=0.05 ScrollBarX=SCREEN_CENTER_X+256+44 ScrollBarY=SCREEN_CENTER_Y-24 # @@ -1462,7 +1460,7 @@ LifeP2OnCommand=finishtweening;zoomx,-1;addy,-48;sleep,1.25;bounceend,0.35;addy, LifeP2OffCommand= CombinedLifeX=SCREEN_CENTER_X CombinedLifeY=SCREEN_TOP+24 -CombinedLifeOnCommand=finishtweening;diffuseleftedge,PlayerColor(PLAYER_1);diffuserightedge,PlayerColor(PLAYER_2);addy,-48;sleep,1.25;bounceend,0.35;addy,48; +CombinedLifeOnCommand=finishtweening;addy,-48;sleep,1.25;bounceend,0.35;addy,48; CombinedLifeOffCommand= # ToastyDisplayP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") @@ -1509,12 +1507,12 @@ DeltaSecondsP2OffCommand= ScoreP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") # ScoreP1X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX") ScoreP1Y=SCREEN_BOTTOM-48 -ScoreP1OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_1);strokecolor,ColorDarkTone(PlayerColor(PLAYER_1));sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48 +ScoreP1OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_1);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48 ScoreP1OffCommand= ScoreP2X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX") # ScoreP2X=(PREFSMAN:GetPreference("Center1Player") and GAMESTATE:GetNumPlayersEnabled() == 1) and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2OnePlayerOneSideX") ScoreP2Y=SCREEN_BOTTOM-48 -ScoreP2OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_2);strokecolor,ColorDarkTone(PlayerColor(PLAYER_2));sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48 +ScoreP2OnCommand=draworder,101;visible,not GAMESTATE:GetCurrentCourse():GetCourseType() == "CourseType_Survival" and ThemePrefs.Get("GameplayShowScore");diffuse,PlayerColor(PLAYER_2);sleep,3+0.3;smooth,0.5;y,SCREEN_BOTTOM-48 ScoreP2OffCommand= # StepsDescriptionP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1OnePlayerOneSideX")