From 1464f12b160786ef77d7011507fd01a435db3030 Mon Sep 17 00:00:00 2001 From: Jonathan Payne Date: Sun, 31 Aug 2014 16:59:03 -0700 Subject: [PATCH] Implement ScreenCaution, fix CDTitle --- Themes/_fallback/Scripts/02 Branches.lua | 7 +++ Themes/_fallback/metrics.ini | 12 ++++- .../ScreenCaution overlay/_exclamation.png | Bin 0 -> 6487 bytes .../ScreenCaution overlay/_warning bg.png | Bin 0 -> 12942 bytes .../ScreenCaution overlay/default.lua | 46 ++++++++++++++++++ .../ScreenSelectMusic decorations/default.lua | 2 +- .../ScreenWithMenuElements header/default.lua | 2 +- .../Sounds/ScreenTitleJoin music.redir | 2 +- .../Sounds/ScreenTitleMenu music.redir | 2 +- 9 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 Themes/default/BGAnimations/ScreenCaution overlay/_exclamation.png create mode 100644 Themes/default/BGAnimations/ScreenCaution overlay/_warning bg.png create mode 100644 Themes/default/BGAnimations/ScreenCaution overlay/default.lua diff --git a/Themes/_fallback/Scripts/02 Branches.lua b/Themes/_fallback/Scripts/02 Branches.lua index acf8a14229..6430b459cd 100644 --- a/Themes/_fallback/Scripts/02 Branches.lua +++ b/Themes/_fallback/Scripts/02 Branches.lua @@ -59,6 +59,13 @@ Branch = { return "ScreenTitleJoin" end end, + AfterTitleMenu = function() + if PREFSMAN:GetPreference("ShowCaution") then + return "ScreenCaution" + else + return Branch.StartGame() + end + end, StartGame = function() -- Check to see if there are 0 songs installed. Also make sure to check -- that the additional song count is also 0, because there is diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index 5f8810c22b..02a1cd0c84 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -1837,7 +1837,7 @@ UpdateOnMessage="" NumChoicesOnPage1=100 DefaultChoice="GameStart" ChoiceNames="GameStart,Options,Edit,Jukebox,GameSelect,Exit" -ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.StartGame() +ChoiceGameStart="applydefaultoptions;text,Game Start;screen,"..Branch.AfterTitleMenu() #ChoiceQuickPlay="applydefaultoptions;text,Quick Play;" ChoiceOptions="screen,ScreenOptionsService;text,Options" ChoiceEdit="text,Edit/Share;screen,"..Branch.OptionsEdit() @@ -1892,6 +1892,14 @@ LogoY=SCREEN_CENTER_Y-80 LogoOnCommand=bob;effectperiod,4;effectmagnitude,0,8,0;zoom,0;bounceend,0.35;zoom,1 LogoOffCommand= +[ScreenCaution] +Fallback="ScreenSplash" +PrepareScreen="" +NextScreen=Branch.StartGame() +PrevScreen=Branch.TitleMenu() +TimerSeconds=3 +AllowStartToSkip=true + [ScreenProfileLoad] Class="ScreenProfileLoad" Fallback="ScreenWithMenuElementsBlank" @@ -2999,7 +3007,7 @@ Line19="conf,NumBackgrounds" Fallback="ScreenOptionsServiceChild" NextScreen="ScreenOptionsService" PrevScreen="ScreenOptionsService" -LineNames="1,3,4,6,7,9,10,11,12,14" +LineNames="1,3,4,6,7,8,9,10,11,12,14" Line1="conf,Center1Player" Line3="conf,DancePointsForOni" Line4="conf,MenuTimer" diff --git a/Themes/default/BGAnimations/ScreenCaution overlay/_exclamation.png b/Themes/default/BGAnimations/ScreenCaution overlay/_exclamation.png new file mode 100644 index 0000000000000000000000000000000000000000..65bd681563fa753cb8336a74c25b649b59e68423 GIT binary patch literal 6487 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 literal 0 HcmV?d00001 diff --git a/Themes/default/BGAnimations/ScreenCaution overlay/_warning bg.png b/Themes/default/BGAnimations/ScreenCaution overlay/_warning bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ff85f7840cfee3dae8a3fa845175d3323565a479 GIT binary patch literal 12942 zcmbWdXH-*N)GfRdLJL*86al4673oM-KtY=HB1M`MDJmdH2p~mKK~PYTCJIQG4nYV- z1d*oFyV9kp^pNmvp7*}rxW6xBWSoqUoU`{TbImo^erRl{ONZt}0|4kQ>s>Sj00G}3 z02Kwi*aZ~0!3(vYp7m`2Xqb;*2$1%g0|2zqO>J#sV-MduzPCMm{rE0xYxDU9_`2Qn zb_F1KEaRHH*|lZ13%gTWTKaL==lZ^;tWS49T;(r;HeUx}A+7vxm z6FDsHd#zI^W}-f~cg)U7YDAy~`~V|Wr3?RU;u!?k!>FpBJ&mVq0*K)6G*ke8H61U_ z9ec#EqV>uSfqj6$-+88}PlaUx8X-@$@_>d80-Nzt=o-jI0mtqe&cA@M1aK4%U-%BN z8GEln5y192KPw{p8Q^1fjk^duR6uc`#iL8WN*b`Z>9;F^5eXoD+0so9l-B}$FC$F_ zprQrRCUMcC02K-xJI|a61`l2V7M;JAs(;RwGA@ciOTDU4trt+b6k$sx;ZJF4DS1ky z_cHrg7I`P6Q<{ck>%CVe&qbVPnECe=fb3_iaJT=6!M*gQy}j~JYv>&$R+=e}PCGmQ zBF*;|`Dp+!dj~T>5|^sv#HvtWeMoNv*HIqVX|nI`#=BK8XjFsjH2oBaIA@)N zj#57~c+TTZJYtgl=p|dt>*z1|F&sEiWwwYkMo^Mgx3pwOo7M+K zaq8q7-5*XD(-w7bmRl5);T~?^==%_aVv4wgrEr_aDxroG`|TXg=VW57^u*5$F(oidF^0xzw<`!RJ=8uYT%U-%{Nb(H zH>Pho-)@{C{oH8O|F1Z}+bK z6fyncdFA9hl;#1=50zniAi6UBB}|6R$O z7vDKO*gbY{mMz_BI5GL+lwoSW<+tu--KEqevaKLmx)|1|&vEV|C(}77IowYMag@C@ z$UFHx{^VyfX$6_zFBe}iyz(`-5~~rr&-&~O`o)zOLNB<)q|DwI<`qsA(wP40+# zfBjlmsgAkqwO{Y4f20(d7iJj$zQ%RU{k=*-Y@vIBubKK=j5YBgg>{=jo00Zglk5); zzZyIEXl|UW3>N42qAQBI8zI*&^r2_;exMlcC6Nagf1&Vwj*_#MJ7eMzdy>CuH|RseY}LT zCPdI{e!e1XC#>t9&`X}Ncy09BWIj5d?dk>P?NZ4?uXkKIxQju}xANCtW;R{NW*YeB zPu=^tc)%SdMKmM&9OQ57(pphe(h5+F)An+xevGZr_|X8 z&*}$Ma|d;v=rBCK*uIJ}>+?kOR18!MKKFd>dDAoW zN-q6^%<#Fz^u_ey^yykhn_wI9nu3}-*UJ@iHhI?THI28TZIrCvS()3|SL&2xln4&t zN^ton^6L$g4T~~|+}q0k)O6LnuRU2lKSD8HTH{j_=H%|o?q2(;v~4~4V{%wS*c0Lf zO1jul`XU}19?b2k02XBn<*BsZ*X!zGpSDt#rQEIh82d(Kf7LK|i?-j)xR(B1*PY$H z{&v*AxcGH1YLe+(9h03O=dRq@_P3u6`L>;rUYXvyRxn<+F28-j9v zOl#TO{cWAvGbZx`>NHs|q`jt#F-F=(5$@HCXQXaOJ+mwsF0XwTRJiN3!LGKW7LfHz z?U$;;)VV2Zhp!6w+RoZ;qc-16hv;eT@H0m)MU^wGwcrJ;UGrv<0@HVmzB zbZoR`jQUf*I4jNpnN+!;feG!~(-#jerd*s#cb73zDwDV(C#F^?>8U!V&~Uy%y+hK? z`s<)ohSgyGB=#KHZA1 zl{)o;vdgP7v6$Ri0$rn(w`67`GAu?};qGeb*4*>(i&9Ea=GmULua#fM6BS->WF4(B zwKB~n)x3+*x0K+qTKHJ(sZ^ore{UT9iW$kY1|xPes$1o z(3NnRP`RsK`mk_$FNNS^Ut;LvzxJ8z8yS)E41LXT{f|MOZx_r=6Nb+I)}{Z<+eFIP z2$G$wM z>meVjL)~_lxiS@cC$~P{`@?oLG?=M$Ve;d@5Z~QTyW7)jlb8TuVsAHYG)Q>8q|vC+ zVM}98b5wgWc2M1xG%>O<5$=f(%KkSnp}R{F9o0vAww=JBO`h;7p*w~y=69x|nv&8_ z^#J1XVZL^sOP^3CJLwInyOfpA-_+!0pZo8KEBN0h%f>reJ5Duq z1%2>`oqlEWt*0EFu=U(_@U9$O9bGBdMG+qq`; z;*usp&^Um(-UjXbIP%dW6KVc8*}*OAdf&d+kG^_4EAtTjfawGL52LBdr?lY0pmwZ5ib!`EmPf*&6ej6M!X1@ z`Z7*6s%EOlfCDDgJ+?UaAXXrUrM3uv#2oR6JTO6IFLd;7?O@hNXNzoO5tiquI0WMy z`{7UgaQSRE={|>sD%J`lk9gschw|7Wu!1;b)u6-@yzhLt*x!=`M5u#1cXbaBb+m<- z_Pd4lqEFgW-Iw4Z0Skm4U=$@0IG^au{`!@>w7R-l>rW5^&6NG9?Bpi|aq75HAVE3d zO)V|5Ad099Lo&KyoQ8&xn>QkwsWjNI#-Q`-S6UHq@z>{r)+g}o?H9w<)zw+Sox69p z9qI$#5m!emcjl!i}rNNOkV;Sd$dE(JA zj0i^Kxq;QkkZMv%?bM^trJUHv;PtTWmBFV$Q}^<78XFs55%WC(FS71)l7_H863Hxm zjp_Ivp(|2(L>sm}1js~4Un?3sxW6|W`;eTR{8{e38lmLnp%^-@ruw_TEu^sVfRvCS z&~J1Z%LJTO-#44G9FhPMaY%+$%E`$oR44sOkmbef&GPADhF_eu9ILFT=v6p>{*H{0 zA676zJ_Yrll~00vLK@L;4R+s=)ZUCvrwU>}frUK+fp9p>5dL!3W0Oq7+q?KEKMQkU z?BP*>#v6cF#T_%KbOoe zK2TikjJV>AxOI^6h7&t32y!+T&)V$vfz2eHTob#-VE^m@Y>C&b5&HD@K`^p);@5XT|Dk_Aeq@-Ru=tnO6XCMY9T*Wm; zMD;58;14Uakww0Si0(=gZV2?O1w#RaNfU+1Zhgp$fa{{hrldDk>_11C{zH zXtE=-Ra(5|)j6J$!Z>?*Eo7T{v5as5ZirxJtmv6Dzq}nB9GYJ-&(F_mb7G&Tr2Hk_ zy&WFjtRyS@j|K>VjSss_H1WzaeN#mVc(=5OicoY>D zp30PUf10_7VVAVSe|;tELuy`G@qGLCE%u+X=Vfw7H^a^aEtljqN$%z< zX;5oS{cwngpjU78pB4l^AM509&`32(NAG6pCY*v!`xIAJR9xJiqa9l}{rg{^I4JUu-Z z4ASK#u#1?sF3cItN8(ntw&U_QIvy8JOg!NH#4-`k#f|9hcYRKZfphY*MK6UHw)`Df&tKr0t%xTc9RKHU8-w~PW%s>k@1l1= zjy?xMp4$%l?(QzR^a+EV@#gUG$Sd!DqSNy7gf7b}Fwl5-c+7;9TzO~u{Kboht}T2f z$Y4LcxKj$SB<;sL-A{8A^_vXju@qKlgwMX^0j z{`GDqB|Udy)pU4OL0MU<0L`tDa(?I8)@Wsrj3{n5);?i_?q|Y#4U>j^nw$~dmLe<# zg@tJsLU+6+y`*$^2nlSaz0~*rd}5clz1T}UD<1gk6DW-uiydIXce{t%{s3?y0ma9+?r6}d=h@s*LQ=`n0`h-v4~LyNR{A5YzR^a>?AJ8XqFCx zS0WH~X+)b<&Yk;aIVUC%$ib#SpR?lxjTLziZ$uzRSkXIv+FJe|cC=I5+>|u=Hm)yT=kP8|k~5@M2Yg>1}7EO^JoI zsp;v?$bXupS{2#34?d(5OUCb0S2%PQnip-2j*e3N7l2*{F3ry%BqUT+oLe7WoS%=D zvaJzk)KDbUj;{z9kZal?gYA&zgA3hMj`1+8fBg9I7J?B^AF)FlZk)ajy+-DDQh){` zd%RnC&Sot)sPP$RYdMZADFwZIMxvsk5$OuPYNaE}*RHD5AZ9-9PQ}0YwxCZR ztsa`VB4%c0Ccu%d>YUG}F>S;ir8e{7)$tB5&<`yXm6uCD`Y&=c?%u8TKI$>GkIoET zuV0#*a|vL5gPIwrY%Y;^_y@A9s?I;F?XlF>jw*H!m(hOqQ>-fd2$K^wa=%8EDGAi0 zO^};$qYi>LM+~0-syznYI8KGaMZPI1xw><-Gf;;vx&G0Hfe*#Dc;=51!WmIYDm6XP z?@Eog*-3Uym$HGsY#Nf-g2#_( zC)4D-T!t6A&5x}KVd+I$nphqB0zEX5AU0hP*!nc(ff1xe==y|`b?trt`5k4R-YoTm zx;n+u;c(LaVy*1CbA=~~;k+7W2=!!SwkTJpChI9ihyJ^zbdh06eDEfVn-8LX54ec!I(&duvqRxhRch!ZCN6I(=Iz%IS_ z8XTjEi!QOmRbAam>?n9KBk0Y&C|-`~{|TKO9+f~U+qb;rU6G|xquv;4ZX#hyUfOD7 zmyGf2(4j2Co7^!?`R>Yl!tTaynvy>RE?JPkt^1UFmdNq7q@?76iHV6Y;w3m_Nx5n^ zuqrzQ8-UbsN}fm7&cKil@us?2r)nqb|Ek1if>Mb(Flcjr{&da>cnK{QKrMn$yuMd? z>)$-3BN@;(G&D4ZFOL68?u5-TM%YIWl{xT2T9-q{NFM)ug%aBNboSRF(ol5sMNlU4 z;>sn+-(N%O12PHs9<6>R6J2X7EG)Evg^z@ef8{}q^~&CHGDAJ@T9q;m|C5)+4TAUQ zQ`_!EIe0$%I>~>D&EV?QLEmFaq&EJ-j8TAsFBam~&Mw1)Pl#G+MMW!fOG^bQMa5ub z--Y=J=y*T8`4Yh1=D2Uu?`02@^RdHP`%qriB~b3(mnjM{F*t8^@oV^P7nipiZlnxkY`=#W*!(6wEO3aJtf1bEvr!m!{_8G z%E}?kOiYF?r)ipK<9{fVvsw2uToq@0}G zu3PVG(LmP1&v+$7Su**1Dn+%*=HTXV`Lmvv{!pmT*jHr9s>h#{bwk}6t+=%Gz8o1y ztMicD_(VS|fmmH$wf!{4)%PGC7@Rn9LU>~mH+&UhytQj-B@Lu&kxv65s`OuJzvE@-EXU-{@yf#S1 z8#`HiX+%pz{{`aK_Z(POLZ(7PuKdsAj4dou_|?@N7`kJM?`GddersM7AfrzQ?NtsV z8%NUE#cG?9|M>MK9i0%L{{=vp+3zJpMKAlY9>`(KW-pa$36M2N?tSuUYL9Lf2f_b( z6omg#H2*lATC4p?{N>A+1>;R&IOC{$kF8*9WH-9tMFXyRd#^6?@bLUt&=;zh$xsPu zprdG`wqV$!7O!wTPthHD>YgFi6G)y$l!uLNMBoxEir&dPNIrl`x;q`No?h0VXdV4=*U|<0AADffB%r@6W zF(pps?2#_@VYQYAE2^Zlf5+02y?Q?&dB+K|OlQlStd=PIXznKv+8$qa+RWpXu+{B# z_1b?x%`9Y`UgrPc`HmBbL@NCD&D5VD{Xtx>RLi0&6&+sl{zw_{@9*y)=<81k>camh#mhX(IVMVm+mzkfhw0x|`U=H}o0@4`k>9WbNk+2w|@;gw~9hi!l69d(44-GE*D4YfU>tNfD)K z4$b3GHhlZ;0spA)D&HkGZ*T9$ti(jVIy6xhD;E4;Nug9zp{?HDY12qAvw{}Vh;Ej7 zz+x>eF8;N)pg_-$^$V&VP1i#)B|zpJ9F&y-4Bo$g?;a8oa&XTz|L@;`q!kx&nyKb+ zhgGpE)>Ct0a~@wq&XO@I5EzF@E#MoNQE1-3`UVpIv=f}1oE|&8l#rImaXzUiE;dLc zUyQViZoEzHnBSACL9`^Jf&vZgWg{bo6w~LPUS7Fz+&A>@vVQ66;v_8{zZjtFhaJKvm0^!1##O4t^CmLewkr}MKii=ihv({h z^4q(kA8zQf_-^V;=$x=46aD68YHEswRbDVAlWj}Qx}WP2wtRZwEP2YupLwF!^6pQ; zKW(2TRb1EzWZgK`F7voY*l#r9LsJ+U5RXg9%F24Qr~{MhdSYvPWK@(el#q1&SZ!#f zf>{6Vg^TE>m&L)p`IwZa;Ck5W37s^M`+agQFG}2HMO_G^284CB1Ttw+7WDV}+lw}x zlb>;R(Q1U%O1BzXMOuYG$SJ_|s&7$`k*e9w{Q5}E2q6u@k^5*Jx1lT;JTTyW_MeHhbyp8k(xGW0&!Q+n zMyQ-ET;B?FAn>9R6gF zEb9Mty$h-O4B-ePp#&H}R<%VW>~>9l?sjd#1#Q5xa~-cikgoNExhG9ajqm@Cv9W46 zbUq>x{W+h+OoXX2nr50iI%YROLIm*zo0`GAS%-4e-C;gB^a0X0_y5joDk&*BHSP)o z@$N>Fm1YbyxS2g*!-7uq$&;>HWnS8Ne7wX^78Uf zsg~9+#=bz-zbq7ZRH$V28cQSK;)!O|u>X|I?5*ADA(aFiH>uNvL zzUCe?`nW4V-t7oTkCs6;tyyA`j7wmLnGlozHPdvja&cYOe{HOqSyon7``*Uob+t_L z0M@@Vg4lvhcL_oXxua>(;OApccIYF{o;~|eK6I&|v~=M*`ZdHfdRvOaa4Th=jfzZUtpQa7^RB%*Gwr+iPfzLo0FryY(8h z`!t<)9L0TPfzq1+Y>As754btP`RC7{g&O(whVuR0<|AT|ID$L!l7+mM&{|vLEo%Ji zI`iIKveA`*T~R41;ajV&71=D7IjmMh6H%f`z5xLN**uo~yD8+8(TI^mV&tWY z=|1pM$SBibUG2QxkXmtl{eIH~gsTz?N1xv%u3krXfQYCle-LkEw@XWZzi|&FAZP2) zu6Q!L=!u^_V?h~+^ zBjZ-8^}qDuab;2BXDNi@L|9e2ywABr9D`F8tej9CaqaBu8*ZyW^nA3Bp6dmUxE{-M zFL4RY%|}`9>IjLex@3lm!p4@C!-b~rpTZQU_yzHJfYy;Ch*w=YDC^Ce(=eC>2q#vd zAazU`nCsE5I0>4>v;X-@ORH5BE+xW0iF{+C{!Ae27%E;|F|SlB^Ez31(3r0zfJ^w4 zjALkdmH3xu;P>_l45v>O-O(H&HpV+^Z7#2Xj^C~*U`)x#;L%%GL%C~1veof~i`+7Y zgI12?ML0oPNfIIbV^TPY)!G7i41CP>gnqxlV_xug?(&DCex}DcaPty~)j9$d6dH1G z&O-nA9TN=+n<_n6Vy?6!=bDxD3~2%Px?0Fbk|MkT_Nz=^M2GgW=_H6t_7}X6lM3~=0CGm{)XzC~0bHBv|C@HWfCc@0b z20t`3C_{74vaPj2!U+S1sBUE!W4|Caw?m7~?-|}%8$ZLu%-l5@D}5{RG)>;ScgtDf zq( zb2~e3E*6${n5hIJbwDEdnKNg?rbB*9w3v%92i#@ll%l}SPKE^n>34Z~nGh0Z1CNs{ z|J9=yZZ{*xI4AAwS~ru(XD3i^7LfFp@|%Zu<88FiLJ&Z zNE7-fv9Ny%&M?%4k(!W1PDc@yS5V-A#@$B+__K1JrI3ESsz8HJ2L>lko^&T19Mris zA7j`Me|$ZH9oLR z|Mh=CZr=r@8*zPS9oN-h4*=6B$}U=GR&0)54upCg-HTk!AM}Lwnc0EaR~57|#Sy54 zDb*^41)(BK9nQ->80>^HU`16_aD~lTw%f8BW7Y9)oSYS>;P_%(tHZHW)GK6S!iPZC0CF;HSWp&kR6XImoZMtSw5c8& zHx!(vV#Gaa!(Og(;H4|F*itU^i-?J(IZJb#hv25lYRchtEYAKeYd!_VStnfBOD`+z zH5znVH>M0JeKkvscuepia6oBb2T~SPeo=CmSN;x*}FM8-cF?Gg|+`bz_>rF$@ZgCQv*v zf%LSa1Ji4TXQTZkc0Ti5w#29}XEG5(iQihz&q`X=jp~4`AVHmE1^d#VN zDP0);B8!r5$uOd6JCF1F@87?za2kmmY4;p9r+UiG6^KQQBoi&DE2g1lZ+m$sSF`PA zsg}}?OUnm0aOMlfw)Pes6oZwgxW3&~M|MSOKTAqt+WV$275$;xZp4@SoHCmW$f>qEv{F1`mMAx34whcUJ&8l9lWy4-BvEaqs-w)t|fZ_2tOMC?Gpwyy>+`1nUIx`CCiPbDR z0K+}uaYDi_tP2``l5g9uz@hatmv5sCtPJ*Sjz?~?CrN+M8`4wQ~eSQPk&;HGf=4+yE(9>?`Udj*ziO~XdTsRPAi zP5ayG+~&!f)Q)9?!@oe}aIv+l|1lUgTEA~>d~K=}F#}*@an%ma(l1(tpu|68%d&~C zSh^sGmN6BShB$Tw|oND&Hw&SBQGabh7&9uskbV5o>P>yWGn-u+Ma6ETbZ9c4D%*++m;Hv{r z__r(bfM;~Rxs~t4;XE|? z7+23oO464#lawK7)m;yVM>yzre(k=os(D4_ZGxJW+CnUm`_W-P6c(;bB?;=+1tQp3 zS^eG5!e!Z+Sy)WDs>_#itTTVwF4qT@B74y&zmotSCApujW`oouDc)H!mL>eD_<;f^ zwl~Q8$!1Ptf9D%!c;ftKTQ3|0Q=|5Owno$JKIKsvLeEfO|B1(}2}R5@Y48%d?H^ys zE+|++hqa?3Rh{J1|8zT$Oh+DE>vOJ!!-mWHK!$7yxk(8mV(EDfNJilY*JQ(fpdt_b z_BLnJdBYF=X|T3Hjl$2t6It#CCRc?dfFS~(fZ56&gN@Zj#+E-b)n830p?`$OKN_Ce zr-7=x^uZ*D@z&Qyec;8`-^QdtX^Z9tn}hJ+NGPnQ!K8e3;_~n`29ov* z^hl?#NM2#X*L5GEnqBCgd2b=W-Q8UsdmE5WYH-Dy|5^2&-nX2fx69$Ua~r{b22$8jCPPDlZJAXqNaMHCHLmR42>h36+zl6jmfjc%fx_> zF-Ds=cc%xG!jYHpXAexON5=*md3bZlOlle^PR5Q%X>c%KRF5YlJn=Tr<73pZ`x_r= zEwZ#-J|J;0I`ve&vV=1dur6{LJC;8cnG*RSfxiDj#KfwW@6AOGK0TWIj+>%QYP4$k z-_IV5rVRO>T23txXgcY*Y2w7sC3I{+~Y5#O!4uK!H8>i!$#c3wYoUT)t#@u~f@3^8W+sl>RaR literal 0 HcmV?d00001 diff --git a/Themes/default/BGAnimations/ScreenCaution overlay/default.lua b/Themes/default/BGAnimations/ScreenCaution overlay/default.lua new file mode 100644 index 0000000000..2b4b3eaff6 --- /dev/null +++ b/Themes/default/BGAnimations/ScreenCaution overlay/default.lua @@ -0,0 +1,46 @@ +local t = Def.ActorFrame {}; + +-- Fade +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.75); + OffCommand=cmd(linear,0.25;diffusealpha,0); + }; +}; +-- Emblem +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center); + OnCommand=cmd(diffusealpha,0.5); + LoadActor("_warning bg") .. { + OnCommand=cmd(diffuse,Color.Yellow); + }; + Def.ActorFrame { + LoadActor("_exclamation") .. { + OnCommand=cmd(diffuse,Color.Yellow); + }; + }; +}; + +-- Text +t[#t+1] = Def.ActorFrame { + InitCommand=cmd(Center;y,SCREEN_CENTER_Y); + OnCommand=cmd(addy,-96); + -- Underline + Def.Quad { + InitCommand=cmd(y,16;zoomto,256,1); + OnCommand=cmd(diffuse,color("#ffd400");shadowlength,1;shadowcolor,BoostColor(color("#ffd40077"),0.25);linear,0.25;zoomtowidth,256;fadeleft,0.25;faderight,0.25); + }; + LoadFont("Common Bold") .. { + Text=Screen.String("Caution"); + OnCommand=cmd(skewx,-0.125;diffuse,color("#ffd400");shadowlength,2;shadowcolor,BoostColor(color("#ffd40077"),0.25)); + }; + LoadFont("Common Normal") .. { + Text=Screen.String("CautionText"); + InitCommand=cmd(y,128); + OnCommand=cmd(strokecolor,color("0,0,0,0.5");shadowlength,1;wrapwidthpixels,SCREEN_WIDTH-80); + }; +}; +-- +return t diff --git a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 3a99044801..290d997789 100644 --- a/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -182,7 +182,7 @@ if not GAMESTATE:IsCourseMode() then cdtitle:visible(false); end; - self:zoom(scale(height,48,128,0.8,1.0)) + self:zoom(scale(height,32,480,1,32/480)) end; t[#t+1] = Def.ActorFrame { OnCommand=cmd(draworder,105;x,SCREEN_CENTER_X-256;y,SCREEN_CENTER_Y-84;zoom,0;sleep,0.5;decelerate,0.25;zoom,1;SetUpdateFunction,CDTitleUpdate); diff --git a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua index 9fd0fb5103..54ace1f6ce 100644 --- a/Themes/default/Graphics/ScreenWithMenuElements header/default.lua +++ b/Themes/default/Graphics/ScreenWithMenuElements header/default.lua @@ -3,7 +3,7 @@ local t = Def.ActorFrame {}; local function Update(self) local c = self:GetChildren(); local bps = GAMESTATE:GetSongBPS() or 1 - c.TextureStripe:texcoordvelocity(bps,0); + c.TextureStripe:texcoordvelocity(bps/3,0); end local function IsVisible() diff --git a/Themes/default/Sounds/ScreenTitleJoin music.redir b/Themes/default/Sounds/ScreenTitleJoin music.redir index c29cb1da10..1f8565ca21 100644 --- a/Themes/default/Sounds/ScreenTitleJoin music.redir +++ b/Themes/default/Sounds/ScreenTitleJoin music.redir @@ -1 +1 @@ -_Music title \ No newline at end of file +_silent \ No newline at end of file diff --git a/Themes/default/Sounds/ScreenTitleMenu music.redir b/Themes/default/Sounds/ScreenTitleMenu music.redir index c29cb1da10..1f8565ca21 100644 --- a/Themes/default/Sounds/ScreenTitleMenu music.redir +++ b/Themes/default/Sounds/ScreenTitleMenu music.redir @@ -1 +1 @@ -_Music title \ No newline at end of file +_silent \ No newline at end of file