diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index b06c3d07ef..dba1ffb2d5 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -51,12 +51,12 @@ Nightmare=Nightmare HalfDouble=Half-Double [CourseDifficulty] -Beginner=BEGINNER -Challenge=CHALLENGE -Hard=DIFFICULT -Easy=EASY -Edit=EDIT -Medium=REGULAR +Beginner=Novice +Challenge=Expert +Hard=Hard +Easy=Easy +Edit=Edit +Medium=Medium [CourseEntryType] Best=Players' Best diff --git a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua index 1f168df8e5..41942df216 100644 --- a/Themes/_fallback/Scripts/03 ProductivityHelpers.lua +++ b/Themes/_fallback/Scripts/03 ProductivityHelpers.lua @@ -63,7 +63,12 @@ Condition = { return GAMESTATE:PlayerIsUsingModifier( pnPlayer, sModifier ); end, } - +--[[ 3.9 Functions ]] +Game = { + GetStage = function() + + end, +} --[[ Aliases ]] -- Blend Modes diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index c622a29145..1180e21415 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -2276,13 +2276,12 @@ BatLives,7="mod,7 lives;name,7" BatLives,8="mod,8 lives;name,8" BatLives,9="mod,9 lives;name,9" BatLives,10="mod,10 lives;name,10" -Fail="5;together" +Fail="4;together" FailDefault="mod,faildefault" -Fail,1="mod,faildefault;name,Default" -Fail,2="mod,failimmediate;name,Immediate" -Fail,3="mod,failimmediatecontinue;name,ImmediateContinue" -Fail,4="mod,failatend;name,FailAtEnd" -Fail,5="mod,failoff;name,Off" +Fail,1="mod,failimmediate;name,Immediate" +Fail,2="mod,failimmediatecontinue;name,ImmediateContinue" +Fail,3="mod,failatend;name,FailAtEnd" +Fail,4="mod,failoff;name,Off" Assist="4;together" AssistDefault="" Assist,1="mod,no clap,no metronome;name,Off" diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index d9ece03880..57452b452d 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -11,11 +11,11 @@ NumRainbowColors=1 RainbowColor1=Color("Black"); [BPMDisplay] -SetNoBpmCommand=stoptweening;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875); -SetNormalCommand=stoptweening;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875); -SetChangeCommand=stoptweening;linear,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5); -SetRandomCommand=stoptweening;linear,0.2;diffuse,Color("Blue");diffusetopedge,BoostColor(Color("Blue"),1.5); -SetExtraCommand=stoptweening;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5); +SetNoBpmCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875); +SetNormalCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("White");diffusebottomedge,BoostColor(Color("White"),0.875); +SetChangeCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Orange");diffusetopedge,BoostColor(Color("Orange"),1.5); +SetRandomCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Blue");diffusetopedge,BoostColor(Color("Blue"),1.5); +SetExtraCommand=stoptweening;maxwidth,128;linear,0.2;diffuse,Color("Red");diffusebottomedge,BoostColor(Color("Red"),0.5); Cycle=true NoBpmText="000" RandomCycleSpeed=0.2 -- smaller numbers mean the bpm cycles faster @@ -83,16 +83,17 @@ HoldJudgmentHeldCommand=finishtweening;shadowlength,0;diffusealpha,1;zoom,1.25;l [Judgment] # New # JudgmentOnCommand= - # !!! # - JudgmentW1Command=finishtweening;shadowlength,0;y,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0;glowblink;effectperiod,0.05;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.8 JudgmentW2Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.3;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentW3Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.2;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; JudgmentW4Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.1;linear,0.05;zoom,1;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0; JudgmentW5Command=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude,1,2,2;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 JudgmentMissCommand=finishtweening;y,0;shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.5;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 - +# Late/Early +OffsetOnCommand= +OffsetLateCommand= +OffsetEarlyCommand= [LifeMeterBar] OverOnCommand=diffuse,Color("Orange");diffuserightedge,BoostColor(Color("Orange"),1.5) @@ -506,7 +507,6 @@ MeterSetCommand=%function(self,param) \ self:stopeffect(); \ end; \ end; \ - (cmd(finishtweening;zoomx,1.5;diffusealpha,0;smooth,0.125;zoom,1;diffusealpha,1))(self); \ end; # ShowDescription=true @@ -521,7 +521,6 @@ DescriptionSetCommand=%function(self,param) \ self:diffuse(CustomDifficultyToColor(param.CustomDifficulty)); \ self:shadowcolor(CustomDifficultyToDarkColor(param.CustomDifficulty)); \ end; \ - (cmd(finishtweening;diffusealpha,0;addx,-4;smooth,0.125;addx,4;diffusealpha,1))(self); \ end; # ShowAutogen=false @@ -1177,7 +1176,7 @@ BannerFrameOffCommand=bouncebegin,0.15;zoomx,0; ShowBPMDisplay=true BPMDisplayX=SCREEN_CENTER_X-160-90+2 BPMDisplayY=SCREEN_TOP+160+(36/2)+8 -BPMDisplayOnCommand=finishtweening;horizalign,left;strokecolor,Color("Outline");maxwidth,128;addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1 +BPMDisplayOnCommand=finishtweening;maxwidth,128;horizalign,left;strokecolor,Color("Outline");addx,320;zoomx,0;decelerate,0.35;addx,-320;zoomx,1 BPMDisplayOffCommand=bouncebegin,0.15;zoomx,0; # ShowBPMLabel=true