From 708093a74574cea010fe075644d4dc12aee3ad20 Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Thu, 1 Jan 2009 23:48:05 +0000 Subject: [PATCH] Cleanup --- .../ScreenSelectMusic decorations/default.lua | 8 +++----- stepmania/Themes/default/metrics.ini | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 0a2111b1e1..a0ff095d7f 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -52,13 +52,11 @@ t[#t+1] = LoadFont("Common", "normal") .. { }; t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X-56;y,SCREEN_CENTER_Y-10); + InitCommand=cmd(x,SCREEN_CENTER_X-44;y,SCREEN_CENTER_Y-10); LoadActor( "wheel cursor glow" ) .. { - InitCommand=cmd(blend,"BlendMode_Add";diffuseshift;); - }; - LoadActor( "wheel cursor normal" ) .. { - + InitCommand=cmd(blend,"BlendMode_Add";diffuseshift); }; + LoadActor( "wheel cursor normal" ); }; for pn in ivalues(PlayerNumber) do diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index d195e03664..cc19376101 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -612,7 +612,7 @@ ScoreP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;acceler ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58 ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 -MusicWheelX=SCREEN_CENTER_X-190 +MusicWheelX=SCREEN_CENTER_X-178 MusicWheelY=SCREEN_CENTER_Y-10 MusicWheelOnCommand=draworder,-100 MusicWheelOffCommand= @@ -1873,7 +1873,7 @@ SortOnCommand=shadowlength,0;maxwidth,400 ModeX=0 ModeY=-2 ModeOnCommand=shadowlength,0;maxwidth,400 -GradeP1X=90 +GradeP1X=106 GradeP1Y=-5 GradeP2X=110 GradeP2Y=5 @@ -1890,7 +1890,7 @@ RouletteSwitchSeconds=0.05 RouletteSlowDownSwitches=5 LockedInitialVelocity=7 ScrollBarHeight=300 -ScrollBarOnCommand=x,-128 +ScrollBarOnCommand=x,-142;y,10 ; linear wheel example: ; ItemTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(offsetFromCenter*38); end ; 3D wheel example: