diff --git a/Themes/_fallback/Scripts/02 StageMods.lua b/Themes/_fallback/Scripts/02 StageMods.lua index 0f1bf5c493..78f0653890 100644 --- a/Themes/_fallback/Scripts/02 StageMods.lua +++ b/Themes/_fallback/Scripts/02 StageMods.lua @@ -32,7 +32,7 @@ function ScreenSelectMusic:setupmusicstagemods() local song, steps = SONGMAN:GetExtraStageInfo( bExtra2, style ) local po, so if bExtra2 then - po = "sudden,shuffle,flat"; + po = "default,1.5x,reverse"; so = "suddendeath"; else po = "default,1.5x,reverse"; diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 119e41aaca..0bbcd25f8a 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1592,8 +1592,8 @@ PrevScreen=Branch.TitleMenu() # TimerSeconds=40 # -DefaultChoice="Normal" -ChoiceNames="Normal,Extended" +DefaultChoice="Easy" +ChoiceNames="Easy,Normal,Hard,Extended,Oni" # PerChoiceScrollElement=false PerChoiceIconElement=false @@ -1602,9 +1602,11 @@ ShowScroller=true WrapScroller=true ShowIcon=false # -ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;screen,ScreenSelectMusic" -ChoiceExtended="applydefaultoptions;name,Extended;playmode,nonstop;screen,ScreenSelectCourse" -ChoiceSurvival="applydefaultoptions;name,Survival;playmode,oni;mod,lifetime;screen,ScreenSelectCourse" +ChoiceEasy="applydefaultoptions;name,Easy;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal" +ChoiceNormal="applydefaultoptions;name,Normal;playmode,regular;difficulty,medium;screen,ScreenSelectMusic;setenv,sMode,Normal" +ChoiceHard="applydefaultoptions;name,Hard;playmode,regular;difficulty,hard;screen,ScreenSelectMusic;setenv,sMode,Normal" +ChoiceExtended="applydefaultoptions;name,Extended;playmode,nonstop;screen,ScreenSelectCourse;setenv,sMode,Extended" +ChoiceOni="applydefaultoptions;name,Oni;playmode,oni;screen,ScreenSelectCourse;setenv,sMode,Oni" [ScreenSelectCharacter] Class="ScreenSelectMaster" @@ -1733,7 +1735,6 @@ DefaultSort="Nonstop" ScreenModsCommand=setupcoursestagemods MusicWheelType="CourseWheel" Codes="CourseCodeDetector" - [CourseCodeDetector] Fallback="CodeDetector" NextSort1= diff --git a/Themes/default/Graphics/OptionRowExit frame.png b/Themes/default/Graphics/OptionRowExit frame.png new file mode 100644 index 0000000000..809ce7e8f7 Binary files /dev/null and b/Themes/default/Graphics/OptionRowExit frame.png differ diff --git a/Themes/default/Graphics/_SelectIcon Easy.png b/Themes/default/Graphics/_SelectIcon Easy.png new file mode 100644 index 0000000000..58a2ea4a10 Binary files /dev/null and b/Themes/default/Graphics/_SelectIcon Easy.png differ diff --git a/Themes/default/Graphics/_SelectIcon Hard.png b/Themes/default/Graphics/_SelectIcon Hard.png new file mode 100644 index 0000000000..dafc049aa6 Binary files /dev/null and b/Themes/default/Graphics/_SelectIcon Hard.png differ diff --git a/Themes/default/Graphics/_SelectIcon Oni.png b/Themes/default/Graphics/_SelectIcon Oni.png new file mode 100644 index 0000000000..17b10f3c22 Binary files /dev/null and b/Themes/default/Graphics/_SelectIcon Oni.png differ diff --git a/Themes/default/Scripts/03 ThemePrefs.lua b/Themes/default/Scripts/03 ThemePrefs.lua index 2e505d2da0..13703c735e 100644 --- a/Themes/default/Scripts/03 ThemePrefs.lua +++ b/Themes/default/Scripts/03 ThemePrefs.lua @@ -180,13 +180,17 @@ end function GetDefaultOptionLines() local LineSets = { - "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17", - "1,2,7,8,13,14,16,17", + "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17", -- All + "1,2,7,8,13,14,16,17", -- DDR Essentials ( no turns, fx ) }; - if GetUserPrefB("UserPrefShowLotsaOptions") then - return GetUserPrefB("UserPrefShowLotsaOptions") and LineSets[1] or LineSets[2]; + if not GAMESTATE:IsExtraStage() then + if GetUserPrefB("UserPrefShowLotsaOptions") then + return GetUserPrefB("UserPrefShowLotsaOptions") and LineSets[1] or LineSets[2]; + else + return LineSets[2]; -- Just make sure! + end else - return LineSets[2]; -- Just make sure! + return "1,2,7,8,13,14,17" -- No Steps Selection end end; diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 057b4f605a..866a8222b5 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -248,13 +248,14 @@ Fallback="OptionRowMiniMenu" [OptionRowExit] Fallback="OptionRow" -FrameOnCommand=visible,false +FrameOnCommand=visible,true;diffuse,Color("Red"); +FrameX=SCREEN_CENTER_X TitleOnCommand=visible,false ItemsMinBaseZoom=1 -ItemOnCommand=shadowlength,0;zoom,1;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);strokecolor,BoostColor(Color("Red"),0.35) -ItemGainFocusCommand=stoptweening;linear,0.2;zoom,1.25;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75) -ItemLoseFocusCommand=stoptweening;decelerate,0.5;zoom,1; +ItemOnCommand=shadowlength,1;zoom,0.8;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75);shadowcolor,BoostColor(Color("Red"),0.35) +ItemGainFocusCommand=stoptweening;linear,0.2;zoom,1;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.75) +ItemLoseFocusCommand=stoptweening;decelerate,0.5;zoom,0.8; ColorSelected=Color("Red") ColorNotSelected=Color("Red") ColorDisabled=Color("Red") @@ -412,7 +413,10 @@ MeterSetCommand=%function(self,param) \ self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ end; \ if param.Meter then \ - if param.Meter >= 10 then \ + if param.Meter >= 100 then \ + self:zoom(0.8); \ + self:glowshift(); \ + elseif param.Meter >= 10 then \ self:glowshift(); \ else \ self:stopeffect(); \ @@ -455,6 +459,13 @@ MeterSetCommand=%function(self,param) \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ end; \ + if param.Meter then \ + if param.Meter >= 100 then \ + self:zoom(0.8); \ + else \ + self:zoom(1); \ + end; \ + end; \ end; [StepsDisplayEvaluation] @@ -593,91 +604,10 @@ ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.35;x,SCREEN_LEFT # PageOnCommand=fadetop,0.125;fadebottom,0.125;cropbottom,0.5;croptop,0.5;decelerate,0.25;croptop,0;cropbottom,0;fadetop,0;fadebottom,0; CursorOnCommand= -LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.3;fadeleft,0.25;faderight,0.25;diffuseramp;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' -LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseramp;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") -LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseramp;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25") +LineHighlightOnCommand=cropleft,0.1;cropright,0.1;zoomx,1.25;fadeleft,0.05;faderight,0.05;diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25");effectclock,'beat' +LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effectcolor2,color("1,1,1,0.5");effectcolor1,color("1,1,1,0.25") +LineHighlightChangeToExitCommand=linear,0.1;diffuse,Color("Red");diffuseshift;effectcolor2,color("1,0,0,0.5");effectcolor1,color("1,0,0,0.25") -[ScreenOptionsMaster] - -# Accel="5;selectmultiple" -# Accel,1="mod,boost;name,Boost" -# Accel,2="mod,brake;name,Brake" -# Accel,3="mod,wave;name,Wave" -# Accel,4="mod,expand;name,Expand" -# Accel,5="mod,boomerang;name,Boomerang" - -# Effect="12;selectmultiple" -# EffectDefault="mod,no drunk,no dizzy,no confusion,no mini,no tiny,no flip,no invert,no tornado,no tipsy,no bumpy,no beat" -# Effect,1="mod,drunk;name,Drunk" -# Effect,2="mod,dizzy;name,Dizzy" -# Effect,3="mod,confusion;name,Confusion" -# Effect,4="mod,mini;name,Mini" -# Effect,5="mod,-100% mini;name,Big" -# Effect,6="mod,tiny;name,Tiny" -# Effect,7="mod,flip;name,Flip" -# Effect,8="mod,invert;name,Invert" -# Effect,9="mod,tornado;name,Tornado" -# Effect,10="mod,tipsy;name,Tipsy" -# Effect,11="mod,bumpy;name,Bumpy" -# Effect,12="mod,beat;name,Beat" - -# XXX: what of hiddenoffset and suddenoffset? -# Appearance="5;selectmultiple" -# Appearance,1="mod,hidden;name,Hidden" -# Appearance,2="mod,sudden;name,Sudden" -# Appearance,3="mod,stealth;name,Stealth" -# Appearance,4="mod,blink;name,Blink" -# Appearance,5="mod,randomvanish;name,R.Vanish" - -# Turn="5;selectmultiple" -# Turn,1="mod,mirror;name,Mirror" -# Turn,2="mod,left;name,Left" -# Turn,3="mod,right;name,Right" -# Turn,4="mod,shuffle;name,Shuffle" -# Turn,5="mod,supershuffle;name,SuperShuffle" - -# Insert="8;selectmultiple" -# Insert,1="mod,little;name,Little" -# Insert,2="mod,wide;name,Wide" -# Insert,3="mod,big;name,Big" -# Insert,4="mod,quick;name,Quick" -# Insert,5="mod,bmrize;name,BMRize" -# Insert,6="mod,skippy;name,Skippy" -# Insert,7="mod,echo;name,Echo" -# Insert,8="mod,stomp;name,Stomp" - -# Remove="3;selectmultiple" -# RemoveDefault="mod,no nojumps,no nohands,no noquads" -# Remove,1="mod,nojumps;name,NoJumps" -# Remove,2="mod,nohands;name,NoHands" -# Remove,3="mod,noquads;name,NoQuads" - -# Scroll="5;selectmultiple" -# ScrollDefault="mod,no reverse,no split,no alternate,no cross,no centered" -# Scroll,1="mod,reverse;name,Reverse" -# Scroll,2="mod,split;name,Split" -# Scroll,3="mod,alternate;name,Alternate" -# Scroll,4="mod,cross;name,Cross" -# Scroll,5="mod,centered;name,Centered" - -# Holds="3;selectmultiple" -# HoldsDefault="mod,no noholds,no planted,no twister,no holdstorolls" -# Holds,1="mod,planted;name,Planted" -# Holds,2="mod,twister;name,Twister" -# Holds,3="mod,holdrolls;name,HoldsToRolls" - -# Mines="4" -# MinesDefault="mod,no nomines,no mines,no attackmines" -# Mines,1="mod,nomines;name,Off" -# Mines,2="name,On" -# Mines,3="mod,mines;name,Add" -# Mines,4="mod,attackmines;name,AttackMines" - -# Hide="2;selectmultiple" -# HideDefault="mod,no dark,no blind,no cover" -# Hide,1="mod,dark;name,Dark" -# Hide,2="mod,blind;name,Blind" -# Hide,3="mod,blind;name,Cover" [ScreenMiniMenu] HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP @@ -895,9 +825,8 @@ IconChoice14KeysOnCommand=zoom,0;bounceend,0.35;zoom,1 IconChoice14KeysOffCommand=linear,0.1175;zoomx,0 [ScreenSelectPlayMode] -DefaultChoice="Normal" -# ChoiceNames="Normal,Extended,Survival" -#~ ChoiceNames="Normal,Rave,Extended,Oni,Survival" +DefaultChoice="Easy" +# ChoiceNames="Normal,Extended" # PerChoiceIconElement=false # @@ -907,58 +836,37 @@ WrapScroller=false UseIconMetrics=true # IconGainFocusCommand=stoptweening;bounceend,0.125;zoom,1; -IconLoseFocusCommand=stoptweening;decelerate,0.25;zoom,0.8; +IconLoseFocusCommand=stoptweening;decelerate,0.25;zoom,0.6; # -IconChoiceNormalX=SCREEN_CENTER_X-160 -IconChoiceNormalY=SCREEN_CENTER_Y -IconChoiceNormalOnCommand=zoom,0;bounceend,0.35;zoom,1 +IconChoiceEasyX=SCREEN_CENTER_X-160 +IconChoiceEasyY=SCREEN_CENTER_Y-48 +IconChoiceEasyOnCommand=zoom,0;bounceend,0.35;zoom,0.8 +IconChoiceEasyOffCommand=linear,0.1175;zoomx,0 +# +IconChoiceNormalX=SCREEN_CENTER_X +IconChoiceNormalY=SCREEN_CENTER_Y-48 +IconChoiceNormalOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceNormalOffCommand=linear,0.1175;zoomx,0 # -IconChoiceExtendedX=SCREEN_CENTER_X+160 -IconChoiceExtendedY=SCREEN_CENTER_Y -IconChoiceExtendedOnCommand=zoom,0;bounceend,0.35;zoom,1 +IconChoiceHardX=SCREEN_CENTER_X+160 +IconChoiceHardY=SCREEN_CENTER_Y-48 +IconChoiceHardOnCommand=zoom,0;bounceend,0.35;zoom,0.8 +IconChoiceHardOffCommand=linear,0.1175;zoomx,0 +# +IconChoiceExtendedX=SCREEN_CENTER_X-80 +IconChoiceExtendedY=SCREEN_CENTER_Y+48 +IconChoiceExtendedOnCommand=zoom,0;bounceend,0.35;zoom,0.8 IconChoiceExtendedOffCommand=linear,0.1175;zoomx,0 # -IconChoiceSurvivalX=SCREEN_CENTER_X -IconChoiceSurvivalY=SCREEN_CENTER_Y+64 -IconChoiceSurvivalOnCommand=zoom,0;bounceend,0.35;zoom,1 -IconChoiceSurvivalOffCommand=linear,0.1175;zoomx,0 +IconChoiceOniX=SCREEN_CENTER_X+80 +IconChoiceOniY=SCREEN_CENTER_Y+48 +IconChoiceOniOnCommand=zoom,0;bounceend,0.35;zoom,0.8 +IconChoiceOniOffCommand=linear,0.1175;zoomx,0 [ScreenSelectMusic] -#~ NextScreen=ScreenSelectMusicNext() -# -MusicWheelType="MusicWheel" -Codes="" -# -TimerSeconds=60 -DoRouletteOnMenuTimer=true -# -DefaultSort=GAMESTATE:IsCourseMode() and "Group" or "AllCourses" -# -SampleMusicLoops=true -SampleMusicFallbackFadeInSeconds=0 -# -UseOptionsList=false -# UsePlayerSelectMenu=false -OptionsMenuAvailable=true -SelectMenuAvailable=true -ModeMenuAvailable=true -# -ShowOptionsMessageSeconds=1.5 -# -ScreenModsCommand=setupmusicstagemods -# -PreviousSongButton="MenuLeft" -NextSongButton="MenuRight" -# -TwoPartSelection=false -TwoPartConfirmsOnly=false -# -SampleMusicDelay=0.25 -SampleMusicDelayInit=0 -AlignMusicBeat=false -SelectMenuChangesDifficulty=true -WrapChangeSteps=false +# OptionsMenuAvailable=(getenv(sMode) ~= Oni) +# SelectMenuAvailable=(getenv(sMode) == Normal) +# ModeMenuAvailable=(getenv(sMode) == Normal) # HelpDisplay has things added here to make sure it disappears for another # actor, which we defined in this screens decorations. HelpSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.125;diffusealpha,0; @@ -1138,7 +1046,6 @@ ShowNumCourseSongs=true # UsePlayerSelectMenu=false SelectMenuAvailable=false - [ScreenNetSelectMusic] StepsDisplayP1X=SCREEN_CENTER_X-240 StepsDisplayP1Y=SCREEN_CENTER_Y+185 diff --git a/Themes/default/~res/SelectIcons.psd b/Themes/default/~res/SelectIcons.psd new file mode 100644 index 0000000000..b2df1b7ba3 Binary files /dev/null and b/Themes/default/~res/SelectIcons.psd differ diff --git a/Themes/default/~res/StepsDisplayMusic frame.psd b/Themes/default/~res/StepsDisplayMusic frame.psd index 04c2d45c04..23857dec84 100644 Binary files a/Themes/default/~res/StepsDisplayMusic frame.psd and b/Themes/default/~res/StepsDisplayMusic frame.psd differ