From 052a832a77cc5ba9825ba6ae8ff01267d6e13240 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Mon, 19 Jun 2023 21:53:07 +0500 Subject: [PATCH] Update --- .gitignore | 8 -------- dev/script.js | 11 +++++------ dev/src/dark-red-border/ENTRY.png | Bin 6263 -> 7829 bytes dev/src/dark-red-border/ENTRY.xcf | Bin 6301 -> 8828 bytes dev/src/light-red-border/ENTRY.png | Bin 6593 -> 8151 bytes dev/src/light-red-border/ENTRY.xcf | Bin 6301 -> 8984 bytes dev/src/light/ENTRY.png | Bin 6593 -> 8151 bytes melawy-lera-sugar/ENTRY.png | Bin 6593 -> 8151 bytes melawy-lera-sugar/script.script | 11 +++++------ 9 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7a63144..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.pkg.tar -*.pkg.tar.* -*.zst -*.zst.* -pkg/ -#src/ -.idea/ -plymouth-theme-lera-sugar diff --git a/dev/script.js b/dev/script.js index c269845..f025729 100755 --- a/dev/script.js +++ b/dev/script.js @@ -219,8 +219,8 @@ spinner.image = spinner.image.Scale(Percent(1, screen.width), Percent(1, screen. spinner.width = spinner.image.GetWidth(); spinner.height = spinner.image.GetHeight(); -spinner.x = progress_form.x + progress_form.width - spinner.width - spinner.width / 2; -spinner.y = progress_form.y + spinner.height / 10 + spinner.height / 2; +spinner.x = progress_form.x + progress_form.width - Percent(10, progress_form.width); +spinner.y = progress_form.y + Percent(10, progress_form.height); spinner.sprite = Sprite(spinner.image); spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед @@ -232,9 +232,8 @@ progress_text.image = Image.Text(progress_t + "%", 255, 255, 255, 1, progressfon progress_text.width = progress_text.image.GetWidth(); progress_text.height = progress_text.image.GetHeight(); -progress_text.x = progress_form.x + progress_text.width / 2;// + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X -// progress_text.y = progress_form.y + progress_text.height / 2;// + progress_text.height; // позиция % по Y -progress_text.y = spinner.y; +progress_text.x = progress_form.x + Percent(5, progress_form.width); // позиция % по X +progress_text.y = progress_form.y + Percent(10, progress_form.height); // позиция % по Y progress_text.sprite = SpriteNew(); progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3); @@ -345,7 +344,7 @@ function dialog_setup() { hint.sprite = SpriteNew(); - hint.sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1); + hint.sprite.SetPosition(entry.x, box_form.y + Percent(5, box_form.height), box_form.z + 1); bullet_i.image = Image("BULLET.png"); diff --git a/dev/src/dark-red-border/ENTRY.png b/dev/src/dark-red-border/ENTRY.png index 58da9fd2e5fd392bba833987525ce8b3cef8e8e0..1e419d962b817fb71975132a023536187ef66e81 100755 GIT binary patch literal 7829 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 HPM-TOVnMnR delta 2219 zcmV;c2vql#J@+t>BYy?#dQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+ND@qlH@21 z{O1&V1S25?$Kj=jy}=%TQ`lA0U5}Zm89Ul`0R|~ECE*V1zkeFkKt1nqR|$hGKK7y7z+cpc^Z3w{Asw5_@(dHkIe=uJT* z6D^K>;L4m%1K9sKaKnS(8Zih4bGf(RdRYQMUg2~XRv^U#(IDQ9g_SA| zcK(u|(MY-S1e?U;q@C$*OWe!WV}!k0!OAmYC`C*LA%A>+hEHEG^H7MTKpiDnEG+|O`{Iup|-5qEe(v%bZh|oU>+6icMKlP|>WaMXR>LB^4>TXep(ZR;epo)Qp2A6U(MntXjLXcG3EDet*DPyjY{nln>N9YiL!yO%Xkvh;s(Q zD5MC+)hY1I=A0cRrbN!1b9PjuKNfi_Eol128~rJB z!KwR@xo6&9u{OO7jm_8@g%0Y$h(6#kA(>U$%5&x3daGk_o*2+Z7_IlRlBGp$U`2|Tr0yF9(% zr9=0IVDD>aJJjZp7QE}oyM}yhJ+6WgDSvWBm9SAQ7=V&S#qBvPk8U;UasWPaE}X`0 z=i=xq$2F@OkqxXpX1gu!dCZqTj%|SF(8gcv4L=M91Eq0QQ2GTZ6!s^muorm%3kCAo z=+}TjOHYs?$nT(q_lExxx^HR=_JrHr@LvP>z#6|X_%)D>RK>vMI5*Yf&YU4P+S z?0l-O@LFDC=n6xqI{6wllZ3n_wM1-7k_T|JaQ3RO$8t#{UiEUg^2U zKX-ib5O&TeLiiTR9ZN-&H1l%Q>5R1rQF_6+bpg_|b9Vvgd@3JR(F@|L8h=pS)*12` zUsBEsGwW)IinZg;Oiq@bI(L9e+mfXKEx~z9h$cNHR*vjGVeg=_C1$VU;U`Mr_dq{G8NOioM$Pd( z%wM1k-?01(QHEDY{)s5V9q7LlW%y}0ejv*5tCaD(q6|L(`vXxba;21t&+Qq=TEY&y zboDR5-V;6pNasi>fmOzGs~E)s)u1-)+evc5k~aPSA^!tg((V9N^Z~__KnrgHgOjie z8GjtbUsH=BEe>`N5zJ7X?4lx$wF*V35Nd^19ZW9$f+h_~ii@M*T5#}VvFhOBtgC~o zAP9bdxVktgx=4xtOA0MwJUH&hyL*qjcYx5WGR^8q0Ge)_nN(8D6Ho6GvHDR*BDvCrr8^ z@gvt2kKZ_#To!m{)XZk)iKE0~sf(2^W@S?&o+gf|nojvb&SRDH7H6$mXYG6P7lsS^ z$}-n!jv$3aEJ1<@1$9(Vg^f6^Iw=-1w4e0x54(PeTnf1=VB}ap4H{(E5B>+gyMMKc zQRA z0fwFo*_2%=NK+^lf%h}|raUls3-qsfy|wpo`T%69tMm;nJ*4;X1wSaeuTOtVN0g90QpWjSFmHe)a?G%+wYEi^MSF)cV@Ibtn2 zF=jMlH!(OhF=IB9?+>R9GdMXmH!wCcHZnOmHIt(dZVfd$F)~y!I65#jIxsbp9uXl8 zH99deR53U@Ff}?bHM2|+u>!N;6krGheur2!lSCacW(5ol1qRt~b8!Fw0PaadK~#9! z?bg8wz#tGs!EE{xEXC3+MX)e)%rP1W1e`g$2>~LQ-dZeo!}Ni`007dwWF7zj002ovPDHLkV1g?A5xM{X diff --git a/dev/src/dark-red-border/ENTRY.xcf b/dev/src/dark-red-border/ENTRY.xcf index 752add3ee3c12f6fe2d6e9fc5110dd87d3ae62b7..330c5ef12f22c7e00513d859b9e7a8ecb5ce136d 100644 GIT binary patch literal 8828 zcmeHLUvJY^6n7d}OABmhY^)MUUbd-4$f^IuaY~#9N@1B=sA$+g(;giAI<=J8QR0^N zsYsjlw1<6wJ>&!MQT8z=?ITRuOZGdClNfNCbnpODZgPCj^}XlbbAR`DkFQ;Kn=Ssx za`;10k~xk`UBV>`q4Y203M7@nl;gYp&EvV>OK zciaXOJhRDgk4r_snLi!7?RDLnQn{D9ppt7^e%UMaxD(VEI zr=w9arJR;ulPBTx>jPG{09#p)5wXJ>AtF!xlyJ^x|%G1m!(Re^jSyaZe ze&q5)_I&T4MggpP+?sL$!ezrYZo5|KJ767iwv`>MV;J(+T3&seLxJl!*~#0Ux;=tywwW3D?W*qsw&6A&*Ew12L}8kuV>~ie z2a)j>#mBMWhFu_pJIDXOgPoo1J>NQLBD7WRWlHo6S+{-5wbw&cvLsV?G+od|%@S0` zRH3G*x*$uMtcbdjSMrIQA;JW`f9rMt%JGlVPiviE>o8b1t$qmYn1{?h1)U_@{zkMj zrL{8}x?U$RJ&VyC2{soKlnbJ!Yk5mhq&yQ;nVEvA=}cgDtxz+?d`_{)at?hY`PYfU z_?!VDkKS9h1l01lU+Qb+KdRG#*ugVH0f|3YM ziFrX)WJ%D?LQN=0j%wv4JttX-54=%mLTInMp4o^8Kne~vf&o_~B1p!xiaO5ejjn3?J+>fP8UaSzQ!}lwC#aY~XSbh8~i$@^U(u)+Ok0A77)q{LV z`o;@f@$vig{N)h02kG+BK*KZ!Z<^6KmtXelGEbx2j`CK54Q^fjtAGF6Z~gp>?S8&Y zb3$7Fv!8R^3HM9)HaFKTa;a{byWO4Rirp0S0%Vr=aUe|6kRq1`Rwvwx?hLib>_|k- z0M`s~%>dU7v@pOi16-Ts5e|e2xCV^UzzSS5z_l4_6IhanS{Ym`gKK4Qt&A3BaIFlk z&GHBb!US9cMrmLLu9d;H8EO+)@+N9MVE1zmZ0mt-J>$I;@+}P?H*g#&K|VB(`%m2$ z#M17`LX>mEyo>we>JUN0IwP_hmBZ*dwyqr6l_R@RIov6sT~b}|WHGGk!9K2^=HqE~ zBY*qz9+hYQPmTX_cLArj3*18Y93+j??Rm)DERS#?Oy+@23K-1+s~g=JVy81C0Wkv{ zGr%ze9K$ItWuOO~a%XuT2f}0?*rb5b9I(1!EYA=-l_3d;mBFzxI93M7aC%FXfh|tA zv%HT3VKNVFQov{qSluWu&k#G6A#WnKg!AFW9(dLRhP_3cXWvI5-xj#*_`3F?`HOFF Vze27-C~ZRMyCWs~rg@%}{{SK8V?qD` literal 6301 zcmeHKPjlNu6jx{*S|<#YmOlp$s)0#5%qm(*mSj)lx=qt!rlp=Hg?1PYYiXru#*#de zk~*j60%y2$2uEf(^BwpId~-AK}-E*F!i>pR!W z8?I+Z-6$3}vW~=Fhlz4_(d#hXnJ`Vo?851O(qpzCdLotK>FBwq{DB;Vek%H*z0VWW zh+H?}shG(Z_#ykeFxtH0u^?c`q4if~Nvmqrs(jig&Rs3MZNO9Juymwz>9?&L{h%uz z@;LFM&|0UGye{(4jvO%DT7R^6hnVX(8s)8#VxugITPgEIgx9L<^nF)qA&}B7KTX;^ z-ep0r%PS44i`j2$6QrkW-DWA@^8-*&WJRu1TBnAnsCD>hwHdm&`5yCNubMnVG&AuY z55081($MsIq`&qZ6jt}9;Pe>0Kt?QOF!h`Tn8xo2#&teP-n>RMsE6)#emP< z*8R4qNK}@TS(`jQ-KEl~>c*xr3!f)v&}i>RX(Vl9WbA^6<5^FAiM{=Upc68``=Wc8 zB3yH*ZAU>b<_UUdr7`{7PWO5Kq^HCCg2w2ytMlyfMSJIND@=K8@3YY3ccM68c$W0F zl}E0r(7D#gjsQY3_U+6LfN11^^O!J}>WV6xs-YSa!z8x{R{z{jz@VdV=(n3mx^tM;nLSKJ z2|MJ@t1Wv;cj(YgrLlQNML$eZ7TO%&5pnY21(lkto4R2Wl^UFA3TK4rCMVqK)H+Ny zs;W~x<2Fg24sUvZCmaBl66g%#M&@_pB(7 z6(^xgJGx3uqeg5~qeP?VL7ciog~mIsVH$K!FBot0@1Q(hZhn+ole|c;xwfh*MCH5# z5yBM0sKFpiY^HZq87}_nV~6PW{E&5vafm+ZfRFO3ZX1ryh--FKq8TzJrlT2za-~+& z9aXidHfi-%FSVtcyK+ae*)XBY@#i zTMI@UyvFG7MZVA4&%?P7kMjPzy#H~64h*gRF&w}A`>=o4ANE%e8)#R48TNwkY-vTP zoh%FWlMBMqiM0UK09#66(=#~B|A2KCU}ph#7GQVo1lU=Coi)a8v8`(Yc1^&p3D})G z0d`Hmt~thTv8@{bb_2j}0N9;70d@nxZZO7ffvtnAA{?JQyLde8vn(@p%*y5Rh|1(9 zjWu(*+6;neZui;;in3vlNDj*WEH+-7&Yb`=_==UR470_xtO=Mk0kbAxcJ2h2!Pl$Q%rIMA%Lahi05BT>X6H_T8GN-$ cgAB6;wG8U??}0u5!nO^B|531A11cf&H;p5vC;$Ke diff --git a/dev/src/light-red-border/ENTRY.png b/dev/src/light-red-border/ENTRY.png index 3e0ed35d341518aceebc8a59a334618cbb8bf560..0f3176e23ce7e306f027f16ef87a51625f6edcb3 100755 GIT binary patch literal 8151 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 wW@Yy4{rsZgp`3q{BG!9f)}p*2gE5m<^TWy delta 3097 zcmah}2{hDe8~+bu&mc?_(_{-R!!Xu~EMuE2gQSsSm>FxsG&6<7j3s4PQ@W_gQc*;U zC6Z+jp%Ai*iL|J=T_x%pb(g+#@BO~>p7TEEd7j_z_bl%@@1R*DIs+~SlJCg-002U4 zPVPE+79~8;4*KS$nsK%-^wV)rK*+oY@VGHNE(KTm7cZrOY^624kj&=%b`tw&^vmC;vnrVbZ* ze(UOqD2m;=I;DA+k+%!Nqb=hn;1?y@ExC%%S97~aR6+Zu+mMo0Hqf{Q+k zK4nppzd#b65i(4XQ+g|MOO=mP(8gAwahNef@52Ti+zg6qp3@2S)F|pxK<7QtuBlTp zzqB5ls9RN}V6o|f-jJI8d2p8kPyW}1O%iX9EP9o>G&Nl$wuAlSH@?hO54uCe?G#5%K8V&LhvIrQTvNLR~T4a5xV9IM=%bAIngnCPD*gKa}DsOx11QfQd ztc_$bfEURV4c^``DJIHOO>|WY?X&?SWPjaCJ4+DQXJ=kA8nZrdw+a_mH_!?%pg!ub zHKar1ofCaC)a_&3L5Y$dNXp6yNlC(cQ-iYgf)m$cpTY`S&aEUR3hhbu%iQ6KJHxW< zmE#ogT%EQsplY^VI-X9(v##XW-?!|Ix2md~q{KELdU%-SFx#3Q%+bxDt-{`hVrw)T2L zv7h0FJH3foU3oB(*r`f6bMwXCPL_sv%-ETbz?sDkzYglM|Rs}fCU-+p8Ol64x&@DP&-%VHHn=4A;s z{r!DWX?Ihfm;7c>PIyG1C!lN#vY0!~O%+-yx3?apZG!g&ODwgJjh$Mi@mrBqvsaN1VrpJ`*^L_P zYB+9v%rG3zlIoAT@LDd(AKxEsAc(46YIVXZdh<;uo%IW z>o#_EUMYPSvv1#0$m9dB=MO7+_0-h&T06l{-EZlVq55uK<{>IOKR076tliGIT(%!b z2r9dKi6 ziidl*N_;#fcu~=#HgJrk{z`tI+%Ewq2G0(n;a3Vbb#1F*3XaHpAt>980DA}N?}*Cy zMa^do7bqCN@VJn zpRG(X?ns4S*V%sF<(d&yeluKkdeL(7L4vNVxM)2wI|A!LJ~)*7i^3bsdivveZ^Z`r zjS;|k8vqahDEx02!Ai1#u+2pU-_AGs#j^ouSszw!9564`oc zTeZ?+gBu&uTT0@RZ&%MV*qI zDs~(p*5Nz13$bupc4;8==VH0(4(CmyNf*MhNLh7RySrrQn{W4mb-&vF$l>A4)((wQcmyw#S&yAooaXgT}e#B?uJOh3i5C(*Pb!_^lG zs8!styT#UN>`Tl>T-JwDeQXBJVw{+(u(vx5hd$` zTSC}zSfUz!==H95^8s()PM}l2Mgzq|^!rb|+%5rtwCC*{2neJXNMn+$!YlYJNwHZvZHjeM;g;QyKfVM6QWrRfOB6W?mIT=zh8ni=47=N-t7+Oadl(o=z z?jf?DHlL=gqlMz=NgHxxq*0t;>3eFr2F89QG+Gylrciv5dK4dBq>qlF57HM+@-gs5 zqxgry!O1vtZpoNJQ2GXXdIo5;kq!!lHsq|zz!Y_LRK%5(l*lBEO(>n}!|ytf>f=w* zriJ)(Hmo;d?OMy4{5}%KA(Z693=9py(kVVn3i*3d$%Ib!!&v(GYyZH0pO-)0KZ5_J zv?m}mEacyHSU(H>h5b{;g3b&Jr3d5bc;6rjiTUqBYdZe~{!_`7;vdLh(j##HH5L5t zWBmoZUAn#v#KAz7SxP2r4~4<4t!~c|8tqUZh5l17dnkwhSkAxTe&T=MZRr1{{|saO zpkqU65%fU+046>xe~gz-O%{|qtFUVC~g%54(VP*goQIC3ul0APO$ zM+*R`NS9dg5#sy8zV^0Od>aV>muF47Ipqihizgu?w?RKMxTcl=mEmw!7H;9gZ$~X4 zO-j;2&bHOx5|yV*apw2@4CxHA&5}Se4YLZZKe!%J(!C05;#`1pq*j@OSfjgm3 diff --git a/dev/src/light-red-border/ENTRY.xcf b/dev/src/light-red-border/ENTRY.xcf index bcca277693aea521d5a78be071b7e5e44c1888ee..edb29adfa56180267c5c1dbf709105f26b2b597c 100644 GIT binary patch literal 8984 zcmeHLQE$^$6n0x+r3E%LHnxceFKlWNx~{M7*iP4^fl?q7g@}d?H0|NWzD_MAc9gg! zeFACHp7*fFJ>&=QbM_M^?GH?vw3qB0+i^{?Nji`QQf_j5j(zXB_xQWtJ-&9!?R3R~ z<%kC|RRlqpI}Zm51j|1l7eVIc;P5fX;>}-9{e}YeC6H4f^B|w5>`w&Y+~071(X}kn z?fH(|=EP$i4%dVQkmcIemRNuI;CAiaHk^Lcf)I$?VJ%KtJ=ex&INpoZesI|4V&8AO z_O+!|r)BwVzbCGSiu77dCd%QDUW4jpMl}_~A65_gU1qsnOQbTK9lmrHpOAge4Mf+o z_IMvXe8=hYKn&Zb?8tn%F~)o;bsrrbFq;Joufx48|GBX_=(NQH-s`)*S6-o#ydrYX z@@)vIyz;1Vo0uz`m8FfbV`WJcHv-lY5x8<;d*C`!4Iz?lxSFlc zScBI2Ubk4l8*T?26j@Q%<>ES3L~5cT7bp1Q;0@M-u}boUreTQpxYr8y3KdPCruFx( zjg1w(G@?~CB=j~{mmuEU3-eVr)*)C2q#<%tDJ2fxhJ!_A7Eq>eYbr{a2GR+-jI*+NT$Z9_8 zk3zoBpYHBAF@ZG>yHid;IBl?ud#)A64zP|%JIy^u>l#;h-5v0D4s#!Ox)Ksqx>2ve z+L1DOmo%!kS>OP8g~~nG+aF}nA!&K5Na4=mfA3&tN4n)(`yEJawOfS>K10@R-*WBs(4-b+rlXt0ly!?}oNJ`1 zY9>*ruBfu98mf`G7-CGI_q%Q%Kso$@{PJQj^I>QMGe92YqD4*N@ZqjTYbu zB*4uL5>i|ZnSbqsQ9s?|kPffQ@W6Z>2~v?LZ-8>*ds37W$1Id-Q&*{Jl!#?&lxP$g z#HmA6D7@(yra`AoghW?Vy}=7om*1KOz?iRmM3^pP1u--nES7tML+pq$C5UWP@m`LW#*r zO;VzcW*O8hQY-U;ca)kSwYOZ4wbKa@lYSs{D(Ah_No*$XSNMvvw0*zv@QDPEK&-_VDJ*9|@WpBb@+I1v&*2C!Um$oL zJY@P8vvC5b1uM~zjqNo6P}MiAnxbGXN$3p&hh#* zb>-L(a&G9K_Iq7jHTHvb@`_(}-BPMu+MdOa^Y_2tzYP1mbE8Gr|DA1(2@yi97KJM#VK~EYTAt+MS5EP-9P+Om^RFE9Z>DioMyP}cCHyM` z|7Q42#gAP4sww_eL;h7`{#9fC%{1~aLM22f;a?T_H^Xl#e&pgO9Pw`naDEphnQsB+ c`@M=6z6<^gaykA!xCI)&iDJR;t*6oW7Y!oujsO4v delta 1251 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 wW@Yy4{rsZgp`3q{BG!9f)}p*2gE5m<^TWy delta 3097 zcmah}2{hDe8~+bu&mc?_(_{-R!!Xu~EMuE2gQSsSm>FxsG&6<7j3s4PQ@W_gQc*;U zC6Z+jp%Ai*iL|J=T_x%pb(g+#@BO~>p7TEEd7j_z_bl%@@1R*DIs+~SlJCg-002U4 zPVPE+79~8;4*KS$nsK%-^wV)rK*+oY@VGHNE(KTm7cZrOY^624kj&=%b`tw&^vmC;vnrVbZ* ze(UOqD2m;=I;DA+k+%!Nqb=hn;1?y@ExC%%S97~aR6+Zu+mMo0Hqf{Q+k zK4nppzd#b65i(4XQ+g|MOO=mP(8gAwahNef@52Ti+zg6qp3@2S)F|pxK<7QtuBlTp zzqB5ls9RN}V6o|f-jJI8d2p8kPyW}1O%iX9EP9o>G&Nl$wuAlSH@?hO54uCe?G#5%K8V&LhvIrQTvNLR~T4a5xV9IM=%bAIngnCPD*gKa}DsOx11QfQd ztc_$bfEURV4c^``DJIHOO>|WY?X&?SWPjaCJ4+DQXJ=kA8nZrdw+a_mH_!?%pg!ub zHKar1ofCaC)a_&3L5Y$dNXp6yNlC(cQ-iYgf)m$cpTY`S&aEUR3hhbu%iQ6KJHxW< zmE#ogT%EQsplY^VI-X9(v##XW-?!|Ix2md~q{KELdU%-SFx#3Q%+bxDt-{`hVrw)T2L zv7h0FJH3foU3oB(*r`f6bMwXCPL_sv%-ETbz?sDkzYglM|Rs}fCU-+p8Ol64x&@DP&-%VHHn=4A;s z{r!DWX?Ihfm;7c>PIyG1C!lN#vY0!~O%+-yx3?apZG!g&ODwgJjh$Mi@mrBqvsaN1VrpJ`*^L_P zYB+9v%rG3zlIoAT@LDd(AKxEsAc(46YIVXZdh<;uo%IW z>o#_EUMYPSvv1#0$m9dB=MO7+_0-h&T06l{-EZlVq55uK<{>IOKR076tliGIT(%!b z2r9dKi6 ziidl*N_;#fcu~=#HgJrk{z`tI+%Ewq2G0(n;a3Vbb#1F*3XaHpAt>980DA}N?}*Cy zMa^do7bqCN@VJn zpRG(X?ns4S*V%sF<(d&yeluKkdeL(7L4vNVxM)2wI|A!LJ~)*7i^3bsdivveZ^Z`r zjS;|k8vqahDEx02!Ai1#u+2pU-_AGs#j^ouSszw!9564`oc zTeZ?+gBu&uTT0@RZ&%MV*qI zDs~(p*5Nz13$bupc4;8==VH0(4(CmyNf*MhNLh7RySrrQn{W4mb-&vF$l>A4)((wQcmyw#S&yAooaXgT}e#B?uJOh3i5C(*Pb!_^lG zs8!styT#UN>`Tl>T-JwDeQXBJVw{+(u(vx5hd$` zTSC}zSfUz!==H95^8s()PM}l2Mgzq|^!rb|+%5rtwCC*{2neJXNMn+$!YlYJNwHZvZHjeM;g;QyKfVM6QWrRfOB6W?mIT=zh8ni=47=N-t7+Oadl(o=z z?jf?DHlL=gqlMz=NgHxxq*0t;>3eFr2F89QG+Gylrciv5dK4dBq>qlF57HM+@-gs5 zqxgry!O1vtZpoNJQ2GXXdIo5;kq!!lHsq|zz!Y_LRK%5(l*lBEO(>n}!|ytf>f=w* zriJ)(Hmo;d?OMy4{5}%KA(Z693=9py(kVVn3i*3d$%Ib!!&v(GYyZH0pO-)0KZ5_J zv?m}mEacyHSU(H>h5b{;g3b&Jr3d5bc;6rjiTUqBYdZe~{!_`7;vdLh(j##HH5L5t zWBmoZUAn#v#KAz7SxP2r4~4<4t!~c|8tqUZh5l17dnkwhSkAxTe&T=MZRr1{{|saO zpkqU65%fU+046>xe~gz-O%{|qtFUVC~g%54(VP*goQIC3ul0APO$ zM+*R`NS9dg5#sy8zV^0Od>aV>muF47Ipqihizgu?w?RKMxTcl=mEmw!7H;9gZ$~X4 zO-j;2&bHOx5|yV*apw2@4CxHA&5}Se4YLZZKe!%J(!C05;#`1pq*j@OSfjgm3 diff --git a/melawy-lera-sugar/ENTRY.png b/melawy-lera-sugar/ENTRY.png index 3e0ed35d341518aceebc8a59a334618cbb8bf560..0f3176e23ce7e306f027f16ef87a51625f6edcb3 100755 GIT binary patch literal 8151 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 wW@Yy4{rsZgp`3q{BG!9f)}p*2gE5m<^TWy delta 3097 zcmah}2{hDe8~+bu&mc?_(_{-R!!Xu~EMuE2gQSsSm>FxsG&6<7j3s4PQ@W_gQc*;U zC6Z+jp%Ai*iL|J=T_x%pb(g+#@BO~>p7TEEd7j_z_bl%@@1R*DIs+~SlJCg-002U4 zPVPE+79~8;4*KS$nsK%-^wV)rK*+oY@VGHNE(KTm7cZrOY^624kj&=%b`tw&^vmC;vnrVbZ* ze(UOqD2m;=I;DA+k+%!Nqb=hn;1?y@ExC%%S97~aR6+Zu+mMo0Hqf{Q+k zK4nppzd#b65i(4XQ+g|MOO=mP(8gAwahNef@52Ti+zg6qp3@2S)F|pxK<7QtuBlTp zzqB5ls9RN}V6o|f-jJI8d2p8kPyW}1O%iX9EP9o>G&Nl$wuAlSH@?hO54uCe?G#5%K8V&LhvIrQTvNLR~T4a5xV9IM=%bAIngnCPD*gKa}DsOx11QfQd ztc_$bfEURV4c^``DJIHOO>|WY?X&?SWPjaCJ4+DQXJ=kA8nZrdw+a_mH_!?%pg!ub zHKar1ofCaC)a_&3L5Y$dNXp6yNlC(cQ-iYgf)m$cpTY`S&aEUR3hhbu%iQ6KJHxW< zmE#ogT%EQsplY^VI-X9(v##XW-?!|Ix2md~q{KELdU%-SFx#3Q%+bxDt-{`hVrw)T2L zv7h0FJH3foU3oB(*r`f6bMwXCPL_sv%-ETbz?sDkzYglM|Rs}fCU-+p8Ol64x&@DP&-%VHHn=4A;s z{r!DWX?Ihfm;7c>PIyG1C!lN#vY0!~O%+-yx3?apZG!g&ODwgJjh$Mi@mrBqvsaN1VrpJ`*^L_P zYB+9v%rG3zlIoAT@LDd(AKxEsAc(46YIVXZdh<;uo%IW z>o#_EUMYPSvv1#0$m9dB=MO7+_0-h&T06l{-EZlVq55uK<{>IOKR076tliGIT(%!b z2r9dKi6 ziidl*N_;#fcu~=#HgJrk{z`tI+%Ewq2G0(n;a3Vbb#1F*3XaHpAt>980DA}N?}*Cy zMa^do7bqCN@VJn zpRG(X?ns4S*V%sF<(d&yeluKkdeL(7L4vNVxM)2wI|A!LJ~)*7i^3bsdivveZ^Z`r zjS;|k8vqahDEx02!Ai1#u+2pU-_AGs#j^ouSszw!9564`oc zTeZ?+gBu&uTT0@RZ&%MV*qI zDs~(p*5Nz13$bupc4;8==VH0(4(CmyNf*MhNLh7RySrrQn{W4mb-&vF$l>A4)((wQcmyw#S&yAooaXgT}e#B?uJOh3i5C(*Pb!_^lG zs8!styT#UN>`Tl>T-JwDeQXBJVw{+(u(vx5hd$` zTSC}zSfUz!==H95^8s()PM}l2Mgzq|^!rb|+%5rtwCC*{2neJXNMn+$!YlYJNwHZvZHjeM;g;QyKfVM6QWrRfOB6W?mIT=zh8ni=47=N-t7+Oadl(o=z z?jf?DHlL=gqlMz=NgHxxq*0t;>3eFr2F89QG+Gylrciv5dK4dBq>qlF57HM+@-gs5 zqxgry!O1vtZpoNJQ2GXXdIo5;kq!!lHsq|zz!Y_LRK%5(l*lBEO(>n}!|ytf>f=w* zriJ)(Hmo;d?OMy4{5}%KA(Z693=9py(kVVn3i*3d$%Ib!!&v(GYyZH0pO-)0KZ5_J zv?m}mEacyHSU(H>h5b{;g3b&Jr3d5bc;6rjiTUqBYdZe~{!_`7;vdLh(j##HH5L5t zWBmoZUAn#v#KAz7SxP2r4~4<4t!~c|8tqUZh5l17dnkwhSkAxTe&T=MZRr1{{|saO zpkqU65%fU+046>xe~gz-O%{|qtFUVC~g%54(VP*goQIC3ul0APO$ zM+*R`NS9dg5#sy8zV^0Od>aV>muF47Ipqihizgu?w?RKMxTcl=mEmw!7H;9gZ$~X4 zO-j;2&bHOx5|yV*apw2@4CxHA&5}Se4YLZZKe!%J(!C05;#`1pq*j@OSfjgm3 diff --git a/melawy-lera-sugar/script.script b/melawy-lera-sugar/script.script index 2d087cf..b0845a0 100755 --- a/melawy-lera-sugar/script.script +++ b/melawy-lera-sugar/script.script @@ -219,8 +219,8 @@ spinner.image = spinner.image.Scale(Percent(1, screen.width), Percent(1, screen. spinner.width = spinner.image.GetWidth(); spinner.height = spinner.image.GetHeight(); -spinner.x = progress_form.x + progress_form.width - spinner.width - spinner.width / 2; -spinner.y = progress_form.y + spinner.height / 10 + spinner.height / 2; +spinner.x = progress_form.x + progress_form.width - Percent(10, progress_form.width); +spinner.y = progress_form.y + Percent(10, progress_form.height); spinner.sprite = Sprite(spinner.image); spinner.sprite.SetPosition(spinner.x, spinner.y, 3); // позиция за или перед @@ -232,9 +232,8 @@ progress_text.image = Image.Text(progress_t + "%", 255, 255, 255, 1, progressfon progress_text.width = progress_text.image.GetWidth(); progress_text.height = progress_text.image.GetHeight(); -progress_text.x = progress_form.x + progress_text.width / 2;// + progress_form.width - (4 * Percent(70, progress_text.height)); // позиция % по X -// progress_text.y = progress_form.y + progress_text.height / 2;// + progress_text.height; // позиция % по Y -progress_text.y = spinner.y; +progress_text.x = progress_form.x + Percent(5, progress_form.width); // позиция % по X +progress_text.y = progress_form.y + Percent(10, progress_form.height); // позиция % по Y progress_text.sprite = SpriteNew(); progress_text.sprite.SetPosition(progress_text.x, progress_text.y, 3); @@ -345,7 +344,7 @@ fun dialog_setup() { hint.sprite = SpriteNew(); - hint.sprite.SetPosition(entry.x, box_form.y + entry.height/2, box_form.z + 1); + hint.sprite.SetPosition(entry.x, box_form.y + Percent(5, box_form.height), box_form.z + 1); bullet_i.image = Image("BULLET.png");