Skip to content

Commit ca18ff6

Browse files
RyutoSetsujinRyutoSetsujin
committed
ayy
i just wanna thank @JoseVarelaP, me, the sm5 devs, uh... me... uh... fuck... New play mode select screen!!!!!!!!!!!
1 parent ea0a5da commit ca18ff6

4 files changed

Lines changed: 39 additions & 75 deletions

File tree

‎Graphics/ScreenSelectPlayMode Icon/default.lua‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ local icon_color = ModeIconColors[gc:GetName()]
66

77
return Def.ActorFrame {
88
Def.ActorFrame {
9-
GainFocusCommand=function(self) self:stoptweening():bob():effectmagnitude(0,6,0):decelerate(0.05):zoom(1) end,
10-
LoseFocusCommand=function(self) self:stoptweening():stopeffect():decelerate(0.1):zoom(0.6) end,
9+
GainFocusCommand=function(self) self:stoptweening():effectmagnitude(0,6,0):decelerate(0.05):zoom(0.9) end,
10+
LoseFocusCommand=function(self) self:stoptweening():stopeffect():decelerate(0.1):zoom(0.75) end,
1111

1212
Def.Sprite{
1313
Texture= THEME:GetPathG("ScreenSelectPlayMode", "Icon/_background base"),
@@ -29,15 +29,15 @@ return Def.ActorFrame {
2929
-- todo: generate a better font for these.
3030
Def.BitmapText{
3131
Font= "Common Large",
32-
Text=string.upper(string_name),
33-
InitCommand=function(self) self:y(-12):maxwidth(232) end,
32+
Text=string_name,
33+
InitCommand=function(self) self:y(-12):maxwidth(390):zoom(0.9) end,
3434
OnCommand=function(self)
3535
self:diffuse(Color.Black):shadowlength(1):shadowcolor(color("#ffffff77")):skewx(-0.125) end,
3636
},
3737
Def.BitmapText{
3838
Font= "Common Normal",
39-
Text=string.upper(string_expl),
40-
InitCommand=function(self) self:y(27.5):maxwidth(232) end,
39+
Text=string_expl,
40+
InitCommand=function(self) self:y(27.5):maxwidth(390):zoom(0.6) end,
4141
},
4242
Def.Sprite{
4343
Texture= THEME:GetPathG("ScreenSelectPlayMode", "Icon/_background base"),

‎Graphics/ScreenSelectPlayMode scroller/default.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local gc = Var "GameCommand"
22
local colors = {
33
Easy = color("#00ff00"),
44
Normal = color("#feee00"),
5-
Hard = color("#feee00"),
5+
Expert = color("#ff2f39"),
66
Rave = color("#db93ff"),
77
Nonstop = color("#00ffff"),
88
Oni = color("#d70b8c"),

‎Languages/en.ini‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,14 @@ Hard=Expert
5757
Challenge=Challenge
5858
Edit=Edit
5959

60+
[PlayMode]
61+
Expert=Expert
62+
6063
[ScreenSelectPlayMode]
6164
HelpText=&BACK; Exit &START; Select / Join &MENULEFT;&MENURIGHT; Move
62-
EasyExplanation=A mode for beginners.
63-
HardExplanation=For experts.
64-
OldNormalExplanation=Not too easy, not too hard.
65+
ExpertExplanation=A true challenge for true dancers.
6566
NormalExplanation=Play all your favorite songs!
66-
RaveExplanation=Battle a friend with wacky attacks.
67+
RaveExplanation=Battle a friend with wacky mods!
6768
NonstopExplanation=Play several songs in a row.
6869
OniExplanation=Survive until the end.
6970
EndlessExplanation=Play an endless amount of songs (no breaks!)

‎metrics.ini‎

Lines changed: 27 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -904,17 +904,19 @@ PersistScreens="ScreenSelectPlayMode,ScreenSelectMusic"
904904
#
905905
ScreenOutDelay=1.5
906906
#
907-
DefaultChoice="Easy"
908-
# ChoiceNames="Normal,Extended"
907+
DefaultChoice="Normal"
908+
ChoiceNames="Normal,Expert,Rave,Nonstop,Oni,Endless"
909+
ChoiceQuest="applydefaultoptions;name,Quest;text,Quest;playmode,regular;difficulty,easy;screen,ScreenSelectMusic;setenv,sMode,Normal"
910+
ChoiceExpert="applydefaultoptions;name,Expert;text,Expert;playmode,regular;difficulty,hard;screen,ScreenSelectMusic;setenv,sMode,Normal"
909911
#
910912
PerChoiceIconElement=false
911913
#
912-
ShowScroller=true
914+
ShowScroller=false
913915
WrapScroller=true
914916
ScrollerX=SCREEN_CENTER_X
915917
ScrollerY=SCREEN_CENTER_Y-60
916918
ScrollerOnCommand=SetFastCatchup,true;
917-
ScrollerOffCommand=decelerate,0.35;y,SCREEN_CENTER_Y;sleep,1.15;linear,0.1;zoomy,0
919+
ScrollerOffCommand=decelerate,1;y,SCREEN_CENTER_Y;sleep,1.15;linear,0.1;zoomy,0
918920
#
919921
ShowBackgroundFrame=false
920922
BackgroundFrameX=SCREEN_CENTER_X
@@ -925,84 +927,45 @@ BackgroundFrameOffCommand=decelerate,0.8;y,SCREEN_CENTER_Y;sleep,1.5;linear,0.1;
925927
ShowIcon=true
926928
UseIconMetrics=true
927929
#
928-
IconGainFocusCommand=stoptweening;glowshift;decelerate,0.125;zoom,1;
929-
IconLoseFocusCommand=stoptweening;stopeffect;decelerate,0.125;zoom,0.6;
930+
IconGainFocusCommand=zoom,0.75;
931+
IconLoseFocusCommand=zoom,0.75;
930932
# IconMinZoom=0.5
931933
# IconBaseZoom=0.6
932934
#
933-
IconChoiceEasyX=SCREEN_CENTER_X-(240*(5/6))
934-
IconChoiceEasyY=SCREEN_BOTTOM-88-64
935-
IconChoiceEasyOnCommand=zoom,0;bounceend,0.35;zoom,0.8
936-
IconChoiceEasyOffCommand=linear,0.1175;zoomx,0
937-
#
938-
IconChoiceNormalX=SCREEN_CENTER_X-80
939-
IconChoiceNormalY=SCREEN_BOTTOM-88-64
940-
IconChoiceNormalOnCommand=zoom,0;bounceend,0.35;zoom,0.8
935+
IconChoiceNormalX=SCREEN_CENTER_X-300
936+
IconChoiceNormalY=SCREEN_BOTTOM-365
937+
IconChoiceNormalOnCommand=zoom,0.75
941938
IconChoiceNormalOffCommand=linear,0.1175;zoomx,0
942939
#
943-
IconChoiceHardX=SCREEN_CENTER_X+(80*(5/6))
944-
IconChoiceHardY=SCREEN_BOTTOM-88-64
945-
IconChoiceHardOnCommand=zoom,0;bounceend,0.35;zoom,0.8
946-
IconChoiceHardOffCommand=linear,0.1175;zoomx,0
940+
IconChoiceExpertX=SCREEN_CENTER_X-300
941+
IconChoiceExpertY=SCREEN_BOTTOM-310
942+
IconChoiceExpertOnCommand=zoom,0.75
943+
IconChoiceExpertOffCommand=linear,0.1175;zoomx,0
947944
#
948-
IconChoiceRaveX=SCREEN_CENTER_X+80
949-
IconChoiceRaveY=SCREEN_BOTTOM-88-64
950-
IconChoiceRaveOnCommand=zoom,0;bounceend,0.35;zoom,0.8
945+
IconChoiceRaveX=SCREEN_CENTER_X-300
946+
IconChoiceRaveY=SCREEN_BOTTOM-255
947+
IconChoiceRaveOnCommand=zoom,0.75
951948
IconChoiceRaveOffCommand=linear,0.1175;zoomx,0
952949
#
953-
IconChoiceNonstopX=SCREEN_CENTER_X-160
954-
IconChoiceNonstopY=SCREEN_BOTTOM-88
955-
IconChoiceNonstopOnCommand=zoom,0;bounceend,0.35;zoom,0.8
950+
IconChoiceNonstopX=SCREEN_CENTER_X-300
951+
IconChoiceNonstopY=SCREEN_BOTTOM-200
952+
IconChoiceNonstopOnCommand=zoom,0.75
956953
IconChoiceNonstopOffCommand=linear,0.1175;zoomx,0
957954
#
958-
IconChoiceOniX=SCREEN_CENTER_X
959-
IconChoiceOniY=SCREEN_BOTTOM-88
960-
IconChoiceOniOnCommand=zoom,0;bounceend,0.35;zoom,0.8
955+
IconChoiceOniX=SCREEN_CENTER_X-300
956+
IconChoiceOniY=SCREEN_BOTTOM-145
957+
IconChoiceOniOnCommand=zoom,0.75
961958
IconChoiceOniOffCommand=linear,0.1175;zoomx,0
962959
#
963-
IconChoiceEndlessX=SCREEN_CENTER_X+160
964-
IconChoiceEndlessY=SCREEN_BOTTOM-88
965-
IconChoiceEndlessOnCommand=zoom,0;bounceend,0.35;zoom,0.8
960+
IconChoiceEndlessX=SCREEN_CENTER_X-300
961+
IconChoiceEndlessY=SCREEN_BOTTOM-90
962+
IconChoiceEndlessOnCommand=zoom,0.75
966963
IconChoiceEndlessOffCommand=linear,0.1175;zoomx,0
967964

968965
[ScreenSelectCharacter]
969966

970967
[ScreenGameInformation]
971968

972-
973-
# wheel
974-
#@@@@@@@@@@@@@@&%/(&&%****/%&&#(%&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
975-
#@@@@@@@@@(&%%(,.,,.............,*#/#@&&@@@@@&*(//&&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
976-
#@@@@@@@&#(##/***//***,,******,***,.*/*//,&%/***//(((&@@@@@@@@@@@@@@@@@@@@@@@@@@@
977-
#@@@@@%#//(###/**//*******************/#(,.,*////(#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
978-
#@@@&&**,,/#(**///*//***************/**/*,,,**//(%&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
979-
#@@%(/,,,**/////,**/(/**/*/**//*/***(/*///**,,/#&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
980-
#@@%**,*******////(#((/*(//*.,*,/////(#(((/*,*///(&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
981-
#@%(*****,,,,**/**(///**//***,/*******(/*/(/#&&&&%&@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
982-
#&#/,*,,,,,,,*,,,*//*,,***,***/*,,,,,.,/*,//*#(@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
983-
#&((*,,,,*****//**(/..,,..*,***/,..,.,,//,*/**%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
984-
#@%*,,*,,**//**/*,/* . .,/*/*. . ,//,*(/.,#%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
985-
#@@(,*,,,**//,***.//#%#%%%* ., .(%#**(,/(/,%/#%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
986-
#%(***,**////***/.,*.(((// ,(/(,**,/(/***%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
987-
#&(***,/////////*/,,....... ...,/*///**,##@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
988-
#&(((#,////////(///*. .......... ...*/(/*//,#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
989-
#@@%(*(*///(/////#(,*(/, .,,,,*. */(((/*/#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
990-
#@@@&%/**///(/////(##*. .*///((**(%@#@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
991-
#@@@@@@@%((*,///(((((/,,,*,.. ,/(///*/(//#@@@@@@@@@@@@@@@@@@@@@@@@@%#&. *&@@@@@
992-
#@@@@@@@@&%(/#**/(/(/*,,,,,,,,*//(//,(/*..&@@@@@@@@@@@@@@@@@@@@@&&&%&&&(...//@@@@
993-
#@@@@&(%,..,,*(/#(/#(((######(((((##@/,,,..*#*&@@@@@@@@@@@&@@%%&@@%%%%(/@@@@(#@@@
994-
#@@#(, .,...,**((,.,(##((((##(,.,/(**,,..,, .,/@@@&@%#%&%%%%#%%%%%&&%(&@&&%&@@@
995-
#@&/* ,,.,,*,.,/*,.....*/(/,..,,,,/*..**,.,,. *%#%%%%((#%%%%%&&&&&&&&&#,.,*.,#@
996-
#@%** ,,..,*,.,/*,. ...**... ..*/*.,*,,/#(/#%##(##%%%%%%%%%%%%%%%%%&%*#@@@&#%
997-
###, . ,**..,,.**,, .,.,*#%((//*/(#%%####%%%%%%####%%%%%&&%/#@@&%%%
998-
#// ..,,...,**., ..,/##*,. .*(%#((###%%%%#######%%%%&&&&&&&&&%(*/#%%@
999-
##..,,,****,.*,*,.,,*,**,,*/(/...*(((/((############%%%%%%%%%%%%%#%%%&@@@%%@@@@@@
1000-
#.,...**//,,(***,,**,(/, .,/(((###((((/(((##%%%%##(((##%%%@@@@%@@@@@@@@@@@@@@@@@@
1001-
#,*((#(/*,*(/***.. .....,(@@&(*,,*/(##(///(((##/*,,,,.**%@@@@@@@@@@@@@@@@@@@@@@@@
1002-
#*,,,.,*//,.,**,,,,,,,,,,,,,*(##(**,,,,,,,,,,,..,.....,,/(&@@@@@@@@@@@@@@@@@@@@@@
1003-
#**,,***,..,/***/,***,*******,,,,,,,,,***,,,,,,,,,,,,,,,,,/@@@@@@@@@@@@@@@@@@@@@@
1004-
#,,,,**..,,,,*(#((**//************/*,/#(/****,,,,,,,,,,,,,/&@@@@@@@@@@@@@@@@@@@@@
1005-
#,***//********/##(*,*/((/********(##(/*****,,,**,,,,,,,,,/#&@@@@@@@@@@@@@@@@@@@@
1006969
[ScreenSelectMusic]
1007970
UsePlayerSelectMenu=false
1008971
# OptionsMenuAvailable=(getenv(sMode) ~= Oni)

0 commit comments

Comments
 (0)