diff --git a/Themes/default/BGAnimations/Online background/default.lua b/Themes/default/BGAnimations/Online background/default.lua index 5ca1ed13c3..6399b7c6e3 100644 --- a/Themes/default/BGAnimations/Online background/default.lua +++ b/Themes/default/BGAnimations/Online background/default.lua @@ -2,11 +2,11 @@ if ThemePrefs.Get("FancyUIBG") then return Def.ActorFrame { Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#18060C");diffusetopedge,color("#000000");); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#18060C");diffusetopedge,color("#000000")); }; LoadActor("_base") .. { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;blend,'BlendMode_Add';); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;blend,'BlendMode_Add'); }, LoadActor("_barcode") .. { @@ -22,11 +22,11 @@ if ThemePrefs.Get("FancyUIBG") then else return Def.ActorFrame { Def.Quad { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#18060C");diffusetopedge,color("#000000");); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color("#18060C");diffusetopedge,color("#000000")); }; LoadActor("_base") .. { - InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;blend,'BlendMode_Add';); + InitCommand=cmd(Center;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;blend,'BlendMode_Add'); }, }; end \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenCaution overlay/default.lua b/Themes/default/BGAnimations/ScreenCaution overlay/default.lua index 35e5f84622..73c7188861 100644 --- a/Themes/default/BGAnimations/ScreenCaution overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenCaution overlay/default.lua @@ -26,7 +26,7 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(diffusealpha,0;linear,0.2;diffusealpha,1); LoadFont("_roboto condensed Bold 48px") .. { Text=Screen.String("Caution"); - OnCommand=cmd(skewx,-0.1;diffuse,color("#E6BF7C");diffusebottomedge,color("#FFB682");strokecolor,color("#594420");); + OnCommand=cmd(skewx,-0.1;diffuse,color("#E6BF7C");diffusebottomedge,color("#FFB682");strokecolor,color("#594420")); }; LoadFont("Common Fallback Font") .. { Text=Screen.String("CautionText"); diff --git a/Themes/default/BGAnimations/ScreenContinue underlay.lua b/Themes/default/BGAnimations/ScreenContinue underlay.lua index 2d02c5a74f..5e06052e4c 100644 --- a/Themes/default/BGAnimations/ScreenContinue underlay.lua +++ b/Themes/default/BGAnimations/ScreenContinue underlay.lua @@ -6,17 +6,17 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(Center); Def.Quad { InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT); - OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;linear,0.5;diffusealpha,0.25; - sleep,timer_seconds/2; - linear,timer_seconds/2-0.5;diffusealpha,1); - OffCommand=cmd(stoptweening;sleep,0.4;decelerate,0.5;diffusealpha,1;); + OnCommand=function(self) + self:diffuse(color("#000000"):diffusealpha(0):linear(0.5):diffusealpha(0.25): + self:sleep(timer_seconds/2):linear(timer_seconds/2-0.5):diffusealpha(1); + end; + OffCommand=cmd(stoptweening;sleep,0.4;decelerate,0.5;diffusealpha,1); }; -- Warning Fade Def.Quad { InitCommand=cmd(y,16;scaletoclipped,SCREEN_WIDTH,250); - OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5; - linear,timer_seconds;zoomtoheight,180); - OffCommand=cmd(stoptweening;); + OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.5;linear,timer_seconds;zoomtoheight,180); + OffCommand=cmd(stoptweening); } }; -- @@ -24,7 +24,7 @@ t[#t+1] = Def.ActorFrame { InitCommand=cmd(Center;y,SCREEN_CENTER_Y-56;zoom,1.5); LoadFont("Common Fallback Font") .. { Text="Continue?"; - OnCommand=cmd(diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211");); + OnCommand=cmd(diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211")); }; }; -- diff --git a/Themes/default/BGAnimations/ScreenDemonstration overlay.lua b/Themes/default/BGAnimations/ScreenDemonstration overlay.lua index b8ec1e152f..42f7d933cc 100644 --- a/Themes/default/BGAnimations/ScreenDemonstration overlay.lua +++ b/Themes/default/BGAnimations/ScreenDemonstration overlay.lua @@ -26,8 +26,7 @@ return Def.ActorFrame{ -- A temporary frame for the jacket. Def.Quad { - InitCommand=cmd(horizalign,right;vertalign,bottom;x,_screen.w-39;y,_screen.h-14;zoomto,192,192; - diffuse,ColorDarkTone(ScreenColor("Default"));diffusealpha,0.9) + InitCommand=cmd(horizalign,right;vertalign,bottom;x,_screen.w-39;y,_screen.h-14;zoomto,192,192;diffuse,ColorDarkTone(ScreenColor("Default"));diffusealpha,0.9) }, -- Jacket (real or not) of the currently playing song. -- todo: make getting the jacket a bit more of a... global function? diff --git a/Themes/default/BGAnimations/ScreenEditMenu background.lua b/Themes/default/BGAnimations/ScreenEditMenu background.lua index d8b9a795dc..d6dc1ed375 100644 --- a/Themes/default/BGAnimations/ScreenEditMenu background.lua +++ b/Themes/default/BGAnimations/ScreenEditMenu background.lua @@ -10,7 +10,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame { Def.Quad { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+20;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT*0.70;); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+20;zoomto,SCREEN_WIDTH,SCREEN_HEIGHT*0.70); OnCommand=cmd(diffuse,color("#61414B");diffusealpha,0.75); }; }; diff --git a/Themes/default/BGAnimations/ScreenEvaluation overlay.lua b/Themes/default/BGAnimations/ScreenEvaluation overlay.lua index f2ff309de3..54e797f16e 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation overlay.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation overlay.lua @@ -2,13 +2,13 @@ local t = Def.ActorFrame {}; if not GAMESTATE:IsCourseMode() then t[#t+1] = Def.ActorFrame { LoadActor(THEME:GetPathG("ScreenEvaluation", "StageDisplay")) .. { - InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); + InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49); OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), } } else t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); + InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49); OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), LoadActor(THEME:GetPathG("", "_sortFrame")) .. { InitCommand=cmd(diffusealpha,0.9;zoom,1.5); @@ -21,7 +21,7 @@ else end }; LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true;); + InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true); BeginCommand=function(self) self:playcommand("Set") end; @@ -41,7 +41,7 @@ end; if GAMESTATE:HasEarnedExtraStage() then t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); + InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49); OffCommand=cmd(sleep,0.175;decelerate,0.4;addy,-105), LoadActor(THEME:GetPathG("", "_sortFrame")) .. { InitCommand=cmd(diffusealpha,0.9;zoom,1.5); @@ -54,11 +54,11 @@ if GAMESTATE:HasEarnedExtraStage() then end }; LoadActor(THEME:GetPathG("", "_sortFrame")) .. { - InitCommand=cmd(diffusealpha,0.9;zoom,1.5;diffuse,color("#FFFFFF");blend,'add';); - BeginCommand=cmd(diffuseshift;effectcolor2,color("1,1,1,0.3");effectcolor2,color("1,1,1,0");effectperiod,2;); + InitCommand=cmd(diffusealpha,0.9;zoom,1.5;diffuse,color("#FFFFFF");blend,'add'); + BeginCommand=cmd(diffuseshift;effectcolor2,color("1,1,1,0.3");effectcolor2,color("1,1,1,0");effectperiod,2); }; LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true;maxwidth,220;); + InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true;maxwidth,220); BeginCommand=function(self) self:playcommand("Set") end; diff --git a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua index 811c454b13..35a04fd6a8 100644 --- a/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluation underlay/default.lua @@ -129,7 +129,7 @@ for i, v in ipairs(eval_lines) do mid_pane[#mid_pane+1] = Def.ActorFrame{ InitCommand=cmd(x,_screen.cx;y,(_screen.cy/1.48)+(spacing)), Def.Quad { - InitCommand=cmd(zoomto,400,36;diffuse,JudgmentLineToColor(cur_line);fadeleft,0.5;faderight,0.5;); + InitCommand=cmd(zoomto,400,36;diffuse,JudgmentLineToColor(cur_line);fadeleft,0.5;faderight,0.5); OnCommand=function(self) self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(1) end; @@ -169,7 +169,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do local spacing = 38*i eval_parts[#eval_parts+1] = Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(x,_screen.cx + step_count_offs;y,(_screen.cy/1.48)+(spacing);diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;diffusealpha,1.0;shadowlength,1;maxwidth,120;), + InitCommand=cmd(x,_screen.cx + step_count_offs;y,(_screen.cy/1.48)+(spacing);diffuse,ColorDarkTone(PlayerColor(p));zoom,0.75;diffusealpha,1.0;shadowlength,1;maxwidth,120), OnCommand=function(self) self:settext(GetJLineValue(v, p)) if string.find(p, "P1") then @@ -191,7 +191,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do --Containers Def.Quad { - InitCommand=cmd(zoomto,190,115;diffuse,ColorLightTone(PlayerColor(p));diffusebottomedge,color("#FEEFCA");), + InitCommand=cmd(zoomto,190,115;diffuse,ColorLightTone(PlayerColor(p));diffusebottomedge,color("#FEEFCA")), OnCommand=function(self) self:diffusealpha(0):decelerate(0.4):diffusealpha(0.5) end, @@ -199,7 +199,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do }, Def.Quad { - InitCommand=cmd(vertalign,top;y,60+grade_area_offset;zoomto,190,136;diffuse,color("#fce1a1");), + InitCommand=cmd(vertalign,top;y,60+grade_area_offset;zoomto,190,136;diffuse,color("#fce1a1")), OnCommand=function(self) self:diffusealpha(0):decelerate(0.4):diffusealpha(0.4) end, @@ -207,7 +207,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do }, LoadActor(THEME:GetPathG("GradeDisplay", "Grade " .. p_grade)) .. { - InitCommand=cmd(zoom,0.75;); + InitCommand=cmd(zoom,0.75); OnCommand=function(self) self:diffusealpha(0):zoom(1):sleep(0.63):decelerate(0.4):zoom(0.75):diffusealpha(1) if STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetStageAward() then @@ -221,7 +221,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do Def.BitmapText { Font = "_roboto condensed 24px", - InitCommand=cmd(diffuse,Color.White;zoom,1;addy,38;maxwidth,160;uppercase,true;diffuse,ColorDarkTone(PlayerDarkColor(p));diffusetopedge,ColorMidTone(PlayerColor(p));shadowlength,1;), + InitCommand=cmd(diffuse,Color.White;zoom,1;addy,38;maxwidth,160;uppercase,true;diffuse,ColorDarkTone(PlayerDarkColor(p));diffusetopedge,ColorMidTone(PlayerColor(p));shadowlength,1), OnCommand=function(self) if STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetStageAward() then self:settext(THEME:GetString( "StageAward", ToEnumShortString(STATSMAN:GetCurStageStats():GetPlayerStageStats(p):GetStageAward()) )) @@ -290,18 +290,18 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do self:sleep(0.13 * i):decelerate(0.6):diffusealpha(0) end; Def.Quad { - InitCommand=cmd(zoomto,190,28;diffuse,color("#fce1a1");diffusealpha,0.4;); + InitCommand=cmd(zoomto,190,28;diffuse,color("#fce1a1");diffusealpha,0.4); }; Def.BitmapText { Font = "Common Condensed", - InitCommand=cmd(zoom,0.8;x,-80;horizalign,left;diffuse,color("0,0,0,0.75");shadowlength,1;), + InitCommand=cmd(zoom,0.8;x,-80;horizalign,left;diffuse,color("0,0,0,0.75");shadowlength,1), BeginCommand=function(self) self:settext(label .. ":") end }; Def.BitmapText { Font = "_overpass 36px", - InitCommand=cmd(zoom,0.5;x,83;horizalign,right;maxwidth,200;diffuse,ColorDarkTone(PlayerColor(p));shadowlength,1;), + InitCommand=cmd(zoom,0.5;x,83;horizalign,right;maxwidth,200;diffuse,ColorDarkTone(PlayerColor(p));shadowlength,1), BeginCommand=function(self) self:settext(performance .. "/" .. possible) end @@ -332,14 +332,14 @@ if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then -- Difficulty banner local grade_parts_offs = -320 t[#t+1] = Def.ActorFrame { - InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-96+grade_area_offset;visible,not GAMESTATE:IsCourseMode();); - OnCommand=cmd(zoomx,0.3;diffusealpha,0;sleep,0.5;decelerate,0.4;zoomx,1;diffusealpha,1;); - OffCommand=cmd(decelerate,0.4;diffusealpha,0;); + InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-96+grade_area_offset;visible,not GAMESTATE:IsCourseMode()); + OnCommand=cmd(zoomx,0.3;diffusealpha,0;sleep,0.5;decelerate,0.4;zoomx,1;diffusealpha,1); + OffCommand=cmd(decelerate,0.4;diffusealpha,0); LoadFont("Common Fallback") .. { InitCommand=cmd(zoom,1;horizalign,center;shadowlength,1); - OnCommand=cmd(playcommand,"Set";); - CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set";); - ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set";); + OnCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); + ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) local song = GAMESTATE:GetCurrentSong(); @@ -370,14 +370,14 @@ if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then if GAMESTATE:IsCourseMode() == false then local grade_parts_offs = 320 t[#t+1] = Def.ActorFrame { - InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-96+grade_area_offset;visible,not GAMESTATE:IsCourseMode();); - OnCommand=cmd(zoomx,0.3;diffusealpha,0;sleep,0.5;decelerate,0.4;zoomx,1;diffusealpha,1;); - OffCommand=cmd(decelerate,0.4;diffusealpha,0;); + InitCommand=cmd(horizalign,center;x,_screen.cx + grade_parts_offs;y,_screen.cy-96+grade_area_offset;visible,not GAMESTATE:IsCourseMode()); + OnCommand=cmd(zoomx,0.3;diffusealpha,0;sleep,0.5;decelerate,0.4;zoomx,1;diffusealpha,1); + OffCommand=cmd(decelerate,0.4;diffusealpha,0); LoadFont("Common Fallback") .. { InitCommand=cmd(zoom,1;horizalign,center;shadowlength,1); - OnCommand=cmd(playcommand,"Set";); - CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set";); - ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set";); + OnCommand=cmd(playcommand,"Set"); + CurrentStepsP2ChangedMessageCommand=cmd(playcommand,"Set"); + ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) local song = GAMESTATE:GetCurrentSong(); @@ -410,12 +410,12 @@ if gameplay_pause_count > 0 then t[#t+1]= Def.BitmapText{ Font= "Common Italic Condensed", Text= THEME:GetString("PauseMenu", "pause_count") .. ": " .. gameplay_pause_count, - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-130;shadowlength,1;maxwidth,140;); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y-130;shadowlength,1;maxwidth,140); OnCommand=function(self) self:diffuse(color("#FF0000")):diffusebottomedge(color("#512232")):zoom(0.8); self:diffusealpha(0):sleep(1.5):smooth(0.3):diffusealpha(1); end; - OffCommand=cmd(sleep,0.2;decelerate,0.3;diffusealpha,0;); + OffCommand=cmd(sleep,0.2;decelerate,0.3;diffusealpha,0); } end diff --git a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua index aab54b5692..f792520328 100644 --- a/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenEvaluationSummary underlay/default.lua @@ -54,7 +54,7 @@ for i, v in ipairs(eval_lines) do t[#t+1] = Def.ActorFrame{ InitCommand=cmd(x,_screen.cx;y,(_screen.cy/1.48)+(spacing)), Def.Quad { - InitCommand=cmd(zoomto,400,36;diffuse,JudgmentLineToColor(cur_line);fadeleft,0.5;faderight,0.5;); + InitCommand=cmd(zoomto,400,36;diffuse,JudgmentLineToColor(cur_line);fadeleft,0.5;faderight,0.5); OnCommand=function(self) self:diffusealpha(0):sleep(0.1 * i):decelerate(0.6):diffusealpha(0.8) end; @@ -114,7 +114,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do --Containers. Def.Quad { - InitCommand=cmd(zoomto,190,115;diffuse,ColorLightTone(PlayerColor(p));diffusebottomedge,color("#FEEFCA");), + InitCommand=cmd(zoomto,190,115;diffuse,ColorLightTone(PlayerColor(p));diffusebottomedge,color("#FEEFCA"));, OnCommand=function(self) self:diffusealpha(0):decelerate(0.4):diffusealpha(0.5) end, @@ -122,7 +122,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do }, Def.Quad { - InitCommand=cmd(vertalign,top;y,60+grade_area_offset;zoomto,190,66;diffuse,color("#fce1a1");), + InitCommand=cmd(vertalign,top;y,60+grade_area_offset;zoomto,190,66;diffuse,color("#fce1a1"));, OnCommand=function(self) self:diffusealpha(0):decelerate(0.4):diffusealpha(0.4) end, @@ -130,7 +130,7 @@ for ip, p in ipairs(GAMESTATE:GetHumanPlayers()) do }, LoadActor(THEME:GetPathG("GradeDisplay", "Grade " .. p_grade)) .. { - InitCommand=cmd(zoom,0.75;); + InitCommand=cmd(zoom,0.75); OnCommand=function(self) self:diffusealpha(0):zoom(1):sleep(0.63):decelerate(0.4):zoom(0.75):diffusealpha(1) end; diff --git a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua index 420bcd44e6..3aa60d5163 100644 --- a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua @@ -15,26 +15,26 @@ return Def.ActorFrame { Def.Quad { InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT), - OnCommand=cmd(diffuse,color("#000000");), + OnCommand=cmd(diffuse,color("#000000")), }, LoadActor("_diamond") .. { - InitCommand=cmd(diffusealpha,0;); + InitCommand=cmd(diffusealpha,0); OnCommand=cmd(rotationz,0;zoom,1;sleep,1;diffusealpha,1;linear,3;zoom,1;diffusealpha,0); }; LoadActor("_sound") .. { - OnCommand=cmd(queuecommand,"Sound";); + OnCommand=cmd(queuecommand,"Sound"); SoundCommand=cmd(play); }; LoadActor(THEME:GetPathG("ScreenGameOver","gameover"))..{ - OnCommand=cmd(zoomx,1.1;diffusealpha,0;sleep,1;decelerate,0.6;diffusealpha,1;zoomx,1;); + OnCommand=cmd(zoomx,1.1;diffusealpha,0;sleep,1;decelerate,0.6;diffusealpha,1;zoomx,1); }, LoadFont("Common Condensed")..{ Text=ScreenString("Play again soon!"); InitCommand=cmd(y,68;shadowlength,2); - OnCommand=cmd(diffusealpha,0;sleep,3;linear,0.3;diffusealpha,1;); + OnCommand=cmd(diffusealpha,0;sleep,3;linear,0.3;diffusealpha,1); }, } diff --git a/Themes/default/BGAnimations/ScreenGameplay go/default.lua b/Themes/default/BGAnimations/ScreenGameplay go/default.lua index e9b1a6b5e8..1022b1dc50 100644 --- a/Themes/default/BGAnimations/ScreenGameplay go/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay go/default.lua @@ -5,5 +5,8 @@ end return LoadActor("go") .. { InitCommand=cmd(Center;draworder,105); - StartTransitioningCommand=cmd(zoom,1.3;diffusealpha,0;bounceend,0.25;zoom,1;diffusealpha,1;linear,0.15;glow,BoostColor(Color("Blue"),1.75);decelerate,0.3;glow,1,1,1,0;sleep,1-0.45;linear,0.25;diffusealpha,0;); + StartTransitioningCommand=function(self) + self:zoom(1.3):diffusealpha(0):bounceend(0.25):zoom(1):diffusealpha(1); + self:linear(0.14):glow(BoostColor(Color("Blue"),1.75)):decelerate(0.3):glow(1,1,1,0):sleep(1-0.45):linear(0.25):diffusealpha(0); + end; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenGameplay in/CourseDisplay.lua b/Themes/default/BGAnimations/ScreenGameplay in/CourseDisplay.lua index dc316ffd8d..bb0d7dce37 100644 --- a/Themes/default/BGAnimations/ScreenGameplay in/CourseDisplay.lua +++ b/Themes/default/BGAnimations/ScreenGameplay in/CourseDisplay.lua @@ -23,7 +23,7 @@ local t = Def.ActorFrame{ }; -- alternate background Def.Sprite{ - InitCommand=cmd(Center;); + InitCommand=cmd(Center); BeginCommand=cmd(LoadFromCurrentSongBackground;scale_or_crop_background;diffusealpha,0); OnCommand=cmd(playcommand,"Show"); ShowCommand=function(self) diff --git a/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua b/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua index 8636fb6933..071aaa1d8b 100644 --- a/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay next course song/default.lua @@ -6,7 +6,7 @@ t[#t+1] = Def.Sprite { InitCommand=cmd(Center); BeforeLoadingNextCourseSongMessageCommand=function(self) self:LoadFromSongBackground( SCREENMAN:GetTopScreen():GetNextCourseSong() ) end; ChangeCourseSongInMessageCommand=cmd(scale_or_crop_background); - StartCommand=cmd(diffusealpha,0;decelerate,0.5;diffusealpha,1;); + StartCommand=cmd(diffusealpha,0;decelerate,0.5;diffusealpha,1); FinishCommand=cmd(linear,0.1;glow,Color.Alpha(Color("White"),0.5);decelerate,0.4;glow,Color("Invisible");diffusealpha,0); }; diff --git a/Themes/default/BGAnimations/ScreenGameplay out.lua b/Themes/default/BGAnimations/ScreenGameplay out.lua index 15fdd49b96..4daca3e868 100644 --- a/Themes/default/BGAnimations/ScreenGameplay out.lua +++ b/Themes/default/BGAnimations/ScreenGameplay out.lua @@ -31,17 +31,17 @@ local bg = Def.ActorFrame{ LoadActor(THEME:GetPathG("_rave result","P1"))..{ Name="P1Win"; - InitCommand=cmd(Center;cropbottom,1;fadebottom,1;); + InitCommand=cmd(Center;cropbottom,1;fadebottom,1); StartTransitioningCommand=cmd(sleep,1.0;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); }; LoadActor(THEME:GetPathG("_rave result","P2"))..{ Name="P2Win"; - InitCommand=cmd(Center;cropbottom,1;fadebottom,1;); + InitCommand=cmd(Center;cropbottom,1;fadebottom,1); StartTransitioningCommand=cmd(sleep,1.0;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); }; LoadActor(THEME:GetPathG("_rave result","draw"))..{ Name="Draw"; - InitCommand=cmd(Center;cropbottom,1;fadebottom,1;); + InitCommand=cmd(Center;cropbottom,1;fadebottom,1); StartTransitioningCommand=cmd(sleep,1.0;linear,0.5;cropbottom,0;fadebottom,0;sleep,1.75;linear,0.25;diffusealpha,0); }; }; diff --git a/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua index 7b189a5637..f5755e6b85 100644 --- a/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua @@ -58,16 +58,16 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); local life_tween = string.find(pn, "P1") and -1 or 1 local second_tween = string.find(pn, "P1") and 1 or -1 t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,life_x_position;y,SCREEN_CENTER_Y;rotationz,-90;); + InitCommand=cmd(x,life_x_position;y,SCREEN_CENTER_Y;rotationz,-90); OnCommand=cmd(addx,100*life_tween;sleep,0.25;decelerate,0.9;addx,100*second_tween); - OffCommand=cmd(sleep,1;decelerate,0.9;addx,100*life_tween;); + OffCommand=cmd(sleep,1;decelerate,0.9;addx,100*life_tween); LoadActor(THEME:GetPathG("LifeMeter", "bar frame")) .. { }; Def.ActorFrame { - InitCommand=cmd(x,-207;y,0;); + InitCommand=cmd(x,-207;y,0); LoadActor("_diffdia") .. { - OnCommand=cmd(playcommand,"Set";); - ["CurrentSteps"..ToEnumShortString(pn).."ChangedMessageCommand"]=cmd(playcommand,"Set";); + OnCommand=cmd(playcommand,"Set"); + ["CurrentSteps"..ToEnumShortString(pn).."ChangedMessageCommand"]=cmd(playcommand,"Set"); SetCommand=function(self) steps_data = GAMESTATE:GetCurrentSteps(pn) local song = GAMESTATE:GetCurrentSong(); @@ -83,8 +83,8 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); }; LoadFont("StepsDisplay description") .. { InitCommand=cmd(zoom,0.75;horizalign,center;rotationz,90); - OnCommand=cmd(playcommand,"Set";); - ["CurrentSteps"..ToEnumShortString(pn).."ChangedMessageCommand"]=cmd(playcommand,"Set";); + OnCommand=cmd(playcommand,"Set"); + ["CurrentSteps"..ToEnumShortString(pn).."ChangedMessageCommand"]=cmd(playcommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) steps_data = GAMESTATE:GetCurrentSteps(pn) @@ -112,10 +112,10 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); if GAMESTATE:GetPlayMode() == 'PlayMode_Rave' then -- P1 t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X-110;y,SCREEN_BOTTOM-55;); + InitCommand=cmd(x,SCREEN_CENTER_X-110;y,SCREEN_BOTTOM-55); LoadActor("_diffdia") .. { - OnCommand=cmd(playcommand,"Set";); - CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set";); + OnCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) local song = GAMESTATE:GetCurrentSong(); @@ -130,9 +130,9 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); end; }; LoadFont("StepsDisplay description") .. { - InitCommand=cmd(zoom,0.75;horizalign,center;); - OnCommand=cmd(playcommand,"Set";); - CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set";); + InitCommand=cmd(zoom,0.75;horizalign,center); + OnCommand=cmd(playcommand,"Set"); + CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -154,10 +154,10 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); }; -- P2 t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X+110;y,SCREEN_BOTTOM-55;); + InitCommand=cmd(x,SCREEN_CENTER_X+110;y,SCREEN_BOTTOM-55); LoadActor("_diffdia") .. { - OnCommand=cmd(playcommand,"Set";); - CurrentstepsP2ChangedMessageCommand=cmd(playcommand,"Set";); + OnCommand=cmd(playcommand,"Set"); + CurrentstepsP2ChangedMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) local song = GAMESTATE:GetCurrentSong(); @@ -173,8 +173,8 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); }; LoadFont("StepsDisplay description") .. { InitCommand=cmd(zoom,0.75;horizalign,center); - OnCommand=cmd(playcommand,"Set";); - CurrentstepsP2ChangedMessageCommand=cmd(playcommand,"Set";); + OnCommand=cmd(playcommand,"Set"); + CurrentstepsP2ChangedMessageCommand=cmd(playcommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(playcommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -198,9 +198,9 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); t[#t+1] = StandardDecorationFromFileOptional("StageDisplay","StageDisplay"); t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_CENTER_X+103;y,SCREEN_BOTTOM-25;); - OnCommand=cmd(draworder,DrawOrder.Screen;addy,100;sleep,0.5;decelerate,0.7;addy,-100;); - OffCommand=cmd(sleep,1;decelerate,0.9;addy,100;); + InitCommand=cmd(x,SCREEN_CENTER_X+103;y,SCREEN_BOTTOM-25); + OnCommand=cmd(draworder,DrawOrder.Screen;addy,100;sleep,0.5;decelerate,0.7;addy,-100); + OffCommand=cmd(sleep,1;decelerate,0.9;addy,100); Def.Quad { InitCommand=cmd(zoomto,264,12); OnCommand=cmd(diffuse,Color.Black;diffusealpha,0.3;fadeleft,0.05;faderight,0.05); @@ -220,7 +220,7 @@ t.InitCommand=cmd(SetUpdateFunction,UpdateTime); Def.SongMeterDisplay { StreamWidth=260; Stream=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'stream') )..{ - InitCommand=cmd(diffuse,Color.White;diffusealpha,0.4;blend,Blend.Add;); + InitCommand=cmd(diffuse,Color.White;diffusealpha,0.4;blend,Blend.Add); }; Tip=LoadActor( THEME:GetPathG( 'SongMeterDisplay', 'tip')) .. { InitCommand=cmd(visible,false); diff --git a/Themes/default/BGAnimations/ScreenGameplay ready/default.lua b/Themes/default/BGAnimations/ScreenGameplay ready/default.lua index 73c513579a..6174362605 100644 --- a/Themes/default/BGAnimations/ScreenGameplay ready/default.lua +++ b/Themes/default/BGAnimations/ScreenGameplay ready/default.lua @@ -5,5 +5,5 @@ end return LoadActor("ready") .. { InitCommand=cmd(Center;draworder,105); - StartTransitioningCommand=cmd(zoom,1.3;diffusealpha,0;bounceend,0.25;zoom,1;diffusealpha,1;linear,0.15;glow,BoostColor(Color("Orange"),1.75);decelerate,0.3;glow,1,1,1,0;sleep,1-0.45;linear,0.25;diffusealpha,0;); + StartTransitioningCommand=cmd(zoom,1.3;diffusealpha,0;bounceend,0.25;zoom,1;diffusealpha,1;linear,0.15;glow,BoostColor(Color("Orange"),1.75);decelerate,0.3;glow,1,1,1,0;sleep,1-0.45;linear,0.25;diffusealpha,0); }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua b/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua index 01e90ad3ba..7b7eadb7f3 100644 --- a/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenHighScores decorations/default.lua @@ -27,13 +27,13 @@ for i=1,NumColumns do }; LoadFont("StepsDisplayListRow description") .. { InitCommand=cmd(uppercase,true;settext,CustomDifficultyToLocalizedString(s)); - OnCommand=cmd(zoom,0.675;maxwidth,80/0.675;diffuse,CustomDifficultyToDarkColor(s);); + OnCommand=cmd(zoom,0.675;maxwidth,80/0.675;diffuse,CustomDifficultyToDarkColor(s)); }; }; end t[#t+1] = LoadFont("Common Normal") .. { - InitCommand=cmd(settext,stString;x,SCREEN_CENTER_X-220;y,SCREEN_CENTER_Y-220;); + InitCommand=cmd(settext,stString;x,SCREEN_CENTER_X-220;y,SCREEN_CENTER_Y-220); OnCommand=cmd(diffusebottomedge,color("0.75,0.75,0.75");shadowlength,2); }; diff --git a/Themes/default/BGAnimations/ScreenNetSelectMusic decorations.lua b/Themes/default/BGAnimations/ScreenNetSelectMusic decorations.lua index 7b01d269bb..b6e44636f1 100644 --- a/Themes/default/BGAnimations/ScreenNetSelectMusic decorations.lua +++ b/Themes/default/BGAnimations/ScreenNetSelectMusic decorations.lua @@ -4,7 +4,7 @@ local t = LoadFallbackB(); local function PercentScore(pn) local t = LoadFont("_overpass Score")..{ - InitCommand=cmd(zoom,1;diffuse,Color("Black");diffusealpha,0.75;); + InitCommand=cmd(zoom,1;diffuse,Color("Black");diffusealpha,0.75); BeginCommand=cmd(playcommand,"Set"); SetCommand=function(self) local SongOrCourse, StepsOrTrail; @@ -67,7 +67,7 @@ end -- Genre/Artist data t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "info pane")) .. { - InitCommand=cmd(horizalign,center;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-75;zoom,1;); + InitCommand=cmd(horizalign,center;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-75;zoom,1); OnCommand=function(self) self:diffuse(ColorMidTone(StageToColor(curStage))); self:zoomx(0):diffusealpha(0):decelerate(0.3):zoomx(1):diffusealpha(1); @@ -79,8 +79,8 @@ t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "info pane")) .. { t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-330+6-138;draworder,126); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(smooth,0.3;diffusealpha,0;); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(smooth,0.3;diffusealpha,0); -- Length StandardDecorationFromFileOptional("SongTime","SongTime") .. { SetCommand=function(self) @@ -128,10 +128,10 @@ t[#t+1] = Def.ActorFrame { -- Course count and type t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-200;draworder,126); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(smooth,0.2;diffusealpha,0;); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(smooth,0.2;diffusealpha,0); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode()); CurrentCourseChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -148,10 +148,10 @@ t[#t+1] = Def.ActorFrame { }; t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X+5;draworder,126); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(smooth,0.2;diffusealpha,0;); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(smooth,0.2;diffusealpha,0); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode()); CurrentCourseChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -172,7 +172,7 @@ if not GAMESTATE:IsCourseMode() then -- P1 Difficulty Pane t[#t+1] = Def.ActorFrame { - InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_1);horizalign,center;x,SCREEN_CENTER_X-210-32;y,SCREEN_CENTER_Y+230+8;); + InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_1);horizalign,center;x,SCREEN_CENTER_X-210-32;y,SCREEN_CENTER_Y+230+8); OnCommand=cmd(zoomy,0.8;diffusealpha,0;smooth,0.4;diffusealpha,1;zoomy,1); PlayerJoinedMessageCommand=function(self,param) if param.Player == PLAYER_1 then @@ -181,8 +181,8 @@ t[#t+1] = Def.ActorFrame { end; OffCommand=cmd(decelerate,0.3;zoomy,0.8;diffusealpha,0); LoadActor(THEME:GetPathG("ScreenSelectMusic", "pane background")) .. { - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1;); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -204,10 +204,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("StepsDisplay meter") .. { InitCommand=cmd(zoom,1.25;diffuse,color("#000000");addx,-143;addy,13); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -228,11 +228,11 @@ t[#t+1] = Def.ActorFrame { end }; LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,-143;diffuse,color("#000000");maxwidth,115;); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,-143;diffuse,color("#000000");maxwidth,115); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -254,10 +254,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Normal") .. { InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000");maxwidth,130); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -281,7 +281,7 @@ t[#t+1] = Def.ActorFrame { -- P2 Difficulty Pane t[#t+1] = Def.ActorFrame { - InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_2);horizalign,center;x,SCREEN_CENTER_X+210+32;y,SCREEN_CENTER_Y+230+8;); + InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_2);horizalign,center;x,SCREEN_CENTER_X+210+32;y,SCREEN_CENTER_Y+230+8); OnCommand=cmd(zoomy,0.8;diffusealpha,0;smooth,0.4;diffusealpha,1;zoomy,1); PlayerJoinedMessageCommand=function(self,param) if param.Player == PLAYER_2 then @@ -290,9 +290,9 @@ t[#t+1] = Def.ActorFrame { end; OffCommand=cmd(decelerate,0.3;zoomy,0.8;diffusealpha,0); LoadActor(THEME:GetPathG("ScreenSelectMusic", "pane background")) .. { - InitCommand=cmd(zoomx,-1;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1;); + InitCommand=cmd(zoomx,-1); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -314,10 +314,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("StepsDisplay meter") .. { InitCommand=cmd(zoom,1.25;diffuse,color("#000000");addx,143;addy,13); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -338,11 +338,11 @@ t[#t+1] = Def.ActorFrame { end }; LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,143;diffuse,color("#000000");maxwidth,115;); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,143;diffuse,color("#000000");maxwidth,115); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -364,10 +364,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Normal") .. { InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000");maxwidth,130); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -400,11 +400,11 @@ end; -- BPMDisplay t[#t+1] = Def.ActorFrame { - InitCommand=cmd(draworder,126;visible,not GAMESTATE:IsCourseMode();); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); + InitCommand=cmd(draworder,126;visible,not GAMESTATE:IsCourseMode()); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(linear,0.3;diffusealpha,0); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X-198+69-66;y,SCREEN_CENTER_Y-78+2;diffuse,color("#512232");horizalign,right;visible,not GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X-198+69-66;y,SCREEN_CENTER_Y-78+2;diffuse,color("#512232");horizalign,right;visible,not GAMESTATE:IsCourseMode()); OnCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index d8f3b56add..0936f5c0ad 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -4,7 +4,7 @@ local t = LoadFallbackB(); local function PercentScore(pn) local t = LoadFont("_overpass Score")..{ - InitCommand=cmd(zoom,1;diffuse,Color("Black");diffusealpha,0.75;); + InitCommand=cmd(zoom,1;diffuse,Color("Black");diffusealpha,0.75); BeginCommand=cmd(playcommand,"Set"); SetCommand=function(self) local SongOrCourse, StepsOrTrail; @@ -68,9 +68,9 @@ end -- Banner underlay -- t[#t+1] = Def.ActorFrame { -- InitCommand=cmd(x,SCREEN_CENTER_X-230;draworder,125); - -- OffCommand=cmd(smooth,0.2;diffusealpha,0;); + -- OffCommand=cmd(smooth,0.2;diffusealpha,0); -- Def.Quad { - -- InitCommand=cmd(zoomto,468,196;diffuse,color("#fce1a1");diffusealpha,0.4;vertalign,top;y,SCREEN_CENTER_Y-230;); + -- InitCommand=cmd(zoomto,468,196;diffuse,color("#fce1a1");diffusealpha,0.4;vertalign,top;y,SCREEN_CENTER_Y-230); -- }; -- }; @@ -82,13 +82,13 @@ t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "banner overlay")) .. { self:diffuse(StageToColor(curStage)); self:zoomy(0):decelerate(0.3):zoomy(1); end; - OffCommand=cmd(decelerate,0.15;zoomx,0;); + OffCommand=cmd(decelerate,0.15;zoomx,0); }; -- Genre/Artist data t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "info pane")) .. { - InitCommand=cmd(horizalign,center;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-75-6;zoom,1;); + InitCommand=cmd(horizalign,center;x,SCREEN_CENTER_X-228;y,SCREEN_CENTER_Y-75-6;zoom,1); OnCommand=function(self) self:diffuse(ColorMidTone(StageToColor(curStage))); self:zoomx(0):diffusealpha(0):decelerate(0.3):zoomx(1):diffusealpha(1); @@ -100,8 +100,8 @@ t[#t+1] = LoadActor(THEME:GetPathG("ScreenSelectMusic", "info pane")) .. { t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-330+6-138;draworder,126); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(smooth,0.3;diffusealpha,0;); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(smooth,0.3;diffusealpha,0); -- Length StandardDecorationFromFileOptional("SongTime","SongTime") .. { SetCommand=function(self) @@ -149,10 +149,10 @@ t[#t+1] = Def.ActorFrame { -- Course count and type t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-200;draworder,126); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(smooth,0.2;diffusealpha,0;); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(smooth,0.2;diffusealpha,0); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2-6;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-78+2-6;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode()); CurrentCourseChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -169,10 +169,10 @@ t[#t+1] = Def.ActorFrame { }; t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X+5;draworder,126); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(smooth,0.2;diffusealpha,0;); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(smooth,0.2;diffusealpha,0); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-76-6;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;zoom,1.0;y,SCREEN_CENTER_Y-76-6;maxwidth,180;diffuse,color("#DFE2E9");visible,GAMESTATE:IsCourseMode()); CurrentCourseChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -194,7 +194,7 @@ if not GAMESTATE:IsCourseMode() then -- P1 Difficulty Pane t[#t+1] = Def.ActorFrame { - InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_1);horizalign,center;x,SCREEN_CENTER_X-210-32;y,SCREEN_CENTER_Y+230+10;); + InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_1);horizalign,center;x,SCREEN_CENTER_X-210-32;y,SCREEN_CENTER_Y+230+10); OnCommand=cmd(zoomy,0.8;diffusealpha,0;smooth,0.4;diffusealpha,1;zoomy,1); PlayerJoinedMessageCommand=function(self,param) if param.Player == PLAYER_1 then @@ -203,8 +203,8 @@ t[#t+1] = Def.ActorFrame { end; OffCommand=cmd(decelerate,0.3;diffusealpha,0); LoadActor(THEME:GetPathG("ScreenSelectMusic", "pane background")) .. { - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1;); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -226,10 +226,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("StepsDisplay meter") .. { InitCommand=cmd(zoom,1.25;diffuse,color("#000000");addx,-143;addy,13); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -250,11 +250,11 @@ t[#t+1] = Def.ActorFrame { end }; LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,-143;diffuse,color("#000000");maxwidth,115;); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,-143;diffuse,color("#000000");maxwidth,115); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -276,10 +276,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Normal") .. { InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000");maxwidth,130); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) @@ -303,7 +303,7 @@ t[#t+1] = Def.ActorFrame { -- P2 Difficulty Pane t[#t+1] = Def.ActorFrame { - InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_2);horizalign,center;x,SCREEN_CENTER_X+210+32;y,SCREEN_CENTER_Y+230+10;); + InitCommand=cmd(visible,GAMESTATE:IsHumanPlayer(PLAYER_2);horizalign,center;x,SCREEN_CENTER_X+210+32;y,SCREEN_CENTER_Y+230+10); OnCommand=cmd(zoomy,0.8;diffusealpha,0;smooth,0.4;diffusealpha,1;zoomy,1); PlayerJoinedMessageCommand=function(self,param) if param.Player == PLAYER_2 then @@ -312,9 +312,9 @@ t[#t+1] = Def.ActorFrame { end; OffCommand=cmd(decelerate,0.3;diffusealpha,0); LoadActor(THEME:GetPathG("ScreenSelectMusic", "pane background")) .. { - InitCommand=cmd(zoomx,-1;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1;); + InitCommand=cmd(zoomx,-1); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;decelerate,0.3;diffusealpha,1); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -336,10 +336,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("StepsDisplay meter") .. { InitCommand=cmd(zoom,1.25;diffuse,color("#000000");addx,143;addy,13); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -360,11 +360,11 @@ t[#t+1] = Def.ActorFrame { end }; LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,143;diffuse,color("#000000");maxwidth,115;); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + InitCommand=cmd(uppercase,true;zoom,1;addy,-40;addx,143;diffuse,color("#000000");maxwidth,115); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -386,10 +386,10 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Normal") .. { InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000");maxwidth,130); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); - CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";); - PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75); + OffCommand=cmd(linear,0.3;diffusealpha,0); + CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set"); + PlayerJoinedMessageCommand=cmd(queuecommand,"Set";diffusealpha,0;linear,0.3;diffusealpha,0.75); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) @@ -426,7 +426,6 @@ if not GAMESTATE:IsCourseMode() then local song = GAMESTATE:GetCurrentSong(); local cdtitle = self:GetChild("CDTitle"); local height = cdtitle:GetHeight(); - if song then if song:HasCDTitle() then cdtitle:visible(true); @@ -437,28 +436,27 @@ if not GAMESTATE:IsCourseMode() then else cdtitle:visible(false); end; - - self:zoom(scale(height,64,480,1,64/480)) + self:zoom(scale(height,32,240,1,32/240)) end; t[#t+1] = Def.ActorFrame { - OnCommand=cmd(draworder,46;x,SCREEN_CENTER_X-420;y,SCREEN_CENTER_Y-147;zoom,0;sleep,0.5;decelerate,0.25;zoom,1;SetUpdateFunction,CDTitleUpdate); - OffCommand=cmd(decelerate,0.3;zoomy,0); + OnCommand=cmd(draworder,49;x,SCREEN_CENTER_X-420;y,SCREEN_CENTER_Y-147;diffusealpha,0;decelerate,0.25;diffusealpha,1;SetUpdateFunction,CDTitleUpdate); + OffCommand=cmd(decelerate,0.3;diffusealpha,0;); Def.Sprite { Name="CDTitle"; - OnCommand=cmd(draworder,46;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75;); + OnCommand=cmd(draworder,49;zoom,0.75;diffusealpha,1;zoom,0;bounceend,0.35;zoom,0.75); BackCullCommand=cmd(diffuse,color("0.5,0.5,0.5,1")); - OffCommand=cmd(decelerate,0.3;zoomy,0); + OffCommand=cmd(decelerate,0.3;diffusealpha,0;); }; }; end; -- BPMDisplay t[#t+1] = Def.ActorFrame { - InitCommand=cmd(draworder,126;visible,not GAMESTATE:IsCourseMode();); - OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); + InitCommand=cmd(draworder,126;visible,not GAMESTATE:IsCourseMode()); + OnCommand=cmd(diffusealpha,0;smooth,0.3;diffusealpha,1); + OffCommand=cmd(linear,0.3;diffusealpha,0); LoadFont("Common Condensed") .. { - InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X-198+69-66;y,SCREEN_CENTER_Y-76-6;diffuse,color("#512232");horizalign,right;visible,not GAMESTATE:IsCourseMode();); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X-198+69-66;y,SCREEN_CENTER_Y-76-6;diffuse,color("#512232");horizalign,right;visible,not GAMESTATE:IsCourseMode()); OnCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -486,8 +484,8 @@ t[#t+1] = StandardDecorationFromFileOptional("AlternateHelpDisplay","AlternateHe t[#t+1] = Def.ActorFrame { - OffCommand=cmd(sleep,0.1;linear,0.2;diffusealpha,0;); - InitCommand=cmd(x,SCREEN_CENTER_X-84;visible,not GAMESTATE:IsCourseMode();); + OffCommand=cmd(sleep,0.1;linear,0.2;diffusealpha,0); + InitCommand=cmd(x,SCREEN_CENTER_X-84;visible,not GAMESTATE:IsCourseMode()); StandardDecorationFromFileOptional("StageDisplay","StageDisplay") .. { InitCommand=cmd(zoom,1); diff --git a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua index d917bbc935..062754dc83 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic overlay.lua @@ -2,8 +2,8 @@ local t = Def.ActorFrame {}; -- Sort order t[#t+1] = Def.ActorFrame { - InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49;); - OffCommand=cmd(linear,0.3;diffusealpha,0;); + InitCommand=cmd(x,SCREEN_RIGHT-290;y,SCREEN_TOP+49); + OffCommand=cmd(linear,0.3;diffusealpha,0); LoadActor(THEME:GetPathG("", "_sortFrame")) .. { InitCommand=cmd(diffusealpha,0.9;zoom,1.5); OnCommand=function(self) @@ -12,7 +12,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Condensed") .. { - InitCommand=cmd(zoom,1;diffuse,color("#FFFFFF");diffusealpha,0.85;horizalign,left;addx,-115;); + InitCommand=cmd(zoom,1;diffuse,color("#FFFFFF");diffusealpha,0.85;horizalign,left;addx,-115); OnCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); SetCommand=function(self) @@ -22,7 +22,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Condensed") .. { - InitCommand=cmd(zoom,1;maxwidth,SCREEN_WIDTH;addx,115;diffuse,color("#FFFFFF");uppercase,true;horizalign,right;maxwidth,157;); + InitCommand=cmd(zoom,1;maxwidth,SCREEN_WIDTH;addx,115;diffuse,color("#FFFFFF");uppercase,true;horizalign,right;maxwidth,157); OnCommand=cmd(queuecommand,"Set"); SortOrderChangedMessageCommand=cmd(queuecommand,"Set"); ChangedLanguageDisplayMessageCommand=cmd(queuecommand,"Set"); diff --git a/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua b/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua index 089f8b1807..b19f31691e 100644 --- a/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua +++ b/Themes/default/BGAnimations/ScreenSelectProfile overlay.lua @@ -10,7 +10,7 @@ function GetLocalProfiles() local ProfileCard = Def.ActorFrame { --[[ Def.Quad { InitCommand=cmd(zoomto,200,1;y,40/2); - OnCommand=cmd(diffuse,Color('Outline');); + OnCommand=cmd(diffuse,Color('Outline')); }; --]] LoadFont("Common Fallback") .. { Text=profile:GetDisplayName(); @@ -60,7 +60,7 @@ function LoadPlayerStuff(Player) LoadFont("Common Italic Condensed") .. { Text="Press &START; to join"; InitCommand=cmd(shadowlength,1;zoom,1.25); - OnCommand=cmd(diffuseshift;effectcolor1,Color('White');effectcolor2,color("0.5,0.5,0.5");strokecolor,color("#4A1110");); + OnCommand=cmd(diffuseshift;effectcolor1,Color('White');effectcolor2,color("0.5,0.5,0.5");strokecolor,color("#4A1110")); }; }; @@ -73,7 +73,7 @@ function LoadPlayerStuff(Player) InitCommand=cmd(y,-2); Def.Quad { InitCommand=cmd(zoomto,270,48); - OnCommand=cmd(diffuse,PlayerDarkColor(Player);fadeleft,0.1;faderight,0.1;); + OnCommand=cmd(diffuse,PlayerDarkColor(Player);fadeleft,0.1;faderight,0.1); }; }; @@ -250,7 +250,7 @@ local t = Def.ActorFrame { OffCommand=cmd(decelerate,0.3;diffusealpha,0); -- PlayerJoinedMessageCommand=function(self,param) -- if param.Player == PLAYER_1 then - -- (cmd(;zoom,1.15;bounceend,0.175;zoom,1.0;))(self); + -- (cmd(;zoom,1.15;bounceend,0.175;zoom,1.0))(self); -- end; -- end; children = LoadPlayerStuff(PLAYER_1); @@ -262,7 +262,7 @@ local t = Def.ActorFrame { OffCommand=cmd(decelerate,0.3;diffusealpha,0); -- PlayerJoinedMessageCommand=function(self,param) -- if param.Player == PLAYER_2 then - -- (cmd(zoom,1.15;bounceend,0.175;zoom,1.0;))(self); + -- (cmd(zoom,1.15;bounceend,0.175;zoom,1.0))(self); -- end; -- end; children = LoadPlayerStuff(PLAYER_2); diff --git a/Themes/default/BGAnimations/ScreenStageInformation underlay/CourseDisplay.lua b/Themes/default/BGAnimations/ScreenStageInformation underlay/CourseDisplay.lua index dc316ffd8d..bb0d7dce37 100644 --- a/Themes/default/BGAnimations/ScreenStageInformation underlay/CourseDisplay.lua +++ b/Themes/default/BGAnimations/ScreenStageInformation underlay/CourseDisplay.lua @@ -23,7 +23,7 @@ local t = Def.ActorFrame{ }; -- alternate background Def.Sprite{ - InitCommand=cmd(Center;); + InitCommand=cmd(Center); BeginCommand=cmd(LoadFromCurrentSongBackground;scale_or_crop_background;diffusealpha,0); OnCommand=cmd(playcommand,"Show"); ShowCommand=function(self) diff --git a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua index b31a3834e4..04a9c9f6fc 100644 --- a/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenStageInformation underlay/default.lua @@ -35,14 +35,14 @@ t[#t+1] = Def.ActorFrame { OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240); -- Behind stage graphic Def.Quad { - InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-110;zoomto,SCREEN_WIDTH,120;); + InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-110;zoomto,SCREEN_WIDTH,120); OnCommand=function(self) self:diffuse(color("#000000")):diffusealpha(0.8); end }; -- Behind song Def.Quad { - InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM;zoomto,SCREEN_WIDTH,110;); + InitCommand=cmd(vertalign,bottom;x,SCREEN_CENTER_X;y,SCREEN_BOTTOM;zoomto,SCREEN_WIDTH,110); OnCommand=function(self) self:diffuse(color("#000000")):diffusealpha(0.9); end @@ -70,7 +70,7 @@ end t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+190); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240); stage_num_actor .. { OnCommand=cmd(zoom,1;diffusealpha,1); @@ -80,10 +80,10 @@ t[#t+1] = Def.ActorFrame { -- Step author credits if GAMESTATE:IsHumanPlayer(PLAYER_1) == true then t[#t+1] = Def.ActorFrame { - InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_LEFT+40;); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_LEFT+40); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240); LoadFont("Common Italic Condensed") .. { - OnCommand=cmd(playcommand,"Set";horizalign,left;diffuse,color("#FFFFFF");); + OnCommand=cmd(playcommand,"Set";horizalign,left;diffuse,color("#FFFFFF")); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) local song = GAMESTATE:GetCurrentSong(); @@ -100,7 +100,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Fallback Font") .. { InitCommand=cmd(addy,22); - OnCommand=cmd(playcommand,"Set";horizalign,left;zoom,0.75;diffuse,color("#FFFFFF");); + OnCommand=cmd(playcommand,"Set";horizalign,left;zoom,0.75;diffuse,color("#FFFFFF")); SetCommand=function(self) stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1) local song = GAMESTATE:GetCurrentSong(); @@ -120,10 +120,10 @@ t[#t+1] = Def.ActorFrame { if GAMESTATE:IsHumanPlayer(PLAYER_2) == true then t[#t+1] = Def.ActorFrame { - InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_RIGHT-40;); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + InitCommand=cmd(y,SCREEN_BOTTOM-80;x,SCREEN_RIGHT-40); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240); LoadFont("Common Italic Condensed") .. { - OnCommand=cmd(playcommand,"Set";horizalign,right;diffuse,color("#FFFFFF");); + OnCommand=cmd(playcommand,"Set";horizalign,right;diffuse,color("#FFFFFF")); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) local song = GAMESTATE:GetCurrentSong(); @@ -142,7 +142,7 @@ t[#t+1] = Def.ActorFrame { LoadFont("Common Fallback Font") .. { InitCommand=cmd(addy,22); - OnCommand=cmd(playcommand,"Set";horizalign,right;zoom,0.75;diffuse,color("#FFFFFF");); + OnCommand=cmd(playcommand,"Set";horizalign,right;zoom,0.75;diffuse,color("#FFFFFF")); SetCommand=function(self) stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2) local song = GAMESTATE:GetCurrentSong(); @@ -163,16 +163,16 @@ t[#t+1] = Def.ActorFrame { -- Song title and artist t[#t+1] = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_BOTTOM-80); - OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240;); + OnCommand=cmd(addy,SCREEN_HEIGHT;sleep,slideWait;smooth,slideTime+easeTime;addy,-SCREEN_HEIGHT;sleep,2-easeTime;smooth,bottomSlide;addy,240); LoadFont("Common Fallback Font") .. { Text=GAMESTATE:IsCourseMode() and GAMESTATE:GetCurrentCourse():GetDisplayFullTitle() or GAMESTATE:GetCurrentSong():GetDisplayFullTitle(); InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); - OnCommand=cmd(zoom,1;); + OnCommand=cmd(zoom,1); }; LoadFont("Common Fallback Font") .. { Text=GAMESTATE:IsCourseMode() and ToEnumShortString( GAMESTATE:GetCurrentCourse():GetCourseType() ) or GAMESTATE:GetCurrentSong():GetDisplayArtist(); InitCommand=cmd(diffuse,color("#FFFFFF");maxwidth,SCREEN_WIDTH*0.6); - OnCommand=cmd(zoom,0.75;addy,24;); + OnCommand=cmd(zoom,0.75;addy,24); }; }; @@ -184,12 +184,12 @@ t[#t+1] = Def.Quad { t[#t+1] = Def.ActorFrame { LoadActor("_arrow") .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,color("#DAD6CC");); - OnCommand=cmd(diffusealpha,0;sleep,0.5;diffusealpha,0.6;decelerate,0.4;zoom,1.2;diffusealpha,0;); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,color("#DAD6CC")); + OnCommand=cmd(diffusealpha,0;sleep,0.5;diffusealpha,0.6;decelerate,0.4;zoom,1.2;diffusealpha,0); }; LoadActor("_arrow") .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,color("#DAD6CC");); - OnCommand=cmd(zoom,0;bounceend,0.5;zoom,1;sleep,0.75;smooth,slideTime;addy,-SCREEN_HEIGHT;); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,color("#DAD6CC")); + OnCommand=cmd(zoom,0;bounceend,0.5;zoom,1;sleep,0.75;smooth,slideTime;addy,-SCREEN_HEIGHT); }; }; diff --git a/Themes/default/BGAnimations/ScreenSystemLayer overlay/default.lua b/Themes/default/BGAnimations/ScreenSystemLayer overlay/default.lua index fc055b36cc..a5eb81f3ef 100644 --- a/Themes/default/BGAnimations/ScreenSystemLayer overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenSystemLayer overlay/default.lua @@ -68,15 +68,15 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame { Def.Quad { InitCommand=cmd(zoomtowidth,SCREEN_WIDTH;zoomtoheight,30;horizalign,left;vertalign,top;y,SCREEN_TOP;diffuse,color("0,0,0,0")); - OnCommand=cmd(finishtweening;diffusealpha,0.85;); - OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0;); + OnCommand=cmd(finishtweening;diffusealpha,0.85); + OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0); }; Def.BitmapText{ Font="_fira mono 24px"; Name="Text"; - InitCommand=cmd(maxwidth,750;horizalign,left;vertalign,top;y,SCREEN_TOP+10;x,SCREEN_LEFT+10;shadowlength,1;diffusealpha,0;); + InitCommand=cmd(maxwidth,750;horizalign,left;vertalign,top;y,SCREEN_TOP+10;x,SCREEN_LEFT+10;shadowlength,1;diffusealpha,0); OnCommand=cmd(finishtweening;diffusealpha,1;zoom,0.5); - OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0;); + OffCommand=cmd(sleep,3;linear,0.5;diffusealpha,0); }; SystemMessageMessageCommand = function(self, params) self:GetChild("Text"):settext( params.Message ); diff --git a/Themes/default/BGAnimations/ScreenTestInput underlay.lua b/Themes/default/BGAnimations/ScreenTestInput underlay.lua index 865885946c..09fddf1618 100644 --- a/Themes/default/BGAnimations/ScreenTestInput underlay.lua +++ b/Themes/default/BGAnimations/ScreenTestInput underlay.lua @@ -1,17 +1,17 @@ return Def.ActorFrame { Def.Quad { InitCommand=cmd(zoomto,SCREEN_WIDTH,SCREEN_HEIGHT;Center); - OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;decelerate,0.3;diffusealpha,0.7;); - OffCommand=cmd(stoptweening;decelerate,0.2;diffusealpha,0;); + OnCommand=cmd(diffuse,Color.Black;diffusealpha,0;decelerate,0.3;diffusealpha,0.7); + OffCommand=cmd(stoptweening;decelerate,0.2;diffusealpha,0); }; Def.DeviceList { Font="Common Italic Condensed", - InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+130;zoom,0.8;halign,0;diffuse,color("#FFFFFF");); - OffCommand=cmd(stoptweening;decelerate,0.2;diffusealpha,0;); + InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+130;zoom,0.8;halign,0;diffuse,color("#FFFFFF")); + OffCommand=cmd(stoptweening;decelerate,0.2;diffusealpha,0); }; Def.InputList { Font="Common Condensed", - InitCommand=cmd(x,SCREEN_CENTER_X-250;y,SCREEN_CENTER_Y;zoom,1;halign,0;vertspacing,8;strokecolor,color("#000000");); + InitCommand=cmd(x,SCREEN_CENTER_X-250;y,SCREEN_CENTER_Y;zoom,1;halign,0;vertspacing,8;strokecolor,color("#000000")); }; }; diff --git a/Themes/default/BGAnimations/ScreenTextEntry underlay.lua b/Themes/default/BGAnimations/ScreenTextEntry underlay.lua index baf635cdfc..0775ad4936 100644 --- a/Themes/default/BGAnimations/ScreenTextEntry underlay.lua +++ b/Themes/default/BGAnimations/ScreenTextEntry underlay.lua @@ -1,7 +1,7 @@ return Def.ActorFrame { Def.Quad{ InitCommand=cmd(scaletocover,-SCREEN_WIDTH*2,SCREEN_TOP,SCREEN_WIDTH*2,SCREEN_BOTTOM;diffuse,color("0,0,0,0.5")); - OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.5;); - OffCommand=cmd(smooth,0.2;diffusealpha,0;); + OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.5); + OffCommand=cmd(smooth,0.2;diffusealpha,0); }; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua b/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua index c70c87fa78..c138dd3971 100644 --- a/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua +++ b/Themes/default/BGAnimations/ScreenTitleMenu background/default.lua @@ -13,7 +13,7 @@ if ThemePrefs.Get("FancyUIBG") then }; Def.ActorFrame { - OnCommand=cmd(diffusealpha,0;decelerate,1.8;diffusealpha,1;); + OnCommand=cmd(diffusealpha,0;decelerate,1.8;diffusealpha,1); LoadActor("_tunnel1") .. { InitCommand=cmd(Center;blend,'BlendMode_Add';rotationz,-20), OnCommand=cmd(zoom,1.75;diffusealpha,0.12;spin;effectmagnitude,0,0,16.5) diff --git a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua index 4c8b190309..6fef088f9d 100644 --- a/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua +++ b/Themes/default/BGAnimations/ScreenWithMenuElements background/default.lua @@ -19,7 +19,7 @@ if ThemePrefs.Get("FancyUIBG") then }; Def.ActorFrame { - OnCommand=cmd(diffusealpha,0;decelerate,1.8;diffusealpha,1;); + OnCommand=cmd(diffusealpha,0;decelerate,1.8;diffusealpha,1); LoadActor("_tunnel1") .. { InitCommand=cmd(x,SCREEN_LEFT+160;y,SCREEN_CENTER_Y;blend,'BlendMode_Add';rotationz,-20), OnCommand=cmd(zoom,1.75;diffusealpha,0.14;spin;effectmagnitude,0,0,16.5) diff --git a/Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua b/Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua index 8f4f71d7f2..f7ede15159 100644 --- a/Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua +++ b/Themes/default/Graphics/MusicWheelItem Mode NormalPart.lua @@ -1,3 +1,5 @@ return LoadActor(THEME:GetPathG("MusicWheelItem", "ModeItem")) .. { - OnCommand=cmd(diffuse,ScreenColor(SCREENMAN:GetTopScreen():GetName());); + OnCommand=function(self) + self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())); + end; }; \ No newline at end of file diff --git a/Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua b/Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua index 8f4f71d7f2..f7ede15159 100644 --- a/Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua +++ b/Themes/default/Graphics/MusicWheelItem Sort NormalPart.lua @@ -1,3 +1,5 @@ return LoadActor(THEME:GetPathG("MusicWheelItem", "ModeItem")) .. { - OnCommand=cmd(diffuse,ScreenColor(SCREENMAN:GetTopScreen():GetName());); + OnCommand=function(self) + self:diffuse(ScreenColor(SCREENMAN:GetTopScreen():GetName())); + end; }; \ No newline at end of file diff --git a/Themes/default/Graphics/PaneDisplay text.lua b/Themes/default/Graphics/PaneDisplay text.lua index 4310b04339..0b33dfb405 100644 --- a/Themes/default/Graphics/PaneDisplay text.lua +++ b/Themes/default/Graphics/PaneDisplay text.lua @@ -83,7 +83,7 @@ local function CreatePaneDisplayGraph( _pnPlayer, _sLabel, _rcRadarCategory ) end; }; LoadFont("Common Normal") .. { - InitCommand=cmd(x,14;zoom,0.5;halign,0;); + InitCommand=cmd(x,14;zoom,0.5;halign,0); OnCommand=cmd(shadowlength,1;strokecolor,color("0.15,0.15,0.15,0.625")); CurrentSongChangedMessageCommand=cmd(playcommand,"Set"); CurrentStepsP1ChangedMessageCommand=cmd(playcommand,"Set"); @@ -109,44 +109,44 @@ t[#t+1] = Def.ActorFrame { -- Left CreatePaneDisplayItem( iPN, "Taps", 'RadarCategory_TapsAndHolds' ) .. { InitCommand=cmd(x,-128+16+8;y,-14); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8); }; CreatePaneDisplayItem( iPN, "Jumps", 'RadarCategory_Jumps' ) .. { InitCommand=cmd(x,-128+16+8;y,-14+24); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8); }; CreatePaneDisplayItem( iPN, "Holds", 'RadarCategory_Holds' ) .. { InitCommand=cmd(x,-128+16+8;y,-14+24*2); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8); }; CreatePaneDisplayItem( iPN, "Mines", 'RadarCategory_Mines' ) .. { InitCommand=cmd(x,-128+16+8;y,-14+24*3); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8); }; -- Center CreatePaneDisplayItem( iPN, "Hands", 'RadarCategory_Hands' ) .. { InitCommand=cmd(x,36;y,-14); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.4;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.1;diffusealpha,0;zoomy,0.8); }; CreatePaneDisplayItem( iPN, "Rolls", 'RadarCategory_Rolls' ) .. { InitCommand=cmd(x,36;y,-14+24); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.5;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.15;diffusealpha,0;zoomy,0.8); }; CreatePaneDisplayItem( iPN, "Lifts", 'RadarCategory_Lifts' ) .. { InitCommand=cmd(x,36;y,-14+24*2); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.6;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.2;diffusealpha,0;zoomy,0.8); }; CreatePaneDisplayItem( iPN, "Fakes", 'RadarCategory_Fakes' ) .. { InitCommand=cmd(x,36;y,-14+24*3); - OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1;); - OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8;); + OnCommand=cmd(zoomy,0.8;diffusealpha,0;sleep,0.7;linear,0.3;diffusealpha,1;zoomy,1); + OffCommand=cmd(linear,0.25;diffusealpha,0;zoomy,0.8); }; }; return t; \ No newline at end of file diff --git a/Themes/default/Graphics/Player combo/default.lua b/Themes/default/Graphics/Player combo/default.lua index 996183d737..366bedeec1 100644 --- a/Themes/default/Graphics/Player combo/default.lua +++ b/Themes/default/Graphics/Player combo/default.lua @@ -88,24 +88,24 @@ local t = Def.ActorFrame { if param.FullComboW1 then c.Number:diffuse(color("#00aeef")); c.Number:glowshift(); - (cmd(diffuse,color("#C7E5F0");diffusebottomedge,color("#00aeef");strokecolor,color("#0E3D53");))(c.Label); + (cmd(diffuse,color("#C7E5F0");diffusebottomedge,color("#00aeef");strokecolor,color("#0E3D53")))(c.Label); elseif param.FullComboW2 then c.Number:diffuse(color("#F3D58D")); c.Number:glowshift(); - (cmd(diffuse,color("#FAFAFA");diffusebottomedge,color("#F3D58D");strokecolor,color("#53450E");))(c.Label); + (cmd(diffuse,color("#FAFAFA");diffusebottomedge,color("#F3D58D");strokecolor,color("#53450E")))(c.Label); elseif param.FullComboW3 then c.Number:diffuse(color("#94D658")); c.Number:stopeffect(); - (cmd(diffuse,color("#CFE5BC");diffusebottomedge,color("#94D658");strokecolor,color("#12530E");))(c.Label); + (cmd(diffuse,color("#CFE5BC");diffusebottomedge,color("#94D658");strokecolor,color("#12530E")))(c.Label); elseif param.Combo then c.Number:diffuse(color("#FBE9DD")); -- c.Number:diffuse(PlayerColor(player)); c.Number:stopeffect(); - (cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B");))(c.Label); + (cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B")))(c.Label); else c.Number:diffuse(color("#FBE9DD")); c.Number:stopeffect(); - (cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B");))(c.Label); + (cmd(diffuse,color("#F5CB92");diffusebottomedge,color("#EFA97A");strokecolor,color("#602C1B")))(c.Label); end -- Pulse Pulse( c.Number, param ); diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua index 8ad3bb9c53..9b31a102ba 100644 --- a/Themes/default/Graphics/Player judgment/default.lua +++ b/Themes/default/Graphics/Player judgment/default.lua @@ -85,25 +85,25 @@ t[#t+1] = Def.ActorFrame { Name="ProtimingGraphBG"; InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth,16); ResetCommand=cmd(finishtweening;diffusealpha,0.8;visible,false); - OnCommand=cmd(diffuse,Color("Black");diffusetopedge,color("0.1,0.1,0.1,1");diffusealpha,0.8;shadowlength,2;); + OnCommand=cmd(diffuse,Color("Black");diffusetopedge,color("0.1,0.1,0.1,1");diffusealpha,0.8;shadowlength,2); }; Def.Quad { Name="ProtimingGraphWindowW3"; InitCommand=cmd(visible,false;y,32;zoomto,ProtimingWidth-4,16-4); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); - OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W3"];); + OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W3"]); }; Def.Quad { Name="ProtimingGraphWindowW2"; InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW2"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); - OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W2"];); + OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W2"]); }; Def.Quad { Name="ProtimingGraphWindowW1"; InitCommand=cmd(visible,false;y,32;zoomto,scale(PREFSMAN:GetPreference("TimingWindowSecondsW1"),0,PREFSMAN:GetPreference("TimingWindowSecondsW3"),0,ProtimingWidth-4),16-4); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); - OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W1"];); + OnCommand=cmd(diffuse,GameColor.Judgment["JudgmentLine_W1"]); }; Def.Quad { Name="ProtimingGraphUnderlay"; @@ -113,19 +113,19 @@ t[#t+1] = Def.ActorFrame { }; Def.Quad { Name="ProtimingGraphFill"; - InitCommand=cmd(visible,false;y,32;zoomto,0,16-4;horizalign,left;); + InitCommand=cmd(visible,false;y,32;zoomto,0,16-4;horizalign,left); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); - OnCommand=cmd(diffuse,Color("Red");); + OnCommand=cmd(diffuse,Color("Red")); }; Def.Quad { Name="ProtimingGraphAverage"; - InitCommand=cmd(visible,false;y,32;zoomto,2,7;); + InitCommand=cmd(visible,false;y,32;zoomto,2,7); ResetCommand=cmd(finishtweening;diffusealpha,0.85;visible,false); OnCommand=cmd(diffuse,Color("Orange");diffusealpha,0.85); }; Def.Quad { Name="ProtimingGraphCenter"; - InitCommand=cmd(visible,false;y,32;zoomto,2,16-4;); + InitCommand=cmd(visible,false;y,32;zoomto,2,16-4); ResetCommand=cmd(finishtweening;diffusealpha,1;visible,false); OnCommand=cmd(diffuse,Color("White");diffusealpha,1); }; diff --git a/Themes/default/Graphics/ScreenEvaluation StageDisplay.lua b/Themes/default/Graphics/ScreenEvaluation StageDisplay.lua index c59787b60a..34e2a96dee 100644 --- a/Themes/default/Graphics/ScreenEvaluation StageDisplay.lua +++ b/Themes/default/Graphics/ScreenEvaluation StageDisplay.lua @@ -20,7 +20,7 @@ t[#t+1] = Def.ActorFrame { end }; LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true;); + InitCommand=cmd(y,-1;zoom,1;shadowlength,1;uppercase,true); BeginCommand=function(self) local top = SCREENMAN:GetTopScreen() if top then diff --git a/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua b/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua index 9c30a10aa5..23f9a013f6 100644 --- a/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua +++ b/Themes/default/Graphics/ScreenGameplay lifebar_bar.lua @@ -86,19 +86,19 @@ t[#t+1] = Def.ActorFrame { Def.Quad { Name="Background", InitCommand=cmd(zoomto,life_meter_width,life_meter_height), - OnCommand=cmd(diffuse,color("#32373E");), - AliveCommand=cmd(stopeffect;diffuse,color("#32373E");), + OnCommand=cmd(diffuse,color("#32373E")), + AliveCommand=cmd(stopeffect;diffuse,color("#32373E")), DangerCommand=cmd(diffuseshift;effectcolor2,ColorMidTone(Color.Red);effectcolor1,ColorDarkTone(Color.Red)), - DeadCommand=cmd(stopeffect;diffuse,color("#000000");), + DeadCommand=cmd(stopeffect;diffuse,color("#000000")), }, Def.Quad { Name="Fill", InitCommand=cmd(x,-life_meter_width/2;zoomto,life_meter_width,life_meter_height;horizalign,left), - OnCommand=cmd(diffuse,PlayerColor(pn);), + OnCommand=cmd(diffuse,PlayerColor(pn)), -- - HotCommand=cmd(diffuse,color("#ff9232");diffuseshift;effectclock,'beat';effectcolor1,color("#ff9232");effectcolor2,color("#ffe263");), + HotCommand=cmd(diffuse,color("#ff9232");diffuseshift;effectclock,'beat';effectcolor1,color("#ff9232");effectcolor2,color("#ffe263")), AliveCommand=cmd(diffuse,PlayerColor(pn);stopeffect), - DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,Color.Red;effectcolor2,color("#FF797C");), + DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,Color.Red;effectcolor2,color("#FF797C")), DeadCommand=cmd(diffuse,Color.Red;stopeffect) }, MakeSeperators(), @@ -106,11 +106,11 @@ t[#t+1] = Def.ActorFrame { Name="Tip", InitCommand=cmd(basezoomx,life_meter_tip_width;basezoomy,life_meter_height), -- - OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(pn));), + OnCommand=cmd(diffuse,ColorLightTone(PlayerColor(pn))), -- HotCommand=cmd(diffuse,color("#FFED31");glowshift;effectclock,'beat'), AliveCommand=cmd(diffuse,ColorLightTone(PlayerColor(pn));stopeffect), - DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,color("#000000");effectcolor2,Color.Red;), + DangerCommand=cmd(diffuse,Color.Red;diffuseshift;effectclock,'beat';effectcolor1,color("#000000");effectcolor2,Color.Red), DeadCommand=cmd(diffuse,Color.Red;stopeffect) } } diff --git a/Themes/default/Graphics/ScreenGameplay lifebar_battery.lua b/Themes/default/Graphics/ScreenGameplay lifebar_battery.lua index a17d75f989..ddc602f42a 100644 --- a/Themes/default/Graphics/ScreenGameplay lifebar_battery.lua +++ b/Themes/default/Graphics/ScreenGameplay lifebar_battery.lua @@ -61,10 +61,10 @@ t[#t+1] = Def.ActorFrame { Def.Quad { Name="Background", InitCommand=cmd(zoomto,life_meter_width,life_meter_height), - OnCommand=cmd(diffuse,color("#32373E");), - AliveCommand=cmd(stopeffect;diffuse,color("#32373E");), + OnCommand=cmd(diffuse,color("#32373E")), + AliveCommand=cmd(stopeffect;diffuse,color("#32373E")), DangerCommand=cmd(diffuseshift;effectcolor2,ColorMidTone(Color.Red);effectcolor1,ColorDarkTone(Color.Red)), - DeadCommand=cmd(stopeffect;diffuse,color("#000000");), + DeadCommand=cmd(stopeffect;diffuse,color("#000000")), }, Def.Quad { Name="Fill", diff --git a/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua b/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua index e76f4d9fed..16c25863ef 100644 --- a/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua +++ b/Themes/default/Graphics/ScreenHighScores ScrollerItem/default.lua @@ -45,7 +45,7 @@ for idx=1,NumColumns do }; Scores[#Scores+1] = LoadActor("empty") .. { Name = idx .. "Empty"; - InitCommand=cmd(x,x_pos;); + InitCommand=cmd(x,x_pos); OnCommand=cmd(zoom,0.75); }; diff --git a/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua index 9e2e7179f7..4f2e5a7935 100644 --- a/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua +++ b/Themes/default/Graphics/ScreenPlayerOptions PlayerNameplate.lua @@ -28,19 +28,19 @@ local t = Def.ActorFrame { LoadFont("Common Condensed") .. { Text=ToEnumShortString(PlayerNumber); Name="PlayerShortName", - InitCommand=cmd(x,-127;maxwidth,32;zoom,0.75;), - OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber));) + InitCommand=cmd(x,-127;maxwidth,32;zoom,0.75), + OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber))) }, LoadFont("_overpass 36px") .. { Text=bpm_text; Name="BPMRangeOld", InitCommand=cmd(x,-60;maxwidth,88/bpm_text_zoom), - OnCommand=cmd(zoom,bpm_text_zoom;diffuse,ColorDarkTone(PlayerColor(PlayerNumber));) + OnCommand=cmd(zoom,bpm_text_zoom;diffuse,ColorDarkTone(PlayerColor(PlayerNumber))) }, LoadActor(THEME:GetPathG("_StepsDisplayListRow","arrow")) .. { Name="Seperator", InitCommand=cmd(x,4); - OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber));) + OnCommand=cmd(diffuse,ColorDarkTone(PlayerColor(PlayerNumber))) }, LoadFont("_overpass 36px") .. { Text="100 - 200000"; @@ -51,8 +51,8 @@ local t = Def.ActorFrame { local speed, mode= GetSpeedModeAndValueFromPoptions(PlayerNumber) self:playcommand("SpeedChoiceChanged", {pn= PlayerNumber, mode= mode, speed= speed}) end, - BPMWillNotChangeCommand=cmd(stopeffect;diffuse,ColorDarkTone(PlayerColor(PlayerNumber));), - BPMWillChangeCommand=cmd(diffuseshift;effectcolor1,Color.Black;effectcolor2,ColorMidTone(PlayerColor(PlayerNumber));), + BPMWillNotChangeCommand=cmd(stopeffect;diffuse,ColorDarkTone(PlayerColor(PlayerNumber))), + BPMWillChangeCommand=cmd(diffuseshift;effectcolor1,Color.Black;effectcolor2,ColorMidTone(PlayerColor(PlayerNumber))), SpeedChoiceChangedMessageCommand= function(self, param) if param.pn ~= PlayerNumber then return end local text= "" diff --git a/Themes/default/Graphics/ScreenSelectMusic CourseContentsList.lua b/Themes/default/Graphics/ScreenSelectMusic CourseContentsList.lua index cb23037a92..5114bfad69 100644 --- a/Themes/default/Graphics/ScreenSelectMusic CourseContentsList.lua +++ b/Themes/default/Graphics/ScreenSelectMusic CourseContentsList.lua @@ -77,7 +77,7 @@ return Def.CourseContentsList { -- self:glow("1,1,1,0"); end - --(cmd(finishtweening;diffusealpha,0;sleep,0.125*params.Number;smooth,0.2;diffusealpha,1;))(self); + --(cmd(finishtweening;diffusealpha,0;sleep,0.125*params.Number;smooth,0.2;diffusealpha,1))(self); end }, diff --git a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua index 885a24ec80..20e4b6adad 100644 --- a/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua +++ b/Themes/default/Graphics/ScreenSelectMusic DifficultyList.lua @@ -49,7 +49,7 @@ return Def.ActorFrame { }; LoadFont("_roboto condensed Bold 48px") .. { Text="P1"; - InitCommand=cmd(horizalign,center;x,8;diffuse,ColorDarkTone(PlayerColor(PLAYER_1));); + InitCommand=cmd(horizalign,center;x,8;diffuse,ColorDarkTone(PlayerColor(PLAYER_1))); OnCommand=cmd(zoom,0.5); }; }; @@ -72,11 +72,11 @@ return Def.ActorFrame { end; end; LoadActor(THEME:GetPathG("_StepsDisplayListRow","Cursor")) .. { - InitCommand=cmd(diffuse,ColorLightTone(PlayerColor(PLAYER_2));x,-8;zoom,0.75;zoomx,-0.75;); + InitCommand=cmd(diffuse,ColorLightTone(PlayerColor(PLAYER_2));x,-8;zoom,0.75;zoomx,-0.75); }; LoadFont("_roboto condensed Bold 48px") .. { Text="P2"; - InitCommand=cmd(horizalign,center;x,-8;diffuse,ColorDarkTone(PlayerColor(PLAYER_2));); + InitCommand=cmd(horizalign,center;x,-8;diffuse,ColorDarkTone(PlayerColor(PLAYER_2))); OnCommand=cmd(zoom,0.5); }; }; @@ -87,4 +87,4 @@ return Def.ActorFrame { ChangeCommand=cmd(stoptweening;decelerate,0.05); }; }; -}; +}; \ No newline at end of file diff --git a/Themes/default/Graphics/ScreenSelectStyle Icon.lua b/Themes/default/Graphics/ScreenSelectStyle Icon.lua index 1b942054e9..b8281d7d8d 100644 --- a/Themes/default/Graphics/ScreenSelectStyle Icon.lua +++ b/Themes/default/Graphics/ScreenSelectStyle Icon.lua @@ -11,8 +11,8 @@ t[#t+1] = Def.ActorFrame { LoseFocusCommand=THEME:GetMetric(Var "LoadingScreen","IconLoseFocusCommand"); LoadActor(THEME:GetPathG("ScreenSelectPlayMode", "icon/_background base"))..{ - GainFocusCommand=cmd(diffuse,color("#981F41");); - LoseFocusCommand=cmd(diffuse,color("#740A27");); + GainFocusCommand=cmd(diffuse,color("#981F41")); + LoseFocusCommand=cmd(diffuse,color("#740A27")); }; LoadFont("_overpass 36px")..{ Text=string.upper(string_name); diff --git a/Themes/default/Graphics/ScreenTitleMenu NetworkStatus.lua b/Themes/default/Graphics/ScreenTitleMenu NetworkStatus.lua index d6df35e773..3398ac181c 100644 --- a/Themes/default/Graphics/ScreenTitleMenu NetworkStatus.lua +++ b/Themes/default/Graphics/ScreenTitleMenu NetworkStatus.lua @@ -20,7 +20,7 @@ local t = Def.ActorFrame{ if netConnected then t[#t+1] = LoadFont("Common Condensed") .. { - InitCommand=cmd(y,16;horizalign,left;zoom,0.5875;shadowlength,1;diffuse,color("#268129");diffusebottomedge,color("#153F17");); + InitCommand=cmd(y,16;horizalign,left;zoom,0.5875;shadowlength,1;diffuse,color("#268129");diffusebottomedge,color("#153F17")); BeginCommand=function(self) self:settext( string.format(Screen.String("Connected to %s"), GetServerName()) ); end; diff --git a/Themes/default/Graphics/ScreenTitleMenu logo/default.lua b/Themes/default/Graphics/ScreenTitleMenu logo/default.lua index 94f20ba42d..ba8d2ed543 100644 --- a/Themes/default/Graphics/ScreenTitleMenu logo/default.lua +++ b/Themes/default/Graphics/ScreenTitleMenu logo/default.lua @@ -6,8 +6,8 @@ local t = Def.ActorFrame{ LoadActor("_text"); LoadActor("_text")..{ Name="TextGlow"; - InitCommand=cmd(blend,Blend.Add;diffusealpha,0.05;); - OnCommand=cmd(glowshift;effectperiod,5;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,1");); + InitCommand=cmd(blend,Blend.Add;diffusealpha,0.05); + OnCommand=cmd(glowshift;effectperiod,5;effectcolor1,color("1,1,1,0.25");effectcolor2,color("1,1,1,1")); }; }; }; diff --git a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua index 00d0407187..f1605b7caa 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements Footer.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements Footer.lua @@ -8,7 +8,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = Def.ActorFrame { Def.Quad { - InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,50;); + InitCommand=cmd(vertalign,bottom;zoomto,SCREEN_WIDTH,50); OnCommand=function(self) self:diffuse(ColorMidTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))) self:diffusetopedge(ColorDarkTone(ScreenColor(SCREENMAN:GetTopScreen():GetName()))):diffusealpha(1) diff --git a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua index dc060bdbd9..e45f762978 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements StageDisplay.lua @@ -5,7 +5,7 @@ local t = Def.ActorFrame {}; t[#t+1] = Def.ActorFrame { LoadFont("Common Italic Condensed") .. { - InitCommand=cmd(y,-1;zoom,1.2;maxwidth,130;); + InitCommand=cmd(y,-1;zoom,1.2;maxwidth,130); BeginCommand=function(self) local top = SCREENMAN:GetTopScreen() if top then diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua index a957339891..0a1b51f97d 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua @@ -62,7 +62,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = LoadFont("Common Header") .. { Name="HeaderTitle", Text=Screen.String("HeaderText"), - InitCommand=cmd(zoom,1.0;x,-SCREEN_CENTER_X+110;y,49;horizalign,left;diffuse,color("#ffffff");shadowlength,1;), + InitCommand=cmd(zoom,1.0;x,-SCREEN_CENTER_X+110;y,49;horizalign,left;diffuse,color("#ffffff");shadowlength,1), OnCommand=cmd(diffusealpha,0;sleep,0.5;smooth,0.3;diffusealpha,0.8), UpdateScreenHeaderMessageCommand=function(self,param) self:settext(param.Header) @@ -74,11 +74,11 @@ t[#t+1] = LoadFont("Common Header") .. { -- Name="HeaderSubTitle"; -- Text=Screen.String("HeaderSubText"); -- InitCommand=cmd(zoom,0.8;x,-SCREEN_CENTER_X+110;y,70;horizalign,left;diffuse,color("#ffffff");shadowlength,1;skewx,-0.1); - -- OnCommand=cmd(diffusealpha,0;sleep,0.55;smooth,0.3;diffusealpha,0.75;); + -- OnCommand=cmd(diffusealpha,0;sleep,0.55;smooth,0.3;diffusealpha,0.75); -- UpdateScreenHeaderMessageCommand=function(self,param) -- self:settext(param.Header); -- end; - -- OffCommand=cmd(smooth,0.3;diffusealpha,0;); + -- OffCommand=cmd(smooth,0.3;diffusealpha,0); -- }; return t \ No newline at end of file diff --git a/Themes/default/Graphics/_title_info_icon.lua b/Themes/default/Graphics/_title_info_icon.lua index 0f2ac75925..55fb28d097 100644 --- a/Themes/default/Graphics/_title_info_icon.lua +++ b/Themes/default/Graphics/_title_info_icon.lua @@ -5,11 +5,11 @@ return Def.ActorFrame { -- Base -- todo; make getting the base's image less stupid LoadActor(THEME:GetPathG("","ScreenSelectPlayMode Icon/_background base")) .. { - InitCommand=cmd(zoomto,70,70;diffuse,params.base_color;diffusebottomedge,ColorMidTone(params.base_color);) + InitCommand=cmd(zoomto,70,70;diffuse,params.base_color;diffusebottomedge,ColorMidTone(params.base_color)) }, -- The wanted value LoadFont("Common Normal") .. { - InitCommand=cmd(diffuse,color("#FFFFFF");diffusealpha,0.85;), + InitCommand=cmd(diffuse,color("#FFFFFF");diffusealpha,0.85), OnCommand=function(self) self:settext( params.value_text ) self:zoom(string.len(params.value_text) > 3 and 0.6 or 1.5) diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 0b7e3c3046..ae02793c2b 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -31,9 +31,9 @@ GradeTierForExtra2="Grade_Tier05" [ScreenSystemLayer] ShowClock=true -CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_1)); +CreditsP1OnCommand=horizalign,left;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_1)) # -CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_2)); +CreditsP2OnCommand=horizalign,right;vertalign,bottom;zoom,1;shadowlength,1;diffuse,color("#FFFFFF");strokecolor,ColorDarkTone(PlayerColor(PLAYER_2)) # [ScreenJukebox] @@ -110,13 +110,13 @@ LineButtonX=SCREEN_CENTER_X-50 LineFunctionX=SCREEN_CENTER_X-30 ButtonTextOnCommand=NoStroke;zoom,0.8;shadowlength,1 -ButtonTextToggledCommand=linear,0.025;textglowmode,'TextGlowMode_Inner';glow,color("1,0,0,1");sleep,0.125;decelerate,0.2;glow,color("1,0,0,0"); +ButtonTextToggledCommand=linear,0.025;textglowmode,'TextGlowMode_Inner';glow,color("1,0,0,1");sleep,0.125;decelerate,0.2;glow,color("1,0,0,0") FunctionTextOnCommand=NoStroke;zoom,0.8;shadowlength,1 PageStartX=SCREEN_CENTER_X-100 PageSpacingX=120 -PageTextOnCommand=NoStroke;zoom,0.75;strokecolor,Color.Outline; -PageTextGainFocusCommand=diffuse,color("1,1,1,1"); +PageTextOnCommand=NoStroke;zoom,0.75;strokecolor,Color.Outline +PageTextGainFocusCommand=diffuse,color("1,1,1,1") PageTextLoseFocusCommand=diffuse,color("0.6,0.6,0.6,1") DebugMenuHeaderX=SCREEN_LEFT+80 @@ -175,19 +175,19 @@ ShowCurrentGametype=true ShowSystemDirection=false SystemDirectionX=SCREEN_LEFT+40 SystemDirectionY=SCREEN_TOP+24 -SystemDirectionOnCommand=diffuse,color("#33312D"); +SystemDirectionOnCommand=diffuse,color("#33312D") SystemDirectionOffCommand= # ShowVersionInfo=true VersionInfoX=SCREEN_RIGHT-16 VersionInfoY=SCREEN_TOP+24 -VersionInfoOnCommand=diffuse,color("#33312D"); +VersionInfoOnCommand=diffuse,color("#33312D") VersionInfoOffCommand= # ShowNetworkStatus=true NetworkStatusX=SCREEN_LEFT+12 NetworkStatusY=SCREEN_BOTTOM-64 -NetworkStatusOnCommand=halign,0; +NetworkStatusOnCommand=halign,0 NetworkStatusOffCommand=linear,0.5;cropright,1 # WrapScroller=false @@ -218,12 +218,12 @@ TimerSeconds=20 TimerMetricsGroup="MenuTimerContinue" TimerX=SCREEN_CENTER_X TimerY=SCREEN_CENTER_Y+42 -TimerOnCommand=visible,true; +TimerOnCommand=visible,true TimerOffCommand= # [MenuTimerContinue] Fallback="MenuTimer" -Text1OnCommand=stopeffect;stoptweening;diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211"); +Text1OnCommand=stopeffect;stoptweening;diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211") [ScreenHighScores] Fallback="ScreenWithMenuElements" @@ -269,7 +269,7 @@ ListHeaderP2S3Command=x,SCREEN_CENTER_X+270+80 # ListHeaderCenterOnCommand is for the center element of the ListHeader. ListHeaderCenterOnCommand=x,SCREEN_CENTER_X;y,-6;zoom,0.7;shadowlength,1;ztest,true # These commands are shared by all the ListHeader parts. -ListHeaderOnCommand=diffuse,color("#808080");shadowlength,0;max_dimension_use_zoom,true;zoom,0.75;maxwidth,130; +ListHeaderOnCommand=diffuse,color("#808080");shadowlength,0;max_dimension_use_zoom,true;zoom,0.75;maxwidth,130 ListHeaderGainFocusCommand=diffuse,color("#808080");diffuseshift;effectcolor2,color("#808080");effectcolor1,color("#FFFFFF") ListHeaderLoseFocusCommand=diffuse,color("#808080");stopeffect # The positions of the elements showing what is mapped. @@ -318,18 +318,18 @@ FOV=90 ShowHeader=true HeaderX=SCREEN_CENTER_X HeaderY=SCREEN_TOP-2 -HeaderOnCommand=draworder,1; +HeaderOnCommand=draworder,1 HeaderOffCommand= ShowFooter=true FooterX=SCREEN_CENTER_X FooterY=SCREEN_BOTTOM-10 -FooterOnCommand=draworder,5;y,SCREEN_BOTTOM+64;decelerate,0.4;y,SCREEN_BOTTOM; -FooterOffCommand=sleep,0.175;decelerate,0.4;y,SCREEN_BOTTOM+64; +FooterOnCommand=draworder,5;y,SCREEN_BOTTOM+64;decelerate,0.4;y,SCREEN_BOTTOM +FooterOffCommand=sleep,0.175;decelerate,0.4;y,SCREEN_BOTTOM+64 TimerX=SCREEN_RIGHT-60 TimerY=SCREEN_TOP+45 -TimerOnCommand=draworder,10;diffuse,color("#fcb62c");shadowlength,1;zoom,0;sleep,0.3;smooth,0.3;zoom,0.75; +TimerOnCommand=draworder,10;diffuse,color("#fcb62c");shadowlength,1;zoom,0;sleep,0.3;smooth,0.3;zoom,0.75 TimerOffCommand=sleep,0.175;decelerate,0.4;addy,-105 StageDisplayNumberOffset=1 @@ -339,16 +339,16 @@ ScreenOutDelay=0 ShowHelp=true HelpX=SCREEN_CENTER_X HelpY=SCREEN_BOTTOM-26 -HelpOnCommand=SetSecsBetweenSwitches,4;zoom,1;maxwidth,720;shadowlength,1;diffuse,color("#FFFFFF");draworder,105;addy,64;decelerate,0.4;addy,-64; -HelpOffCommand=sleep,0.175;decelerate,0.4;addy,64; +HelpOnCommand=SetSecsBetweenSwitches,4;zoom,1;maxwidth,720;shadowlength,1;diffuse,color("#FFFFFF");draworder,105;addy,64;decelerate,0.4;addy,-64 +HelpOffCommand=sleep,0.175;decelerate,0.4;addy,64 AlternateHelpDisplayX=SCREEN_CENTER_X AlternateHelpDisplayY=SCREEN_BOTTOM-26 -# AlternateHelpDisplayOnCommand=draworder,105; -AlternateHelpDisplayOnCommand=SetSecsBetweenSwitches,4;zoom,1;maxwidth,720;shadowlength,1;diffuse,color("#FFFFFF");diffusealpha,0;draworder,105;addy,64;decelerate,0.4;addy,-64; -AlternateHelpDisplayOffCommand=sleep,0.175;decelerate,0.4;addy,64; +# AlternateHelpDisplayOnCommand=draworder,105 +AlternateHelpDisplayOnCommand=SetSecsBetweenSwitches,4;zoom,1;maxwidth,720;shadowlength,1;diffuse,color("#FFFFFF");diffusealpha,0;draworder,105;addy,64;decelerate,0.4;addy,-64 +AlternateHelpDisplayOffCommand=sleep,0.175;decelerate,0.4;addy,64 -# This is useful +# This is useful ArcadeOverlayX= ArcadeOverlayY= ArcadeOverlayOnCommand=draworder,100 @@ -370,7 +370,7 @@ DisqualifyP2Y=SCREEN_BOTTOM-98 DisqualifyP2OnCommand=draworder,100;zoom,0.5;shadowlength,1;player,PLAYER_2 # ContainerOnCommand=x,-SCREEN_WIDTH;decelerate,0.275;x,SCREEN_LEFT -ContainerOffCommand=decelerate,0.35;addx,SCREEN_WIDTH; +ContainerOffCommand=decelerate,0.35;addx,SCREEN_WIDTH CursorOnCommand= # 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' @@ -378,12 +378,12 @@ LineHighlightChangeCommand=linear,0.1;diffuse,Color("White");diffuseshift;effect 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") # -LineHighlightP1OnCommand=diffuse,PlayerColor(PLAYER_1);zoomtowidth,720; -LineHighlightP1ChangeCommand=finishtweening;diffusealpha,1; -LineHighlightP1ChangeToExitCommand=finishtweening;diffusealpha,0.15; -LineHighlightP2OnCommand=diffuse,PlayerColor(PLAYER_2);zoomtowidth,720; -LineHighlightP2ChangeCommand=finishtweening;diffusealpha,1; -LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15; +LineHighlightP1OnCommand=diffuse,PlayerColor(PLAYER_1);zoomtowidth,720 +LineHighlightP1ChangeCommand=finishtweening;diffusealpha,1 +LineHighlightP1ChangeToExitCommand=finishtweening;diffusealpha,0.15 +LineHighlightP2OnCommand=diffuse,PlayerColor(PLAYER_2);zoomtowidth,720 +LineHighlightP2ChangeCommand=finishtweening;diffusealpha,1 +LineHighlightP2ChangeToExitCommand=finishtweening;diffusealpha,0.15 # RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-213+50*offsetFromCenter) end # @@ -400,11 +400,11 @@ ScrollBarY=SCREEN_CENTER_Y-20 ShowExplanations=true ExplanationP1X=SCREEN_CENTER_X-450+10 ExplanationP1Y=SCREEN_CENTER_Y+250 -ExplanationP1OnCommand=diffuse,ColorDarkTone(PlayerColor(PLAYER_1));wrapwidthpixels,310/0.5;zoom,0.7;halign,0;cropright,1;linear,0.5;cropright,0;vertspacing,4; +ExplanationP1OnCommand=diffuse,ColorDarkTone(PlayerColor(PLAYER_1));wrapwidthpixels,310/0.5;zoom,0.7;halign,0;cropright,1;linear,0.5;cropright,0;vertspacing,4 ExplanationP1OffCommand= ExplanationP2X=SCREEN_CENTER_X+450-10 ExplanationP2Y=SCREEN_CENTER_Y+250 -ExplanationP2OnCommand=diffuse,ColorDarkTone(PlayerColor(PLAYER_2));wrapwidthpixels,310/0.5;zoom,0.7;halign,1;cropright,1;linear,0.5;cropright,0;vertspacing,4; +ExplanationP2OnCommand=diffuse,ColorDarkTone(PlayerColor(PLAYER_2));wrapwidthpixels,310/0.5;zoom,0.7;halign,1;cropright,1;linear,0.5;cropright,0;vertspacing,4 ExplanationP2OffCommand= ExplanationTogetherX=SCREEN_CENTER_X ExplanationTogetherY=SCREEN_CENTER_Y+245 @@ -461,21 +461,21 @@ SeparateExitRow=false SeparateExitRowY=SCREEN_BOTTOM-40 [OptionRowService] -TitleGainFocusCommand=diffuse,color("#9d324e"); -TitleLoseFocusCommand=diffuse,color("#512232"); +TitleGainFocusCommand=diffuse,color("#9d324e") +TitleLoseFocusCommand=diffuse,color("#512232") TitleOnCommand=maxwidth,600;zoom,0.6 [OptionRowExit] -FrameOnCommand=visible,true;diffusealpha,0.2; -FrameX=SCREEN_CENTER_X; +FrameOnCommand=visible,true;diffusealpha,0.2 +FrameX=SCREEN_CENTER_X ItemsMinBaseZoom=1 -ItemOnCommand=zoom,1;uppercase,true;diffuse,color("#A61C17"); -ItemGainFocusCommand=stoptweening;linear,0.1;diffuse,color("#A61C17"); -ItemLoseFocusCommand=stoptweening;decelerate,0.05;diffuse,color("#A61C17"); +ItemOnCommand=zoom,1;uppercase,true;diffuse,color("#A61C17") +ItemGainFocusCommand=stoptweening;linear,0.1;diffuse,color("#A61C17") +ItemLoseFocusCommand=stoptweening;decelerate,0.05;diffuse,color("#A61C17") -FrameGainFocusCommand=stoptweening;linear,0.1;diffusealpha,1; -FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.2; +FrameGainFocusCommand=stoptweening;linear,0.1;diffusealpha,1 +FrameLoseFocusCommand=stoptweening;decelerate,0.05;diffusealpha,0.2 ColorSelected=color("#A61C17") ColorNotSelected=color("#A61C17") @@ -494,9 +494,9 @@ ExplanationTogetherOnCommand=stoptweening;zoom,0.75;diffuse,color("#512232");wra [OptionRow] TitleX=SCREEN_CENTER_X-440 -TitleGainFocusCommand=diffuse,color("#9d324e"); -TitleLoseFocusCommand=diffuse,color("#320E1B"); -TitleOnCommand=shadowlength,0;wrapwidthpixels,SCREEN_WIDTH*0.4;vertspacing,-6;zoom,0.5;horizalign,left; +TitleGainFocusCommand=diffuse,color("#9d324e") +TitleLoseFocusCommand=diffuse,color("#320E1B") +TitleOnCommand=shadowlength,0;wrapwidthpixels,SCREEN_WIDTH*0.4;vertspacing,-6;zoom,0.5;horizalign,left ColorSelected=color("#320E1B") ColorNotSelected=color("#9d324e") ColorDisabled=color("0.37,0.16,0.29,0.5") @@ -534,15 +534,15 @@ LineHighlightChangeCommand= LineHighlightChangeToExitCommand= RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-219+43*offsetFromCenter) end NumRowsShown=12 -ContainerOnCommand=diffusealpha,0;decelerate,0.086;diffusealpha,1; -ContainerOffCommand=decelerate,0.12;diffusealpha,0; +ContainerOnCommand=diffusealpha,0;decelerate,0.086;diffusealpha,1 +ContainerOffCommand=decelerate,0.12;diffusealpha,0 CursorOnCommand= ColorDisabled=color("0.37,0.16,0.29,0.5") [OptionRowMiniMenu] Fallback="OptionRow" TitleX=SCREEN_CENTER_X-400 -TitleOnCommand=horizalign,left;shadowlength,0;zoom,0.6; +TitleOnCommand=horizalign,left;shadowlength,0;zoom,0.6 ItemsLongRowP1X=SCREEN_CENTER_X-240 ItemsLongRowP2X=SCREEN_CENTER_X+240+50 ItemsLongRowSharedX=SCREEN_CENTER_X+200+50 @@ -608,8 +608,8 @@ ShowIcon=true WrapScroller=false UseIconMetrics=true # -IconGainFocusCommand=stoptweening;bounceend,0.05;zoom,1; -IconLoseFocusCommand=stoptweening;decelerate,0.1;zoom,0.8; +IconGainFocusCommand=stoptweening;bounceend,0.05;zoom,1 +IconLoseFocusCommand=stoptweening;decelerate,0.1;zoom,0.8 # IconChoicePosFunction=ScreenSelectStylePositions IconChoiceOnCommand=diffusealpha,0;linear,0.4;diffusealpha,1 @@ -636,15 +636,15 @@ UsePlayerSelectMenu=false # OptionsMenuAvailable=(getenv(sMode) ~= Oni) SelectMenuAvailable=true # ModeMenuAvailable=(getenv(sMode) == Normal) -# HelpDisplay has things added here to make sure it disappears for another +# HelpDisplay has things added here to make sure it disappears for another # actor, which we defined in this screens decorations. -HelpSelectMenuOpenedMessageCommand=stoptweening;maxwidth,480/0.675;zoom,0.675;accelerate,0.125;diffusealpha,0;zoom,1; +HelpSelectMenuOpenedMessageCommand=stoptweening;maxwidth,480/0.675;zoom,0.675;accelerate,0.125;diffusealpha,0;zoom,1 HelpSelectMenuClosedMessageCommand=stoptweening;maxwidth,480/0.675;zoom,0.675*0.75;bouncebegin,0.125;diffusealpha,1;zoom,1 # Clone everything from HelpDisplay: we're lazy ShowAlternateHelpDisplay=true -# -AlternateHelpDisplaySelectMenuOpenedMessageCommand=stoptweening;maxwidth,480/0.675;zoom,0.675*1.25;bounceend,0.2;diffusealpha,1;zoom,1; -AlternateHelpDisplaySelectMenuClosedMessageCommand=stoptweening;maxwidth,480/0.675;zoom,1;accelerate,0.125;diffusealpha,0;zoom,0.675*0.75; +# +AlternateHelpDisplaySelectMenuOpenedMessageCommand=stoptweening;maxwidth,480/0.675;zoom,0.675*1.25;bounceend,0.2;diffusealpha,1;zoom,1 +AlternateHelpDisplaySelectMenuClosedMessageCommand=stoptweening;maxwidth,480/0.675;zoom,1;accelerate,0.125;diffusealpha,0;zoom,0.675*0.75 # MusicWheelX=SCREEN_CENTER_X+326 MusicWheelY=SCREEN_CENTER_Y-12 @@ -653,10 +653,10 @@ MusicWheelOffCommand=decelerate,0.4;x,SCREEN_WIDTH/0.75 # BannerX=SCREEN_CENTER_X-229 BannerY=SCREEN_CENTER_Y-165-20 -BannerOnCommand=draworder,45;scaletoclipped,468,146;visible,true;zoomy,0;decelerate,0.3;zoomy,1; -BannerOffCommand=decelerate,0.2;zoomx,0; +BannerOnCommand=draworder,45;scaletoclipped,468,146;visible,true;zoomy,0;decelerate,0.3;zoomy,1 +BannerOffCommand=decelerate,0.2;zoomx,0 # -ShowDifficultyList=not GAMESTATE:IsCourseMode(); +ShowDifficultyList=not GAMESTATE:IsCourseMode() DifficultyListX=SCREEN_CENTER_X-228 DifficultyListY=SCREEN_CENTER_Y-33 DifficultyListOnCommand= @@ -665,33 +665,33 @@ DifficultyListOffCommand= # DifficultyListTweenOnCommand= DifficultyListTweenOffCommand= -# Shrink the difficultylist for viewing panedisplays; -# DifficultyListSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.1;zoom,0.5; -# DifficultyListSelectMenuClosedMessageCommand=stoptweening;accelerate,0.05;zoom,1; +# Shrink the difficultylist for viewing panedisplays +# DifficultyListSelectMenuOpenedMessageCommand=stoptweening;decelerate,0.1;zoom,0.5 +# DifficultyListSelectMenuClosedMessageCommand=stoptweening;accelerate,0.05;zoom,1 # ShowSongTime=true SongTimeX= SongTimeY=SCREEN_CENTER_Y-78+2-6 -SongTimeOnCommand=horizalign,left;zoom,1.0;diffuse,color("#DFE2E9");diffusebottomedge,color("#DFE2E9");maxwidth,128; +SongTimeOnCommand=horizalign,left;zoom,1.0;diffuse,color("#DFE2E9");diffusebottomedge,color("#DFE2E9");maxwidth,128 # -SongTimeResetCommand=diffuse,color("#DFE2E9"); -SongTimeAutogenCommand=diffuse,color("#ffaf99"); -SongTimeLongCommand=diffuse,color("#c9ddff"); -SongTimeMarathonCommand=diffuse,color("#d2c9ff"); +SongTimeResetCommand=diffuse,color("#DFE2E9") +SongTimeAutogenCommand=diffuse,color("#ffaf99") +SongTimeLongCommand=diffuse,color("#c9ddff") +SongTimeMarathonCommand=diffuse,color("#d2c9ff") ShowBPMDisplay=true BPMDisplayX=SCREEN_CENTER_X-179-63 BPMDisplayY=SCREEN_CENTER_Y-78+2-6 -BPMDisplayOnCommand=horizalign,right;zoom,1.0; +BPMDisplayOnCommand=horizalign,right;zoom,1.0 ShowSongOptions=true SongOptionsX=SCREEN_CENTER_X SongOptionsY=SCREEN_CENTER_Y -SongOptionsOnCommand=visible,false;draworder,1000;diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211"); +SongOptionsOnCommand=visible,false;draworder,1000;diffuse,color("#FF8312");diffusebottomedge,color("#FFD75B");shadowlength,1;strokecolor,color("#472211") SongOptionsOffCommand= -SongOptionsShowCommand=visible,true;diffusealpha,0;zoom,0;settext,THEME:GetString("ScreenSelectMusic","Press Start For Options");decelerate,0.5;zoom,1.25;diffusealpha,1; -SongOptionsEnterCommand=settext,THEME:GetString("ScreenSelectMusic","Entering Options");sleep,0.1;decelerate,0.3;diffusealpha,0; -SongOptionsHideCommand=sleep,0.3;decelerate,0.3;diffusealpha,0; +SongOptionsShowCommand=visible,true;diffusealpha,0;zoom,0;settext,THEME:GetString("ScreenSelectMusic","Press Start For Options");decelerate,0.5;zoom,1.25;diffusealpha,1 +SongOptionsEnterCommand=settext,THEME:GetString("ScreenSelectMusic","Entering Options");sleep,0.1;decelerate,0.3;diffusealpha,0 +SongOptionsHideCommand=sleep,0.3;decelerate,0.3;diffusealpha,0 # ShowStageDisplay=true StageDisplayX= @@ -704,7 +704,7 @@ ShowCourseContentsList=GAMESTATE:IsCourseMode() CourseContentsListX=SCREEN_CENTER_X-228 CourseContentsListY=SCREEN_CENTER_Y-20 CourseContentsListOnCommand=draworder,-1;addx,-SCREEN_CENTER_X;decelerate,0.1;addx,SCREEN_CENTER_X -CourseContentsListOffCommand=bouncebegin,0.05;zoomx,0; +CourseContentsListOffCommand=bouncebegin,0.05;zoomx,0 # ShowNumCourseSongs=GAMESTATE:IsCourseMode() NumCourseSongsX=SCREEN_CENTER_X-179 @@ -715,26 +715,26 @@ NumCourseSongsOffCommand= ShowPaneDisplayTextP1=true PaneDisplayTextP1X=SCREEN_CENTER_X-200+24-32 PaneDisplayTextP1Y=SCREEN_CENTER_Y+207+10 -PaneDisplayTextP1OnCommand=player,PLAYER_1;horizalign,center; +PaneDisplayTextP1OnCommand=player,PLAYER_1;horizalign,center PaneDisplayTextP1OffCommand= PaneDisplayTextP1PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_1 then self:playcommand("On") end end # ShowPaneDisplayTextP2=true PaneDisplayTextP2X=SCREEN_CENTER_X+200-72-4+32 PaneDisplayTextP2Y=SCREEN_CENTER_Y+207+10 -PaneDisplayTextP2OnCommand=player,PLAYER_2;horizalign,center; +PaneDisplayTextP2OnCommand=player,PLAYER_2;horizalign,center PaneDisplayTextP2OffCommand= PaneDisplayTextP2PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_2 then self:playcommand("On") end end # PercentScoreP1X=SCREEN_CENTER_X-353-32 PercentScoreP1Y=SCREEN_CENTER_Y+284 PercentScoreP1OnCommand=zoomy,0;zoomx,0.35;sleep,0.8;smooth,0.2;zoomy,0.35 -PercentScoreP1OffCommand=smooth,0.2;zoomy,0;addy,-6; +PercentScoreP1OffCommand=smooth,0.2;zoomy,0;addy,-6 # PercentScoreP2X=SCREEN_CENTER_X+353+32 PercentScoreP2Y=SCREEN_CENTER_Y+284 PercentScoreP2OnCommand=zoomy,0;zoomx,0.35;sleep,0.8;smooth,0.2;zoomy,0.35 -PercentScoreP2OffCommand=smooth,0.2;zoomy,0;addy,-6; +PercentScoreP2OffCommand=smooth,0.2;zoomy,0;addy,-6 NullScoreString=string.format("% 9i",0) # @@ -746,11 +746,11 @@ SelectMenuAvailable=false # [BPMDisplay] -SetNoBpmCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,color("#CFCAC3"); -SetNormalCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,color("#DFE2E9"); -SetChangeCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,color("#EDD7B9"); -SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,color("#DE2626");textglowmode,'TextGlowMode_Inner';glowshift;effectcolor1,color("#EB7515");effectcolor2,color("#FF0000"); -SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5);diffuseshift;effectcolor1,color("1,1,1,1");effectcolor2,color("0.475,0.475,0.475,1"); +SetNoBpmCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,color("#CFCAC3") +SetNormalCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,color("#DFE2E9") +SetChangeCommand=stoptweening;stopeffect;maxwidth,128;linear,0.2;diffuse,color("#EDD7B9") +SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,color("#DE2626");textglowmode,'TextGlowMode_Inner';glowshift;effectcolor1,color("#EB7515");effectcolor2,color("#FF0000") +SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5);diffuseshift;effectcolor1,color("1,1,1,1");effectcolor2,color("0.475,0.475,0.475,1") RandomCycleSpeed=0.2 -- smaller numbers mean the bpm cycles faster [DifficultyList] @@ -780,7 +780,7 @@ MaxTicks=10 # ShowMeter=true MeterX=84+24 -MeterOnCommand=zoom,0.6;maxwidth,47;shadowlength,1; +MeterOnCommand=zoom,0.6;maxwidth,47;shadowlength,1 MeterSetCommand=%function(self,param) \ if param.CustomDifficulty and param.CustomDifficulty ~= "" then \ self:diffuse(color("#000000")); \ @@ -797,7 +797,7 @@ end; # ShowDescription=true DescriptionX=-84 -DescriptionOnCommand=horizalign,left;zoom,1;maxwidth,130;uppercase,true; +DescriptionOnCommand=horizalign,left;zoom,1;maxwidth,130;uppercase,true DescriptionSetCommand=%function(self,param) \ if self:GetText() == "" then \ self:settext("Edit"); \ @@ -812,7 +812,6 @@ ShowAutogen=true AutogenX=0 AutogenY=0 AutogenOnCommand=diffuseshift;effectcolor1,Color.Alpha( Color("Red") , 0.5 );effectcolor2,ColorMidTone( Color("Red") );zoom,0.6 -#AutogenOnCommand=zoom,0.75; # ShowStepsType=true StepsTypeX=-100 @@ -846,15 +845,15 @@ SectionCountOnCommand=zoom,0.6;addy,2;diffuse,color("#000000");shadowlength,1;di # WheelNotifyIconX=-245 WheelNotifyIconY=0 -WheelNotifyIconOnCommand=zoom,1; +WheelNotifyIconOnCommand=zoom,1 RouletteX=-200 RouletteY=0 -RouletteOnCommand=zoom,1.25;uppercase,true;rainbowscroll,true;shadowlength,1;horizalign,left; +RouletteOnCommand=zoom,1.25;uppercase,true;rainbowscroll,true;shadowlength,1;horizalign,left RandomX=-200 RandomY=0 -RandomOnCommand=zoom,1.25;uppercase,true;rainbowscroll,true;shadowlength,1;horizalign,left; +RandomOnCommand=zoom,1.25;uppercase,true;rainbowscroll,true;shadowlength,1;horizalign,left GradeP1X=-196 GradeP1Y=-14 @@ -886,13 +885,13 @@ AfterSetCommand=%function(self) \ local Subtitle=self:GetChild("Subtitle"); \ local Artist=self:GetChild("Artist"); \ if Subtitle:GetText() == "" then \ - (cmd(zoom,1.1;maxwidth,SCREEN_WIDTH*0.24;y,-13;x,-150;strokecolor,color("#42292E");))(Title); \ + (cmd(zoom,1.1;maxwidth,SCREEN_WIDTH*0.24;y,-13;x,-150;strokecolor,color("#42292E")))(Title); \ (cmd(visible,false))(Subtitle); \ - (cmd(zoom,0.75;maxwidth,SCREEN_WIDTH*0.36;y,13;x,-150;strokecolor,color("#42292E");))(Artist); \ + (cmd(zoom,0.75;maxwidth,SCREEN_WIDTH*0.36;y,13;x,-150;strokecolor,color("#42292E")))(Artist); \ else \ - (cmd(zoom,0.9;maxwidth,SCREEN_WIDTH*0.30;y,-14;x,-150;strokecolor,color("#42292E");))(Title); \ - (cmd(visible,true;zoom,0.5;y,4;maxwidth,SCREEN_WIDTH*0.40;x,-150;strokecolor,color("#42292E");))(Subtitle); \ - (cmd(zoom,0.6;maxwidth,SCREEN_WIDTH*0.36;y,18;x,-150;strokecolor,color("#42292E");))(Artist); \ + (cmd(zoom,0.9;maxwidth,SCREEN_WIDTH*0.30;y,-14;x,-150;strokecolor,color("#42292E")))(Title); \ + (cmd(visible,true;zoom,0.5;y,4;maxwidth,SCREEN_WIDTH*0.40;x,-150;strokecolor,color("#42292E")))(Subtitle); \ + (cmd(zoom,0.6;maxwidth,SCREEN_WIDTH*0.36;y,18;x,-150;strokecolor,color("#42292E")))(Artist); \ end \ end; @@ -908,11 +907,11 @@ AfterSetCommand=%function(self) \ if Subtitle:GetText() == "" then \ (cmd(zoom,1.1;x,-220;maxwidth,340;y,-11))(Title); \ (cmd(visible,false))(Subtitle); \ - (cmd(zoom,0.75;maxwidth,500;y,13;x,-220;))(Artist); \ + (cmd(zoom,0.75;maxwidth,500;y,13;x,-220))(Artist); \ else \ (cmd(zoom,0.9;x,-220;maxwidth,340;y,-13))(Title); \ - (cmd(visible,true;zoom,0.5;y,4;maxwidth,500;x,-220;))(Subtitle); \ - (cmd(zoom,0.6;maxwidth,500;y,18;x,-220;))(Artist); \ + (cmd(visible,true;zoom,0.5;y,4;maxwidth,500;x,-220))(Subtitle); \ + (cmd(zoom,0.6;maxwidth,500;y,18;x,-220))(Artist); \ end \ end; @@ -935,21 +934,21 @@ Line18="list,Characters" PlayerNameplateP1X=SCREEN_CENTER_X-270 PlayerNameplateP1Y=SCREEN_CENTER_Y+190 -PlayerNameplateP1OnCommand=zoomy,0;draworder,DrawOrder.Decorations;sleep,0.8;decelerate,0.5;zoomy,1; -PlayerNameplateP1OffCommand=decelerate,0.35;addx,SCREEN_WIDTH; +PlayerNameplateP1OnCommand=zoomy,0;draworder,DrawOrder.Decorations;sleep,0.8;decelerate,0.5;zoomy,1 +PlayerNameplateP1OffCommand=decelerate,0.35;addx,SCREEN_WIDTH PlayerNameplateP2X=SCREEN_CENTER_X+270 PlayerNameplateP2Y=SCREEN_CENTER_Y+190 -PlayerNameplateP2OnCommand=zoomy,0;draworder,DrawOrder.Decorations;sleep,0.8;decelerate,0.5;zoomy,1; -PlayerNameplateP2OffCommand=decelerate,0.35;addx,SCREEN_WIDTH; +PlayerNameplateP2OnCommand=zoomy,0;draworder,DrawOrder.Decorations;sleep,0.8;decelerate,0.5;zoomy,1 +PlayerNameplateP2OffCommand=decelerate,0.35;addx,SCREEN_WIDTH # 06 # [Judgment] JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,0.9;smooth,0.05;zoom,0.75;sleep,0.8;smooth,0.1;zoomy,0.5;zoomx,1.3;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,color("1,1,1,0");effectcolor2,color("1,1,1,0.25") JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,0.9;smooth,0.05;zoom,0.75;sleep,0.5;smooth,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 -JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,0.9;smooth,0.05;zoom,0.75;sleep,0.5;smooth,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; -JudgmentW4Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,0.9;smooth,0.05;zoom,0.75;sleep,0.5;smooth,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; +JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,0.9;smooth,0.05;zoom,0.75;sleep,0.5;smooth,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 +JudgmentW4Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,0.9;smooth,0.05;zoom,0.75;sleep,0.5;smooth,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW5Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,0.75;vibrate;effectmagnitude,1,2,2;sleep,0.5;smooth,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentMissCommand=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,0.75;y,-20;smooth,0.8;y,20;sleep,0.5;smooth,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 # Late/Early @@ -962,19 +961,19 @@ HoldJudgmentLetGoCommand=finishtweening;visible,true;shadowlength,0;diffusealpha HoldJudgmentHeldCommand=finishtweening;visible,true;shadowlength,0;diffusealpha,1;zoom,1;linear,0.3;zoom,0.75;sleep,0.5;linear,0.1;diffusealpha,0 [Protiming] -ProtimingOnCommand=shadowlength,1;horizalign,right;x,30;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; -AverageOnCommand=shadowlength,1;horizalign,left;x,32;y,8;zoom,0.75;diffuse,ColorLightTone( Color("Green") );strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; -TextOnCommand=shadowlength,1;horizalign,left;x,32;y,-6;zoom,0.5;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner"; +ProtimingOnCommand=shadowlength,1;horizalign,right;x,30;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner" +AverageOnCommand=shadowlength,1;horizalign,left;x,32;y,8;zoom,0.75;diffuse,ColorLightTone( Color("Green") );strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner" +TextOnCommand=shadowlength,1;horizalign,left;x,32;y,-6;zoom,0.5;strokecolor,Color("Outline");skewx,-0.125;textglowmode,"TextGlowMode_Inner" # -ProtimingW1Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W1"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW2Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W2"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW3Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W3"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW4Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W4"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingW5Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W5"];sleep,2;linear,0.5;diffuse,Color("Invisible"); -ProtimingMissCommand=finishtweening;diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_Miss"];linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_Miss"];sleep,2;linear,0.5;diffuse,Color("Invisible"); +ProtimingW1Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W1"];sleep,2;linear,0.5;diffuse,Color("Invisible") +ProtimingW2Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W2"];sleep,2;linear,0.5;diffuse,Color("Invisible") +ProtimingW3Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W3"];sleep,2;linear,0.5;diffuse,Color("Invisible") +ProtimingW4Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W4"];sleep,2;linear,0.5;diffuse,Color("Invisible") +ProtimingW5Command=finishtweening;diffuse,Color("White");zoom,1.15;glow,Color("White");linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_W5"];sleep,2;linear,0.5;diffuse,Color("Invisible") +ProtimingMissCommand=finishtweening;diffusealpha,1;zoom,1.15;glow,GameColor.Judgment["JudgmentLine_Miss"];linear,0.05;zoom,1;glow,Color("Invisible");diffuse,GameColor.Judgment["JudgmentLine_Miss"];sleep,2;linear,0.5;diffuse,Color("Invisible") # -AveragePulseCommand=finishtweening;diffusealpha,1;zoom,0.75*1.025;decelerate,0.05;zoom,0.75;sleep,2;linear,0.5;diffusealpha,0; -TextPulseCommand=finishtweening;diffusealpha,1;zoom,0.5*1.025;decelerate,0.05;zoom,0.5;sleep,2;linear,0.5;diffusealpha,0; +AveragePulseCommand=finishtweening;diffusealpha,1;zoom,0.75*1.025;decelerate,0.05;zoom,0.75;sleep,2;linear,0.5;diffusealpha,0 +TextPulseCommand=finishtweening;diffusealpha,1;zoom,0.5*1.025;decelerate,0.05;zoom,0.5;sleep,2;linear,0.5;diffusealpha,0 [Combo] @@ -1004,23 +1003,23 @@ LifeP2OnCommand=visible,false ShowLifeMeterBarP1=GAMESTATE:GetPlayMode() ~= 'PlayMode_Rave' ShowLifeMeterBarP2=GAMESTATE:GetPlayMode() ~= 'PlayMode_Rave' # -LifeMeterBarP1X=SCREEN_LEFT+40; +LifeMeterBarP1X=SCREEN_LEFT+40 LifeMeterBarP1Y=SCREEN_CENTER_Y -LifeMeterBarP1OnCommand=player,PLAYER_1;rotationz,-90;addx,-100;sleep,0.25;decelerate,0.9;addx,100; -LifeMeterBarP1OffCommand=sleep,1;decelerate,0.9;addx,-100; -LifeMeterBarP2X=SCREEN_RIGHT-40; +LifeMeterBarP1OnCommand=player,PLAYER_1;rotationz,-90;addx,-100;sleep,0.25;decelerate,0.9;addx,100 +LifeMeterBarP1OffCommand=sleep,1;decelerate,0.9;addx,-100 +LifeMeterBarP2X=SCREEN_RIGHT-40 LifeMeterBarP2Y=SCREEN_CENTER_Y -LifeMeterBarP2OnCommand=player,PLAYER_2;rotationz,-90;addx,100;sleep,0.25;decelerate,0.9;addx,-100; -LifeMeterBarP2OffCommand=sleep,1;decelerate,0.9;addx,100; +LifeMeterBarP2OnCommand=player,PLAYER_2;rotationz,-90;addx,100;sleep,0.25;decelerate,0.9;addx,-100 +LifeMeterBarP2OffCommand=sleep,1;decelerate,0.9;addx,100 # ScoreP1X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP1MiscX") ScoreP1Y=SCREEN_TOP+40 -ScoreP1OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_1));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_1;addy,-100;sleep,0.5;decelerate,0.7;addy,100; -ScoreP1OffCommand=sleep,1;decelerate,0.9;addy,-100; +ScoreP1OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_1));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_1;addy,-100;sleep,0.5;decelerate,0.7;addy,100 +ScoreP1OffCommand=sleep,1;decelerate,0.9;addy,-100 ScoreP2X=Center1Player() and SCREEN_CENTER_X or THEME:GetMetric(Var "LoadingScreen","PlayerP2MiscX") ScoreP2Y=SCREEN_TOP+40 -ScoreP2OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_2));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_2;addy,-100;sleep,0.5;decelerate,0.7;addy,100; -ScoreP2OffCommand=sleep,1;decelerate,0.9;addy,-100; +ScoreP2OnCommand=visible,(GAMESTATE:GetCurrentCourse() == nil or GAMESTATE:GetCurrentCourse():GetCourseType() ~= "CourseType_Survival") and ThemePrefs.Get("GameplayShowScore");zoom,0.75;diffuse,ColorLightTone(PlayerColor(PLAYER_2));hide_if,(GAMESTATE:GetCurrentStyle():GetStyleType() == "StyleType_TwoPlayersSharedSides") and GAMESTATE:GetMasterPlayerNumber() ~= PLAYER_2;addy,-100;sleep,0.5;decelerate,0.7;addy,100 +ScoreP2OffCommand=sleep,1;decelerate,0.9;addy,-100 # StepsDisplayP1OnCommand=visible,false StepsDisplayP2OnCommand=visible,false @@ -1034,23 +1033,23 @@ StepsDisplayP2Y=SCREEN_BOTTOM+999 ShowStageDisplay=true StageDisplayX=SCREEN_CENTER_X StageDisplayY=SCREEN_BOTTOM-25 -StageDisplayOnCommand=draworder,DrawOrder.Screen;addy,100;sleep,0.5;decelerate,0.7;addy,-100; -StageDisplayOffCommand=sleep,1;decelerate,0.9;addy,100; +StageDisplayOnCommand=draworder,DrawOrder.Screen;addy,100;sleep,0.5;decelerate,0.7;addy,-100 +StageDisplayOffCommand=sleep,1;decelerate,0.9;addy,100 StageDisplayUseShortString=true # CombinedLifeX=SCREEN_CENTER_X CombinedLifeY=SCREEN_TOP-46 -CombinedLifeOnCommand=sleep,0.4;decelerate,0.3;addy,73; -CombinedLifeOffCommand=sleep,0.6;decelerate,0.5;addy,-73; +CombinedLifeOnCommand=sleep,0.4;decelerate,0.3;addy,73 +CombinedLifeOffCommand=sleep,0.6;decelerate,0.5;addy,-73 # RemainingTimeP1X=THEME:GetMetric(Var "LoadingScreen","ScoreP1X") +60 RemainingTimeP1Y=THEME:GetMetric(Var "LoadingScreen","ScoreP1Y") -RemainingTimeP1OnCommand=zoom,1;diffuse,ColorLightTone(PlayerColor(PLAYER_1));strokecolor,ColorDarkTone(PlayerColor(PLAYER_1));addy,-100;sleep,1.3;decelerate,0.7;addy,100; -RemainingTimeP1OffCommand=sleep,1;decelerate,0.9;addy,-100; +RemainingTimeP1OnCommand=zoom,1;diffuse,ColorLightTone(PlayerColor(PLAYER_1));strokecolor,ColorDarkTone(PlayerColor(PLAYER_1));addy,-100;sleep,1.3;decelerate,0.7;addy,100 +RemainingTimeP1OffCommand=sleep,1;decelerate,0.9;addy,-100 RemainingTimeP2X=THEME:GetMetric(Var "LoadingScreen","ScoreP2X") +60 RemainingTimeP2Y=THEME:GetMetric(Var "LoadingScreen","ScoreP2Y") -RemainingTimeP2OnCommand=zoom,1;diffuse,ColorLightTone(PlayerColor(PLAYER_2));strokecolor,ColorDarkTone(PlayerColor(PLAYER_2));addy,-100;sleep,1.3;decelerate,0.7;addy,100; -RemainingTimeP2OffCommand=sleep,1;decelerate,0.9;addy,-100; +RemainingTimeP2OnCommand=zoom,1;diffuse,ColorLightTone(PlayerColor(PLAYER_2));strokecolor,ColorDarkTone(PlayerColor(PLAYER_2));addy,-100;sleep,1.3;decelerate,0.7;addy,100 +RemainingTimeP2OffCommand=sleep,1;decelerate,0.9;addy,-100 # DeltaSecondsP1X=THEME:GetMetric(Var "LoadingScreen","RemainingTimeP1X") - 120 DeltaSecondsP1Y=THEME:GetMetric(Var "LoadingScreen","RemainingTimeP1Y") @@ -1071,15 +1070,15 @@ UnpauseWithStart=false SelectSkipsSong=false StopCourseEarly=check_stop_course_early() # -LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+260; +LyricDisplaySetNoReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y+260 LyricDisplaySetReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-260 # This is used if one player is in reverse and the other isn't. LyricDisplaySetOneReverseCommand=x,SCREEN_CENTER_X+0;y,SCREEN_CENTER_Y-260 -LyricDisplayDefaultColor=color("0,1,0,1"); +LyricDisplayDefaultColor=color("0,1,0,1") [ScoreDisplayNormal] TextY= -TextOnCommand=zoom,1; +TextOnCommand=zoom,1 [ScoreDisplayPercentage Percent] PercentP1OnCommand=shadowlength,1;strokecolor,Color.Outline @@ -1088,11 +1087,11 @@ DancePointsP1OnCommand=shadowlength,1;strokecolor,Color.Outline DancePointsP2OnCommand=shadowlength,1;strokecolor,Color.Outline [ScoreDisplayOni] -TextOnCommand=zoom,1; +TextOnCommand=zoom,1 TextOffCommand= [ScoreDisplayOni Numbers] -TextOnCommand=zoom,1; +TextOnCommand=zoom,1 TextOffCommand= [ScoreDisplayLifeTime] @@ -1101,8 +1100,8 @@ TextOffCommand= [ScoreDisplayRave] MeterP1OnCommand=draworder,-1;texcoordvelocity,1,0 MeterP2OnCommand=draworder,-1;zoomx,-1;texcoordvelocity,1,0 -LevelP1OnCommand=draworder,105;zoom,1.5;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144; -LevelP2OnCommand=draworder,105;draworder,105;zoom,1.5;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144; +LevelP1OnCommand=draworder,105;zoom,1.5;diffuse,ColorLightTone( PlayerColor(PLAYER_1) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_1) );x,-144 +LevelP2OnCommand=draworder,105;draworder,105;zoom,1.5;diffuse,ColorLightTone( PlayerColor(PLAYER_2) );strokecolor,ColorDarkTone( PlayerColor(PLAYER_2) );x,144 [ScoreKeeperRave] AttackDurationSeconds=6 @@ -1155,16 +1154,16 @@ GradePercentTier17=-999 [ScreenEvaluationNormal] ShowTimingDifficulty=true -TimingDifficultyX=SCREEN_CENTER_X-120; -TimingDifficultyY=SCREEN_BOTTOM-126+11; -TimingDifficultyOnCommand=maxwidth,140;shadowlength,1;diffusealpha,0;sleep,0.5;smooth,0.3;diffusealpha,1; -TimingDifficultyOffCommand=decelerate,0.3;diffusealpha,0; +TimingDifficultyX=SCREEN_CENTER_X-120 +TimingDifficultyY=SCREEN_BOTTOM-126+11 +TimingDifficultyOnCommand=maxwidth,140;shadowlength,1;diffusealpha,0;sleep,0.5;smooth,0.3;diffusealpha,1 +TimingDifficultyOffCommand=decelerate,0.3;diffusealpha,0 # ShowLifeDifficulty=true -LifeDifficultyX=SCREEN_CENTER_X+120; -LifeDifficultyY=SCREEN_BOTTOM-126+11; -LifeDifficultyOnCommand=maxwidth,140;shadowlength,1;diffusealpha,0;sleep,0.5;smooth,0.3;diffusealpha,1; -LifeDifficultyOffCommand=decelerate,0.3;diffusealpha,0; +LifeDifficultyX=SCREEN_CENTER_X+120 +LifeDifficultyY=SCREEN_BOTTOM-126+11 +LifeDifficultyOnCommand=maxwidth,140;shadowlength,1;diffusealpha,0;sleep,0.5;smooth,0.3;diffusealpha,1 +LifeDifficultyOffCommand=decelerate,0.3;diffusealpha,0 # StageDisplayUseShortString=false @@ -1177,28 +1176,28 @@ StageDisplayUseShortString=false SmallBanner1X=SCREEN_CENTER_X-40 SmallBanner1Y=SCREEN_CENTER_Y-150-30 -SmallBanner1OnCommand=visible,true;draworder,100;zoom,1;zoomy,0;decelerate,0.4;zoomy,1; -SmallBanner1OffCommand=sleep,0.2;decelerate,0.3;zoomy,0; +SmallBanner1OnCommand=visible,true;draworder,100;zoom,1;zoomy,0;decelerate,0.4;zoomy,1 +SmallBanner1OffCommand=sleep,0.2;decelerate,0.3;zoomy,0 #--# SmallBanner2X=SCREEN_CENTER_X-20 SmallBanner2Y=SCREEN_CENTER_Y-145-30 -SmallBanner2OnCommand=visible,true;draworder,80;zoom,1;zoomy,0;sleep,0.1;decelerate,0.4;zoomy,1; -SmallBanner2OffCommand=sleep,0.3;decelerate,0.3;zoomy,0; +SmallBanner2OnCommand=visible,true;draworder,80;zoom,1;zoomy,0;sleep,0.1;decelerate,0.4;zoomy,1 +SmallBanner2OffCommand=sleep,0.3;decelerate,0.3;zoomy,0 #--# SmallBanner3X=SCREEN_CENTER_X SmallBanner3Y=SCREEN_CENTER_Y-140-30 -SmallBanner3OnCommand=visible,true;draworder,60;zoom,1;zoomy,0;sleep,0.2;decelerate,0.4;zoomy,1; -SmallBanner3OffCommand=sleep,0.4;decelerate,0.3;zoomy,0; +SmallBanner3OnCommand=visible,true;draworder,60;zoom,1;zoomy,0;sleep,0.2;decelerate,0.4;zoomy,1 +SmallBanner3OffCommand=sleep,0.4;decelerate,0.3;zoomy,0 #--# SmallBanner4X=SCREEN_CENTER_X+20 SmallBanner4Y=SCREEN_CENTER_Y-135-30 -SmallBanner4OnCommand=visible,true;draworder,40;zoom,1;zoomy,0;sleep,0.3;decelerate,0.4;zoomy,1; -SmallBanner4OffCommand=sleep,0.5;decelerate,0.3;zoomy,0; +SmallBanner4OnCommand=visible,true;draworder,40;zoom,1;zoomy,0;sleep,0.3;decelerate,0.4;zoomy,1 +SmallBanner4OffCommand=sleep,0.5;decelerate,0.3;zoomy,0 #--# SmallBanner5X=SCREEN_CENTER_X+40 SmallBanner5Y=SCREEN_CENTER_Y-130-30 -SmallBanner5OnCommand=visible,true;draworder,20;zoom,1;zoomy,0;sleep,0.4;decelerate,0.4;zoomy,1; -SmallBanner5OffCommand=sleep,0.6;decelerate,0.3;zoomy,0; +SmallBanner5OnCommand=visible,true;draworder,20;zoom,1;zoomy,0;sleep,0.4;decelerate,0.4;zoomy,1 +SmallBanner5OffCommand=sleep,0.6;decelerate,0.3;zoomy,0 #--# @@ -1226,7 +1225,7 @@ Fallback="ScreenWithMenuElements" ChatInputBoxX=SCREEN_CENTER_X*0.5 ChatInputBoxY=SCREEN_CENTER_Y-200 -ChatInputBoxOnCommand=bounceend,0.5;diffusealpha,1; +ChatInputBoxOnCommand=bounceend,0.5;diffusealpha,1 ChatInputBoxOffCommand=bouncebegin,0.5;zoomy,0 ChatInputBoxWidth=SCREEN_CENTER_X*0.9 ChatInputBoxHeight=64 @@ -1254,7 +1253,7 @@ RoomWheelCommand=decelerate,0.4;x,SCREEN_WIDTH/0.75 # ChatInputBoxX=SCREEN_CENTER_X*0.5 ChatInputBoxY=SCREEN_CENTER_Y+112 -ChatInputBoxOnCommand=diffusealpha,0; +ChatInputBoxOnCommand=diffusealpha,0 ChatInputBoxOffCommand=bouncebegin,0.5;zoomy,0 ChatInputBoxWidth=SCREEN_CENTER_X*0.9 ChatInputBoxHeight=64 @@ -1267,8 +1266,8 @@ ChatInputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0 # ChatOutputBoxX=SCREEN_CENTER_X*0.46 ChatOutputBoxY=SCREEN_CENTER_Y+150 -ChatOutputBoxOnCommand=diffusealpha,0; -ChatOutputBoxOffCommand=diffusealpha,0; +ChatOutputBoxOnCommand=diffusealpha,0 +ChatOutputBoxOffCommand=diffusealpha,0 ChatOutputBoxWidth=SCREEN_CENTER_X*0.9 ChatOutputBoxHeight=SCREEN_CENTER_Y*0.875 @@ -1302,32 +1301,32 @@ StepsDisplayP1Y=SCREEN_CENTER_Y+8888 StepsDisplayP2X=SCREEN_CENTER_X StepsDisplayP2Y=SCREEN_CENTER_Y+8888 # -StepsDisplayP1OnCommand=visible,false; -StepsDisplayP2OnCommand=visible,false; +StepsDisplayP1OnCommand=visible,false +StepsDisplayP2OnCommand=visible,false # ShowPaneDisplayTextP1=true PaneDisplayTextP1X=SCREEN_CENTER_X-200+24-32 PaneDisplayTextP1Y=SCREEN_CENTER_Y+207+8 PaneDisplayTextP1OnCommand=player,PLAYER_1;horizalign,center;zoomy,0;sleep,0.4;decelerate,0.3;zoomy,1 -PaneDisplayTextP1OffCommand=smooth,0.2;zoomy,0; +PaneDisplayTextP1OffCommand=smooth,0.2;zoomy,0 PaneDisplayTextP1PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_1 then self:playcommand("On") end end # ShowPaneDisplayTextP2=true PaneDisplayTextP2X=SCREEN_CENTER_X+200-72-4+32 PaneDisplayTextP2Y=SCREEN_CENTER_Y+207+8 PaneDisplayTextP2OnCommand=player,PLAYER_2;horizalign,center;zoomy,0;sleep,0.4;decelerate,0.3;zoomy,1 -PaneDisplayTextP2OffCommand=smooth,0.2;zoomy,0; +PaneDisplayTextP2OffCommand=smooth,0.2;zoomy,0 PaneDisplayTextP2PlayerJoinedMessageCommand=%function(self,params) if params.Player == PLAYER_2 then self:playcommand("On") end end # PercentScoreP1X=SCREEN_CENTER_X-353-32 PercentScoreP1Y=SCREEN_CENTER_Y+284 PercentScoreP1OnCommand=zoomy,0;zoomx,0.35;sleep,0.8;smooth,0.2;zoomy,0.35 -PercentScoreP1OffCommand=smooth,0.2;zoomy,0;addy,-6; +PercentScoreP1OffCommand=smooth,0.2;zoomy,0;addy,-6 # PercentScoreP2X=SCREEN_CENTER_X+353+32 PercentScoreP2Y=SCREEN_CENTER_Y+284 PercentScoreP2OnCommand=zoomy,0;zoomx,0.35;sleep,0.8;smooth,0.2;zoomy,0.35 -PercentScoreP2OffCommand=smooth,0.2;zoomy,0;addy,-6; +PercentScoreP2OffCommand=smooth,0.2;zoomy,0;addy,-6 NullScoreString=string.format("% 9i",0) # MusicWheelX=SCREEN_CENTER_X+326 @@ -1343,15 +1342,15 @@ ChatInputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0 # ChatInputBoxX=SCREEN_CENTER_X*0.5 ChatInputBoxY=SCREEN_CENTER_Y+112 -ChatInputBoxOnCommand=diffusealpha,0; +ChatInputBoxOnCommand=diffusealpha,0 ChatInputBoxOffCommand=bouncebegin,0.5;zoomy,0 ChatInputBoxWidth=SCREEN_CENTER_X*0.9 ChatInputBoxHeight=64 # ChatOutputBoxX=SCREEN_CENTER_X*0.46 ChatOutputBoxY=SCREEN_CENTER_Y+150 -ChatOutputBoxOnCommand=diffusealpha,0; -ChatOutputBoxOffCommand=diffusealpha,0; +ChatOutputBoxOnCommand=diffusealpha,0 +ChatOutputBoxOffCommand=diffusealpha,0 ChatOutputBoxWidth=SCREEN_CENTER_X*0.9 ChatOutputBoxHeight=SCREEN_CENTER_Y*0.875 @@ -1372,11 +1371,11 @@ UsersOnCommand=draworder,2;zoom,0.75;shadowlength,1 [RoomWheelItem] TextX=0 TextY=0 -TextOnCommand=horizalign,left;zoom,1.1;maxwidth,SCREEN_WIDTH*0.31;y,-14;x,-200;strokecolor,color("#42292E"); +TextOnCommand=horizalign,left;zoom,1.1;maxwidth,SCREEN_WIDTH*0.31;y,-14;x,-200;strokecolor,color("#42292E") DescriptionX=0 DescriptionY=0 -DescriptionOnCommand=horizalign,left;zoom,0.75;maxwidth,SCREEN_WIDTH*0.5;x,-200;y,16;strokecolor,color("#42292E"); +DescriptionOnCommand=horizalign,left;zoom,0.75;maxwidth,SCREEN_WIDTH*0.5;x,-200;y,16;strokecolor,color("#42292E") [StepsDisplayEdit] ShowDescription=true @@ -1390,7 +1389,7 @@ PrevScreen=Branch.TitleMenu() EditMenuType="EditMenu" ExplanationX=SCREEN_CENTER_X ExplanationY=SCREEN_BOTTOM-147 -ExplanationOnCommand=wrapwidthpixels,SCREEN_WIDTH*0.9375/0.675;shadowlength,1;zoom,1;strokecolor,color("#000000");zoom,1; +ExplanationOnCommand=wrapwidthpixels,SCREEN_WIDTH*0.9375/0.675;shadowlength,1;zoom,1;strokecolor,color("#000000");zoom,1 NumStepsLoadedFromProfileX=SCREEN_RIGHT-180 NumStepsLoadedFromProfileY=SCREEN_TOP+42 NumStepsLoadedFromProfileOnCommand=visible,false @@ -1398,8 +1397,8 @@ NumStepsLoadedFromProfileOnCommand=visible,false [EditMenu] Arrows1X=SCREEN_CENTER_X-270-90 Arrows2X=SCREEN_CENTER_X+270+90 -ArrowsEnabledCommand=diffuse,color("#EBC159");shadowlengthy,1;shadowcolor,color("#002740"); -ArrowsDisabledCommand=diffuse,color("0.45,0.45,0.45,1");shadowlengthy,1;shadowcolor,color("#382902"); +ArrowsEnabledCommand=diffuse,color("#EBC159");shadowlengthy,1;shadowcolor,color("#002740") +ArrowsDisabledCommand=diffuse,color("0.45,0.45,0.45,1");shadowlengthy,1;shadowcolor,color("#382902") GroupBannerX=SCREEN_CENTER_X+170+60 GroupBannerY=SCREEN_CENTER_Y-140-20 @@ -1428,36 +1427,36 @@ Row7Y=SCREEN_CENTER_Y+120 Label1X=SCREEN_CENTER_X-300-30 Label1Y=THEME:GetMetric("EditMenu","Row1Y") -Label1OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left; +Label1OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left Label1OffCommand= Label2X=SCREEN_CENTER_X-300-30 Label2Y=THEME:GetMetric("EditMenu","Row2Y") -Label2OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left; +Label2OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left Label2OffCommand= Label3X=SCREEN_CENTER_X-300-30 Label3Y=THEME:GetMetric("EditMenu","Row3Y") -Label3OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left; +Label3OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left Label3OffCommand= Label4X=SCREEN_CENTER_X-300-30 Label4Y=THEME:GetMetric("EditMenu","Row4Y") -Label4OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left; +Label4OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left Label4OffCommand= Label5X=SCREEN_CENTER_X-300-30 Label5Y=THEME:GetMetric("EditMenu","Row5Y") -Label5OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left; +Label5OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left Label5OffCommand= Label6X=SCREEN_CENTER_X-300-30 Label6Y=THEME:GetMetric("EditMenu","Row6Y") -Label6OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left; +Label6OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left Label6OffCommand= Label7X=SCREEN_CENTER_X-300-30 Label7Y=THEME:GetMetric("EditMenu","Row7Y") -Label7OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left; +Label7OnCommand=strokecolor,color("#000000");zoom,1;horizalign,left Label7OffCommand= Value1X=SCREEN_CENTER_X-50 Value1Y=THEME:GetMetric("EditMenu","Row1Y") -Value1OnCommand=strokecolor,color("#000000");zoom,1;maxwidth,SCREEN_CENTER_X*0.45; +Value1OnCommand=strokecolor,color("#000000");zoom,1;maxwidth,SCREEN_CENTER_X*0.45 Value1OffCommand= Value2X=SCREEN_CENTER_X+60+40 Value2Y=THEME:GetMetric("EditMenu","Row2Y") @@ -1469,7 +1468,7 @@ Value3OnCommand=strokecolor,color("#000000");zoom,1;maxwidth,SCREEN_CENTER_X*0.6 Value3OffCommand= Value4X=SCREEN_CENTER_X+40 Value4Y=THEME:GetMetric("EditMenu","Row4Y") -Value4OnCommand=visible,false; +Value4OnCommand=visible,false Value4OffCommand= Value5X=SCREEN_CENTER_X+60+40 Value5Y=THEME:GetMetric("EditMenu","Row5Y") @@ -1482,4 +1481,4 @@ Value6OffCommand= Value7X=SCREEN_CENTER_X+60+40 Value7Y=THEME:GetMetric("EditMenu","Row7Y") Value7OnCommand=strokecolor,color("#000000");zoom,1;maxwidth,SCREEN_CENTER_X*0.65 -Value7OffCommand= \ No newline at end of file +Value7OffCommand=