From 9a29217752c5401890d20b6f61dba5afb249656f Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 30 May 2010 18:43:35 -0500 Subject: [PATCH] some more defualt theme changes from midi --- .../ScreenSelectMusic DifficultyList.lua | 130 ++++++++++-------- Themes/default/metrics.ini | 16 ++- 2 files changed, 79 insertions(+), 67 deletions(-) diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua index 3b4c234ce3..a36af6fd1d 100644 --- a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua +++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua @@ -1,72 +1,82 @@ -return Def.StepsDisplayList { - Name="StepsDisplayListRow"; - CurrentSongChangedMessageCommand=function(self) - local song = GAMESTATE:GetCurrentSong(); - if song and self:GetZoomX() == 0 then - self:playcommand("Show"); - elseif not song and self:GetZoomX() == 1 then - self:playcommand("Hide"); +return Def.ActorFrame { + Def.Quad { + InitCommand=cmd(y,-14;zoomto,164,2;fadeleft,8/164;faderight,8/164); + OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5); + }; + Def.Quad { + InitCommand=cmd(y,24*8-10;zoomto,164,2;fadeleft,8/164;faderight,8/164); + OnCommand=cmd(diffuse,Color("Black");diffusealpha,0;linear,0.35;diffusealpha,0.5); + }; + Def.StepsDisplayList { + Name="StepsDisplayListRow"; + CurrentSongChangedMessageCommand=function(self) + local song = GAMESTATE:GetCurrentSong(); + if song and self:GetZoomX() == 0 then + self:playcommand("Show"); + elseif not song and self:GetZoomX() == 1 then + self:playcommand("Hide"); + end; end; - end; - CursorP1 = Def.ActorFrame { - InitCommand=cmd(x,-128+16;player,PLAYER_1); - PlayerJoinedMessageCommand=function(self, params) - if params.Player == PLAYER_1 then - self:visible(true); - (cmd(zoom,0;bounceend,0.3;zoom,1))(self); + CursorP1 = Def.ActorFrame { + InitCommand=cmd(x,-128+16;player,PLAYER_1); + PlayerJoinedMessageCommand=function(self, params) + if params.Player == PLAYER_1 then + self:visible(true); + (cmd(zoom,0;bounceend,0.3;zoom,1))(self); + end; end; - end; - PlayerUnjoinedMessageCommand=function(self, params) - if params.Player == PLAYER_1 then - self:visible(true); - (cmd(bouncebegin,0.3;zoom,0))(self); + PlayerUnjoinedMessageCommand=function(self, params) + if params.Player == PLAYER_1 then + self:visible(true); + (cmd(bouncebegin,0.3;zoom,0))(self); + end; end; - end; - LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. { - InitCommand=cmd(diffuse,PlayerColor(PLAYER_1);x,8;zoom,0.75); + LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. { + InitCommand=cmd(diffuse,PlayerColor(PLAYER_1);x,8;zoom,0.75); + }; + LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. { + InitCommand=cmd(x,20;diffuse,PlayerColor(PLAYER_1)); + OnCommand=cmd(thump,1;effectmagnitude,1,1.25,1;effectclock,'beat';); + }; + LoadFont("Common Normal") .. { + Text="P1"; + InitCommand=cmd(x,2;diffuse,PlayerColor(PLAYER_1);shadowlength,1); + OnCommand=cmd(zoom,0.75); + }; }; - LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. { - InitCommand=cmd(x,20;diffuse,PlayerColor(PLAYER_1)); - OnCommand=cmd(thump,1;effectmagnitude,1,1.25,1;effectclock,'beat';); - }; - LoadFont("Common Normal") .. { - Text="P1"; - InitCommand=cmd(x,2;diffuse,PlayerColor(PLAYER_1);shadowlength,1); - OnCommand=cmd(zoom,0.75); - }; - }; - CursorP2 = Def.ActorFrame { - InitCommand=cmd(x,128-16;player,PLAYER_2); - PlayerJoinedMessageCommand=function(self, params) - if params.Player == PLAYER_2 then - self:visible(true); - (cmd(zoom,0;bounceend,0.3;zoom,1))(self); + CursorP2 = Def.ActorFrame { + InitCommand=cmd(x,128-16;player,PLAYER_2); + PlayerJoinedMessageCommand=function(self, params) + if params.Player == PLAYER_2 then + self:visible(true); + (cmd(zoom,0;bounceend,0.3;zoom,1))(self); + end; end; - end; - PlayerUnjoinedMessageCommand=function(self, params) - if params.Player == PLAYER_2 then - self:visible(true); - (cmd(bouncebegin,0.3;zoom,0))(self); + PlayerUnjoinedMessageCommand=function(self, params) + if params.Player == PLAYER_2 then + self:visible(true); + (cmd(bouncebegin,0.3;zoom,0))(self); + end; end; - end; - LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. { - InitCommand=cmd(diffuse,PlayerColor(PLAYER_2);x,-8;zoom,0.75;zoomx,-0.75;); + LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. { + InitCommand=cmd(diffuse,PlayerColor(PLAYER_2);x,-8;zoom,0.75;zoomx,-0.75;); + }; + LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. { + InitCommand=cmd(x,-20;diffuse,PlayerColor(PLAYER_2);zoomx,-1); + OnCommand=cmd(thump,1;effectmagnitude,1,1.25,1;effectclock,'beat';); + }; + LoadFont("Common Normal") .. { + Text="P2"; + InitCommand=cmd(x,-2;diffuse,PlayerColor(PLAYER_2);shadowlength,1); + OnCommand=cmd(zoom,0.75); + }; }; - LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. { - InitCommand=cmd(x,-20;diffuse,PlayerColor(PLAYER_2);zoomx,-1); - OnCommand=cmd(thump,1;effectmagnitude,1,1.25,1;effectclock,'beat';); + CursorP1Frame = Def.Actor{ + ChangeCommand=cmd(stoptweening;decelerate,0.125); }; - LoadFont("Common Normal") .. { - Text="P2"; - InitCommand=cmd(x,-2;diffuse,PlayerColor(PLAYER_2);shadowlength,1); - OnCommand=cmd(zoom,0.75); + CursorP2Frame = Def.Actor{ + ChangeCommand=cmd(stoptweening;decelerate,0.125); }; }; - CursorP1Frame = Def.Actor{ - ChangeCommand=cmd(stoptweening;decelerate,0.125); - }; - CursorP2Frame = Def.Actor{ - ChangeCommand=cmd(stoptweening;decelerate,0.125); - }; }; \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 571ca67347..057b4f605a 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -43,7 +43,7 @@ NumberMaxZoomAt=100 LabelMinZoom=0.75*0.75 LabelMaxZoom=0.75*1 -PulseCommand=%function(self,param) self:stoptweening(); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); end +PulseCommand=%function(self,param) self:stoptweening(); self:linear(0.05); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); end PulseLabelCommand=%function(self,param) self:stoptweening(); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); end NumberOnCommand=y,240-216-1.5;shadowlength,1;horizalign,right;vertalign,bottom;skewx,-0.125; LabelOnCommand=x,6;y,22.5;shadowlength,1;zoom,0.75;diffusebottomedge,color("0.75,0.75,0.75,1");horizalign,left;vertalign,bottom @@ -462,8 +462,9 @@ Fallback="StepsDisplay" [StepsDisplayListRow] # - -ItemsSpacingY=12 +CapitalizeDifficultyNames=false +NumShownItems=8 +ItemsSpacingY=24 MoveCommand=decelerate,0.3 # FrameX= @@ -588,7 +589,8 @@ ShowHeader=false ShowFooter=false [ScreenOptions] -PageOnCommand=zoomy,0;bounceend,0.35;zoomy,1 +ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT +# PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; CursorOnCommand= LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffuseramp;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' @@ -977,9 +979,9 @@ ShowNewSong=not GAMESTATE:IsCourseMode() NewSongX=SCREEN_CENTER_X-160+128 NewSongY=SCREEN_TOP+160 NewSongOnCommand=diffuse,Color("Orange");diffusetopedge,Color("Yellow");strokecolor,Color("Outline");zoom,0.75;skewx,-0.125;rotationz,-11.25/2;draworder,106; -NewSongOffCommand=accelerate,0.35;addy,-SCREEN_CENTER_Y; -NewSongShowCommand=stoptweening;decelerate,0.125;diffusealpha,1;zoomy,0.75;thump,2;effectclock,'bgm';effectmagnitude,1,1,1;effectcolor1,color("1,1,1");effectcolor2,color("1,1.25,1"); -NewSongHideCommand=stoptweening;accelerate,0.075;diffusealpha,0;zoomy,0.75*1.5;stopeffect; +NewSongOffCommand=accelerate,0.35*0.5;zoom,0.5;diffusealpha,0 +NewSongShowCommand=finishtweening;decelerate,0.125;diffusealpha,1;zoomy,0.75;thump,2;effectclock,'bgm';effectmagnitude,1,1,1;effectcolor1,color("1,1,1");effectcolor2,color("1,1.25,1"); +NewSongHideCommand=finishtweening;accelerate,0.075;diffusealpha,0;zoomy,0.75*1.5;stopeffect; # ShowSongTime=true SongTimeX=SCREEN_CENTER_X-160