From e0e646a3d0746a7391456d60d988eeb8b3ecf520 Mon Sep 17 00:00:00 2001 From: NeeEoo Date: Sat, 19 Aug 2023 21:18:13 +0200 Subject: [PATCH] Added Error popups --- assets/images/editors/ui/normal-popup.png | Bin 0 -> 1690 bytes assets/images/editors/ui/normal-popup.xml | 13 +++++++++++++ assets/images/editors/ui/warning-popup.png | Bin 1690 -> 2564 bytes .../editors/character/CharacterSelection.hx | 7 +++++++ .../editors/charter/CharterSelection.hx | 11 ++++++++++- source/funkin/editors/ui/UISubstateWindow.hx | 2 +- source/funkin/editors/ui/UIWindow.hx | 2 +- 7 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 assets/images/editors/ui/normal-popup.png create mode 100644 assets/images/editors/ui/normal-popup.xml diff --git a/assets/images/editors/ui/normal-popup.png b/assets/images/editors/ui/normal-popup.png new file mode 100644 index 0000000000000000000000000000000000000000..f0f003057a112fba9695c0bcfad4ad321b24dde4 GIT binary patch literal 1690 zcmb7FYgm%m7FH`0FAV0%nn|NZ%^3`}ykMhf-fC1dFEFKml;dq8#n4RSYwT&Vh>jYT z5~=9PyiAT(cBVw-Q^QLNYK~1MA|N`^ITi-#0gjsUF@MhQ^JDGx?su){UGKB^v!8u6 zHs-L6%h_GOM zf#m%R16OgzVMrqve)F|t-`~((+Y`rpRPXL^iED9DlkM@sG?xu%ua%!k^UOLkON(dW zy&}vAZr^E%A35WPB)%lc2Ypm_w8+mRY}>@}&8QD~V}?S~*Mq5H8HTQpm* z63B(Y80$&zfdQU_SN5^-*lTkvpXS~gu$ zG>Fm8PP7rT1%;z^eP>Go2t`RRUe#_{c3oII`*clZG8%R$f2(?D_QZPW^mON;eC*oC zSxUES=_~u}^^}Dv#R`c@6E{EHw_!8<^^2Jq>>C9bsuXk0)oTcIYat>ITMyU{T5v>X z@^x*&p}{*RSbd{XP}4rnJ&=c`!*_B$y>S1v>Q4ZbYJqo*BwF0j*;~tb?@HKuKyRV zI7#oiZ|Ahr!5x$smNz=74f=>D150je>MFABd+f(eZ%^rhJn;_x=K#U1|1vn!qdV9m z|M!n7*+%%jM9IK(uLj~KJF3$FV)Yu!rVXoa(a+PcY+|K`p z?t?(DnZ|TS|K?K&Vc!z~ z+DMrZi+df6N_$g5^gvp$)#NH?k!^Wrpw$i)iz zj)R-Ub;q{KsqL2;R(|3Z@3?`(T1TUqavnj`T3*G6#Km_bP+$e!PG_HUD{-lsMJtv* zGkWwD)G3MXEyfn--{y}4JB$;Zi8o7<@J^Oo~ha=&sM=j=ZXQ(uoQ z3cyxOUWy}=v(lrJ2L%ILl#e`K2tSHQ7~*yxAD?tdzl)T(cQ&KL(H|s53 zPD34<#7QSGuN(!M@mY*((aiDNJ2h#~#m50R{*%`iT^(QM6|~QCf*;`l1O0%`o_L+- zgZ<4eCD7%bzVex+8vR%?|EN(k{NzG89w=$>S3Ba{9n9jZmQR{B%}4wt?{)`zMQ=z4YN6xkc$YN!M>`Q`Kn0eG6|xlA>{L_e1s8nXrzpZb zoC+d1q?NpmrONmdo}l;tZZR?(1sncSd1&;NhfT;P{0Ow1rl<027k(OF5N6|j7 zXx5jfp>&n&cVn>CfMdp`CD^f;1{CPbeJW@mcSw`@u{IAbj^Kf-`?(B}OOEnPy5|7Ei)z5JzK+S>rnTdl#MBM~TfcV zbMsdd4N==p+-}Uw%tVxwl-y~x(VThAWLnJTcWo$o1rB+C= + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/editors/ui/warning-popup.png b/assets/images/editors/ui/warning-popup.png index f0f003057a112fba9695c0bcfad4ad321b24dde4..c190bffaab6265c54dc208e3e587ff58b3de368f 100644 GIT binary patch literal 2564 zcmbVO2~-p59S@HzQc>22wPryu4IZtUOeTaQvxJC5N$f@x@InJSOeSQ6WI{4X01w>V zswkSGz$=HKBI2UZ6(TAW*aAgF4&@LzJXmY9R1l~jqER~GdT!sg+iu>Q%s2D>zTfYE zze(7<$#?!-`?(YfWxiM>^e6AxEfl0b#CCfGoDzt4W{?nZ>E2G!c{HG6X;) zP$jA&v?Las#i|uJfom1`f1sY-{(%4)U5R8?<40{#DrY6M#QMFY8`A;#QM5KNMvVgg zs1}dXAn5wNq?yiUZ`6>F289V+6NuvxGr8J4V=|q?Wx3OTBY_c2Wp?7X9~?o2FoE(J z=Dac4?o5y!$Yw(v4g|7SvpEo(Jq4BEGE5%xA=HBj@&Y*^1d=Is`2m!y8yQT%KM9s0 zkQ~=2VbWzx35TJ8S{25i&ju3m!6R@DDNI`DGHHcG0*O^x0#+fYSjcCPUb8Sv2EiN< zbp=6$iMn$`nOwHJ2NUMs#JrRILPOl;``eYqIFk-H6J_9i)7L_rkUt>Qz0#mfn3X~-MFX^6w zX>mCb4Qo*EFfv;ILqP$g`GC0>r#u1v-O0(l5BhcnP7VX}a&{1r53{2TRgv>cLk=pz z)rTv{`Bx$qdI#z<2YMRAcWxaf$7^9RB5v6mx-cp_DH`fX{$9fUSOuxz?luV_$+zt{iY|4 z=WoY7N;6(>?6|{k<_)H42Tw#c^?K)x`FWmkyq(?Ps1iIhdj02A5Y=l0^tqX$>N_*&54l~I!w zXgeo3GtoahZ8Z0|AamFIr(JO&SEPkRh4JxFdHR9B-%UF0w=XOInXOcMBmP7gdbR57 zgEZt160c*HfFME0*fKtvGZ_5(im5f~tYbxIKN7dH`Ok*Um)rf1hZ*l#Z>(A#AV}8@ zQ0;SDvX6%}FP$hNa#a>jp6Ghd#Fl5hdDn`6;@Ra!Vw3WpZSb`@BCw#?P>|EjXG+K0 z@uHM1kHe|UcazdR{UalN?-mBUI*})rukNgD3Ez6)(%FIQk=GMz>*p3Zj|Y^nqf7-E zk9Ql&PwqZi;xpdDDY{jAG2-d)NZkf>YpIhx{rT^%!}^o@?zR^X6Dm6{w~XGU+$@f@ ze0%ta&uXdleAZ!o4SV0R!@bVnyrl{7Ytg)F-%y&DUG-2B?I*WZP~we`_wOpTwO?xy zZyN7-oLu;&RYOD1oPw0*LxcS-P2orM3M06083`1X&b1fq9-riYuva{9`=rJn_jaQu zg)#Ekth_!*G`&YFk=j+K=xc_=a=X^z0ejjZ|M$lie%Cu3ufy>|`SNmV6f5<{DKS9MNmMUHXRM-&y04oK^^ebZOl zO3-p6ntdY;iD*u6bkEBqYhz}~P~Z5nmAi~Z9w9+MThl5 zs-BvWUzKOBE} znnPI|eCOEtoQ*q!YV9@~{)u(ki?s2lI%<=)7aLo-Ik{Np*fo8Ssq!zi-z(3gCgh(V z*s~+;-FI(~mRwSl1<8y2xQ5`t?Ot;#pTFEnoyb-Xzj@VFzNmBT&iC0(N8gxkcXXF@ z2MwFb)j>3U$i>74xWErE0Rc(LVb7)Ng4E&pNiqi__K(F1}EDpo00T z;KsRgzy1ogHZG}u#>sDAb-r#QXQ}eawK^Hcx_Uvafw5!FuaJYRV+`SzzjdWI-Mk21 zOcyPCMI30hJea3S#3+|OHSTG;S;up4c^*AsnelN#_o?`vbLQ_f@%l}|!gZg2@h|gs B9;5&O delta 1665 zcma)*ZCH|L8^_hkB#mJ%Yflvp`Zsl!U1PDy>S<`V1V2RFcSh!$koH}?P!{ivjZ?&dzV0F0#s+Uj zyw4sn=25>i`Z;S^-)oGWk36}O=~|6QDGmhjHsfA>eF6v1%wwap=$YE3kYaX`cB1Qi zwSsF=^TWsGnOSb|MkKFO^k8UGF~t-9X`i{8G&iAIqOuv%#s~Y>ZA89$J_Sw@ zUaO#BwUlqET|rseh*8mmTEMp7iYGajqi;d)oNB)y;dW0h!-e_D(naytHj`6wxjbY3 z=u&9JS!;c&Rj?i@qIh}xI8JrVtAY>aWYQ76JQV&HRX>Dx2D<2<=>4s}ZJ{Tq1xr`h zb_1sZ?#b@^;82N~M-)A1J^1$B^y>eRs#DC4dv;Dc9dMA$xVYX)YczyC?pttM(N-kb zz9W3t@aD8Wz=Py)Fdq<2A6$f{y7Y&-lz)7$QLIPqJE5w2qPHm4Ah zuN*{I3u#)F!W?OL)aeH}L!+=Tsag_1*2QYEDi6fMEe@kf-Y?qVkh-bx8@Rc&I*Va` zl^`-a(?$YB)7pRR4`BdSqTa7}A7&cDu{0CucJI>%IU z?gh1Uy@|Bc`=FN{+D7d1i_^CBH5rCd$n4D-pvN-$XJhW3*h`#y#FiP_2IP&PSP~$a zjbDpBn|{{=fqsP2@ypQ(2^pziB&}c6w?+NX{kiyq zgo>wZ_xAQqmG!#FDSLMlmVyEZyE&)qt;BPS<$_mKEw(I6H_;#-j8hMj;JW_TS&Rn= z^LXo(_scr`NbG11Zzx=g_1W!D&+o+-r#2ckxtuXgz{kg(pzIP1WFh3Ru0^s(%Xh*l z&!i^+HzD}=)g@QQ7umV3)4afkB*4f#ptq-77kCqXwM+7MxoaqUx=D+Dq?&zLFByD% zv4jNVwN|pOVNDDijJ=b*HL+#yj3UWe{jfd);NQHhmT>Fjl+!`Liv_m(wHPvREd`;s zuRv9M6V#GDM?IjVHCih@k|)XZ872pS>r=UV+ka&J=C}kH!RfQ8tmz|Xy~`3NFD?HWi~b^V;5w@ zZw>=|jsJPWoWR!fVW4b&feDX;x5gB47y{{YXMbu=v#FU7F2q1yLeyV;x7()A^qP90 z+H@gpZ{x>*Z>12882@6aN|A(^o@fZZ=t8Rb7(u>E)R+t&bt$`Tp)BU42junlLxOSP zp%~}@6Q?he1m!x`1_P4DV|~2O333X~nkO%^UW{OTR@!JNNx|sLR_`1kR057^mlqJn zj?`fwXZ{mWT|%3jCXCvA|I!c%_;EjZiau|<@YK6|-@UQt(h$>WE zQ~_sH&wS_NSxR5VD;X>Jv3!|KHmr|eB@Vv$IH0+|oYv9U_{CUV#I}>=_37#9sKUa+ z+s&KdbC1|;tLdDMb>K^A!0UZ`d;3?C;tv7#P(>cCY4!Dz;V@6~n^SJUwhID#<=m=H n^h(WArYeV5doE0N%y*gl{`b$qE3mHL%yhy+kA$=Yow)RWSqfW~ diff --git a/source/funkin/editors/character/CharacterSelection.hx b/source/funkin/editors/character/CharacterSelection.hx index dd213c39..ae5e6635 100644 --- a/source/funkin/editors/character/CharacterSelection.hx +++ b/source/funkin/editors/character/CharacterSelection.hx @@ -27,7 +27,14 @@ class CharacterSelection extends EditorTreeMenu ]; list.insert(0, new NewOption("New Character", "New Character", function() { + openSubState(new UIWarningSubstate("New Character", "This feature isnt implemented yet", [ + { + label: "OK", + onClick: function(t) { + } + } + ])); })); main = new OptionsScreen("Character Editor", "Select a character to edit", list); diff --git a/source/funkin/editors/charter/CharterSelection.hx b/source/funkin/editors/charter/CharterSelection.hx index 1a641dbd..c753027a 100644 --- a/source/funkin/editors/charter/CharterSelection.hx +++ b/source/funkin/editors/charter/CharterSelection.hx @@ -31,7 +31,16 @@ class CharterSelection extends EditorTreeMenu { FlxG.switchState(new Charter(s.name, d)); }) ]; - list.push(new NewOption("New Difficulty", "New Difficulty", function() {})); + list.push(new NewOption("New Difficulty", "New Difficulty", function() { + openSubState(new UIWarningSubstate("New Difficulty", "This feature isnt implemented yet", [ + { + label: "OK", + onClick: function(t) { + + } + } + ])); + })); optionsTree.add(new OptionsScreen(s.name, "Select a difficulty to continue.", list)); }) ]; diff --git a/source/funkin/editors/ui/UISubstateWindow.hx b/source/funkin/editors/ui/UISubstateWindow.hx index c1012ee9..b17afbba 100644 --- a/source/funkin/editors/ui/UISubstateWindow.hx +++ b/source/funkin/editors/ui/UISubstateWindow.hx @@ -59,7 +59,7 @@ class UISubstateWindow extends MusicBeatSubstate { subCam.zoom = 0.1; FlxG.cameras.add(subCam, false); - windowSpr = new UISliceSprite(0, 0, winWidth, winHeight, "editors/ui/warning-popup"); + windowSpr = new UISliceSprite(0, 0, winWidth, winHeight, "editors/ui/normal-popup"); add(windowSpr); add(titleSpr = new UIText(windowSpr.x + 25, windowSpr.y, windowSpr.bWidth - 50, winTitle, 15, -1)); diff --git a/source/funkin/editors/ui/UIWindow.hx b/source/funkin/editors/ui/UIWindow.hx index 89fd6bfe..6853ce06 100644 --- a/source/funkin/editors/ui/UIWindow.hx +++ b/source/funkin/editors/ui/UIWindow.hx @@ -4,7 +4,7 @@ class UIWindow extends UISliceSprite { public var titleSpr:UIText; public override function new(x:Float, y:Float, w:Int, h:Int, title:String) { - super(x, y, w, h, "editors/ui/warning-popup"); + super(x, y, w, h, "editors/ui/normal-popup"); members.push(titleSpr = new UIText(x + 25, y, bWidth - 50, title, 15, -1)); titleSpr.y = y + ((30 - titleSpr.height) / 2);