From feed4c802a9249b7a7d67757678793a1a8db1582 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Mon, 18 Aug 2008 12:09:00 +0000 Subject: [PATCH] eval cleanup --- .../default.lua | 34 +- ...t 16px [main-stroke] 15x15 (doubleres).png | Bin 0 -> 28145 bytes ... upright 16px [main] 15x15 (doubleres).png | Bin 0 -> 17685 bytes .../_sf sports night ns upright 16px.ini | 352 ++++++++++++++++++ .../ScreenEvaluation MachineRecord.lua | 1 - .../ScreenEvaluation ProfileRecord.lua | 1 - .../Graphics/_JudgmentLineLabel/default.lua | 2 +- stepmania/Themes/default/Languages/en.ini | 2 +- stepmania/Themes/default/metrics.ini | 108 +++--- 9 files changed, 431 insertions(+), 69 deletions(-) create mode 100644 stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main-stroke] 15x15 (doubleres).png create mode 100644 stepmania/Themes/default/Fonts/_sf sports night ns upright 16px [main] 15x15 (doubleres).png create mode 100644 stepmania/Themes/default/Fonts/_sf sports night ns upright 16px.ini delete mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation MachineRecord.lua delete mode 100644 stepmania/Themes/default/Graphics/ScreenEvaluation ProfileRecord.lua 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 0000000000000000000000000000000000000000..c0067b1fd7d63b939d0ef2f459f3fc0521fe7b92 GIT binary patch literal 28145 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f5f467be3e10fd0d4398e0cdcabe422838795962 GIT binary patch literal 17685 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 literal 0 HcmV?d00001 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