From 267cee2a4ffd191d3c650429da75e06938b1743b Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Mon, 6 Oct 2008 09:31:27 +0000 Subject: [PATCH] Cleanup. --- .../default/Fonts/RoomInfoDisplay text.redir | 2 +- .../ScreenSMOnlineSelectMusic DIffBG.redir | 2 +- .../Graphics/ScreenSelectGame header.redir | 2 +- stepmania/Themes/default/Languages/en.ini | 2 ++ stepmania/Themes/default/metrics.ini | 25 ++++++++++++------- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/stepmania/Themes/default/Fonts/RoomInfoDisplay text.redir b/stepmania/Themes/default/Fonts/RoomInfoDisplay text.redir index ba41a9d72b..8b94917099 100644 --- a/stepmania/Themes/default/Fonts/RoomInfoDisplay text.redir +++ b/stepmania/Themes/default/Fonts/RoomInfoDisplay text.redir @@ -1 +1 @@ -_shared2 +Common normal \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSMOnlineSelectMusic DIffBG.redir b/stepmania/Themes/default/Graphics/ScreenSMOnlineSelectMusic DIffBG.redir index 52992f8569..04b2ead777 100755 --- a/stepmania/Themes/default/Graphics/ScreenSMOnlineSelectMusic DIffBG.redir +++ b/stepmania/Themes/default/Graphics/ScreenSMOnlineSelectMusic DIffBG.redir @@ -1 +1 @@ -ScreenNetRoom TitleBG.png \ No newline at end of file +_blank \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir b/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir index 98d01c640d..022dc5bbe9 100644 --- a/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir +++ b/stepmania/Themes/default/Graphics/ScreenSelectGame header.redir @@ -1 +1 @@ -_shared options header +ScreenWithMenuElements2 header \ No newline at end of file diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index dcdea676eb..316e9f8346 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1179,6 +1179,8 @@ InvalidButton=That key can not be mapped. Enter a description for the room:=Enter a description for the room: Enter a password for the room (blank, no password):=Enter a password for the room (blank, no password): Enter Room's Password:=Enter Room's Password: +HeaderText=StepMania Online +HeaderSubText=Room Selection [ScreenSMOnlineSelectMusic] HeaderText=Stepmania Online diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 7835b121cb..c73b95da13 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -703,6 +703,7 @@ PrevScreen=ScreenTitleBranch() NextScreen="ScreenGameplayBranch" Fallback="ScreenNetSelectMusic" Class="ScreenNetRoom" +HelpText="" OpenRoomColor=color("1.0,1.0,1.0,1.0") PasswdRoomColor=color("1.0,0.5,0.5,1.0") InGameRoomColor=color("1.0,0.1,0.1,1.0") @@ -807,6 +808,11 @@ DifficultyIconP1OnCommand= DifficultyIconP1OffCommand= DifficultyIconP2OnCommand= DifficultyIconP2OffCommand= +DifficultyIconP1X=SCREEN_LEFT+50 +DifficultyIconP1Y=SCREEN_BOTTOM-50 +DifficultyIconP2X=SCREEN_RIGHT-50 +DifficultyIconP2X=SCREEN_BOTTOM-50 +HelpText="" [ScreenSplash] Class="ScreenSplash" @@ -1098,6 +1104,7 @@ Fallback="ScreenWithMenuElements2" Class="ScreenEvaluation" LightsMode="LightsMode_MenuStartOnly" HelpText=ScreenString("HelpTextEvaluation") +FooterOffCommand=linear,0.5;addy,90 Summary=false TimerSeconds=15 DisqualifiedP1X= @@ -1486,30 +1493,30 @@ ShowGraphDisplay=true GraphDisplayP1X=SCREEN_CENTER_X-222 GraphDisplayP1Y=SCREEN_CENTER_Y-16 GraphDisplayP1OnCommand=draworder,1 -GraphDisplayP1OffCommand= +GraphDisplayP1OffCommand=linear,0.7;addx,-400 GraphDisplayP2X=SCREEN_CENTER_X+222 GraphDisplayP2Y=SCREEN_CENTER_Y-16 GraphDisplayP2OnCommand=draworder,1 -GraphDisplayP2OffCommand= +GraphDisplayP2OffCommand=linear,0.7;addx,400 ShowComboGraph=true ComboGraphP1X=SCREEN_CENTER_X-222 ComboGraphP1Y=SCREEN_CENTER_Y+10 ComboGraphP1OnCommand=draworder,1 -ComboGraphP1OffCommand= +ComboGraphP1OffCommand=linear,0.7;addx,-400 ComboGraphP2X=SCREEN_CENTER_X+222 ComboGraphP2Y=SCREEN_CENTER_Y+10 ComboGraphP2OnCommand=draworder,1 -ComboGraphP2OffCommand= +ComboGraphP2OffCommand=linear,0.7;addx,400 StageAwardP1X=SCREEN_CENTER_X-222 StageAwardP1Y=SCREEN_CENTER_Y-32 StageAwardP1OnCommand=draworder,1 -StageAwardP1OffCommand= +StageAwardP1OffCommand=linear,0.7;addx,-400 StageAwardP2X=SCREEN_CENTER_X+222 StageAwardP2Y=SCREEN_CENTER_Y-32 StageAwardP2OnCommand=draworder,1 -StageAwardP2OffCommand= +StageAwardP2OffCommand=linear,0.7;addx,400 ModIconRowP1X=SCREEN_CENTER_X-316 ModIconRowP1Y=SCREEN_CENTER_Y-130 @@ -2094,18 +2101,18 @@ ShowStageDisplay=false StageDisplayX=SCREEN_CENTER_X+234 StageDisplayY=SCREEN_CENTER_Y-172 StageDisplayOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 -StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 +StageDisplayOffCommand=linear,0.5;addx,SCREEN_WIDTH*0.6 ShowStageFrame=false StageFrameX=SCREEN_CENTER_X+234 StageFrameY=SCREEN_CENTER_Y-172 StageFrameOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 -StageFrameOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 +StageFrameOffCommand=linear,0.5;addx,SCREEN_WIDTH*0.6 MemoryCardIcons=true CancelTransitionsOut=false HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP+35 HeaderOnCommand=addy,-50;linear,0.25;addy,50;draworder,1 -HeaderOffCommand=linear,0.25;addy,-70; +HeaderOffCommand=linear,0.25;addy,-90; FooterX=SCREEN_CENTER_X FooterY=SCREEN_BOTTOM FooterOnCommand=draworder,-1;vertalign,bottom