diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 7eba2ff674..12c2d5547e 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -447,30 +447,30 @@ ArtistDisplayX= ArtistDisplayY= ArtistDisplayOnCommand=hidden,1 ArtistDisplayOffCommand= -BannerX=SCREEN_CENTER_X-172 +BannerX=SCREEN_CENTER_X-172-SCREEN_WIDTH*0.6 BannerY=SCREEN_CENTER_Y-68 -BannerOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +BannerOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 BannerOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 BannerWidth=284 BannerHeight=88 -BannerFrameX=SCREEN_CENTER_X-160 +BannerFrameX=SCREEN_CENTER_X-160-SCREEN_WIDTH*0.6 BannerFrameY=SCREEN_CENTER_Y-78 -BannerFrameOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +BannerFrameOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 BannerFrameOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -BPMDisplayX=SCREEN_CENTER_X-160 +BPMDisplayX=SCREEN_CENTER_X-160-SCREEN_WIDTH*0.6 BPMDisplayY=SCREEN_CENTER_Y-119 -BPMDisplayOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +BPMDisplayOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 ShowStage=1 -StageX=SCREEN_CENTER_X-280 +StageX=SCREEN_CENTER_X-280-SCREEN_WIDTH*0.6 StageY=SCREEN_CENTER_Y-119 -StageOnCommand=draworder,1;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +StageOnCommand=draworder,1;bounceend,0.5;addx,SCREEN_WIDTH*0.6 StageOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -CDTitleX=SCREEN_CENTER_X-68 +CDTitleX=SCREEN_CENTER_X-68-SCREEN_WIDTH*0.6 CDTitleY=SCREEN_CENTER_Y-92 CDTitleFrontCommand=spin;effectmagnitude,0,90,0;cullmode,back CDTitleBackCommand=spin;effectmagnitude,0,90,0;cullmode,front;diffuse,#333333 -CDTitleOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +CDTitleOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 CDTitleOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 CharacterIconP1Y=-1000 CharacterIconP1X=-1000 @@ -504,9 +504,9 @@ AutogenIconP2X=SCREEN_CENTER_X-48 AutogenIconP2Y=SCREEN_CENTER_Y+8 AutogenIconP2OnCommand=zoomy,0;linear,0.5;zoomy,1 AutogenIconP2OffCommand=linear,0.5;zoomy,0 -DifficultyDisplayX=SCREEN_CENTER_X-15 +DifficultyDisplayX=SCREEN_CENTER_X-15-SCREEN_WIDTH*0.6 DifficultyDisplayY=SCREEN_CENTER_Y-60 -DifficultyDisplayOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +DifficultyDisplayOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 DifficultyDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 ShowRadar=1 RadarX=SCREEN_CENTER_X-160 @@ -516,25 +516,25 @@ RadarOffCommand= ShowDifficultyList=0 ShowCourseContents=1 ShowPanes=0 -SortIconX=SCREEN_CENTER_X-68 +SortIconX=SCREEN_CENTER_X-68-SCREEN_WIDTH*0.6 SortIconY=SCREEN_CENTER_Y-119 -SortIconOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +SortIconOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 SortIconOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -ScoreFrameP1X=SCREEN_CENTER_X+200 +ScoreFrameP1X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6 ScoreFrameP1Y=SCREEN_CENTER_Y-30 -ScoreFrameP1OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6 +ScoreFrameP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 ScoreFrameP1OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 -ScoreFrameP2X=SCREEN_CENTER_X+200 +ScoreFrameP2X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6 ScoreFrameP2Y=SCREEN_CENTER_Y+46 -ScoreFrameP2OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6 +ScoreFrameP2OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 ScoreFrameP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 -ScoreP1X=SCREEN_CENTER_X+200 +ScoreP1X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6 ScoreP1Y=SCREEN_CENTER_Y-30 -ScoreP1OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6 +ScoreP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 ScoreP1OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 -ScoreP2X=SCREEN_CENTER_X+200 +ScoreP2X=SCREEN_CENTER_X+200+SCREEN_WIDTH*0.6 ScoreP2Y=SCREEN_CENTER_Y+46 -ScoreP2OnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6 +ScoreP2OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 ScoreP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 # Don't use relative motion here. It's usually possible to change the # sort again while this command is still executing. @@ -2357,9 +2357,9 @@ AllowDisabledPlayerInput=0 StyleIcon=1 ShowStage=0 MemoryCardIcons=1 -HeaderX=SCREEN_CENTER_X +HeaderX=SCREEN_CENTER_X+SCREEN_WIDTH HeaderY=SCREEN_TOP+22 -HeaderOnCommand=draworder,95;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH +HeaderOnCommand=draworder,95;spring,0.5;addx,-SCREEN_WIDTH HeaderOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH; FooterX=SCREEN_CENTER_X FooterY=SCREEN_BOTTOM-16 @@ -2369,21 +2369,21 @@ HelpX=SCREEN_CENTER_X HelpY=SCREEN_BOTTOM-24 HelpOnCommand=draworder,97;zoom,0.5;zoomy,0;linear,0.5;zoomy,0.5 HelpOffCommand=linear,0.5;zoomy,0 -StyleIconX=SCREEN_CENTER_X+120 +StyleIconX=SCREEN_CENTER_X+120+SCREEN_WIDTH StyleIconY=SCREEN_TOP+26 -StyleIconOnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH +StyleIconOnCommand=draworder,97;spring,0.5;addx,-SCREEN_WIDTH StyleIconOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH; -MemoryCardDisplayP1X=SCREEN_CENTER_X+140 +MemoryCardDisplayP1X=SCREEN_CENTER_X+140+SCREEN_WIDTH MemoryCardDisplayP1Y=SCREEN_CENTER_Y-220 -MemoryCardDisplayP1OnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH +MemoryCardDisplayP1OnCommand=draworder,97;spring,0.5;addx,-SCREEN_WIDTH MemoryCardDisplayP1OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH; -MemoryCardDisplayP2X=SCREEN_CENTER_X+160 +MemoryCardDisplayP2X=SCREEN_CENTER_X+160+SCREEN_WIDTH MemoryCardDisplayP2Y=SCREEN_CENTER_Y-220 -MemoryCardDisplayP2OnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH +MemoryCardDisplayP2OnCommand=draworder,97;spring,0.5;addx,-SCREEN_WIDTH MemoryCardDisplayP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH; -TimerX=SCREEN_CENTER_X+270 +TimerX=SCREEN_CENTER_X+270+SCREEN_WIDTH TimerY=SCREEN_TOP+22 -TimerOnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH +TimerOnCommand=draworder,97;spring,0.5;addx,-SCREEN_WIDTH TimerOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH; TimerStealth=0 ForceTimer=0