diff --git a/Themes/default/Graphics/ScreenSelectPlayMode Icon.lua b/Themes/default/Graphics/ScreenSelectPlayMode Icon.lua index 6dbc7e3141..a22e27600a 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode Icon.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode Icon.lua @@ -3,6 +3,8 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { GainFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconGainFocusCommand"); LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand"); +-- IconGainFocusCommand=cmd(stoptweening;glowshift;decelerate,0.125;zoom,1); +-- IconLoseFocusCommand=cmd(stoptweening;stopeffect;decelerate,0.125;zoom,fZoom); LoadActor(THEME:GetPathG("_SelectIcon",gc:GetName() )) .. { DisabledCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); EnabledCommand=cmd(diffuse,color("1,1,1,1")); diff --git a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua index c3b901f9c8..101aed3983 100644 --- a/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua +++ b/Themes/default/Graphics/ScreenSelectPlayMode scroller/default.lua @@ -3,9 +3,10 @@ local colors = { Easy = color("#00ff00"), Normal = color("#feee00"), Hard = color("#feee00"), + Rave = color("#c44dff"), Extended = color("#00ffff"), Oni = color("#d70b8c"), - Rave = color("#c44dff"), + Endless = color("748392"), }; local t = Def.ActorFrame {}; -- Background! diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 80c1e43f18..f23e144e19 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -32,9 +32,10 @@ HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move EasyExplanation=A mode for beginners. NormalExplanation=Not too easy, not too hard. HardExplanation=For experts. +RaveExplanation=Battle against friend or foe. ExtendedExplanation=Several Songs in a row OniExplanation=A true test of skill. -RaveExplanation=Battle against friend or foe. +EndlessExplanation=It don't stop, it keep rollin'. [ScreenSelectPlayStyle] HelpText=&BACK; Exit &START; Select &MENULEFT;&MENURIGHT; Move [ScreenGameInformation] @@ -109,6 +110,12 @@ Lights_Cabinet=! BodyHeader=How to Obtain and Install Songs for sm-ssc Finding Songs=Where to Find Songs Installing Songs=How to Install Songs -Importing Songs=Importing Songs from other StepMania installs +Importing Songs=Importing from existing StepMania installs Reload Songs=Reload Songs -Exit=Back to Title Menu \ No newline at end of file +Exit=Back to Title Menu + +Explanation-WhereToFind=Launches a web page with information on finding songs for use with sm-ssc. +Explanation-HowToInstall=Launches a web page with song installation instructions. +Explanation-AdditionalFolders=If you have other installs of StepMania, you can use the AdditionalFolders preferences to load it into sm-ssc. +Explanation-ReloadSongs=Reload the songs. This is required if you've added/changed/deleted songs while sm-ssc is running. +Explanation-Exit=Return to the title menu. \ No newline at end of file diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 8b470f33ae..1a72a4d0fa 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -997,23 +997,30 @@ ShowIcon=true UseIconMetrics=true # IconGainFocusCommand=stoptweening;glowshift;decelerate,0.125;zoom,1; -IconLoseFocusCommand=stoptweening;stopeffect;decelerate,0.125;zoom,0.6; +IconLoseFocusCommand=stoptweening;stopeffect;decelerate,0.125;zoom,0.325; +# IconMinZoom=0.5 +# IconBaseZoom=0.6 # -IconChoiceEasyX=SCREEN_CENTER_X-160 +IconChoiceEasyX=SCREEN_CENTER_X-(240*(5/6)) IconChoiceEasyY=SCREEN_BOTTOM-88-64 IconChoiceEasyOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceEasyOffCommand=linear,0.1175;zoomx,0 # -IconChoiceNormalX=SCREEN_CENTER_X +IconChoiceNormalX=SCREEN_CENTER_X-(80*(5/6)) IconChoiceNormalY=SCREEN_BOTTOM-88-64 IconChoiceNormalOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceNormalOffCommand=linear,0.1175;zoomx,0 # -IconChoiceHardX=SCREEN_CENTER_X+160 +IconChoiceHardX=SCREEN_CENTER_X+(80*(5/6)) IconChoiceHardY=SCREEN_BOTTOM-88-64 IconChoiceHardOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceHardOffCommand=linear,0.1175;zoomx,0 # +IconChoiceRaveX=SCREEN_CENTER_X+(240*(5/6)) +IconChoiceRaveY=SCREEN_BOTTOM-88-64 +IconChoiceRaveOnCommand=zoom,0;bounceend,0.35;zoom,0.8 +IconChoiceRaveOffCommand=linear,0.1175;zoomx,0 +# IconChoiceExtendedX=SCREEN_CENTER_X-160 IconChoiceExtendedY=SCREEN_BOTTOM-88 IconChoiceExtendedOnCommand=zoom,0;bounceend,0.35;zoom,0.8 @@ -1024,10 +1031,11 @@ IconChoiceOniY=SCREEN_BOTTOM-88 IconChoiceOniOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceOniOffCommand=linear,0.1175;zoomx,0 # -IconChoiceRaveX=SCREEN_CENTER_X+160 -IconChoiceRaveY=SCREEN_BOTTOM-88 -IconChoiceRaveOnCommand=zoom,0;bounceend,0.35;zoom,0.8 -IconChoiceRaveOffCommand=linear,0.1175;zoomx,0 +IconChoiceEndlessX=SCREEN_CENTER_X+160 +IconChoiceEndlessY=SCREEN_BOTTOM-88 +IconChoiceEndlessOnCommand=zoom,0;bounceend,0.35;zoom,0.8 +IconChoiceEndlessOffCommand=linear,0.1175;zoomx,0 + [ScreenSelectMusic] UsePlayerSelectMenu=false # OptionsMenuAvailable=(getenv(sMode) ~= Oni) diff --git a/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd b/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd index fcdbbb2ba3..ef7815ead3 100644 Binary files a/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd and b/Themes/default/~res/ScreenSelectPlayMode scroller icons.psd differ diff --git a/Themes/default/~res/SelectIcons.psd b/Themes/default/~res/SelectIcons.psd index b2df1b7ba3..940f096ba6 100644 Binary files a/Themes/default/~res/SelectIcons.psd and b/Themes/default/~res/SelectIcons.psd differ