diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index f78afa9fb2..d259766ed2 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -41,11 +41,37 @@ if ShowStandardDecoration("ComboGraph") then end end -t[#t+1] = StandardDecorationFromFile( "TimingDifficultyFrame", "TimingDifficultyFrame" ); -t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. { - InitCommand=function(self) self:name("TimingDifficultyNumber"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; -}; +if ShowStandardDecoration("ItsARecord") then + for pn in ivalues(PlayerNumber) do + local t2 = Def.ActorFrame { + BeginCommand=function(self) + local index = SCREENMAN:GetTopScreen():GetStageStats():GetPlayerStageStats(pn):GetMachineHighScoreIndex(); + if index == 0 then + self:GetChild("Record"):visible( true ); + self:GetChild("NoRecord"):visible( false ); + else + self:GetChild("Record"):visible( false ); + self:GetChild("NoRecord"):visible( true ); + end + end; + LoadFont("_sf sports night ns upright 16px") .. { + InitCommand=cmd(name,"Record";settext,"It's a New\nRecord!!!";diffuse,color("#fffc00");strokecolor,color("#807e00");vertspacing,-2;shadowlength,0;glowshift;); + }; + LoadFont("common normal") .. { + InitCommand=cmd(name,"NoRecord";settext,"WWWW:\n82.34%";strokecolor,color("#807e00");shadowlength,0;); + }; + } + t[#t+1] = StandardDecorationFromTable( "ItsARecord" .. PlayerNumber:ToString()[pn], t2 ); + end +end +if ShowStandardDecoration("TimingDifficulty") then + t[#t+1] = StandardDecorationFromFile( "TimingDifficultyFrame", "TimingDifficultyFrame" ); + local t2 = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. { + InitCommand=cmd(settext,GetTimingDifficulty();); + }; + t[#t+1] = StandardDecorationFromTable( "TimingDifficultyNumber", t2 ); +end if ShowStandardDecoration("ModIconRows") then for pn in ivalues(PlayerNumber) do diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png new file mode 100644 index 0000000000..c0067b1fd7 Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png new file mode 100644 index 0000000000..f5f467be3e Binary files /dev/null and b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png differ diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini new file mode 100644 index 0000000000..c80a40a226 --- /dev/null +++ b/stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini @@ -0,0 +1,352 @@ +[common] +Baseline=14 +Top=2 +LineSpacing=17 +DrawExtraPixelsLeft=0 +DrawExtraPixelsRight=0 +AdvanceExtraPixels=0 + +[main] +Line 0= !"#$%&'()*+,-. +Line 1=/0123456789:;<= +Line 2=>?@ABCDEFGHIJKL +Line 3=MNOPQRSTUVWXYZ[ +Line 4=\]^_`abcdefghij +Line 5=klmnopqrstuvwxy +Line 6=z{|}~€‚ƒ„…†‡ˆ‰Š +Line 7=‹ŒŽ‘’“”•–—˜™š›œ +Line 8=žŸ ¡¢£¤¥¦§¨©ª«¬ +Line 9=­®¯°±²³´µ¶·¸¹º» +Line 10=¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊ +Line 11=ËÌÍÎÏÐÑÒÓÔÕÖ×ØÙ +Line 12=ÚÛÜÝÞßàáâãäåæçè +Line 13=éêëìíîïðñòóôõö÷ +Line 14=øùúûüýþÿ + +0=6 +1=4 +2=7 +3=19 +4=13 +5=10 +6=14 +7=4 +8=6 +9=6 +10=14 +11=14 +12=4 +13=14 +14=4 +15=5 +16=11 +17=4 +18=11 +19=11 +20=11 +21=11 +22=11 +23=11 +24=11 +25=11 +26=4 +27=4 +28=18 +29=14 +30=18 +31=9 +32=10 +33=10 +34=11 +35=11 +36=11 +37=10 +38=10 +39=11 +40=11 +41=4 +42=11 +43=10 +44=10 +45=12 +46=11 +47=11 +48=11 +49=12 +50=11 +51=11 +52=11 +53=11 +54=10 +55=16 +56=11 +57=11 +58=11 +59=5 +60=5 +61=5 +62=10 +63=10 +64=10 +65=10 +66=11 +67=11 +68=11 +69=10 +70=10 +71=11 +72=11 +73=4 +74=11 +75=10 +76=10 +77=12 +78=11 +79=11 +80=11 +81=12 +82=11 +83=11 +84=11 +85=11 +86=10 +87=16 +88=11 +89=11 +90=11 +91=6 +92=4 +93=6 +94=10 +95=13 +96=4 +97=10 +98=7 +99=10 +100=10 +101=10 +102=10 +103=10 +104=14 +105=10 +106=13 +107=14 +108=4 +109=4 +110=7 +111=7 +112=10 +113=15 +114=16 +115=10 +116=10 +117=14 +118=10 +119=10 +120=14 +121=10 +122=14 +123=4 +124=10 +125=10 +126=10 +127=10 +128=14 +129=10 +130=10 +131=10 +132=10 +133=10 +134=14 +135=14 +136=10 +137=14 +138=14 +139=10 +140=14 +141=14 +142=10 +143=10 +144=10 +145=14 +146=10 +147=14 +148=10 +149=10 +150=14 +151=14 +152=14 +153=9 +154=18 +155=18 +156=18 +157=18 +158=18 +159=18 +160=27 +161=13 +162=13 +163=13 +164=10 +165=13 +166=4 +167=4 +168=4 +169=4 +170=14 +171=15 +172=16 +173=16 +174=16 +175=16 +176=16 +177=14 +178=10 +179=15 +180=15 +181=15 +182=15 +183=14 +184=14 +185=10 +186=10 +187=10 +188=10 +189=10 +190=10 +191=10 +192=10 +193=10 +194=10 +195=10 +196=10 +197=10 +198=10 +199=10 +200=10 +201=10 +202=14 +203=10 +204=10 +205=10 +206=10 +207=10 +208=10 +209=14 +210=10 +211=10 +212=10 +213=10 +214=10 +215=14 +216=14 +217=10 + +[alt] +Line 0= Ą˘Ł¤ĽŚ§¨Š +Line 1=ŞŤŹ­ŽŻ°ą˛ł +Line 2=´ľśˇ¸šşťź˝ +Line 3=žżŔÁÂĂÄĹĆÇ +Line 4=ČÉĘËĚÍÎĎĐŃ +Line 5=ŇÓÔŐÖ×ŘŮÚŰ +Line 6=ÜÝŢßŕáâăäĺ +Line 7=ćçčéęëěíîď +Line 8=đńňóôőö÷řů +Line 9=úűüýţ˙ + +0=14 +1=14 +2=10 +3=14 +4=10 +5=14 +6=14 +7=10 +8=10 +9=14 +10=14 +11=14 +12=14 +13=14 +14=14 +15=14 +16=14 +17=14 +18=10 +19=14 +20=10 +21=14 +22=14 +23=10 +24=10 +25=14 +26=14 +27=14 +28=14 +29=10 +30=14 +31=14 +32=14 +33=18 +34=18 +35=14 +36=18 +37=14 +38=14 +39=13 +40=14 +41=13 +42=14 +43=13 +44=14 +45=4 +46=4 +47=14 +48=14 +49=14 +50=14 +51=16 +52=16 +53=14 +54=16 +55=14 +56=14 +57=14 +58=15 +59=14 +60=15 +61=14 +62=14 +63=10 +64=14 +65=10 +66=10 +67=14 +68=10 +69=14 +70=14 +71=10 +72=14 +73=10 +74=14 +75=10 +76=14 +77=10 +78=10 +79=14 +80=14 +81=14 +82=14 +83=10 +84=10 +85=14 +86=10 +87=14 +88=14 +89=14 +90=10 +91=14 +92=10 +93=14 +94=14 +95=10 diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua b/stepmania/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua deleted file mode 100644 index 11ec6eac79..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("common normal") .. { InitCommand=cmd(settext,"Machine Record #" .. (Var "MachineHighScoreNumber"); ); }; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation ProfileRecord.lua b/stepmania/Themes/default/Graphics/ScreenEvaluation ProfileRecord.lua deleted file mode 100644 index 0e5fa08682..0000000000 --- a/stepmania/Themes/default/Graphics/ScreenEvaluation ProfileRecord.lua +++ /dev/null @@ -1 +0,0 @@ -return LoadFont("common normal") .. { InitCommand=cmd(settext,"Profile Record #" .. (Var "ProfileHighScoreNumber"); ); }; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua index 1d3d8065f4..8a3271b6a8 100644 --- a/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua +++ b/stepmania/Themes/default/Graphics/_JudgmentLineLabel/default.lua @@ -5,6 +5,6 @@ return Def.ActorFrame { InitCommand=cmd(y,4;); }; LoadFont("_sf square head 13px") .. { - InitCommand=cmd(settext,string.upper(JudgmentLineToLocalizedString(jl));diffuse,JudgmentLineToColor(jl);strokecolor,JudgmentLineToStrokeColor(jl);shadowlength,0;maxwidth,180); + InitCommand=cmd(y,2;settext,string.upper(JudgmentLineToLocalizedString(jl));diffuse,JudgmentLineToColor(jl);strokecolor,JudgmentLineToStrokeColor(jl);shadowlength,0;maxwidth,180); }; }; \ No newline at end of file diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 9bada12512..6ed079f785 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1786,7 +1786,7 @@ W4=Good W5=Boo Miss=Miss Held=Held -MaxCombo=MaxCombo +MaxCombo=Max Combo [NativeLanguageNames] Afar=Afar diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 7fbc60ef58..7e27a2b7b1 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1120,6 +1120,7 @@ ShowJudgmentLineMiss=true ShowJudgmentLineMaxCombo=true ShowPerDifficultyAward=false ShowPeakComboAward=false +ShowTimingDifficulty=true BannerWidth=268 BannerHeight=98 @@ -1142,72 +1143,72 @@ GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_ GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 W1LabelX=SCREEN_CENTER_X+0 -W1LabelY=SCREEN_CENTER_Y-36+30*0 +W1LabelY=SCREEN_CENTER_Y-36+29*0 W1LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*0;decelerate,0.3;addy,-SCREEN_HEIGHT W1LabelOffCommand=sleep,0.7-0.1*0;accelerate,0.3;addy,SCREEN_HEIGHT W1NumberP1X=SCREEN_CENTER_X-100 -W1NumberP1Y=SCREEN_CENTER_Y-36+30*0 +W1NumberP1Y=SCREEN_CENTER_Y-36+29*0 W1NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2 W1NumberP1OffCommand=sleep,0.7;accelerate,0.3;addx,-SCREEN_WIDTH/2 W1NumberP2X=SCREEN_CENTER_X+100 -W1NumberP2Y=SCREEN_CENTER_Y-36+30*0 +W1NumberP2Y=SCREEN_CENTER_Y-36+29*0 W1NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2 W1NumberP2OffCommand=sleep,0.7-0.1*0;accelerate,0.3;addx,SCREEN_WIDTH/2 W2LabelX=SCREEN_CENTER_X+0 -W2LabelY=SCREEN_CENTER_Y-36+30*1 +W2LabelY=SCREEN_CENTER_Y-36+29*1 W2LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*1;decelerate,0.3;addy,-SCREEN_HEIGHT W2LabelOffCommand=sleep,0.7-0.1*1;accelerate,0.3;addy,SCREEN_HEIGHT W2NumberP1X=SCREEN_CENTER_X-100 -W2NumberP1Y=SCREEN_CENTER_Y-36+30*1 +W2NumberP1Y=SCREEN_CENTER_Y-36+29*1 W2NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2 W2NumberP1OffCommand=sleep,0.7-0.1*1;accelerate,0.3;addx,-SCREEN_WIDTH/2 W2NumberP2X=SCREEN_CENTER_X+100 -W2NumberP2Y=SCREEN_CENTER_Y-36+30*1 +W2NumberP2Y=SCREEN_CENTER_Y-36+29*1 W2NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2 W2NumberP2OffCommand=sleep,0.7-0.1*1;accelerate,0.3;addx,SCREEN_WIDTH/2 W3LabelX=SCREEN_CENTER_X+0 -W3LabelY=SCREEN_CENTER_Y-36+30*2 +W3LabelY=SCREEN_CENTER_Y-36+29*2 W3LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*2;decelerate,0.3;addy,-SCREEN_HEIGHT W3LabelOffCommand=sleep,0.7-0.1*2;accelerate,0.3;addy,SCREEN_HEIGHT W3NumberP1X=SCREEN_CENTER_X-100 -W3NumberP1Y=SCREEN_CENTER_Y-36+30*2 +W3NumberP1Y=SCREEN_CENTER_Y-36+29*2 W3NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2 W3NumberP1OffCommand=sleep,0.7-0.1*2;accelerate,0.3;addx,-SCREEN_WIDTH/2 W3NumberP2X=SCREEN_CENTER_X+100 -W3NumberP2Y=SCREEN_CENTER_Y-36+30*2 +W3NumberP2Y=SCREEN_CENTER_Y-36+29*2 W3NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2 W3NumberP2OffCommand=sleep,0.7-0.1*2;accelerate,0.3;addx,SCREEN_WIDTH/2 W4LabelX=SCREEN_CENTER_X+0 -W4LabelY=SCREEN_CENTER_Y-36+30*3 +W4LabelY=SCREEN_CENTER_Y-36+29*3 W4LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*3;decelerate,0.3;addy,-SCREEN_HEIGHT W4LabelOffCommand=sleep,0.7-0.1*3;accelerate,0.3;addy,SCREEN_HEIGHT W4NumberP1X=SCREEN_CENTER_X-100 -W4NumberP1Y=SCREEN_CENTER_Y-36+30*3 +W4NumberP1Y=SCREEN_CENTER_Y-36+29*3 W4NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2 W4NumberP1OffCommand=sleep,0.7-0.1*3;accelerate,0.3;addx,-SCREEN_WIDTH/2 W4NumberP2X=SCREEN_CENTER_X+100 -W4NumberP2Y=SCREEN_CENTER_Y-36+30*3 +W4NumberP2Y=SCREEN_CENTER_Y-36+29*3 W4NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2 W4NumberP2OffCommand=sleep,0.7-0.1*3;accelerate,0.3;addx,SCREEN_WIDTH/2 W5LabelX=SCREEN_CENTER_X -W5LabelY=SCREEN_CENTER_Y-36+30*4 +W5LabelY=SCREEN_CENTER_Y-36+29*4 W5LabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*4;decelerate,0.3;addy,-SCREEN_HEIGHT W5LabelOffCommand=sleep,0.7-0.1*4;accelerate,0.3;addy,SCREEN_HEIGHT W5NumberP1X=SCREEN_CENTER_X-100 -W5NumberP1Y=SCREEN_CENTER_Y-36+30*4 +W5NumberP1Y=SCREEN_CENTER_Y-36+29*4 W5NumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,SCREEN_WIDTH/2 W5NumberP1OffCommand=sleep,0.7-0.1*4;accelerate,0.3;addx,-SCREEN_WIDTH/2 W5NumberP2X=SCREEN_CENTER_X+100 -W5NumberP2Y=SCREEN_CENTER_Y-36+30*4 +W5NumberP2Y=SCREEN_CENTER_Y-36+29*4 W5NumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2 W5NumberP2OffCommand=sleep,0.7-0.1*4;accelerate,0.3;addx,SCREEN_WIDTH/2 @@ -1226,44 +1227,44 @@ HeldNumberP2OnCommand= HeldNumberP2OffCommand= MissLabelX=SCREEN_CENTER_X+0 -MissLabelY=SCREEN_CENTER_Y-36+30*5 +MissLabelY=SCREEN_CENTER_Y-36+29*5 MissLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*5;decelerate,0.3;addy,-SCREEN_HEIGHT MissLabelOffCommand=sleep,0.7-0.1*5;accelerate,0.3;addy,SCREEN_HEIGHT MissNumberP1X=SCREEN_CENTER_X-100 -MissNumberP1Y=SCREEN_CENTER_Y-36+30*5 +MissNumberP1Y=SCREEN_CENTER_Y-36+29*5 MissNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*5;decelerate,0.3;addx,SCREEN_WIDTH/2 MissNumberP1OffCommand=sleep,0.7-0.1*5;accelerate,0.3;addx,-SCREEN_WIDTH/2 MissNumberP2X=SCREEN_CENTER_X+100 -MissNumberP2Y=SCREEN_CENTER_Y-36+30*5 +MissNumberP2Y=SCREEN_CENTER_Y-36+29*5 MissNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*5;decelerate,0.3;addx,-SCREEN_WIDTH/2 MissNumberP2OffCommand=sleep,0.7-0.1*5;accelerate,0.3;addx,SCREEN_WIDTH/2 MaxComboMaxDigits=5 MaxComboLabelX=SCREEN_CENTER_X+0 -MaxComboLabelY=SCREEN_CENTER_Y-36+30*6 +MaxComboLabelY=SCREEN_CENTER_Y-36+29*6 MaxComboLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.1+0.1*6;decelerate,0.3;addy,-SCREEN_HEIGHT MaxComboLabelOffCommand=sleep,0.7-0.1*6;accelerate,0.3;addy,SCREEN_HEIGHT MaxComboNumberP1X=SCREEN_CENTER_X-100 -MaxComboNumberP1Y=SCREEN_CENTER_Y-36+30*6 +MaxComboNumberP1Y=SCREEN_CENTER_Y-36+29*6 MaxComboNumberP1OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#ffd900");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*6;decelerate,0.3;addx,SCREEN_WIDTH/2 MaxComboNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2 MaxComboNumberP2X=SCREEN_CENTER_X+100 -MaxComboNumberP2Y=SCREEN_CENTER_Y-36+30*6 +MaxComboNumberP2Y=SCREEN_CENTER_Y-36+29*6 MaxComboNumberP2OnCommand=shadowlength,0;shadowcolor,color("#000000AA");diffuse,color("#5bff00");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*6;decelerate,0.3;addx,-SCREEN_WIDTH/2 MaxComboNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 ScoreLabelX=SCREEN_CENTER_X+0 -ScoreLabelY=SCREEN_CENTER_Y+140 +ScoreLabelY=SCREEN_CENTER_Y+178 ScoreLabelOnCommand=addy,SCREEN_HEIGHT;sleep,0.8;decelerate,0.3;addy,-SCREEN_HEIGHT ScoreLabelOffCommand=sleep,0.0;accelerate,0.3;addy,SCREEN_HEIGHT -ScoreNumberP1X=SCREEN_CENTER_X-192 -ScoreNumberP1Y=SCREEN_CENTER_Y+180 +ScoreNumberP1X=SCREEN_CENTER_X-212 +ScoreNumberP1Y=SCREEN_CENTER_Y+178 ScoreNumberP1OnCommand=shadowlength,0;diffuse,PlayerScoreColor("PlayerNumber_P1");addx,-SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,SCREEN_WIDTH/2 ScoreNumberP1OffCommand=sleep,0.0;accelerate,0.3;addx,-SCREEN_WIDTH/2 -ScoreNumberP2X=SCREEN_CENTER_X+192 -ScoreNumberP2Y=SCREEN_CENTER_Y+180 +ScoreNumberP2X=SCREEN_CENTER_X+212 +ScoreNumberP2Y=SCREEN_CENTER_Y+178 ScoreNumberP2OnCommand=shadowlength,0;diffuse,PlayerScoreColor("PlayerNumber_P2");addx,SCREEN_WIDTH/2;sleep,0.8;decelerate,0.3;addx,-SCREEN_WIDTH/2 ScoreNumberP2OffCommand=sleep,0.0;accelerate,0.3;addx,SCREEN_WIDTH/2 @@ -1276,23 +1277,6 @@ LargeBannerFrameY=SCREEN_CENTER_Y-106 LargeBannerFrameOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT LargeBannerFrameOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -MachineRecordP1X=SCREEN_CENTER_X-250 -MachineRecordP1Y=SCREEN_CENTER_Y+160 -MachineRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -MachineRecordP1OffCommand=linear,0.7;diffusealpha,0 -MachineRecordP2X=SCREEN_CENTER_X+250 -MachineRecordP2Y=SCREEN_CENTER_Y+160 -MachineRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -MachineRecordP2OffCommand=linear,0.7;diffusealpha,0 -ProfileRecordP1X=SCREEN_CENTER_X-250 -ProfileRecordP1Y=SCREEN_CENTER_Y+190 -ProfileRecordP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -ProfileRecordP1OffCommand=linear,0.7;diffusealpha,0 -ProfileRecordP2X=SCREEN_CENTER_X+250 -ProfileRecordP2Y=SCREEN_CENTER_Y+190 -ProfileRecordP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1;glowshift -ProfileRecordP2OffCommand=linear,0.7;diffusealpha,0 - PlayerOptionsP1X=SCREEN_CENTER_X-70 PlayerOptionsP1Y=SCREEN_CENTER_Y-182 PlayerOptionsP1OnCommand=visible,false;horizalign,left;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT @@ -1319,8 +1303,8 @@ SurvivedNumberP2Y=SCREEN_CENTER_Y+0 SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -TimingDifficultyNumberX=SCREEN_CENTER_X+114 -TimingDifficultyNumberY=SCREEN_CENTER_Y-204 +TimingDifficultyNumberX=SCREEN_CENTER_X+116 +TimingDifficultyNumberY=SCREEN_CENTER_Y-205 TimingDifficultyNumberOnCommand=draworder,2;shadowlength,0 TimingDifficultyNumberOffCommand= TimingDifficultyFrameX=SCREEN_CENTER_X+114+3 @@ -1382,12 +1366,12 @@ RollsNumberP2Y=SCREEN_CENTER_Y+52+16*4 RollsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*4;decelerate,0.3;addx,-SCREEN_WIDTH/2 RollsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 -StepsDisplayP1X=SCREEN_CENTER_X-154 -StepsDisplayP1Y=SCREEN_CENTER_Y-110 +StepsDisplayP1X=SCREEN_CENTER_X-230 +StepsDisplayP1Y=SCREEN_CENTER_Y+150 StepsDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; StepsDisplayP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -StepsDisplayP2X=SCREEN_CENTER_X+154 -StepsDisplayP2Y=SCREEN_CENTER_Y-110 +StepsDisplayP2X=SCREEN_CENTER_X+230 +StepsDisplayP2Y=SCREEN_CENTER_Y+150 StepsDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; StepsDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT @@ -1528,14 +1512,14 @@ ModIconRowP2Y=SCREEN_CENTER_Y-130 ModIconRowP2OnCommand=draworder,1;player,"PlayerNumber_P2";addx,200;linear,0.5;addx,-200 ModIconRowP2OffCommand=linear,0.5;addx,200 -StepsDisplayP1X=SCREEN_CENTER_X-230 -StepsDisplayP1Y=SCREEN_CENTER_Y+151 -StepsDisplayP1OnCommand=zoomy,0;linear,0.5;zoomy,1 -StepsDisplayP1OffCommand=linear,0.5;zoomy,0 -StepsDisplayP2X=SCREEN_CENTER_X+230 -StepsDisplayP2Y=SCREEN_CENTER_Y+151 -StepsDisplayP2OnCommand=zoomy,0;linear,0.5;zoomy,1 -StepsDisplayP2OffCommand=linear,0.5;zoomy,0 +ItsARecordP1X=SCREEN_CENTER_X-72 +ItsARecordP1Y=SCREEN_CENTER_Y+185 +ItsARecordP1OnCommand=shadowlength,0;diffusealpha,0;zoom,3;linear,0.5;diffusealpha,1;zoom,1 +ItsARecordP1OffCommand=linear,0.5;diffusealpha,0 +ItsARecordP2X=SCREEN_CENTER_X+72 +ItsARecordP2Y=SCREEN_CENTER_Y+185 +ItsARecordP2OnCommand=shadowlength,0;diffusealpha,0;zoom,3;linear,0.5;diffusealpha,1;zoom,1 +ItsARecordP2OffCommand=linear,0.5;diffusealpha,1 BarActualMaxCommand=glowshift;effectperiod,0.5 @@ -1580,6 +1564,7 @@ ShowStageDisplay=true ShowStageFrame=true ShowModIconRows=true ShowStepsDisplay=true +ShowItsARecord=true TryExtraStageX=SCREEN_CENTER_X+0 TryExtraStageY=SCREEN_CENTER_Y+188 @@ -2154,9 +2139,9 @@ StyleIconOffCommand= WarningStart=6 WarningBeepStart=5 MaxStallSeconds=30 -Text1OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,-14;y,2 +Text1OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,-13;y,2 Text1FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.floor(fSeconds/10); return ""..digit end -Text2OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,14;y,2 +Text2OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,13;y,2 Text2FormatFunction=function(fSeconds) fSeconds=math.min( 99, math.ceil(fSeconds) ); local digit = math.mod(fSeconds,10); return ""..digit end Warning6Command=stoptweening;sleep,0.8;linear,0.2;zoomx,0 Warning5Command=stoptweening;linear,0.2;zoomx,1;sleep,0.6;linear,0.2;zoomx,0;glowshift;effectperiod,0.15;effectcolor1,1,0,0,0;effectcolor2,1,0,0,1 @@ -2691,11 +2676,12 @@ MountainHeight= TextX=0 TextY=0 TextOnCommand=maxwidth,40;uppercase,true;shadowlength,0;diffuse,color("#f6ff00") -CropTextToLength=4 -CropIfLongerThan=5 +CropTextToWidth=50 [ModIconSelectMusic] Fallback="ModIcon" +TextY=-1 +TextOnCommand=maxwidth,38;uppercase,true;shadowlength,0 [ModIconRow] NumModIcons=6