From a51ed6204144982c6a3754d0d847775d33420432 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Tue, 8 Apr 2008 19:57:31 +0000 Subject: [PATCH] eval cleanup --- .../default.lua | 16 +- .../default.lua | 2 +- .../ScreenEvaluation DetailLineNumber.redir | 2 +- ...enEvaluation TimingDifficultyNumber.redir} | 0 .../_terminator two 40 [numbers] 4x4.png | Bin 5548 -> 5576 bytes .../default/Fonts/_terminator two 40.ini | 2 +- ...acti bold fixed-width 24 [numbers] 4x4.png | Bin 4737 -> 4877 bytes .../Fonts/_venacti bold fixed-width 24.ini | 11 +- .../Graphics/ComboGraph ComboNumber.lua | 1 + .../Graphics/GraphDisplay Barely/default.lua | 4 +- ...reenEvaluation BannerFrame (doubleres).png | Bin 8722 -> 9495 bytes .../default.lua | 12 +- ...ithMenuElements StageFrame (doubleres).png | Bin 7065 -> 5444 bytes stepmania/Themes/default/metrics.ini | 220 +++++++++--------- 14 files changed, 144 insertions(+), 126 deletions(-) rename stepmania/Themes/default/Fonts/{ScreenEvaluation TimingDifficulty.redir => ScreenEvaluation TimingDifficultyNumber.redir} (100%) diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua index 87ff7e1f6b..68d046983c 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage decorations/default.lua @@ -30,31 +30,31 @@ end local t = LoadFallbackB( "decorations" ); t[#t+1] = GraphDisplay(PLAYER_1) .. { - InitCommand = cmd(x,SCREEN_CENTER_X-224;y,SCREEN_CENTER_Y-50;draworder,1;); + InitCommand = cmd(x,SCREEN_CENTER_X-222;y,SCREEN_CENTER_Y-16;draworder,1;); }; t[#t+1] = GraphDisplay(PLAYER_2) .. { - InitCommand = cmd(x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-50;draworder,1;); + InitCommand = cmd(x,SCREEN_CENTER_X+222;y,SCREEN_CENTER_Y-16;draworder,1;); }; t[#t+1] = ComboGraph(PLAYER_1) .. { - InitCommand = cmd(x,SCREEN_CENTER_X-224;y,SCREEN_CENTER_Y-20;draworder,1;); + InitCommand = cmd(x,SCREEN_CENTER_X-222;y,SCREEN_CENTER_Y+10;draworder,1;); }; t[#t+1] = ComboGraph(PLAYER_2) .. { - InitCommand = cmd(x,SCREEN_CENTER_X+224;y,SCREEN_CENTER_Y-20;draworder,1;); + InitCommand = cmd(x,SCREEN_CENTER_X+222;y,SCREEN_CENTER_Y+10;draworder,1;); }; t[#t+1] = LoadActor( THEME:GetPathB('','_standard decoration required'), "TimingDifficultyFrame", "TimingDifficultyFrame" ); -t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficulty" ) .. { - InitCommand=function(self) self:name("TimingDifficulty"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; +t[#t+1] = LoadFont( Var "LoadingScreen", "TimingDifficultyNumber" ) .. { + InitCommand=function(self) self:name("TimingDifficultyNumber"); self:settext(GetTimingDifficulty()); ActorUtil.LoadAllCommandsAndSetXY(self,Var "LoadingScreen"); end; }; t[#t+1] = Def.OptionIconRow { - InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;Load,"OptionIconRowEvaluation",PLAYER_1,player,PLAYER_1); + InitCommand=cmd(x,SCREEN_CENTER_X-316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP1",PLAYER_1,player,PLAYER_1); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); OffCommand=cmd(linear,0.5;zoomy,0); }; t[#t+1] = Def.OptionIconRow { - InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;Load,"OptionIconRowEvaluation",PLAYER_2;player,PLAYER_2); + InitCommand=cmd(x,SCREEN_CENTER_X+316;y,SCREEN_CENTER_Y-130;draworder,1;Load,"OptionIconRowEvaluationP2",PLAYER_2;player,PLAYER_2); OnCommand=cmd(zoomy,0;linear,0.5;zoomy,1); OffCommand=cmd(linear,0.5;zoomy,0); }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua index 3df7062bf4..dded5fdb2f 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenWithMenuElements decorations/default.lua @@ -5,6 +5,6 @@ return Def.ActorFrame { LoadActor( THEME:GetPathB('','_standard decoration required'), "Header", "Header" ); LoadActor( THEME:GetPathB('','_standard decoration required'), "Footer", "Footer" ); LoadActor( THEME:GetPathB('','_standard decoration optional'), "StyleIcon", "StyleIcon" ); + LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageFrame", "StageFrame" ); LoadActor( THEME:GetPathB('','_standard decoration optional'), "StageDisplay", "StageDisplay" ); - }; diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir index 6272ef61a7..66fb5b1677 100644 --- a/stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir +++ b/stepmania/Themes/default/Fonts/ScreenEvaluation DetailLineNumber.redir @@ -1 +1 @@ -common normal \ No newline at end of file +_venacti bold fixed-width 24 \ No newline at end of file diff --git a/stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficulty.redir b/stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficultyNumber.redir similarity index 100% rename from stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficulty.redir rename to stepmania/Themes/default/Fonts/ScreenEvaluation TimingDifficultyNumber.redir diff --git a/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png b/stepmania/Themes/default/Fonts/_terminator two 40 [numbers] 4x4.png index f7b73bda95be8e7b84dc63119f5823f82781be80..0e6b296a812343ae3ee45f230e7b1d9a09775f92 100644 GIT binary patch delta 2838 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 t7Cg%OZ;5u({Odv9Gp#%k#2n_NM*m439 z*uf?eR+^+pVcdx;Q>aLx!i9bahVQ5``Lq;2IO2pWMJjqqMr zZrd^C!qHX<^s&{2dNy^+Q?;Ng07@D>m%@8pqXb~72a;vPK}%9$ENpG5ctLS}oE>if z*bVoG08FIZn+1RWhJT02xf6~)NFBgh%JrimF%iyqsE5~aT2cMZVVF14J^@R#lSeJJ(-42JtV0FJoQ;&wI96&cUEP)AeLY_Ws-5@pukH9gfq z``3o8lF*MNTnQB#m3F%As1H^3c|s7u=bB~%04#T*FPeW95x0*OLvrRlKTiq3g0!H0 z980n3B0L3f7r=GPx{~amSC|@q8Ni|t)M@<2*>ot&`h>nXUzHuVrdO%R#$oacyEogrSz!Ohpzrl{L>}bp+++e;8oTq z4MU)VF(%&TT@n;&GS_4J4I#**cq@vbdX#_cy9|vVGCZFZ?_?Ekd9s7jv^cu9&9-Gd zJl<)Y^*M1`oDItC`HjR|o(R&7r}^5l9v<&Bp>e+rrrGfyrUevfEN%meh-eMy#ydsg z)Hddc{{X)0M}q1AzJa@u=d^gIh!__!Ph7k;v;4p$J}Bo9rx77YAOs0P0wG8s1POmZ z0wG8U5(q&8AxH=ka|QA8HenYVMInf~Rn-tbs~OGs zy_WGAbk?(8hkI{NiVF6fBJUJci%ZI_<8rm%UBmOPFh$;Fv8V*~1KwnRBMmR|{QNC% z4{Wk-_R$3OHM+i+V`8HBIEVHqgL+<-1Kk$%h-pIHKDoyF4_l1FPh?w?Kiz-ryebE} z1l`swr)lx)t22e+TFeh&((*m$(TZQXLAC(^FXvS`&?RWfz&^=p2Yuhg_njjfR}Kzq zjy7}^D!;e}Ga}bg?2{URw=zCQ6~HBv=XNx_6p83%02dG+e`Fig=T%9dezP2#y;rM+K4mnhR(+)t$>T!CKfj?pUZ2Ur|Z zPa>_w{ZuVzoE_8H9qt!5E)7J9Q>1HHbU~0R-_ANAsU)o@6$|7W-S=S!?P{KLfy`bo z3T(2n7s$1$$9e%^hV1_=hH5-`nuCwXK3@R#rsKL#gnx}(y$*jGLGx&L44EL}hkBRR z9BZUBcaTw#*g+iX`Ia45nfL+h*XQP-xr6TZ13?31bDeN-4(*An&JghvwI0{rrcq0+ zo3_lZ6Or83*(1UUSXyi=ILJ+qZ(&B?$t~lb; zqOUTgU<1G}OleqfBt}PU#G4L5Jb%t4+tTjME6&6y41DP2vSTs2?3|!b6zS&Magl4M z8>paj@g{_JPn~t_wyh`%b1}}kW!eX&<=ZjJwUdMX=ORu!rtzu2vTHLI_0W;)$2Jcv z@j-sDg8fu%U)Z!DA;=G^Xyu&!&sOvcK{cAxH=k^a}qE0IFIAlF!I=AOHXW M07*qoM6N<$f|ou6lmGw# delta 1993 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 delta 5755 zcmaJ_XET~~Q!pjF8YmnrOa&7-l1S%DKBuTv-? z7=a(Nk`Ir5AlOL*~Pxv+`A7yLm9I5$g)>g}rX-C03 zJo*{w)|*C=*1fgv_f$sN`PJct+Sh{Las+U=BKct~{b1QAZTr0ty5GnwPDpRB z`RlCEmJ)cAYSFv>%UWjd767AWGYB}WZ^u5aFxqxG98}p<>eBA{m7O<0u$L5OXf*M3 zF$t7TIBRlGh*=cCAAd06LXtL?wCgAGUJ-{@gzJh$_2RORQBftNdkYKBUyM^VoH@q0 z!$FhbPkLgfK98Nxt;XaS{CbxA%f&Q4SFb^rKwJ_}hb4Y7mc(zd{SfoRav7OU3*iA9 zw{w`E(`Dw@ysiuE6Lk+mBq&!!&;-p*lYF{O{;QmlNaL&?%Ty1RMt>0i@A8gAbN54K zzL7+=aFt_}s*fDud2B8>D(H*xJu!I~6)^3x;h8gMx{h43og{F8%^O`zoDjy=DKN11 zA)6jKu5H+noT=$w2bXPhc+icwu@{Y5%;Y-6O%B}vk<+;w_mW233D zv2kFgC7SyHJO?;LR807y)~weD z3>QK>TFObXs_q0&0T}{tpS3Y?f9mC>wWF=1hFTeRBzslJvUZbrxtc`SOi;=)1E$3@ z&pBUCJWi9T5WZIVxczCxxc5?`nbl#+gd1R^Y!$fKGRW^c^=GQ}@v_qgXiWxisII$Vu9dTs5!o3T{9tF)eVbJ$=%5HiiyzX+wWzDA{U_6TRW_K|~OLQc4Bc5C=Np+`({%hZBVI{Wrl%dC;{PP=pWkAxrEaN#d?+JP{6)ZOxDm51-0rRfszhVC1_8X9GVPU1xmYk3am zVc=hUF2qWmF20IF^yf60vj}zukjn;x!ImgaZjQR4X`j|6#rj>DE=Kw~vdbsd;9wE} z5-dCnZjMo`)%$4M>NWXwi(`J_lNAB`YcFryxS{@=AYZID#(T!ZK^5~1#>w~Qrsb6C z+nAh%bPx>g$~P^LmiGTp*wc{aN=c{7*<_vtc2?KWbTMGy?+3D52eYwsZ(s0Ze@%;Y`+ZNaZp26w-;pUEiRgdmGwwAFxmw+L=QOxm zq3%TcIZ4a@Lv3Qy?F=CLG_dwX=FO=3g;pp4j=JINSVDBpgw%jsBFTgUh3MsgV~Wb2 z&9;7vN;~?XYvq=Zcn#2K;P*Yqnb(S~#rm?06VWMZd=n|R?H=c`MG{N6@;On0;E$od zw~*G9zAdD5)f1=Hi1gv|+|9v#x2JxVr$R8~;`Q+nfBVri$F|pR-bhz1qy^w2@*?JJ z`-!a1D14k8di#8R0hj-!FxL5S)_L++)i$NKxA*+EA!ToRc6wjoDBUk&;*Yhf5P+j6 zm3)GIDI~gr_eAC)roJ3X4aeY3v!XGc3Ajs<&pg&WmY7*O@4pg3lsxLjJ&3#ccOPQX z`k;v$*J>*s#!8#7cSx~i29#1S*1b?U>I&-7NumWVY6)0S4tv00JzsDr{_0t~{p3z> z!|8VwnTW|m7rcV&&_CDr!fLz)^!cf@iz_%Fq<@XHzV5g-5+vq-7kt|M*98G4OtC>6 zIr(j5uCdnu3^8~s1~NAC`1|DXadcN?x$F$I$USqM8QkBO(P5NNdgwjO@Mw$c42jI3 ziT4jHyp7))WzueTn(Ij1PLh6DEk=K$8;cHGSKrld9%TeN6HdNn7fE?$tPjdvhrhRQ zTL&7vGQ`KhKrcgLlcU7w{cF5>@kCU`*mI<3^{3s#LEZuBQ-JK!cX(SfZh&e*gV2W=LkY7!Hc#fso(Let_4qva+<2?=B-S#ZJ(ve#~@f507(n zmV8k1L~QQ~w z6l938FMaT75zdPi^}=CawHSXSMezYPIPsb^Y+>nK)Buc=+zefNAyqu6VMph%cJ67i zORo>pT<##V2w+p>q~kW+ZY=wS5g}^v@tu&~QvQZb(^;VN=^-l zQp8_wgk(HIBx#CU?x>1q@&vWMH9rl^+rosa%sX^3SVzKy2K8A zPG&{MV6P;u)o~C>g#hpwi}6pbjH6zIY%i53P^!35z~=|Qqr5J*p(%er^53ILCOc() z9+#o1AII=3Zup_X23@0r8pC$6lTiF z4usf9tP8h5dnD%Do`}k+d(x{2c$_PN%>Ex@I8o4^CGfCQAYcN6bpE$A4ag2utk!b? z_^*Hd?=SzoCjjyWEG6`RsV56Z`~pH`-{@03EnF`VXj>m9<&#Ckk9S? z)I!S&{?|dkVyPOv3sSn!#s+VciuC$7IFF>Ypf4(?66U zaU!X3IoA8uxA-n(0=v~z2rA(!IUL$rVpv)B%|6zxc2pYIee7&VHyWIR&{SEZAeCO>(37x z?UN7PI-n5sPCpu-OMQ3gH$=nUM)M_y$9aoS$}Lusd4v(1s#-;s4&;FKy8W)JaPQSv z)upQy57iz?u>&5;C$_CslD8H;ownz@z$Mup6{fX=o`oNTD)yY>h%Q?CINf2E3!0y4YaFlA?K;(|03jR8Y zL$eWgI@!h<+>Ev!t8p1DvTjW~pt#_?Xr9NyPu)cUkNo2$3UXx7x>T|nJiExKesE`~ z*6#&vwQ|UUIMI_NC9EGEnkPmOX))ecpd}Uu&P_&HJ?fVda4V+&Vk~qx4HzWz(mk^4 zmT;H2FWRj^)WMZwjyrgvhk(4frgaaNNIp;%Cag8kX^Q-QzuwW!c98Uzbn9EswsUpS z1R%tz=CD7DTtjQqWdUnuifY#Mp_}t|FF7F+D>*j^n-fKaTmB|gH;2@V+u1vP_jZNO z{J`qOx$6Dx>ez({)^q6rYgI1yi>>PZUc7YBTOJfc-)#UV{HYswA6{Vbn_u*Nc*B@) zi+1m$N>^sf?MvMp{ zF4WQ4d);z;R6~()!g^v~zm^P~4(ASb-<)ZAi2%PAzj+-I!B5?vpQUd&Zx21w5(P5G zrjG0nb_8NR(W!s+?tO2Xk=?NNn@jw)Tu^LqQ9vzFg&nCYOG*eDqo$Eiuw6G&vrl*< z$8AzVEO8agcCwlerd4~bbc4%zxdRt3Uc{}5drVD{el_aS>oyH7t=#Lk3!c$=fe^j! zt2|7g$N1Ks6tB)GQs#=}@dOkGqGk`hOkb=|)V0;zf{%-w>S9?_txu7^6YU%wCM#(Fe@f0)v*%(AEcbL_y#BU5|y?N?cyZrm~B z8)5gW{O75c_{vO`fcL_W9l9mUhOtsoes|OP99wP7v|%^RPwfa-R^+B2yV;eoqt6n zwlv|XtdTDc`}6Mt=eBiMC2$UGB*pM5u2n$Jpr>lR zp4x{Mvg`3q`8wX({3}SPG)X^loOqXL#VK5k%i}hyi%m(U{@EE6EO=nE=my^y?g{qx zoo$Wz1|hpz&|MMu9;+)5SHO@;Dlr%`bRf0x>rvB)xxXbY90vHNz&$3&vS0>oCfZVR=B&X?f$@YiKh8x zRy`dpXB82+zjD>>TWgQG^xM|v0GFham6VbXa{SE1BTCMUO+FiXm|<$zvBORAJ3PQm zU(QRNpO2qEjSfZ{2HHA~S9`sL$YSB#wF*!3>|An3t2WvhF*G$^S<~X`3V|UW0oIN2v)VSvMz) zH`YkvN_b7nZ;(7^d|Y=o8AX!?Ry~`A%T@hck1@0=+vqk!$?j!O<=IDDKO_Q}V7#t& z#b#^TVNWvJunkOu-trx-_x^TbTISA`B8hH+aFlOt7wufoTf6WNJzj?3fz z@x*K$MC;yj0@M0c!nf8w4Uq)GJDYq0EE4Ju1vPS9|C8f+<7K!?(gk89%uC?wQINY7 zrp8{fWu~wJ>f;cFP--e>97xhL%V6-6!o-DK9TB|6qpfhTfQW*am%Y0f1O?Wa6#dqV z?Q<{1K(=vGocVHCUWzG~4yItwT2-E~1^U9-Wu4m9jYPMPht>Tv0w$Ly6mL{aghHSW zpZbRn=uGs`N6v`D&6%t0@17482YuZ#r(T$@B=wa{mi-*G9#hRJ;xz!BM2wY_jhr2t zh>pj`HUBnLP?C0v&7En2gK(rY8wz5DXEA#(NKh6jL!E#~9HW-m+Wg}wQ`DY?{>|V9 zTBta$!8<36!uu%NpB)$5cWG1h^Yw|$*(KqVhvt_Jpa$C+2?71X9?n9$<#EHX1Mf4Y zgR#+ti4yQIU+_7UqKK@T1R=c}+Y!PH(?2ZvtUTE!S3UFCW=5I6*ygbjiymD@LPBOf zO1!rfSm3r_5Y;A4Bh?a=8Pv_>AL<+G!4PS%_Hc~Y#|nFVp!dVQSTdr|7ayop#KxSR zA3k|U`_$*Z&*zw5Yf%$$d6kKnIuu0R6KatTFkaXPFXX_31{42KNs5U#ACuE}D~u}U zMknSE$V3W5XL%>_{+Ii~w|wDW_B~zA0^eIRntu9TBbQ;I2TRn(NaAgi?zdZaDkkel zG7ACtQMRA%aycIY2_|0m$Ce)KJlu{o&^+>ea$|qjKssZD;hw2Oggfah@Z!dsd^Lel zw~WON5NpADm&7n3_+#kf?ezpSlq7H4u?VU$OAwS3Rg0o>%*9SXm9m*I@S2z@mLG6X z*o|Y%Rl`$W6OAq#cxmQ2m;Bo~WW+GFaJLq+8`-hvjF3DnLi4T>I-2raDG3Q-_n9uX zo%)>2XM~6+=KHdIpqb>|#u-?`e!e1ttR12Th&#eKKtnFvNEMM^lMygK2ult1SYD_X zOZdVLbdv8vJ-m*!TuyyiE|hSu375Lv9aByn2&mn!ZK8teC0naph4L_*I4Co;Yw2L%t GLjMCT#4#rT diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua index e8c83b5061..03a2ebb6e7 100644 --- a/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenEvaluation DetailFrame p1/default.lua @@ -2,21 +2,21 @@ return Def.ActorFrame { LoadActor("frame") .. { }; LoadActor( THEME:GetPathG("PaneDisplay","label Hands") ) .. { - InitCommand=cmd(x,-50;y,-20+16*0;); + InitCommand=cmd(horizalign,right;x,-22;y,-12+16*0;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; LoadActor( THEME:GetPathG("PaneDisplay","label Holds") ) .. { - InitCommand=cmd(x,-50;y,-20+16*1;); + InitCommand=cmd(horizalign,right;x,-22;y,-12+16*1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; LoadActor( THEME:GetPathG("PaneDisplay","label Jumps") ) .. { - InitCommand=cmd(x,-50;y,-20+16*2;); + InitCommand=cmd(horizalign,right;x,-22;y,-12+16*2;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; LoadActor( THEME:GetPathG("PaneDisplay","label Mines") ) .. { - InitCommand=cmd(x,-50;y,-20+16*3;); + InitCommand=cmd(horizalign,right;x,-22;y,-12+16*3;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; LoadActor( THEME:GetPathG("PaneDisplay","label NumSteps") ) .. { - InitCommand=cmd(x,-50;y,-20+16*4;); + InitCommand=cmd(horizalign,right;x,-22;y,-12+16*4;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; LoadActor( THEME:GetPathG("PaneDisplay","label Rolls") ) .. { - InitCommand=cmd(x,-50;y,-20+16*5;); + InitCommand=cmd(horizalign,right;x,-22;y,-12+16*5;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");); }; }; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageFrame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenWithMenuElements StageFrame (doubleres).png index 809a7a1ae8673afb3a41422ab9813730127e9521..bf3357f1fb58ba867052fc6b863991a803022538 100644 GIT binary patch delta 2720 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 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index e7a5a876d5..d4ae5fb76c 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -596,10 +596,6 @@ BannerY=0 BannerOnCommand=scaletoclipped,322,120;visible,false;ztest,1 BannerOffCommand= ShowStageDisplay=true -StageDisplayX=SCREEN_CENTER_X+272 -StageDisplayY=SCREEN_CENTER_Y-164 -StageDisplayOnCommand=draworder,101;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 -StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 CDTitleX=SCREEN_CENTER_X+240 CDTitleY=SCREEN_CENTER_Y-50 CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,"CullMode_Back"; @@ -1183,93 +1179,93 @@ ShowJudgmentLineMaxCombo=true ShowPerDifficultyAward=false ShowPeakComboAward=false -BannerWidth=256 -BannerHeight=80 +BannerWidth=268 +BannerHeight=98 -GradeP1X=SCREEN_CENTER_X-226 -GradeP1Y=SCREEN_CENTER_Y-140 +GradeP1X=SCREEN_CENTER_X-222 +GradeP1Y=SCREEN_CENTER_Y-106 GradeP1OnCommand=glowshift;effectperiod,2;addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 GradeP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeP2X=SCREEN_CENTER_X+226 -GradeP2Y=SCREEN_CENTER_Y-140 +GradeP2X=SCREEN_CENTER_X+222 +GradeP2Y=SCREEN_CENTER_Y-106 GradeP2OnCommand=glowshift;effectperiod,2;addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 GradeP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 -GradeFrameP1X=SCREEN_CENTER_X-226 -GradeFrameP1Y=SCREEN_CENTER_Y-140 +GradeFrameP1X=SCREEN_CENTER_X-222 +GradeFrameP1Y=SCREEN_CENTER_Y-106 GradeFrameP1OnCommand=addx,-SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,SCREEN_WIDTH/2 GradeFrameP1OffCommand=sleep,0.8;accelerate,0.3;addx,-SCREEN_WIDTH/2 -GradeFrameP2X=SCREEN_CENTER_X+226 -GradeFrameP2Y=SCREEN_CENTER_Y-140 +GradeFrameP2X=SCREEN_CENTER_X+222 +GradeFrameP2Y=SCREEN_CENTER_Y-106 GradeFrameP2OnCommand=addx,SCREEN_WIDTH/2;sleep,0.0;decelerate,0.3;addx,-SCREEN_WIDTH/2 GradeFrameP2OffCommand=sleep,0.8;accelerate,0.3;addx,SCREEN_WIDTH/2 W1LabelX=SCREEN_CENTER_X+0 -W1LabelY=SCREEN_CENTER_Y-80+30*0 +W1LabelY=SCREEN_CENTER_Y-36+30*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-80+30*0 +W1NumberP1Y=SCREEN_CENTER_Y-36+30*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-80+30*0 +W1NumberP2Y=SCREEN_CENTER_Y-36+30*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-80+30*1 +W2LabelY=SCREEN_CENTER_Y-36+30*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-80+30*1 +W2NumberP1Y=SCREEN_CENTER_Y-36+30*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-80+30*1 +W2NumberP2Y=SCREEN_CENTER_Y-36+30*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-80+30*2 +W3LabelY=SCREEN_CENTER_Y-36+30*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-80+30*2 +W3NumberP1Y=SCREEN_CENTER_Y-36+30*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-80+30*2 +W3NumberP2Y=SCREEN_CENTER_Y-36+30*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-80+30*3 +W4LabelY=SCREEN_CENTER_Y-36+30*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-80+30*3 +W4NumberP1Y=SCREEN_CENTER_Y-36+30*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-80+30*3 +W4NumberP2Y=SCREEN_CENTER_Y-36+30*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-80+30*4 +W5LabelY=SCREEN_CENTER_Y-36+30*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-80+30*4 +W5NumberP1Y=SCREEN_CENTER_Y-36+30*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-80+30*4 +W5NumberP2Y=SCREEN_CENTER_Y-36+30*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 @@ -1288,31 +1284,31 @@ HeldNumberP2OnCommand= HeldNumberP2OffCommand= MissLabelX=SCREEN_CENTER_X+0 -MissLabelY=SCREEN_CENTER_Y-80+30*5 +MissLabelY=SCREEN_CENTER_Y-36+30*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-80+30*5 +MissNumberP1Y=SCREEN_CENTER_Y-36+30*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-80+30*5 +MissNumberP2Y=SCREEN_CENTER_Y-36+30*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-80+30*6 +MaxComboLabelY=SCREEN_CENTER_Y-36+30*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-80+30*6 +MaxComboNumberP1Y=SCREEN_CENTER_Y-36+30*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-80+30*6 +MaxComboNumberP2Y=SCREEN_CENTER_Y-36+30*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 @@ -1329,12 +1325,12 @@ ScoreNumberP2Y=SCREEN_CENTER_Y+206 ScoreNumberP2OnCommand=shadowlength,0;diffusetopedge,color("#fefefe");diffusebottomedge,color("#908d78");strokecolor,color("#00000000");shadowlengthx,0;shadowlengthy,2;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 -LargeBannerX=SCREEN_CENTER_X+0 -LargeBannerY=SCREEN_CENTER_Y-140 +LargeBannerX=SCREEN_CENTER_X-1 +LargeBannerY=SCREEN_CENTER_Y-106-3 LargeBannerOnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT LargeBannerOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT LargeBannerFrameX=SCREEN_CENTER_X+0 -LargeBannerFrameY=SCREEN_CENTER_Y-140 +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 @@ -1357,11 +1353,11 @@ ProfileRecordP2OffCommand=linear,0.7;diffusealpha,0 PlayerOptionsP1X=SCREEN_CENTER_X-70 PlayerOptionsP1Y=SCREEN_CENTER_Y-182 -PlayerOptionsP1OnCommand=horizalign,left;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +PlayerOptionsP1OnCommand=visible,false;horizalign,left;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT PlayerOptionsP1OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT PlayerOptionsP2X=SCREEN_CENTER_X+70 PlayerOptionsP2Y=SCREEN_CENTER_Y-90 -PlayerOptionsP2OnCommand=horizalign,right;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT +PlayerOptionsP2OnCommand=visible,false;horizalign,right;vertalign,bottom;shadowlength,2;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT PlayerOptionsP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT SurvivedFrameP1X=SCREEN_CENTER_X-224 @@ -1381,74 +1377,69 @@ SurvivedNumberP2Y=SCREEN_CENTER_Y+0 SurvivedNumberP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 SurvivedNumberP2OffCommand=linear,0.7;diffusealpha,0 -TimingDifficultyX=SCREEN_CENTER_X+120 -TimingDifficultyY=SCREEN_CENTER_Y-200 -TimingDifficultyOnCommand=draworder,2 -TimingDifficultyOffCommand= -TimingDifficultyFrameX=SCREEN_CENTER_X+120 -TimingDifficultyFrameY=SCREEN_CENTER_Y-200 +TimingDifficultyNumberX=SCREEN_CENTER_X+114 +TimingDifficultyNumberY=SCREEN_CENTER_Y-204 +TimingDifficultyNumberOnCommand=draworder,2;shadowlength,0 +TimingDifficultyNumberOffCommand= +TimingDifficultyFrameX=SCREEN_CENTER_X+114+3 +TimingDifficultyFrameY=SCREEN_CENTER_Y-204+3 TimingDifficultyFrameOnCommand=draworder,2 TimingDifficultyFrameOffCommand= -NumStepsNumberP1X=SCREEN_CENTER_X-200 -NumStepsNumberP1Y=SCREEN_CENTER_Y+10+20*-1 -NumStepsNumberP1OnCommand=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 +NumStepsNumberP1X=SCREEN_CENTER_X-204 +NumStepsNumberP1Y=SCREEN_CENTER_Y+52+16*-1 +NumStepsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2 NumStepsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2 -NumStepsNumberP2X=SCREEN_CENTER_X+200 -NumStepsNumberP2Y=SCREEN_CENTER_Y+10+20*-1 -NumStepsNumberP2OnCommand=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 +NumStepsNumberP2X=SCREEN_CENTER_X+240 +NumStepsNumberP2Y=SCREEN_CENTER_Y+52+16*-1 +NumStepsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2 NumStepsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 -JumpsNumberP1X=SCREEN_CENTER_X-200 -JumpsNumberP1Y=SCREEN_CENTER_Y+10+20*0 -JumpsNumberP1OnCommand=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 +JumpsNumberP1X=SCREEN_CENTER_X-204 +JumpsNumberP1Y=SCREEN_CENTER_Y+52+16*0 +JumpsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,SCREEN_WIDTH/2 JumpsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2 -JumpsNumberP2X=SCREEN_CENTER_X+200 -JumpsNumberP2Y=SCREEN_CENTER_Y+10+20*0 -JumpsNumberP2OnCommand=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 +JumpsNumberP2X=SCREEN_CENTER_X+240 +JumpsNumberP2Y=SCREEN_CENTER_Y+52+16*0 +JumpsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*0;decelerate,0.3;addx,-SCREEN_WIDTH/2 JumpsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 -HoldsNumberP1X=SCREEN_CENTER_X-200 -HoldsNumberP1Y=SCREEN_CENTER_Y+10+20*1 -HoldsNumberP1OnCommand=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 +HoldsNumberP1X=SCREEN_CENTER_X-204 +HoldsNumberP1Y=SCREEN_CENTER_Y+52+16*1 +HoldsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,SCREEN_WIDTH/2 HoldsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2 -HoldsNumberP2X=SCREEN_CENTER_X+200 -HoldsNumberP2Y=SCREEN_CENTER_Y+10+20*1 -HoldsNumberP2OnCommand=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 +HoldsNumberP2X=SCREEN_CENTER_X+240 +HoldsNumberP2Y=SCREEN_CENTER_Y+52+16*1 +HoldsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*1;decelerate,0.3;addx,-SCREEN_WIDTH/2 HoldsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 -MinesNumberP1X=SCREEN_CENTER_X-200 -MinesNumberP1Y=SCREEN_CENTER_Y+10+20*2 -MinesNumberP1OnCommand=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 +MinesNumberP1X=SCREEN_CENTER_X-204 +MinesNumberP1Y=SCREEN_CENTER_Y+52+16*2 +MinesNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,SCREEN_WIDTH/2 MinesNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2 -MinesNumberP2X=SCREEN_CENTER_X+200 -MinesNumberP2Y=SCREEN_CENTER_Y+10+20*2 -MinesNumberP2OnCommand=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 +MinesNumberP2X=SCREEN_CENTER_X+240 +MinesNumberP2Y=SCREEN_CENTER_Y+52+16*2 +MinesNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*2;decelerate,0.3;addx,-SCREEN_WIDTH/2 MinesNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 -HandsNumberP1X=SCREEN_CENTER_X-200 -HandsNumberP1Y=SCREEN_CENTER_Y+10+20*3 -HandsNumberP1OnCommand=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 +HandsNumberP1X=SCREEN_CENTER_X-204 +HandsNumberP1Y=SCREEN_CENTER_Y+52+16*3 +HandsNumberP1OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,-SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,SCREEN_WIDTH/2 HandsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2 -HandsNumberP2X=SCREEN_CENTER_X+200 -HandsNumberP2Y=SCREEN_CENTER_Y+10+20*3 -HandsNumberP2OnCommand=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 +HandsNumberP2X=SCREEN_CENTER_X+240 +HandsNumberP2Y=SCREEN_CENTER_Y+52+16*3 +HandsNumberP2OnCommand=shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000AA");diffuse,color("#FFFFFF");addx,SCREEN_WIDTH/2;sleep,0.1+0.1*3;decelerate,0.3;addx,-SCREEN_WIDTH/2 HandsNumberP2OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,SCREEN_WIDTH/2 -RollsNumberP1X=SCREEN_CENTER_X-200 -RollsNumberP1Y=SCREEN_CENTER_Y+10+20*4 -RollsNumberP1OnCommand=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 +RollsNumberP1X=SCREEN_CENTER_X-204 +RollsNumberP1Y=SCREEN_CENTER_Y+52+16*4 +RollsNumberP1OnCommand=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 RollsNumberP1OffCommand=sleep,0.7-0.1*6;accelerate,0.3;addx,-SCREEN_WIDTH/2 -RollsNumberP2X=SCREEN_CENTER_X+200 -RollsNumberP2Y=SCREEN_CENTER_Y+10+20*4 -RollsNumberP2OnCommand=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 +RollsNumberP2X=SCREEN_CENTER_X+240 +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 -StageDisplayX=SCREEN_CENTER_X+0 -StageDisplayY=SCREEN_CENTER_Y-168 -StageDisplayOnCommand=draworder,1;addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT -StageDisplayOffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT - DifficultyDisplayP1X=SCREEN_CENTER_X-154 DifficultyDisplayP1Y=SCREEN_CENTER_Y-110 DifficultyDisplayP1OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; @@ -1458,21 +1449,21 @@ DifficultyDisplayP2Y=SCREEN_CENTER_Y-110 DifficultyDisplayP2OnCommand=addy,SCREEN_HEIGHT;sleep,0.0;decelerate,0.3;addy,-SCREEN_HEIGHT;draworder,100; DifficultyDisplayP2OffCommand=sleep,0.8;accelerate,0.3;addy,SCREEN_HEIGHT -DetailFrameP1X=SCREEN_CENTER_X-224 -DetailFrameP1Y=SCREEN_CENTER_Y+16 +DetailFrameP1X=SCREEN_CENTER_X-222 +DetailFrameP1Y=SCREEN_CENTER_Y+50 DetailFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 DetailFrameP1OffCommand=linear,0.7;diffusealpha,0 -DetailFrameP2X=SCREEN_CENTER_X+224 -DetailFrameP2Y=SCREEN_CENTER_Y+16 +DetailFrameP2X=SCREEN_CENTER_X+222 +DetailFrameP2Y=SCREEN_CENTER_Y+50 DetailFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 DetailFrameP2OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP1X=SCREEN_CENTER_X-224 -BonusFrameP1Y=SCREEN_CENTER_Y+16 +BonusFrameP1X=SCREEN_CENTER_X-222 +BonusFrameP1Y=SCREEN_CENTER_Y+50 BonusFrameP1OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 BonusFrameP1OffCommand=linear,0.7;diffusealpha,0 -BonusFrameP2X=SCREEN_CENTER_X+224 -BonusFrameP2Y=SCREEN_CENTER_Y+16 +BonusFrameP2X=SCREEN_CENTER_X+222 +BonusFrameP2Y=SCREEN_CENTER_Y+50 BonusFrameP2OnCommand=diffusealpha,0;linear,0.7;diffusealpha,1 BonusFrameP2OffCommand=linear,0.7;diffusealpha,0 @@ -2104,9 +2095,18 @@ Fallback="DifficultyDisplayGameplay" Fallback="Screen" AllowDisabledPlayerInput=false ShowStyleIcon=true -ShowStageDisplay=false +ShowStageDisplay=true StageDisplayStageToShow=GAMESTATE:GetCurrentStage() StageDisplayStageIndex=GAMESTATE:GetStageIndex() +StageDisplayX=SCREEN_CENTER_X+220 +StageDisplayY=SCREEN_CENTER_Y-172 +StageDisplayOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +StageDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 +ShowStageFrame=true +StageFrameX=SCREEN_CENTER_X+220 +StageFrameY=SCREEN_CENTER_Y-172 +StageFrameOnCommand=draworder,-2;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +StageFrameOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 MemoryCardIcons=true CancelTransitionsOut=false HeaderX=SCREEN_CENTER_X @@ -2118,7 +2118,7 @@ FooterY=SCREEN_BOTTOM-34 FooterOnCommand= FooterOffCommand= HelpX=SCREEN_CENTER_X -HelpY=SCREEN_BOTTOM-24 +HelpY=SCREEN_BOTTOM-40 HelpOnCommand=draworder,1;zoomy,0;linear,0.5;zoomy,1 HelpOffCommand=linear,0.5;zoomy,0 MemoryCardDisplayP1X=SCREEN_LEFT+10; @@ -2132,10 +2132,10 @@ MemoryCardDisplayP2OnCommand=draworder,97; MemoryCardDisplayP2OffCommand= //MemoryCardDisplayP2OffCommand=bouncebegin,0.5;addx,25; TimerMetricsGroup="MenuTimer" -TimerX=SCREEN_CENTER_X+270 -TimerY=SCREEN_TOP-11 -TimerOnCommand=draworder,97;linear,0.25;addy,33 -TimerOffCommand=linear,0.25;addy,-44; +TimerX=SCREEN_CENTER_X+273 +TimerY=SCREEN_TOP+26 +TimerOnCommand=draworder,2;addy,-40;linear,0.25;addy,40 +TimerOffCommand=linear,0.25;addy,-40; TimerStealth=false ForceTimer=false FirstUpdateCommand= @@ -2159,9 +2159,9 @@ StyleIconOffCommand= WarningStart=6 WarningBeepStart=5 MaxStallSeconds=30 -Text1OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,-13;y,2 +Text1OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,-14;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,17;y,2 +Text2OnCommand=stopeffect;stoptweening;shadowlength,0;zoomx,1;x,14;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 @@ -2647,10 +2647,20 @@ Fallback="OptionIconRow" Fallback="OptionIconRow" SpacingX=0 SpacingY=46 + +[OptionIconRowGameplayP1] +Fallback="OptionIconRowGameplay" +OptionIconOnCommand=rotationz,-90; + +[OptionIconRowGameplayP2] +Fallback="OptionIconRowGameplay" OptionIconOnCommand=rotationz,90; -[OptionIconRowEvaluation] -Fallback="OptionIconRowGameplay" +[OptionIconRowEvaluationP1] +Fallback="OptionIconRowGameplayP1" + +[OptionIconRowEvaluationP2] +Fallback="OptionIconRowGameplayP2" [TransitionOniFade] BannerWidth=512