diff --git a/Themes/default/BGAnimations/ScreenGameplay in.redir b/Themes/default/BGAnimations/ScreenGameplay in.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenGameplay in.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenStageInformation out.redir b/Themes/default/BGAnimations/ScreenStageInformation out.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenStageInformation out.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/Oni.png b/Themes/default/Graphics/ScreenSelectPlayMode scroller/Oni.png new file mode 100644 index 0000000000..1569820b6a Binary files /dev/null and b/Themes/default/Graphics/ScreenSelectPlayMode scroller/Oni.png differ diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/Oni.redir b/Themes/default/Graphics/ScreenSelectPlayMode scroller/Oni.redir deleted file mode 100644 index 3310ed756e..0000000000 --- a/Themes/default/Graphics/ScreenSelectPlayMode scroller/Oni.redir +++ /dev/null @@ -1 +0,0 @@ -Normal \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index f58469fdbc..45f0a1b5d5 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -580,7 +580,7 @@ StepsTypeSetCommand= ; PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) local native_width=32; local zoomed_width=12; self:zoomx(zoomed_width/native_width); self:x((itemIndex-(numItems/2))*zoomed_width); end PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ local fItemWidth = ( 256 / numItems ) \ - self:x( ((itemIndex-(numItems/2))*fItemWidth) + 8 ); \ + self:x( ((itemIndex-(numItems/2))*fItemWidth) + ( numItems / 2 ) ); \ self:zoomtowidth(fItemWidth); \ self:diffuseramp(); \ self:effecttiming(3,0.01875*itemIndex,0,1-(0.01875*itemIndex)); \ @@ -618,7 +618,7 @@ FooterOffCommand= ShowHelp=true HelpX=SCREEN_CENTER_X -HelpY=IsArcade() and SCREEN_BOTTOM-16 +HelpY=IsArcade() and SCREEN_BOTTOM-16 or SCREEN_BOTTOM-16 HelpOnCommand=SetSecsBetweenSwitches,4;shadowlength,0;strokecolor,Color("Outline");draworder,105;zoomy,0;linear,0.175;zoom,1*0.75;maxwidth,(SCREEN_WIDTH-64)/0.75;diffuseshift;effectcolor1,color("0.5,0.5,0.5,1"); HelpOffCommand=linear,0.175;zoomy,0 @@ -766,6 +766,8 @@ NetworkStatusY=SCREEN_HEIGHT*0.85 NetworkStatusOnCommand=horizalign,left; NetworkStatusOffCommand=linear,0.5;cropright,1 # +HelpY=SCREEN_BOTTOM-24 +# #ChoiceNames="1,Setup,4,5,7" ChoiceNames="1,4,5,7" #~ ChoiceNames="1,3,4,7" @@ -1655,4 +1657,30 @@ ScoreP1OnCommand=visible,false ScoreP2OnCommand=visible,false StepsDisplayP1OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 StepsDisplayP2OnCommand=zoomy,0;linear,0.3;zoomy,1;sleep,3;smooth,0.5;y,SCREEN_BOTTOM-20;zoomy,0 -ShowBPMDisplay=false \ No newline at end of file +ShowBPMDisplay=false + +# sm-ssc helper screens +[ScreenHowToInstallSongs] +Class="ScreenSelectMaster" +Fallback="ScreenSelectMaster" +ShowHeader=false + +ShowScroller=true +PerChoiceScrollElement=false +PerChoiceIconElement=false +# +ScrollerX=SCREEN_LEFT+32 +ScrollerY=SCREEN_CENTER_Y*0.5 +ScrollerTransform=function(self,offset,itemIndex,numItems) self:y(24*(itemIndex-(numItems-1)/2)); end +ScrollerNumItemsToDraw=20 + +ChoiceNames="WhereToFind,HowToInstall,AdditionalFolders,ReloadSongs,Exit" +ChoiceWhereToFind="urlnoexit,http://code.google.com/p/sm-ssc/wiki/FindingContent;text,"..Screen.String("Finding Songs") +ChoiceHowToInstall="urlnoexit,http://code.google.com/p/sm-ssc/wiki/InstallingContent;text,"..Screen.String("Installing Songs") +ChoiceAdditionalFolders="text,"..Screen.String("Importing Songs") +ChoiceReloadSongs="screen,ScreenReloadSongs;text,"..Screen.String("Reload Songs") +ChoiceExit="screen,"..Branch.TitleMenu()..";text,"..Screen.String("Exit") +DefaultChoice="WhereToFind" + +OptionOrderUp="5:4,4:3,3:2,2:1,1:5" +OptionOrderDown="1:2,2:3,3:4,4:5,5:1" \ No newline at end of file diff --git a/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd b/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd index 83d801d022..fcdbbb2ba3 100644 Binary files a/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd and b/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd differ