diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index a9dc226624..785d0df9c7 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -198,7 +198,7 @@ t[#t+1] = Def.ActorFrame { (cmd(visible,true;diffusealpha,0;linear,0.3;diffusealpha,1))(self); end; end; - OffCommand=cmd(decelerate,0.3;zoomy,0.8;diffusealpha,0); + OffCommand=cmd(decelerate,0.3;diffusealpha,0); LoadActor(THEME:GetPathG("ScreenSelectMusic", "pane background")) .. { CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1;); @@ -307,7 +307,7 @@ t[#t+1] = Def.ActorFrame { (cmd(visible,true;diffusealpha,0;linear,0.3;diffusealpha,1))(self); end; end; - OffCommand=cmd(decelerate,0.3;zoomy,0.8;diffusealpha,0); + OffCommand=cmd(decelerate,0.3;diffusealpha,0); LoadActor(THEME:GetPathG("ScreenSelectMusic", "pane background")) .. { InitCommand=cmd(zoomx,-1;); CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); diff --git a/Themes/default/Graphics/PaneDisplay text.lua b/Themes/default/Graphics/PaneDisplay text.lua index 63ed8e8f81..4310b04339 100644 --- a/Themes/default/Graphics/PaneDisplay text.lua +++ b/Themes/default/Graphics/PaneDisplay text.lua @@ -109,28 +109,44 @@ t[#t+1] = Def.ActorFrame { -- Left CreatePaneDisplayItem( iPN, "Taps", 'RadarCategory_TapsAndHolds' ) .. { InitCommand=cmd(x,-128+16+8;y,-14); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8;); }; CreatePaneDisplayItem( iPN, "Jumps", 'RadarCategory_Jumps' ) .. { InitCommand=cmd(x,-128+16+8;y,-14+24); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8;); }; CreatePaneDisplayItem( iPN, "Holds", 'RadarCategory_Holds' ) .. { InitCommand=cmd(x,-128+16+8;y,-14+24*2); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8;); }; CreatePaneDisplayItem( iPN, "Mines", 'RadarCategory_Mines' ) .. { InitCommand=cmd(x,-128+16+8;y,-14+24*3); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8;); }; -- Center CreatePaneDisplayItem( iPN, "Hands", 'RadarCategory_Hands' ) .. { InitCommand=cmd(x,36;y,-14); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8;); }; CreatePaneDisplayItem( iPN, "Rolls", 'RadarCategory_Rolls' ) .. { InitCommand=cmd(x,36;y,-14+24); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8;); }; CreatePaneDisplayItem( iPN, "Lifts", 'RadarCategory_Lifts' ) .. { InitCommand=cmd(x,36;y,-14+24*2); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8;); }; CreatePaneDisplayItem( iPN, "Fakes", 'RadarCategory_Fakes' ) .. { InitCommand=cmd(x,36;y,-14+24*3); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1;); + OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8;); }; }; return t; \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 97881b179c..a4710379a2 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -639,15 +639,15 @@ NumCourseSongsOffCommand= ShowPaneDisplayTextP1=true PaneDisplayTextP1X=SCREEN_CENTER_X-200+24-32 PaneDisplayTextP1Y=SCREEN_CENTER_Y+207+8 -PaneDisplayTextP1OnCommand=player,PLAYER_1;horizalign,center;zoomy,0;sleep,0.4;decelerate,0.3;zoomy,1 -PaneDisplayTextP1OffCommand=smooth,0.2;zoomy,0; +PaneDisplayTextP1OnCommand=player,PLAYER_1;horizalign,center; +PaneDisplayTextP1OffCommand= PaneDisplayTextP1PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_1 then self:playcommand("On") end end # ShowPaneDisplayTextP2=true PaneDisplayTextP2X=SCREEN_CENTER_X+200-72-4+32 PaneDisplayTextP2Y=SCREEN_CENTER_Y+207+8 -PaneDisplayTextP2OnCommand=player,PLAYER_2;horizalign,center;zoomy,0;sleep,0.4;decelerate,0.3;zoomy,1 -PaneDisplayTextP2OffCommand=smooth,0.2;zoomy,0; +PaneDisplayTextP2OnCommand=player,PLAYER_2;horizalign,center; +PaneDisplayTextP2OffCommand= PaneDisplayTextP2PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_2 then self:playcommand("On") end end # PercentScoreP1X=SCREEN_CENTER_X-353-32