From 11bdaa7a78c9e11a9d8f9736b9acaac1ee00ce0a Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Sun, 8 Aug 2010 11:14:07 -0500 Subject: [PATCH] changes from midi --- .../default/Graphics/Player judgment/default.lua | 2 +- .../ScreenSelectMusic DifficultyList.lua | 16 ++++++++-------- Themes/default/metrics.ini | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua index 1e8876ef64..35e9056c2a 100644 --- a/Themes/default/Graphics/Player judgment/default.lua +++ b/Themes/default/Graphics/Player judgment/default.lua @@ -104,7 +104,7 @@ t[#t+1] = Def.ActorFrame { ProtimingCmds[param.TapNoteScore](c.ProtimingDisplay); c.ProtimingAverage:visible( bShowProtiming ); - c.ProtimingAverage:settextf("%i%%",100 - MakeAverage( tTotalJudgments ) * 1000 ); + c.ProtimingAverage:settextf("%.2f%%",100 - MakeAverage( tTotalJudgments ) * 1000 ); AverageCmds['Pulse'](c.ProtimingAverage); end; }; diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua index 349a9a5fba..2aeedec580 100644 --- a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua +++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua @@ -1,4 +1,12 @@ return Def.ActorFrame { + CurrentSongChangedMessageCommand=function(self) + local song = GAMESTATE:GetCurrentSong(); + if song then + self:playcommand("TweenOn"); + elseif not song then + self:playcommand("TweenOff"); + end; + end; 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); @@ -9,14 +17,6 @@ return Def.ActorFrame { }; 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; CursorP1 = Def.ActorFrame { InitCommand=cmd(x,-128+16;player,PLAYER_1); diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 81b4cd8365..158a993bb6 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -1148,8 +1148,8 @@ DifficultyListY=SCREEN_TOP+216 DifficultyListOnCommand=addx,-SCREEN_CENTER_X;decelerate,0.35;addx,SCREEN_CENTER_X; DifficultyListOffCommand=bouncebegin,0.15;zoomx,0; # -DifficultyListShowCommand=stoptweening;bounceend,0.135;zoomx,1 -DifficultyListHideCommand=stoptweening;bouncebegin,0.135;zoomx,0 +DifficultyListTweenOnCommand=stoptweening;bounceend,0.135;zoomx,1 +DifficultyListTweenOffCommand=stoptweening;bouncebegin,0.135;zoomx,0 # Shrink the difficultylist for viewing panedisplays; # DifficultyListSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.125;zoom,0.5; # DifficultyListSelectMenuClosedMessageCommand=stoptweening;accelerate,0.0725;zoom,1;