diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 2c829d7245..0e8e37b07d 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1324,7 +1324,7 @@ HelpText=Ctrl+ENTER Selects &BACK; Exit &MENULEFT;&MENURIGHT; Move [ScreenNetSelectMusic] HeaderText=Select Music Online HeaderSubText=Song Selection -HelpText=Ctrl+ENTER Selects &BACK; Exit &MENULEFT;&MENURIGHT; Move::&MENUUP; Options &MENUDOWN; Change Difficulty +HelpText=Ctrl+ENTER Selects &BACK; Exit &MENULEFT;&MENURIGHT; Move::&MENUUP;&MENUUP; Easier &MENUDOWN;&MENUDOWN; Harder::&SELECT; for Player Options [ScreenNetworkOptions] Disconnected from server.=Disconnected from server. diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 71138f7642..720363e2a0 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -3846,21 +3846,19 @@ TimerStealth=true SampleMusicPreviewMode='SampleMusicPreviewMode_Normal' -# huh? (probably leftovers from the old NetSelectBase) -NumStylesShow=1 -NumSongsShow=4 -NumGroupsShow=3 - +MusicWheelType="OnlineMusicWheel" MusicWheelX=SCREEN_CENTER_X+160 MusicWheelY=SCREEN_CENTER_Y MusicWheelOnCommand= MusicWheelOffCommand= +# todo: move these to Lua bganim BPMDisplayX=SCREEN_CENTER_X-160-90+2 BPMDisplayY=SCREEN_TOP+160+(36/2)+8 BPMDisplayOnCommand= BPMDisplayOffCommand= +# todo: move these to Lua bganim ModIconsP1X=SCREEN_CENTER_X+144 ModIconsP1Y=SCREEN_CENTER_Y-165 ModIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1 @@ -3870,11 +3868,13 @@ ModIconsP2Y=SCREEN_CENTER_Y-164 ModIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1 ModIconsP2OffCommand=linear,0.5;zoomy,0 -optionsY=SCREEN_CENTER_Y-170 +# are these used? optionsX=SCREEN_CENTER_X-240 +optionsY=SCREEN_CENTER_Y-170 optionsOnCommand=zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,0.7;zoomx,0.7 optionsOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 +# uses StepsDisplayNet StepsDisplayP1X=SCREEN_CENTER_X-223 StepsDisplayP1Y=SCREEN_CENTER_Y+150 StepsDisplayP1OnCommand=halign,1;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 @@ -3885,25 +3885,6 @@ StepsDisplayP2Y=SCREEN_CENTER_Y+150 StepsDisplayP2OnCommand=halign,1;zoomx,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 StepsDisplayP2OffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 -DiffBGX=SCREEN_CENTER_X-60 -DiffBGY=SCREEN_CENTER_Y+160 -DiffBGOnCommand=zoomz,0.0;zoomy,0.0;linear,0.5;zoomy,1.0;zoomx,1.0 -DiffBGOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 -DiffBGWidth=0 -DiffBGHeight=0 -DiffBGColor=color("0.7,0.7,0.7,0.7") - -DifficultyIconP1OnCommand=visible,false -DifficultyIconP1OffCommand= -DifficultyIconP2OnCommand=visible,false -DifficultyIconP2OffCommand= -DifficultyIconP1X=SCREEN_CENTER_X+50 -DifficultyIconP1Y=SCREEN_BOTTOM-54 -DifficultyIconP2X=SCREEN_CENTER_X+80 -DifficultyIconP2Y=SCREEN_BOTTOM-50 - -HelpText=Screen.String("HelpTextNetSelectMusic"); - [StepsDisplayNet] Fallback="StepsDisplay"