From 53581e21c4c30a5f2a566847722b8cff01c80c97 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 19 Feb 2008 02:15:31 +0000 Subject: [PATCH] new, in-progress theme --- .../ScreenSelectMusic overlay/default.lua | 347 ++++++--- .../ScreenSelectMusic underlay/default.lua | 32 +- .../ScreenSelectStyle background.redir | 2 +- .../Themes/default/BGAnimations/_delay in.lua | 1 + .../Fonts/MusicWheelItem roulette.redir | 2 +- .../default/Fonts/MusicWheelItem sort.redir | 2 +- .../default/Fonts/TextBanner text.redir | 2 +- .../ScreenWithMenuElements footer.redir | 2 +- .../ScreenWithMenuElements stage/stage.lua | 18 +- stepmania/Themes/default/Languages/en.ini | 17 + stepmania/Themes/default/Scripts/Colors.lua | 71 +- stepmania/Themes/default/Scripts/Other.lua | 31 +- stepmania/Themes/default/metrics.ini | 700 +++++++++--------- 13 files changed, 748 insertions(+), 479 deletions(-) diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua index 60807e9011..9f50fa2159 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/default.lua @@ -88,29 +88,28 @@ local function Radar() return t; end + +local fallback_screen = THEME:GetMetric(Var 'LoadingScreen','Fallback'); +local element = "overlay"; +local fallback_path = THEME:GetPathB(fallback_screen,element); +Trace('fallback_path ' .. fallback_path ); + local t = Def.ActorFrame { - LoadActor( "_banner mask" ) .. { - InitCommand=cmd(y,SCREEN_CENTER_Y-84;blend,"BlendMode_NoEffect";zwrite,1); - OnCommand=cmd(x,SCREEN_CENTER_X-180-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); + LoadActor( fallback_path ); + + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X+140;y,SCREEN_CENTER_Y-10); + OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); - }; - - Def.ActorProxy { - BeginCommand=function(self) local banner = SCREENMAN:GetTopScreen():GetChild('Banner'); self:SetTarget(banner); end; - InitCommand=cmd(y,SCREEN_CENTER_Y-84); - OnCommand=cmd(x,SCREEN_CENTER_X-180-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); - OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); - }; - - LoadActor( "_banner frame" ) .. { - InitCommand=cmd(y,SCREEN_CENTER_Y-97); - OnCommand=cmd(x,SCREEN_CENTER_X-180-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); - OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); - }; - - Radar() .. { - BeginCommand=cmd(x,SCREEN_CENTER_X-156;y,SCREEN_CENTER_Y+105); - Condition=GAMESTATE:IsCourseMode() == false; + LoadActor( "_banner mask" ) .. { + InitCommand=cmd(y,-74;zwrite,1;z,1;blend,"BlendMode_NoEffect"); + }; + Def.ActorProxy { + BeginCommand=function(self) local banner = SCREENMAN:GetTopScreen():GetChild('Banner'); self:SetTarget(banner); end; + InitCommand=cmd(y,-74;); + }; + LoadActor( "_banner frame" ) .. { + }; }; LoadFont("Common", "normal") .. { @@ -128,28 +127,76 @@ local t = Def.ActorFrame { end; SongOptionsChangedMessageCommand=cmd(playcommand,"Set"); }; - Def.OptionIconRow { - Condition=GAMESTATE:IsHumanPlayer(PLAYER_1); - InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y-182;set,PLAYER_1); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - PlayerOptionsChangedP1MessageCommand=cmd(set,PLAYER_1); + + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X-56;y,SCREEN_CENTER_Y); + LoadActor( "wheel cursor glow" ) .. { + InitCommand=cmd(blend,"BlendMode_Add";); + }; + LoadActor( "wheel cursor normal" ) .. { + + }; + }; + + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+136); + Def.ActorFrame { + InitCommand=cmd(x,-1*THEME:GetMetric("OptionIconRow","SpacingX");y,-1*THEME:GetMetric("OptionIconRow","SpacingY");); + LoadActor( "option icon header" ) .. { + + }; + LoadFont("_terminator two 32" ) .. { + InitCommand=cmd(y,-4;settext,"P1";zoom,0.5;zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); + }; + }; + Def.OptionIconRow { + Condition=GAMESTATE:IsHumanPlayer(PLAYER_1); + InitCommand=cmd(set,PLAYER_1); + OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); + OffCommand=cmd(linear,0.5;zoomy,0); + PlayerOptionsChangedP1MessageCommand=cmd(set,PLAYER_1); + }; }; - Def.OptionIconRow { - Condition=GAMESTATE:IsHumanPlayer(PLAYER_2); - InitCommand=cmd(x,SCREEN_CENTER_X-300;y,SCREEN_CENTER_Y-164;set,PLAYER_2); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - PlayerOptionsChangedP2MessageCommand=cmd(set,PLAYER_2); + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X+56;y,SCREEN_CENTER_Y+154); + Def.ActorFrame { + InitCommand=cmd(x,-1*THEME:GetMetric("OptionIconRow","SpacingX");y,-1*THEME:GetMetric("OptionIconRow","SpacingY");); + LoadActor( "option icon header" ) .. { + + }; + LoadFont("_terminator two 32") .. { + InitCommand=cmd(y,-4;settext,"P2";zoom,0.5;zoom,0.5;diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000");); + }; + }; + Def.OptionIconRow { + Condition=GAMESTATE:IsHumanPlayer(PLAYER_2); + InitCommand=cmd(set,PLAYER_2); + OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); + OffCommand=cmd(linear,0.5;zoomy,0); + PlayerOptionsChangedP2MessageCommand=cmd(set,PLAYER_2); + }; }; - Def.MusicSortDisplay { - Condition=not GAMESTATE:IsCourseMode(); - InitCommand=cmd(x,SCREEN_CENTER_X-65-SCREEN_WIDTH*0.6;y,SCREEN_CENTER_Y-135); - OnCommand=cmd(bounceend,0.5;addx,SCREEN_WIDTH*0.6); + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X-120;y,SCREEN_CENTER_Y-170); + OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); + LoadActor( THEME:GetPathG("MusicSortDisplay","frame") ) .. { + + }; + LoadFont( "_sf square head bold stroke 28" ) .. { + InitCommand=cmd(zoom,0.5;maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#696800");); + SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) )); + SortOrderChangedMessageCommand=cmd(playcommand,"Set"); + }; + LoadFont( "_sf square head bold 28" ) .. { + InitCommand=cmd(zoom,0.5;maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57");); + SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) )); + SortOrderChangedMessageCommand=cmd(playcommand,"Set"); + }; }; + -- Do the fade out here, because we want the options message to -- appear over it. Def.Quad { @@ -170,7 +217,7 @@ local t = Def.ActorFrame { Def.PaneDisplay { MetricsGroup="PaneDisplay"; PlayerNumber=PLAYER_1; - InitCommand=cmd(player,PLAYER_1;playcommand,"Set";x,SCREEN_CENTER_X-257;y,SCREEN_CENTER_Y+36); + InitCommand=cmd(player,PLAYER_1;playcommand,"Set";x,SCREEN_CENTER_X-180;y,SCREEN_CENTER_Y+194); SetCommand=function(self) self:SetFromGameState() end; CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); @@ -181,7 +228,7 @@ local t = Def.ActorFrame { Def.PaneDisplay { MetricsGroup="PaneDisplay"; PlayerNumber=PLAYER_2; - InitCommand=cmd(player,PLAYER_2;playcommand,"Set";x,SCREEN_CENTER_X-47;y,SCREEN_CENTER_Y+36); + InitCommand=cmd(player,PLAYER_2;playcommand,"Set";x,SCREEN_CENTER_X+180;y,SCREEN_CENTER_Y+194); SetCommand=function(self) self:SetFromGameState() end; CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); @@ -192,18 +239,83 @@ local t = Def.ActorFrame { Def.BPMDisplay { File=THEME:GetPathF("BPMDisplay", "bpm"); Name="BPMDisplay"; - InitCommand=cmd(horizalign,right;y,SCREEN_CENTER_Y-134;shadowlength,0;); - OnCommand=cmd(stoptweening;x,SCREEN_CENTER_X-160-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;); + OnCommand=cmd(stoptweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); SetCommand=function(self) self:SetFromGameState() end; CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); }; LoadActor( "_bpm label" ) .. { - InitCommand=cmd(horizalign,left); - OnCommand=cmd(x,SCREEN_CENTER_X-160-SCREEN_WIDTH*0.6;y,SCREEN_CENTER_Y-133;bounceend,0.5;addx,SCREEN_WIDTH*0.6); + InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X+280;y,SCREEN_CENTER_Y); + OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); }; + LoadActor( "bpm meter" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X+230;y,SCREEN_CENTER_Y-12); + OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); + OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); + }; + LoadActor( "stop icon" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X+296;y,SCREEN_CENTER_Y+6); + OnCommand=cmd(addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); + OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); + SetCommand=function(self) + local b = false; + local song = GAMESTATE:GetCurrentSong(); + if song then + b = song:GetTimingData():HasStops(); + end; + self:visible( b ); + end; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + }; + + LoadFont("_regra 32 bold") .. { + InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;zoom,0.5;settext,"/Senser";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); + SetCommand=function(self) + local s = "---"; + local song = GAMESTATE:GetCurrentSong(); + if song then + local s2 = song:GetDisplayArtist(); + if s2 ~= "" then + s = "/" .. s2; + end; + end; + self:settext( s ); + end; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + }; + LoadFont("_regra 32 bold") .. { + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;zoom,0.5;settext,"_Hardcore Techno";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); + SetCommand=function(self) + local s = "---"; + local song = GAMESTATE:GetCurrentSong(); + if song then + local s2 = song:GetGenre(); + if s2 ~= "" then + s = "_" .. s2; + end; + end; + self:settext( s ); + end; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + }; + + Def.ActorFrame { + InitCommand=cmd(x,SCREEN_CENTER_X+26;y,SCREEN_CENTER_Y+5;); + LoadActor("star full") .. { InitCommand=cmd(x,16*-2); }; + LoadActor("star full") .. { InitCommand=cmd(x,16*-1); }; + LoadActor("star full") .. { InitCommand=cmd(x,16*0); }; + LoadActor("star empty") .. { InitCommand=cmd(x,16*1); }; + LoadActor("star empty") .. { InitCommand=cmd(x,16*2); }; + CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); + CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); + }; + Def.CourseContentsList { MaxSongs = 5; @@ -263,7 +375,7 @@ local t = Def.ActorFrame { DifficultyChangedCommand=function(self, params) if params.PlayerNumber ~= GAMESTATE:GetMasterPlayerNumber() then return end self:settext( params.Meter ); - self:diffuse( DifficultyColor(params.Difficulty) ); + self:diffuse( DifficultyToColor(params.Difficulty) ); end; }; @@ -276,7 +388,7 @@ local t = Def.ActorFrame { OnCommand=cmd(x,SCREEN_CENTER_X-222;y,-8;shadowlength,0;settext,"1"); DifficultyChangedCommand=function(self, params) if params.PlayerNumber ~= GAMESTATE:GetMasterPlayerNumber() then return end - self:diffuse( DifficultyColor(params.Difficulty) ); + self:diffuse( DifficultyToColor(params.Difficulty) ); end; }; }; @@ -289,27 +401,27 @@ local t = Def.ActorFrame { BeginCommand=cmd(x,SCREEN_CENTER_X-68;y,SCREEN_CENTER_Y-15); }; - DifficultyIcons(PLAYER_1) .. { - BeginCommand=cmd(x,SCREEN_CENTER_X-290;y,SCREEN_CENTER_Y-15); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; - DifficultyIcons(PLAYER_2) .. { - BeginCommand=cmd(x,SCREEN_CENTER_X-68;y,SCREEN_CENTER_Y-15); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; + --DifficultyIcons(PLAYER_1) .. { + -- BeginCommand=cmd(x,SCREEN_CENTER_X-290;y,SCREEN_CENTER_Y-15); + -- OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); + -- OffCommand=cmd(linear,0.5;zoomy,0); + --}; + --DifficultyIcons(PLAYER_2) .. { + -- BeginCommand=cmd(x,SCREEN_CENTER_X-68;y,SCREEN_CENTER_Y-15); + -- OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); + -- OffCommand=cmd(linear,0.5;zoomy,0); + --}; - DifficultyMeter(PLAYER_1) .. { - BeginCommand=cmd(player,PLAYER_1;x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-20); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; - DifficultyMeter(PLAYER_2) .. { - BeginCommand=cmd(player,PLAYER_2;x,SCREEN_CENTER_X-121;y,SCREEN_CENTER_Y-20); - OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); - OffCommand=cmd(linear,0.5;zoomy,0); - }; + --DifficultyMeter(PLAYER_1) .. { + -- BeginCommand=cmd(player,PLAYER_1;x,SCREEN_CENTER_X-254;y,SCREEN_CENTER_Y-20); + -- OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); + -- OffCommand=cmd(linear,0.5;zoomy,0); + --}; + --DifficultyMeter(PLAYER_2) .. { + -- BeginCommand=cmd(player,PLAYER_2;x,SCREEN_CENTER_X-121;y,SCREEN_CENTER_Y-20); + -- OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); + -- OffCommand=cmd(linear,0.5;zoomy,0); + --}; LoadActor( "_balloon long" ) .. { InitCommand=cmd(x,SCREEN_CENTER_X+58;y,SCREEN_CENTER_Y-33;playcommand,"Set";finishtweening); @@ -337,7 +449,7 @@ local t = Def.ActorFrame { }; LoadFont("_numbers2") .. { - InitCommand=cmd(x,SCREEN_CENTER_X-262;y,SCREEN_CENTER_Y-126); + InitCommand=cmd(x,SCREEN_CENTER_X+262;y,SCREEN_CENTER_Y); OnCommand=cmd(shadowlength,0;addx,-SCREEN_WIDTH;bounceend,0.5;addx,SCREEN_WIDTH); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH); @@ -354,39 +466,74 @@ local t = Def.ActorFrame { CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); }; - LoadActor( "difficulties" ) .. { - InitCommand=cmd(y,SCREEN_CENTER_Y-134); - OnCommand=cmd(finishtweening;x,SCREEN_CENTER_X-35-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); - OffCommand=cmd(finishtweening;bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); - }; - LoadFont("BPMDisplay", "bpm") .. { - SetCommand=function(self) - local song = GAMESTATE:GetCurrentSong() - local course = GAMESTATE:GetCurrentCourse() - if not song and not course then - self:hidden(1) - return - end - self:hidden(0) - local time - if song then time = song:MusicLengthSeconds() end - if course then - local st = GAMESTATE:GetCurrentStyle():GetStepsType() - time = course:GetTotalSeconds( st ) - end - if time then - self:settext( SecondsToMSSMsMs(time) ); - else - self:settext( "xx:xx.xx" ); - end - end; - - InitCommand=cmd(x,SCREEN_CENTER_X-156;y,SCREEN_CENTER_Y+190;shadowlength,0); - OnCommand=cmd(diffusealpha,0;linear,0.5;diffusealpha,1); - OffCommand=cmd(linear,0.5;diffusealpha,0); - - CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); - CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); - }; + --LoadActor( "difficulties" ) .. { + -- InitCommand=cmd(x,SCREEN_CENTER_X-35;y,SCREEN_CENTER_Y-134); + -- OnCommand=cmd(finishtweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); + -- OffCommand=cmd(finishtweening;bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); + --}; }; + +if not GAMESTATE:IsCourseMode() then + t[#t+1] = Def.DifficultyList { + Name="DifficultyList"; + OnCommand=cmd(x,SCREEN_CENTER_X+170;y,SCREEN_CENTER_Y+40); + CursorP1 = Def.ActorFrame { + InitCommand=cmd(x,-150;bounce;effectmagnitude,-5,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm"); + BeginCommand=cmd(visible,true); + StepsSelectedMessageCommand=function( self, param ) + if param.Player ~= "PlayerNumber_P1" then return end; + self:visible(false); + end; + children={ + LoadActor( "DifficultyList cursor p1" ) .. { + BeginCommand=cmd(player,"PlayerNumber_P1";); + PlayerJoinedMessageCommand=function(self,param ) + if param.Player ~= "PlayerNumber_P1" then return end; + self:visible( true ); + end; + }; + LoadFont( "_terminator two 32" ) .. { + InitCommand=cmd(x,-4;y,-3;settext,"P1";zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); + BeginCommand=cmd(player,"PlayerNumber_P1";); + PlayerJoinedMessageCommand=function(self,param ) + if param.Player ~= "PlayerNumber_P1" then return end; + self:visible( true ); + end; + }; + } + }; + CursorP2 = Def.ActorFrame { + InitCommand=cmd(x,130;bounce;effectmagnitude,5,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm"); + BeginCommand=cmd(visible,true); + StepsSelectedMessageCommand=function( self, param ) + if param.Player ~= "PlayerNumber_P2" then return end; + self:visible(false); + end; + children={ + LoadActor( "DifficultyList cursor p2" ) .. { + BeginCommand=cmd(player,"PlayerNumber_P2";); + PlayerJoinedMessageCommand=function(self,param ) + if param.Player ~= "PlayerNumber_P2" then return end; + self:visible( true ); + end; + }; + LoadFont( "_terminator two 32" ) .. { + InitCommand=cmd(x,4;y,-3;settext,"P2";zoom,0.5;diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000");); + BeginCommand=cmd(player,"PlayerNumber_P2";); + PlayerJoinedMessageCommand=function(self,param ) + if param.Player ~= "PlayerNumber_P2" then return end; + self:visible( true ); + end; + }; + } + }; + CursorP1Frame = LoadActor( "DifficultyList frame p1" ) .. { + InitCommand=cmd(bounce;effectmagnitude,-10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm"); + }; + CursorP2Frame = LoadActor( "DifficultyList frame p2" ) .. { + InitCommand=cmd(bounce;effectmagnitude,10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,"bgm"); + }; + }; +end + return t; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic underlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic underlay/default.lua index c390179c85..1ecbe65398 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic underlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic underlay/default.lua @@ -1,15 +1,17 @@ -local OnCommand = cmd(diffusealpha,0;linear,0.5;diffusealpha,1) -local OffCommand = cmd(linear,0.5;diffusealpha,0) -local t = Def.ActorFrame { - LoadActor( '_difficulty frame p1' ) .. { - InitCommand = cmd(player,PLAYER_1;x,SCREEN_CENTER_X-275;y,SCREEN_CENTER_Y-15); - OnCommand = OnCommand; - OffCommand = OffCommand; - }; - LoadActor( '_difficulty frame p2' ) .. { - InitCommand = cmd(player,PLAYER_2;x,SCREEN_CENTER_X-82;y,SCREEN_CENTER_Y-15); - OnCommand = OnCommand; - OffCommand = OffCommand; - }; -} -return t +--local OnCommand = cmd(diffusealpha,0;linear,0.5;diffusealpha,1) +--local OffCommand = cmd(linear,0.5;diffusealpha,0) +--local t = Def.ActorFrame { +-- LoadActor( '_difficulty frame p1' ) .. { +-- InitCommand = cmd(player,PLAYER_1;x,SCREEN_CENTER_X-275;y,SCREEN_CENTER_Y-15); +-- OnCommand = OnCommand; +-- OffCommand = OffCommand; +-- }; +-- LoadActor( '_difficulty frame p2' ) .. { +-- InitCommand = cmd(player,PLAYER_2;x,SCREEN_CENTER_X-82;y,SCREEN_CENTER_Y-15); +-- OnCommand = OnCommand; +-- OffCommand = OffCommand; +-- }; +--} +--return t + +return Def.Actor {}; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir index e80b2145da..f98a6ace22 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectStyle background.redir @@ -1 +1 @@ -_shared background fade in \ No newline at end of file +ScreenWithMenuElements background \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/_delay in.lua b/stepmania/Themes/default/BGAnimations/_delay in.lua index 8f38e29226..51b726d646 100644 --- a/stepmania/Themes/default/BGAnimations/_delay in.lua +++ b/stepmania/Themes/default/BGAnimations/_delay in.lua @@ -1,2 +1,3 @@ local fSeconds = ScreenMetric("InDelay"); return Def.Actor { OnCommand=cmd(sleep,fSeconds); }; + diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir b/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir index 8696c8d713..8463ae69a6 100644 --- a/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir +++ b/stepmania/Themes/default/Fonts/MusicWheelItem roulette.redir @@ -1 +1 @@ -blaster \ No newline at end of file +_terminator two 50 \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir b/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir index 8696c8d713..c7b301f980 100644 --- a/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir +++ b/stepmania/Themes/default/Fonts/MusicWheelItem sort.redir @@ -1 +1 @@ -blaster \ No newline at end of file +_terminator two 36 \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/TextBanner text.redir b/stepmania/Themes/default/Fonts/TextBanner text.redir index 0ba01b32c5..c2bd76238f 100644 --- a/stepmania/Themes/default/Fonts/TextBanner text.redir +++ b/stepmania/Themes/default/Fonts/TextBanner text.redir @@ -1 +1 @@ -_zeroesthree \ No newline at end of file +_regra bold 36 \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer.redir b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer.redir index a8c38e48f6..04b2ead777 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer.redir +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements footer.redir @@ -1 +1 @@ -_shared footer +_blank \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua index 3a01fad650..9c299df994 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements stage/stage.lua @@ -1,17 +1,27 @@ local stages = Def.ActorFrame { + LoadActor("_stage frame"); }; for _, s in ipairs(Stage) do if s == "Stage_Normal" then - stages[#stages+1] = LoadFont("_zeroesthree") .. { - InitCommand=cmd(shadowlength,0); + stages[#stages+1] = LoadFont("_sf square head bold stroke 28") .. { + InitCommand=cmd(shadowlength,0;zoom,0.5;diffuse,color("#208f00");); SetCommand=function(self, params) self:visible( params.StageToShow == s ); if params.StageNumber then - self:settext( FormatNumberAndSuffix(params.StageNumber+1) ); + self:settext( string.upper(FormatNumberAndSuffix(params.StageNumber+1)) ); end end; - } + }; + stages[#stages+1] = LoadFont("_sf square head bold 28") .. { + InitCommand=cmd(shadowlength,0;zoom,0.5;diffuse,color("#6cff00");); + SetCommand=function(self, params) + self:visible( params.StageToShow == s ); + if params.StageNumber then + self:settext( string.upper(FormatNumberAndSuffix(params.StageNumber+1)) ); + end + end; + }; else stages[#stages+1] = LoadActor("_stage " .. s) .. { SetCommand=function(self, params) diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index b03d12300d..342661b054 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1363,6 +1363,17 @@ HelpText=&LEFT; or &RIGHT; change music Hold &LEFT; and &RIGHT; then press S [ScreenSelectStyle] HelpText=Use &LEFT; &RIGHT; to select, then press START +[ScreenSelectStyle2] +HelpText=Use &LEFT; &RIGHT; to select, then press START + +[ScreenSelectPlayMode] +NormalExplanation=CHOOSE YOUR\nFAVORITE SONGS +NonstopExplanation=PLAY SONGS\nBACK-TO-BACK +ChallengeExplanation=DON'T MISS\nMANY STEPS +SurvivalExplanation=BEAT THE CLOCK\nTO WIN +EndlessExplanation=PLAY UNTIL\nYOU DROP +HelpText=Use &LEFT; &RIGHT; to select, then press START + [ScreenSelectStyle5th] HelpText=Use &LEFT; &RIGHT; to select, then press START @@ -1531,6 +1542,7 @@ Preferred=Preferred Title=Title TopGrades=Top Grades Roulette=Roulette +Length=Length [StepMania] Announcer=Announcer @@ -1828,3 +1840,8 @@ OpenGL hardware acceleration is not available.=OpenGL hardware acceleration is n Off=Off DoubleFor1Credit=Double For 1 Credit 2PlayersFor1Credit=2 Players For 1 Credit + +[DifficultyAndStepsType] +Difficulty_Easy-StepsType_Dance_Single=Easy +Difficulty_Medium-StepsType_Dance_Single=Medium +Difficulty_Hard-StepsType_Dance_Single=Hard diff --git a/stepmania/Themes/default/Scripts/Colors.lua b/stepmania/Themes/default/Scripts/Colors.lua index a386e4daf2..6b813d8867 100644 --- a/stepmania/Themes/default/Scripts/Colors.lua +++ b/stepmania/Themes/default/Scripts/Colors.lua @@ -13,7 +13,76 @@ local DifficultyColors = { Difficulty_Edit = color("0.8,0.8,0.8,1"), -- gray } -function DifficultyColor( dc ) return DifficultyColors[dc] end +function DifficultyToColor( dc ) + local c = DifficultyColors[dc] + if c then return c end + return color("#000000"); +end + + + +function StepsOrTrailToLocalizedString(StepsOrTrail) + if not StepsOrTrail then + return ""; + end + if lua.CheckType("Trail", StepsOrTrail) then + local s = THEME:GetString("DifficultyAndStepsType", "Course"); + return s; + end + + local dc = StepsOrTrail:GetDifficulty(); + local st = StepsOrTrail.GetStepsType and StepsOrTrail:GetStepsType(); + return DifficultyAndStepsTypeToLocalizedString( dc, st ); +end + +function StepsOrTrailToIndex(StepsOrTrail) + if not StepsOrTrail then return 1; end + if lua.CheckType("Trail", StepsOrTrail) then + return 8 + end + local dc = StepsOrTrail:GetDifficulty(); + local st = StepsOrTrail.GetStepsType and StepsOrTrail:GetStepsType(); + return DifficultyAndStepsTypeToIndex( dc, st ); +end; +function TrailColor() + return color("#30f0c8"); +end; + +function StepsOrTrailToColor(StepsOrTrail) + if not StepsOrTrail then return color("#000000"); end + if lua.CheckType("Trail", StepsOrTrail) then return TrailColor() end + + local dc = StepsOrTrail:GetDifficulty(); + local st = StepsOrTrail.GetStepsType and StepsOrTrail:GetStepsType(); + return DifficultyAndStepsTypeToColor( dc, st ); +end + +function DifficultyAndStepsTypeToLocalizedString( difficulty, stepsType ) + if( not difficulty or not stepsType ) then + return ""; + end + return THEME:GetString( "DifficultyAndStepsType", difficulty .. "-" .. stepsType ); +end + +function DifficultyAndStepsTypeToIndex( difficulty, stepsType ) + for idx, entry in ipairs(DifficultyAndStepsTypeInfo) do + if entry.difficulty == difficulty and entry.stepsType == stepsType then + return idx; + end + end + + if difficulty == "Difficulty_Edit" then + return 7 + end; + return nil; +end + +function DifficultyAndStepsTypeToColor( difficulty, stepsType ) + return DifficultyToColor( difficulty ); +end + + + -- (c) 2005 Chris Danford -- All rights reserved. diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua index 79eee94b32..a81f17a40a 100644 --- a/stepmania/Themes/default/Scripts/Other.lua +++ b/stepmania/Themes/default/Scripts/Other.lua @@ -75,18 +75,33 @@ function ScreenString( sName ) return THEME:GetString( sClass, sName ) end -function TextBannerSet(self,param) +function TextBannerAfterSet(self,param) local Title=self:GetChild("Title"); local Subtitle=self:GetChild("Subtitle"); - local Artist=self:GetChild("Artist"); + --local Artist=self:GetChild("Artist"); + local edge_x = 120; if Subtitle:GetText() == "" then - (cmd(zoom,1;maxwidth,180;y,-8))(Title); - (cmd(visible,false))(Subtitle); - (cmd(zoom,0.6;maxwidth,266;y,8))(Artist); + (cmd(zoom,0.5;maxwidth,300;x,edge_x;y,0))(Title); + (cmd(visible,false))(Subtitle); + --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,7))(Artist); else - (cmd(zoom,1;maxwidth,180;y,-10))(Title); - (cmd(visible,true;zoom,.5;maxwidth,360))(Subtitle); - (cmd(zoom,0.6;maxwidth,266;y,10))(Artist); + local one_line_title_zoom = 0.5; + local one_line_sub_zoom = 0.3; + local title_width = Title:GetWidth() * one_line_title_zoom; + local sub_width = Subtitle:GetWidth() * one_line_sub_zoom; + local spacing = 4; + local max_one_line_width = 200; + if title_width + spacing + sub_width < max_one_line_width then + -- subtitle to the side + (cmd(zoom,0.5;x,edge_x-sub_width-spacing;y,0))(Title); + (cmd(visible,true;zoom,one_line_sub_zoom;x,edge_x;y,2))(Subtitle); + --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,7))(Artist); + else + -- subtitle below + (cmd(zoom,0.5;x,edge_x;y,-6;))(Title); + (cmd(visible,true;zoom,0.3;x,edge_x;y,7))(Subtitle); + --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,9))(Artist); + end end end diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 0911cc5319..30d405cb49 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -135,7 +135,7 @@ ChoiceNames="1" [ScreenCaution] Fallback="ScreenSelectMasterBlank" PrevScreen=ScreenTitleBranch() -Choice1="screen,ScreenSelectStyle" +Choice1="screen,ScreenSelectStyle2" [ScreenProfileLoad] Class="ScreenProfileLoad" @@ -172,6 +172,111 @@ SilentWait=true BounceJoinMessage=true FoldOnJoin=true +[ScreenWithMenuElements2] +Fallback="ScreenWithMenuElements" + +[ScreenSelectStyle2] +Fallback="ScreenWithMenuElements2" +Class="ScreenSelectMaster" +IdleCommentSeconds=0 +IdleTimeoutSeconds=0 +TimerSeconds=0 +UpdateOnMessage="" +PrevScreen="ScreenTitleMenu" +ChoiceNames="1,2,3" +# The "name" here affects the announcer, eg. "ScreenSelectStyle comment single". +Choice1="Style,single;name,1Player;text,1 Player;screen,ScreenSelectPlayMode" +Choice2="Style,versus;name,2Players;text,2 Players;screen,ScreenSelectPlayMode" +Choice3="Style,double;name,Double;text,Double;screen,ScreenSelectPlayMode" +ShowIcon=true +PerChoiceIconElement=false +ShowScroller=false +ShowCursor=false +SharedSelection=true +UseIconMetrics=false +NumChoicesOnPage1=3 +CursorP1OffsetXFromIcon=0 +CursorP1OffsetYFromIcon=0 +CursorP2OffsetXFromIcon=0 +CursorP2OffsetYFromIcon=0 +PreSwitchPageSeconds=0 +PostSwitchPageSeconds=0 +OptionOrderUp= +OptionOrderDown= +OptionOrderLeft= +OptionOrderRight= +OptionOrderAuto= +WrapCursor=false +WrapScroller=false +LoopScroller=false +PerChoiceScrollElement=false +AllowRepeatingInput=false +ScrollerSecondsPerItem=0 +ScrollerNumItemsToDraw=1 +ScrollerTransform=function() end; +ScrollerSubdivisions=1 +DefaultChoice="1" +MorePage1X=0 +MorePage1Y=0 +MorePage2X=0 +MorePage2Y=0 +ExplanationPage1X=0 +ExplanationPage1Y=0 +ExplanationPage2X=0 +ExplanationPage2Y=0 + +[ScreenSelectPlayMode] +Fallback="ScreenWithMenuElements2" +Class="ScreenSelectMaster" +IdleCommentSeconds=0 +IdleTimeoutSeconds=0 +TimerSeconds=0 +UpdateOnMessage="" +PrevScreen="ScreenTitleMenu" +ChoiceNames="1,2,3,4,5" +# The "name" here affects the announcer, eg. "ScreenSelectStyle comment single". +Choice1="playmode,regular;name,Normal;text,Normal;screen,ScreenSelectMusic" +Choice2="playmode,nonstop;name,Nonstop;text,Nonstop;screen,ScreenSelectMusic" +Choice3="playmode,oni;name,Challenge;text,Challenge;screen,ScreenSelectMusic" +Choice4="playmode,nonstop;name,Survival;text,Survival;screen,ScreenSelectMusic" +Choice5="playmode,endless;name,Endless;text,Endless;screen,ScreenSelectMusic" +ShowIcon=true +PerChoiceIconElement=false +ShowScroller=false +ShowCursor=false +SharedSelection=true +UseIconMetrics=false +NumChoicesOnPage1=5 +CursorP1OffsetXFromIcon=0 +CursorP1OffsetYFromIcon=0 +CursorP2OffsetXFromIcon=0 +CursorP2OffsetYFromIcon=0 +PreSwitchPageSeconds=0 +PostSwitchPageSeconds=0 +OptionOrderUp= +OptionOrderDown= +OptionOrderLeft= +OptionOrderRight= +OptionOrderAuto= +WrapCursor=false +WrapScroller=false +LoopScroller=false +PerChoiceScrollElement=false +AllowRepeatingInput=false +ScrollerSecondsPerItem=0 +ScrollerNumItemsToDraw=1 +ScrollerTransform=function() end; +ScrollerSubdivisions=1 +DefaultChoice="1" +MorePage1X=0 +MorePage1Y=0 +MorePage2X=0 +MorePage2Y=0 +ExplanationPage1X=0 +ExplanationPage1Y=0 +ExplanationPage2X=0 +ExplanationPage2Y=0 + [ScreenSelectStyle] Class="ScreenSelectStyle" Fallback="ScreenSelect" @@ -479,7 +584,7 @@ StyleIcon=true [ScreenSelectMusic] Class="ScreenSelectMusic" -Fallback="ScreenWithMenuElements" +Fallback="ScreenWithMenuElements2" NextScreen=GetSelectMusicNext() PrevScreen=ScreenTitleBranch() MusicWheelType="MusicWheel" @@ -488,44 +593,44 @@ SampleMusicFallbackFadeInSeconds=0 ShowOptionsMessageSeconds=1.5 BannerX=0 BannerY=0 -BannerOnCommand=scaletoclipped,256,80;visible,false +BannerOnCommand=scaletoclipped,322,120;visible,false;ztest,1 BannerOffCommand= ShowStage=true -StageX=SCREEN_CENTER_X-272-SCREEN_WIDTH*0.6 -StageY=SCREEN_CENTER_Y-134 -StageOnCommand=draworder,101;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +StageX=SCREEN_CENTER_X+272 +StageY=SCREEN_CENTER_Y-164 +StageOnCommand=draworder,101;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 StageOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -CDTitleX=-170 -CDTitleY=SCREEN_CENTER_Y-98 +CDTitleX=SCREEN_CENTER_X+240 +CDTitleY=SCREEN_CENTER_Y-50 CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Back"; CDTitleBackCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Front";diffuse,#606060; -CDTitleOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6;draworder,101 +CDTitleOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6;draworder,101 CDTitleOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -ScoreFrameP1X=SCREEN_CENTER_X-265+SCREEN_WIDTH*0.6 -ScoreFrameP1Y=SCREEN_CENTER_Y+160 -ScoreFrameP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 -ScoreFrameP1OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH -ScoreFrameP2X=SCREEN_CENTER_X-45+SCREEN_WIDTH*0.6 -ScoreFrameP2Y=SCREEN_CENTER_Y+160 -ScoreFrameP2OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 -ScoreFrameP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 -ScoreP1X=SCREEN_CENTER_X-265+SCREEN_WIDTH*0.6 -ScoreP1Y=SCREEN_CENTER_Y+154 -ScoreP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 -ScoreP1OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 -ScoreP2X=SCREEN_CENTER_X-44+SCREEN_WIDTH*0.6 -ScoreP2Y=SCREEN_CENTER_Y+154 -ScoreP2OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 -ScoreP2OffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 +ScoreFrameP1X= +ScoreFrameP1Y= +ScoreFrameP1OnCommand=visible,false +ScoreFrameP1OffCommand= +ScoreFrameP2X= +ScoreFrameP2Y= +ScoreFrameP2OnCommand=visible,false +ScoreFrameP2OffCommand= +ScoreP1X= +ScoreP1Y= +ScoreP1OnCommand=visible,false +ScoreP1OffCommand= +ScoreP2X= +ScoreP2Y= +ScoreP2OnCommand= +ScoreP2OffCommand= # Don't use relative motion here. It's usually possible to change the # sort again while this command is still executing. ScoreP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58 ScoreP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 ScoreFrameP1SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,58 ScoreFrameP2SortChangeCommand=stoptweening;decelerate,0.128;x,920;sleep,0.128;accelerate,0.25;x,269 -MusicWheelX=SCREEN_WIDTH-160 -MusicWheelY=SCREEN_CENTER_Y+4 -MusicWheelOnCommand= +MusicWheelX=SCREEN_CENTER_X-190 +MusicWheelY=SCREEN_CENTER_Y-2 +MusicWheelOnCommand=draworder,-100 MusicWheelOffCommand= TimerSeconds=60 StyleIcon=true @@ -1672,11 +1777,11 @@ Line4Old="list,RandomModifiers" Fallback="Screen" Class="ScreenSystemLayer" CreditsJoinOnly=false -CreditsP1X=SCREEN_LEFT+120 -CreditsP1Y=SCREEN_BOTTOM-6 -CreditsP2X=SCREEN_RIGHT-120 -CreditsP2Y=SCREEN_BOTTOM-6 -CreditsInitCommand=shadowlength,0 +CreditsP1X=SCREEN_CENTER_X-230 +CreditsP1Y=SCREEN_BOTTOM-10 +CreditsP2X=SCREEN_CENTER_X+230 +CreditsP2Y=SCREEN_BOTTOM-10 +CreditsInitCommand=shadowlength,0;zoom,0.5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000"); [ScreenDebugOverlay] Class="ScreenDebugOverlay" @@ -1693,31 +1798,34 @@ StatsX=SCREEN_RIGHT-8 StatsY=SCREEN_TOP+10 StatsOnCommand=horizalign,right;vertalign,top;zoom,0.7;shadowlength,2 -[WheelItemBase] -TextOnCommand= -TextX=0 -TextY=0 - [MusicWheelItem] -Fallback="WheelItemBase" IconX=-136 IconY=0 IconOnCommand= SongNameX=-30 SongNameY=0 SongNameOnCommand= -SectionX=-30 -SectionY=0 -SectionOnCommand=zoom,1.0;maxwidth,200 -RouletteX=-30 -RouletteY=0 -RouletteOnCommand=Zoom,1.0;rainbowscroll,true -CourseNameX=-140 -CourseNameY=0 -CourseNameOnCommand=shadowlength,0;zoom,1;horizAlign,left;maxwidth,200 -SortX=-130 -SortY=0 -SortOnCommand=shadowlength,0;zoom,1.0;horizAlign,left;maxwidth,200 +SectionExpandedX=-18 +SectionExpandedY=-2 +SectionExpandedOnCommand=zoom,0.5;maxwidth,400;strokecolor,color("#00000077");shadowlength,0 +SectionCollapsedX=-18 +SectionCollapsedY=-2 +SectionCollapsedOnCommand=zoom,0.5;maxwidth,400;strokecolor,color("#00000077");shadowlength,0 +SectionCountX=105 +SectionCountY=0 +SectionCountOnCommand=zoom,0.5;diffuse,color("#8e8b3f");shadowlength,0 +RouletteX=-0 +RouletteY=-2 +RouletteOnCommand=zoom,0.5;maxwidth,400;rainbowscroll,true;strokecolor,color("#00000077");shadowlength,0 +CourseX=0 +CourseY=-2 +CourseOnCommand=shadowlength,0;zoom,0.5;maxwidth,400 +SortX=0 +SortY=-2 +SortOnCommand=shadowlength,0;zoom,0.5;maxwidth,400 +ModeX=0 +ModeY=-2 +ModeOnCommand=shadowlength,0;zoom,0.5;maxwidth,400 GradeP1X=90 GradeP1Y=-5 GradeP2X=110 @@ -1734,12 +1842,22 @@ RandomPicksLockedSongs=true RouletteSwitchSeconds=0.05 RouletteSlowDownSwitches=5 LockedInitialVelocity=7 -ScrollBarHeight=368 -ScrollBarOnCommand=x,148 -ItemCurveX=35 -ItemSpacingY=42 -NoCurving=false -NumWheelItems=17 +ScrollBarHeight=300 +ScrollBarOnCommand=x,-148 +; linear wheel example: +; ItemTransformFunction=function(self,positionIndex,itemIndex,numItems) self:y(positionIndex*38); end +; 3D wheel example: +; ItemTransformFunction=function(self,positionIndex,itemIndex,numItems) +; local curve = math.pi; +; local NUM_WHEEL_ITEMS = 11; +; local WHEEL_3D_RADIUS = 245; +; local rotationx_radians = scale(positionIndex,-NUM_WHEEL_ITEMS/2.0f,+NUM_WHEEL_ITEMS/2.0f,-curve/2.f,+curve/2.f) ); +; self:x( 1 - math.cos(positionIndex/math.pi) ); +; self:y( WHEEL_3D_RADIUS * math.sin(rotationx_radians) ); +; self:z( -100 + WHEEL_3D_RADIUS * math.cos(rotationx_radians) ); +; self:rotationx( rotationx_radians * 180/math.pi ); -- to degrees end +ItemTransformFunction=function(self,positionIndex,itemIndex,numItems) self:x( (1-math.cos(positionIndex/math.pi))*44 ); self:y( positionIndex*38 ); end +NumWheelItems=11 MusicWheelSortOnCommand= MusicWheelSortOffCommand= MusicWheelItemSortOnCommand=addx,SCREEN_WIDTH/2;accelerate,0.2;addx,-SCREEN_WIDTH/2 @@ -1763,11 +1881,8 @@ SongRealExtraColor=color("0.9,0.9,0,1") -- yellow SortMenuColor=color("1,1,0,1") SortOrders={ "SortOrder_Preferred", "SortOrder_Group", "SortOrder_Title", "SortOrder_BPM", "SortOrder_Popularity", "SortOrder_Artist", "SortOrder_Genre" } ShowRoulette=true -ShowRandom=true -ShowPortal=true -Use3D=false -Wheel3DRadius=245 -- Possibly safe defaults? -CirclePercent=0.5 +ShowRandom=false +ShowPortal=false MostPlayedSongsToShow=30 ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,EasyMeter,MediumMeter,HardMeter,Genre,Length" ChoicePreferred="sort,Preferred" @@ -1851,7 +1966,7 @@ NumTicks=10 MaxTicks=14 TicksX=0 TicksY=0 -TicksOnCommand=shadowlength,0 +TicksOnCommand=shadowlength,0;stoke TicksSetCommand=%function(self,param) self:diffuse(DifficultyColor(param.Difficulty)) if param.Meter > 9 then self:glowshift() else self:stopeffect() end end ShowTicks=false ShowMeter=true @@ -1883,8 +1998,8 @@ HeaderY=SCREEN_TOP-11 HeaderOnCommand=draworder,95;linear,0.25;addy,33 HeaderOffCommand=linear,0.25;addy,-44; FooterX=SCREEN_CENTER_X -FooterY=SCREEN_BOTTOM-16 -FooterOnCommand=draworder,95;ZoomToWidth,SCREEN_WIDTH +FooterY=SCREEN_BOTTOM +FooterOnCommand=vertalign,bottom FooterOffCommand= HelpX=SCREEN_CENTER_X HelpY=SCREEN_BOTTOM-24 @@ -2191,21 +2306,24 @@ RainbowColor7=color("1.0,0.8,0.2,1") -- orange [SongManager] NumSongGroupColors=7 -SongGroupColor1=color("0.8,0.1,0.6,1") -- pink -SongGroupColor2=color("0.6,0.4,0.8,1") -- purple -SongGroupColor3=color("0.0,0.4,0.8,1") -- sky blue -SongGroupColor4=color("0.0,0.6,0.6,1") -- sea green -SongGroupColor5=color("0.1,0.7,0.3,1") -- green -SongGroupColor6=color("0.8,0.6,0.0,1") -- orange -SongGroupColor7=color("1.0,0.3,0.3,1") -- light red +SongGroupColor1=color("#ffba00") +SongGroupColor2=color("#ffec00") +SongGroupColor3=color("#00ff00") +SongGroupColor4=color("#00f6ff") +SongGroupColor5=color("#4896ff") +SongGroupColor6=color("#b87fff") +SongGroupColor7=color("#ff7fc7") NumCourseGroupColors=1 UseUnlockColor=false UnlockColor=color("1,0.5,0,1") CourseGroupColor1=color("1,1,1,1") -ExtraColor=color("1.0,0.0,0.0,1.0") -- red +ExtraColor=color("#ff0000") -- red ExtraColorMeter=10 UsePreferredSortColor=false MoveUnlocksToBottomOfPreferredSort=false +Loading songs...= +Loading courses...= +Reloading...= ExtraStage2DifficultyMax=8 [Background] @@ -2281,11 +2399,12 @@ AvoidMineCommand= HitMineCommand= [BPMDisplay] -NormalColor=color("1.0,1.0,1.0,1") -- white -ChangeColor=color("1.0,0.5,0.0,1") -- orange -ExtraColor=color("0.7,0.0,0.0,1") -- dark red +SetNoBpmCommand=diffusetopedge,color("#777777");diffusebottomedge,color("#666666") +SetNormalCommand=diffusetopedge,color("#fbfb57");diffusebottomedge,color("#fb9c57") +SetChangeCommand=diffusetopedge,color("#fb9c57");diffusebottomedge,color("#fb5757") +SetExtraCommand=diffusetopedge,color("#fb5757");diffusebottomedge,color("#9c4242") Cycle=true -NoBPMText="..." +NoBpmText="000" Separator="-" [CodeDetector] @@ -2387,8 +2506,9 @@ TextZoom=0.5 Uppercase=false [OptionIconRow] -SpacingX=32 +SpacingX=46 SpacingY=0 +NumOptionIcons=6 [TransitionOniFade] BannerWidth=512 @@ -3177,17 +3297,11 @@ LineNames="1" Line1="lua,OptionsRowTest()" [TextBanner] -TitleX=-120 -TitleY=0 -TitleOnCommand=shadowlength,0;horizalign,left -SubtitleX=-120 -SubtitleY=0 -SubtitleOnCommand=shadowlength,0;horizalign,left -ArtistX=-120 -ArtistY=0 -ArtistOnCommand=shadowlength,0;horizalign,left +TitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");horizalign,right +SubtitleOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");horizalign,right +ArtistOnCommand=visible,false ArtistPrependString="/" -SetCommand=%TextBannerSet +AfterSetCommand=%TextBannerAfterSet [TextBannerCourseEntry] Fallback="TextBanner" @@ -4063,106 +4177,107 @@ AllowCenter1Player=0 SyncInfoOnCommand=x,SCREEN_CENTER_X+160;y,SCREEN_CENTER_Y;zoom,0;decelerate,0.5;zoom,0.6 [PaneDisplay] -ShiftP1X=60 +ShiftP1X=-40 ShiftP1Y=0 -ShiftP2X=60 +ShiftP2X=40 ShiftP2Y=0 -UnderOnCommand= -UnderOffCommand= -OverOnCommand=visible,false; -OverOffCommand= -OverOnCommand=visible,false; -OverOffCommand= -SongNumStepsTextX=-40 -SongNumStepsTextY=-25 -SongNumStepsTextOnCommand=shadowlength,0;zoom,0.5; -SongNumStepsTextOffCommand=linear,0.1;diffusealpha,0; -SongNumStepsLabelX=-119 -SongNumStepsLabelY=-25 -SongNumStepsLabelOffCommand=linear,0.1;diffusealpha,0; -SongNumStepsNumLevels=8 -SongNumStepsLevel1=1;diffuse,#FFFFFF -SongNumStepsLevel2=249;diffuse,#00FF00 -- 1-249 (green) -SongNumStepsLevel3=374;diffuse,#C0FF00 -- 250-374 (greenish yellow) -SongNumStepsLevel4=499;diffuse,#FFFF00 -- 375-499 (yellow) -SongNumStepsLevel5=624;diffuse,#FF8800 -- 500-624 (orange) -SongNumStepsLevel6=749;diffuse,#FF6600 -- 625-749 (darker orange) -SongNumStepsLevel7=1000;diffuse,#00C0FF -- 750-999 (AJ Blue) -SongNumStepsLevel8=9999;diffuse,#FF0000 -- 1000-9999 (Red) -SongJumpsTextX=-40 -SongJumpsTextY=-15 -SongJumpsTextOnCommand=shadowlength,0;zoom,0.5; -SongJumpsTextOffCommand=linear,0.1;diffusealpha,0; -SongJumpsLabelX=-119 -SongJumpsLabelY=-15 -SongJumpsLabelOffCommand=linear,0.1;diffusealpha,0; -SongJumpsNumLevels=6 -SongJumpsLevel1=1;diffuse,#FFFFFF -SongJumpsLevel2=49;diffuse,#00FF00 -- 1-49 (green) -SongJumpsLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) -SongJumpsLevel4=199;diffuse,#FF8800 -- 100-199 (orange) -SongJumpsLevel5=449;diffuse,#00C0FF -- 200-450 (AJ Blue) -SongJumpsLevel6=9999;diffuse,#FF0000 -- 450-inf (red) -SongHoldsTextX=-40 -SongHoldsTextY=-5 -SongHoldsTextOnCommand=shadowlength,0;zoom,0.5; -SongHoldsTextOffCommand=linear,0.1;diffusealpha,0; -SongHoldsLabelX=-120 -SongHoldsLabelY=-5 -SongHoldsLabelOffCommand=linear,0.1;diffusealpha,0; -SongHoldsNumLevels=5 -SongHoldsLevel1=1;diffuse,#FFFFFF -SongHoldsLevel2=49;diffuse,#00FF00 -- 1-49 (green) -SongHoldsLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) -SongHoldsLevel4=199;diffuse,#FF8800 -- 100-199 (orange) -SongHoldsLevel5=9999;diffuse,#FF0000 -- 200-inf (red) -SongMinesTextX=-40 -SongMinesTextY=5 -SongMinesTextOnCommand=shadowlength,0;zoom,0.5; -SongMinesTextOffCommand=linear,0.1;diffusealpha,0; -SongMinesLabelX=-120 -SongMinesLabelY=5 -SongMinesLabelOffCommand=linear,0.1;diffusealpha,0; -SongMinesNumLevels=6 -SongMinesLevel1=1;diffuse,#FFFFFF -SongMinesLevel2=49;diffuse,#00FF00 -- 1-49 (green) -SongMinesLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) -SongMinesLevel4=199;diffuse,#FF8800 -- 100-199 (orange) -SongMinesLevel5=999;diffuse,#00C0FF -- 200-999 (AJ Blue) -SongMinesLevel6=9999;diffuse,#FF0000 -- 1000-inf (red) -SongHandsTextX=-40 -SongHandsTextY=15 -SongHandsTextOnCommand=shadowlength,0;zoom,0.5; -SongHandsTextOffCommand=linear,0.1;diffusealpha,0; -SongHandsLabelX=-120 -SongHandsLabelY=15 -SongHandsLabelOffCommand=linear,0.1;diffusealpha,0; -SongHandsNumLevels=5 -SongHandsLevel1=1;diffuse,#FFFFFF -SongHandsLevel2=14;diffuse,#00FF00 -- 1-7 (green) -SongHandsLevel3=34;diffuse,#FFFF00 -- 8-34 (yellow) -SongHandsLevel4=99;diffuse,#FF8800 -- 35-99 (orange) -SongHandsLevel5=9999;diffuse,#FF0000 -- 100-inf (red) -SongRollsTextX=-40 -SongRollsTextY=25 -SongRollsTextOnCommand=shadowlength,0;zoom,0.5; -SongRollsTextOffCommand=linear,0.1;diffusealpha,0; -SongRollsLabelX=-119 -SongRollsLabelY=25 -SongRollsLabelOffCommand=linear,0.1;diffusealpha,0; -SongRollsNumLevels=5 -SongRollsLevel1=1;diffuse,#FFFFFF -SongRollsLevel2=49;diffuse,#00FF00 -- 1-49 (green) -SongRollsLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) -SongRollsLevel4=199;diffuse,#FF8800 -- 100-199 (orange) -SongRollsLevel5=9999;diffuse,#FF0000 -- 200-inf (red) -MachineHighScoreTextX=-40 -MachineHighScoreTextY=35 -MachineHighScoreTextOnCommand=shadowlength,0;zoom,0.5; +CountFormat="%3.0f" +NumStepsTextX=4+74*-0.5 +NumStepsTextY=16*-1 +NumStepsTextOnCommand=shadowlength,0;zoom,0.5; +NumStepsTextOffCommand=linear,0.1;diffusealpha,0; +NumStepsLabelX=-16-4+74*-0.5 +NumStepsLabelY=16*-1 +NumStepsLabelOnCommand=horizalign,right +NumStepsLabelOffCommand=linear,0.1;diffusealpha,0; +NumStepsNumLevels=8 +NumStepsLevel1=1;diffuse,#FFFFFF +NumStepsLevel2=249;diffuse,#00FF00 -- 1-249 (green) +NumStepsLevel3=374;diffuse,#C0FF00 -- 250-374 (greenish yellow) +NumStepsLevel4=499;diffuse,#FFFF00 -- 375-499 (yellow) +NumStepsLevel5=624;diffuse,#FF8800 -- 500-624 (orange) +NumStepsLevel6=749;diffuse,#FF6600 -- 625-749 (darker orange) +NumStepsLevel7=1000;diffuse,#00C0FF -- 750-999 (AJ Blue) +NumStepsLevel8=9999;diffuse,#FF0000 -- 1000-9999 (Red) +JumpsTextX=4+74*-0.5 +JumpsTextY=16*0 +JumpsTextOnCommand=shadowlength,0;zoom,0.5; +JumpsTextOffCommand=linear,0.1;diffusealpha,0; +JumpsLabelX=-16+74*-0.5 +JumpsLabelY=16*0 +JumpsLabelOnCommand=horizalign,right +JumpsLabelOffCommand=linear,0.1;diffusealpha,0; +JumpsNumLevels=6 +JumpsLevel1=1;diffuse,#FFFFFF +JumpsLevel2=49;diffuse,#00FF00 -- 1-49 (green) +JumpsLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) +JumpsLevel4=199;diffuse,#FF8800 -- 100-199 (orange) +JumpsLevel5=449;diffuse,#00C0FF -- 200-450 (AJ Blue) +JumpsLevel6=9999;diffuse,#FF0000 -- 450-inf (red) +HoldsTextX=4+74*-0.5 +HoldsTextY=16*1 +HoldsTextOnCommand=shadowlength,0;zoom,0.5; +HoldsTextOffCommand=linear,0.1;diffusealpha,0; +HoldsLabelX=-16+74*-0.5 +HoldsLabelY=16*1 +HoldsLabelOnCommand=horizalign,right +HoldsLabelOffCommand=linear,0.1;diffusealpha,0; +HoldsNumLevels=5 +HoldsLevel1=1;diffuse,#FFFFFF +HoldsLevel2=49;diffuse,#00FF00 -- 1-49 (green) +HoldsLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) +HoldsLevel4=199;diffuse,#FF8800 -- 100-199 (orange) +HoldsLevel5=9999;diffuse,#FF0000 -- 200-inf (red) +MinesTextX=4+74*0.5 +MinesTextY=16*-1 +MinesTextOnCommand=shadowlength,0;zoom,0.5; +MinesTextOffCommand=linear,0.1;diffusealpha,0; +MinesLabelX=-16+74*0.5 +MinesLabelY=16*-1 +MinesLabelOnCommand=horizalign,right +MinesLabelOffCommand=linear,0.1;diffusealpha,0; +MinesNumLevels=6 +MinesLevel1=1;diffuse,#FFFFFF +MinesLevel2=49;diffuse,#00FF00 -- 1-49 (green) +MinesLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) +MinesLevel4=199;diffuse,#FF8800 -- 100-199 (orange) +MinesLevel5=999;diffuse,#00C0FF -- 200-999 (AJ Blue) +MinesLevel6=9999;diffuse,#FF0000 -- 1000-inf (red) +HandsTextX=4+74*0.5 +HandsTextY=16*0 +HandsTextOnCommand=shadowlength,0;zoom,0.5; +HandsTextOffCommand=linear,0.1;diffusealpha,0; +HandsLabelX=-16+74*0.5 +HandsLabelY=16*0 +HandsLabelOnCommand=horizalign,right +HandsLabelOffCommand=linear,0.1;diffusealpha,0; +HandsNumLevels=5 +HandsLevel1=1;diffuse,#FFFFFF +HandsLevel2=14;diffuse,#00FF00 -- 1-7 (green) +HandsLevel3=34;diffuse,#FFFF00 -- 8-34 (yellow) +HandsLevel4=99;diffuse,#FF8800 -- 35-99 (orange) +HandsLevel5=9999;diffuse,#FF0000 -- 100-inf (red) +RollsTextX=4+74*0.5 +RollsTextY=16*1 +RollsTextOnCommand=shadowlength,0;zoom,0.5; +RollsTextOffCommand=linear,0.1;diffusealpha,0; +RollsLabelX=-16+74*0.5 +RollsLabelY=16*1 +RollsLabelOnCommand=horizalign,right +RollsLabelOffCommand=linear,0.1;diffusealpha,0; +RollsNumLevels=5 +RollsLevel1=1;diffuse,#FFFFFF +RollsLevel2=49;diffuse,#00FF00 -- 1-49 (green) +RollsLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) +RollsLevel4=199;diffuse,#FF8800 -- 100-199 (orange) +RollsLevel5=9999;diffuse,#FF0000 -- 200-inf (red) +MachineHighScoreTextX=100 +MachineHighScoreTextY=10 +MachineHighScoreTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb"); MachineHighScoreTextOffCommand=linear,0.1;diffusealpha,0; -MachineHighScoreLabelX=-119 -MachineHighScoreLabelY=35 -MachineHighScoreLabelOffCommand=linear,0.1;diffusealpha,0; +MachineHighScoreLabelX=0 +MachineHighScoreLabelY=0 +MachineHighScoreLabelOnCommand=visible,false; MachineHighScoreNumLevels=12 MachineHighScoreLevel1=1;diffuse,#FFFFFF -- No Play (white) MachineHighScoreLevel2=9;diffuse,#FF0000 -- below 10% (red) @@ -4176,173 +4291,24 @@ MachineHighScoreLevel9=79;diffuse,#66FF00 -- 70-79% (Less Greenish Yellow) MachineHighScoreLevel10=89;diffuse,#33FF00 -- 80-89% (Least Greenish Yellow) MachineHighScoreLevel11=99;diffuse,#00FF00 -- 90-99% (Green) MachineHighScoreLevel12=101;diffuse,#00C0FF -- 100% (AJ Blue) -MachineNumPlaysTextX=0 -MachineNumPlaysTextY=-25 -MachineNumPlaysTextOnCommand=visible,false; -MachineNumPlaysTextOffCommand= -MachineNumPlaysLabelX=0 -MachineNumPlaysLabelY=-25 -MachineNumPlaysLabelOffCommand= -MachineRankTextX=-40 -MachineRankTextY=50 -MachineRankTextOnCommand=visible,false; -MachineRankTextOffCommand=linear,0.1;diffusealpha,0; -MachineRankLabelX=320 -MachineRankLabelY=240 -MachineRankLabelOffCommand=linear,0.1;diffusealpha,0; -MachineRankNumLevels=6 -MachineRankLevel1=1;diffuse,#FF0000 -- 1 (red) -MachineRankLevel2=2;diffuse,#FF8800 -- 2 (orange) -MachineRankLevel3=3;diffuse,#FFFF00 -- 3 (yellow) -MachineRankLevel4=4;diffuse,#00FF00 -- 4 (green) -MachineRankLevel5=5;diffuse,#00C0FF -- 5 (AJ Blue) -MachineRankLevel6=9999;diffuse,#FFFFFF -- 6-inf (white) -MachineHighNameTextX=-20 -MachineHighNameTextY=20 -MachineHighNameTextOnCommand=visible,false; -MachineHighNameTextOffCommand= -MachineHighNameLabelX=320 -MachineHighNameLabelY=240 -MachineHighNameLabelOnCommand= +MachineHighNameTextX=100 +MachineHighNameTextY=-10 +MachineHighNameTextOnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;strokecolor,color("#77777744");diffusebottomedge,color("#bbbbbb"); +MachineHighNameTextOffCommand=linear,0.1;diffusealpha,0; +MachineHighNameLabelX= +MachineHighNameLabelY= +MachineHighNameLabelOnCommand=visible,false; MachineHighNameLabelOffCommand= MachineHighNameNumLevels=0 -ProfileHighScoreTextX=-40 -ProfileHighScoreTextY=45 +ProfileHighScoreTextX= +ProfileHighScoreTextY= ProfileHighScoreTextOnCommand=visible,false; ProfileHighScoreTextOffCommand= -ProfileHighScoreLabelX=320 -ProfileHighScoreLabelY=240 -ProfileHighScoreLabelOnCommand= +ProfileHighScoreLabelX= +ProfileHighScoreLabelY= +ProfileHighScoreLabelOnCommand=visible,false; ProfileHighScoreLabelOffCommand= ProfileHighScoreNumLevels=0 -ProfileNumPlaysTextX=0 -ProfileNumPlaysTextY=-25 -ProfileNumPlaysTextOnCommand=visible,false; -ProfileNumPlaysTextOffCommand= -ProfileNumPlaysLabelX=0 -ProfileNumPlaysLabelY=-15 -ProfileNumPlaysLabelOffCommand= -ProfileRankTextX=-20 -ProfileRankTextY=-25 -ProfileRankTextOnCommand=visible,false; -ProfileRankTextOffCommand= -ProfileRankLabelX=320 -ProfileRankLabelY=240 -ProfileRankLabelOffCommand= -CourseMachineHighScoreTextX=-40 -CourseMachineHighScoreTextY=35 -CourseMachineHighScoreTextOnCommand=shadowlength,0; -CourseMachineHighScoreTextOffCommand=linear,0.1;diffusealpha,0; -CourseMachineHighScoreLabelX=320 -CourseMachineHighScoreLabelY=240 -CourseMachineHighScoreLabelOffCommand=linear,0.1;diffusealpha,0; -CourseMachineHighScoreNumLevels=12 -CourseMachineHighScoreLevel1=1;diffuse,#FFFFFF -- No Play (white) -CourseMachineHighScoreLevel2=9;diffuse,#FF0000 -- below 10% (red) -CourseMachineHighScoreLevel3=19;diffuse,#FF3300 -- 10-19% (Brownish) -CourseMachineHighScoreLevel4=29;diffuse,#FF6600 -- 20-29% (Dark Orange) -CourseMachineHighScoreLevel5=39;diffuse,#FF9900 -- 30-39% (Orange) -CourseMachineHighScoreLevel6=49;diffuse,#FFCC00 -- 40-49% (Light Orange) -CourseMachineHighScoreLevel7=59;diffuse,#FFFF00 -- 50-59% (Yellow) -CourseMachineHighScoreLevel8=69;diffuse,#CCFF00 -- 60-69% (Greenish Yellow) -CourseMachineHighScoreLevel9=79;diffuse,#66FF00 -- 70-79% (Less Greenish Yellow) -CourseMachineHighScoreLevel10=89;diffuse,#33FF00 -- 80-89% (Least Greenish Yellow) -CourseMachineHighScoreLevel11=99;diffuse,#00FF00 -- 90-99% (Green) -CourseMachineHighScoreLevel12=101;diffuse,#00C0FF -- 100% (AJ Blue) -CourseMachineHighNameTextX=320 -CourseMachineHighNameTextY=240 -CourseMachineHighNameTextOnCommand=visible,false; -CourseMachineHighNameTextOffCommand= -CourseMachineHighNameLabelX=320 -CourseMachineHighNameLabelY=240 -CourseMachineHighNameLabelOnCommand= -CourseMachineHighNameLabelOffCommand= -CourseMachineHighNameNumLevels=0 -CourseProfileHighScoreTextX=320 -CourseProfileHighScoreTextY=240 -CourseProfileHighScoreTextOnCommand=visible,false; -CourseProfileHighScoreTextOffCommand= -CourseProfileHighScoreLabelX=320 -CourseProfileHighScoreLabelY=240 -CourseProfileHighScoreLabelOnCommand= -CourseProfileHighScoreLabelOffCommand= -CourseProfileHighScoreNumLevels=0 -CourseProfileHighNameTextX=320 -CourseProfileHighNameTextY=240 -CourseProfileHighNameTextOnCommand=visible,false; -CourseProfileHighNameTextOffCommand= -CourseProfileHighNameLabelX=320 -CourseProfileHighNameLabelY=240 -CourseProfileHighNameLabelOffCommand= -CourseProfileHighNameNumLevels=0 -CourseNumStepsTextX=-40 -CourseNumStepsTextY=-25 -CourseNumStepsTextOnCommand=shadowlength,0; -CourseNumStepsTextOffCommand=linear,0.1;diffusealpha,0; -CourseNumStepsLabelX=320 -CourseNumStepsLabelY=240 -CourseNumStepsLabelOffCommand=linear,0.1;diffusealpha,0; -CourseNumStepsNumLevels=8 -CourseNumStepsLevel1=1;diffuse,#FFFFFF -CourseNumStepsLevel2=249;diffuse,#00FF00 -- 1-249 (green) -CourseNumStepsLevel3=374;diffuse,#C0FF00 -- 250-374 (greenish yellow) -CourseNumStepsLevel4=499;diffuse,#FFFF00 -- 375-499 (yellow) -CourseNumStepsLevel5=624;diffuse,#FF8800 -- 500-624 (orange) -CourseNumStepsLevel6=749;diffuse,#FF6600 -- 625-749 (darker orange) -CourseNumStepsLevel7=1000;diffuse,#00C0FF -- 750-999 (AJ Blue) -CourseNumStepsLevel8=9999;diffuse,#FF0000 -- 1000-9999 (Red) -CourseJumpsTextX=-40 -CourseJumpsTextY=-15 -CourseJumpsTextOnCommand=shadowlength,0; -CourseJumpsTextOffCommand=linear,0.1;diffusealpha,0; -CourseJumpsLabelX=320 -CourseJumpsLabelY=240 -CourseJumpsLabelOffCommand=linear,0.1;diffusealpha,0; -CourseJumpsNumLevels=6 -CourseJumpsLevel1=1;diffuse,#FFFFFF -CourseJumpsLevel2=49;diffuse,#00FF00 -- 1-49 (green) -CourseJumpsLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) -CourseJumpsLevel4=199;diffuse,#FF8800 -- 100-199 (orange) -CourseJumpsLevel5=449;diffuse,#00C0FF -- 200-450 (AJ Blue) -CourseJumpsLevel6=9999;diffuse,#FF0000 -- 450-inf (red) -CourseRollsTextX=-40 -CourseRollsTextY=-5 -CourseRollsTextOnCommand=shadowlength,0; -CourseRollsTextOffCommand=linear,0.1;diffusealpha,0; -CourseRollsLabelX=320 -CourseRollsLabelY=240 -CourseRollsLabelOffCommand=linear,0.1;diffusealpha,0; -CourseRollsNumLevels=0 -CourseHoldsTextX=-40 -CourseHoldsTextY=5 -CourseHoldsTextOnCommand=shadowlength,0; -CourseHoldsTextOffCommand=linear,0.1;diffusealpha,0; -CourseHoldsLabelX=320 -CourseHoldsLabelY=240 -CourseHoldsLabelOffCommand= -CourseHoldsNumLevels=0 -CourseMinesTextX=-40 -CourseMinesTextY=15 -CourseMinesTextOnCommand=shadowlength,0; -CourseMinesTextOffCommand=linear,0.1;diffusealpha,0; -CourseMinesLabelX=320 -CourseMinesLabelY=240 -CourseMinesLabelOffCommand=linear,0.1;diffusealpha,0; -CourseMinesNumLevels=6 -CourseMinesLevel1=1;diffuse,#FFFFFF -CourseMinesLevel2=49;diffuse,#00FF00 -- 1-49 (green) -CourseMinesLevel3=99;diffuse,#FFFF00 -- 50-99 (yellow) -CourseMinesLevel4=199;diffuse,#FF8800 -- 100-199 (orange) -CourseMinesLevel5=999;diffuse,#00C0FF -- 200-999 (AJ Blue) -CourseMinesLevel6=9999;diffuse,#FF0000 -- 1000-inf (red) -CourseHandsTextX=-40 -CourseHandsTextY=25 -CourseHandsTextOnCommand=shadowlength,0; -CourseHandsTextOffCommand=linear,0.1;diffusealpha,0; -CourseHandsLabelX=320 -CourseHandsLabelY=240 -CourseHandsLabelOffCommand= -CourseHandsNumLevels=0 [ScreenSandbox] Class="ScreenSandbox" @@ -4397,3 +4363,45 @@ PropertyMin=7/8 PropertyCenter=1.0 PropertyMax=9/8 +[DifficultyList] +ItemsSpacingY=20 +NumShownItems=7 +CapitalizeDifficultyNames=1 +CursorP1OnCommand=x,-46;diffusealpha,0;sleep,.5;bounce;effectmagnitude,-10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,bgm +CursorP1OffCommand= +CursorP1TweenOnCommand=linear,0.5;diffusealpha,1 +CursorP1ChangeCommand=finishtweening;decelerate,0.15 +CursorP2OnCommand=x,+198;diffusealpha,0;sleep,.5;bounce;effectmagnitude,10,0,0;effectperiod,1.0;effectoffset,0.0;effectclock,bgm +CursorP2OffCommand= +CursorP2TweenOnCommand=linear,0.5;diffusealpha,1 +CursorP2ChangeCommand=finishtweening;decelerate,0.15 +RowOnCommand= +RowOffCommand= +MoveCommand=finishtweening;linear,0.3 +CursorP1ShowCommand=sleep,.3;linear,.3;diffusealpha,1 +CursorP2ShowCommand=sleep,.3;linear,.3;diffusealpha,1 +CursorP1HideCommand=linear,.3;diffusealpha,0 +CursorP2HideCommand=linear,.3;diffusealpha,0 + +[DifficultyListRow] +Fallback=DifficultyMeter +FrameX=0 +FrameY=0 +FrameOnCommand= +ShowTicks=true +NumTicks=13 +MaxTicks=13 +TicksSetCommand=%function(self,param) self:diffuse(DifficultyAndStepsTypeToColor(param.Difficulty,param.StepsType)); end +TicksX=0 +TicksY=0 +TicksOnCommand=shadowlength,0;shadowcolor,color("#FFFFFF");zoom,0.5; +ShowMeter=1 +MeterX=92 +MeterY=-1 +MeterOnCommand=zoom,0.5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#00000077"); +ShowEditDescription=false +EditDescriptionX=-70 +EditDescriptionY=0 +EditDescriptionOnCommand=horizalign,right;zoom,.5;shadowlength,2;maxwidth,150 +ZeroMeterString="?" +MeterSetCommand=%function(self,param) self:diffuse(DifficultyAndStepsTypeToColor(param.Difficulty,param.StepsType)); end