From c6322b49c48eec64202e1892e8060d2fb0c1382a Mon Sep 17 00:00:00 2001 From: luk3yx Date: Sun, 4 Oct 2020 19:08:28 +1300 Subject: [PATCH] Fix formspecs on games other than minetest_game --- atm-core.lua | 17 +++++++++++++---- mod.conf | 2 +- textures/lurkcoin_error.png | Bin 694 -> 2032 bytes textures/lurkcoin_processing.png | Bin 274 -> 1491 bytes textures/lurkcoin_success.png | Bin 781 -> 2994 bytes 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/atm-core.lua b/atm-core.lua index 31cc002..3d96837 100644 --- a/atm-core.lua +++ b/atm-core.lua @@ -12,12 +12,13 @@ end local formspecs = {} +lurkcoin.formspec_prepend = 'style_type[image_button;bgimg=;bgimg_pressed=]' + -- 0.4 compatibility -lurkcoin.formspec_prepend = '' if minetest.global_exists('default') and default.gui_bg and default.gui_bg_img and default.gui_slots then lurkcoin.formspec_prepend = default.gui_bg .. default.gui_bg_img .. - default.gui_slots + default.gui_slots .. lurkcoin.formspec_prepend end local function centre_label(pos, label) @@ -25,6 +26,14 @@ local function centre_label(pos, label) ';true;false;]' end +local formspec_img = 'blank.png' +if minetest.registered_items['default:mese_crystal'] then + formspec_img = 'default_mese_crystal.png' +elseif minetest.registered_items['default:gold_ingot'] or + minetest.registered_items['mcl_core:gold_ingot'] then + formspec_img = 'default_gold_ingot.png' +end + -- The formspec code is based on something I did in 2017(?) for lurkcoinV1, -- formspecs are weird and I somehow got it right then. local function get_formspec(name, page, params) @@ -37,8 +46,8 @@ local function get_formspec(name, page, params) 'label[0.5,2.25;Exchange rate: \194\1641.00 is equal to ' .. e(lurkcoin.exchange_rate) .. 'cr.]' .. centre_label('1.75,1.05;4.5,0.5', 'Your account: ' .. name) .. - 'image[0.5,0.5;1,1;default_mese_crystal.png]' .. - 'image[6.5,0.5;1,1;default_mese_crystal.png]' + 'image[0.5,0.5;1,1;' .. formspec_img .. ']' .. + 'image[6.5,0.5;1,1;' .. formspec_img .. ']' -- Get the page formspec page = formspecs[page] or formspecs.main diff --git a/mod.conf b/mod.conf index ece215a..93aec2b 100644 --- a/mod.conf +++ b/mod.conf @@ -1,2 +1,2 @@ name = lurkcoin -optional_depends = atm,bank_accounts,cloaking,currency,default,economy,money,money2 +optional_depends = atm,bank_accounts,cloaking,currency,default,economy,mcl_core,money,money2 diff --git a/textures/lurkcoin_error.png b/textures/lurkcoin_error.png index 53580941e94bf71d6cc02d88fc62b0a1f88d1d79..a759927c5fce05135566363355a82576380d3f50 100644 GIT binary patch delta 2019 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 BnMeQt delta 645 zcmV;00($-M54Hu6BM<-vVoOIv05kwJ05q>O9Ke(51Rj6m0uvVtHc?NJIsgCw9cffp zbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0vbs~K~z}7?U&1HR6!7i zzdjM-6S&N{5qtn&!3!ZMgLpwi21f}=Bt)GUFNot6FPXR$#DLLVHVGKA&dyDqAP70# z=LuZtn9P4^H#0DFs^^?JmyOtPHZxuIe^hmMRl)z&x4y&S2-bJuWYNAgT-ES-6#{X? z7K|F$jKD_lD}>WUi5s|Ppc8>L@Z|u+HXJhWtt;O9erp)dD;`3vC*J!stTaJEm*fQO zTlnGFjs~!1U?PY3^#GRD!LaW%!Ag00??k~y(B6NAvl()J(?IO{Gw?9Ua7lpp6GC-} zoKJehAEa^+K}&+ra6U!Yr##~KhYFztVPMa|g#po<5x}j1g{;?SQE;{&!X;tvtR$}C zUfw(WPJ+;IrEkxiM|?iXze)-5RyocrbS%^?92tR@YZJqK1r`ed7yuCqcbpg+6#*(2 zKo@`FjY`OA2kst)rP2zPf!9*LyJzF}u>OJ!3_qnGE!f!eUts_m9w~U`$)yV5lZG3m z0BCp|zzg>fx)2IJ8kj5;z`&CLo(bZ$7#c1F@F9e$q7L2D91qbQhyZ00000NkvXXu0mjf-{~B! diff --git a/textures/lurkcoin_processing.png b/textures/lurkcoin_processing.png index e592978cc2223a577a72abce3d5476ebe3c82643..b44c8f8084ea3dfe4734d2dfe3689832323f2554 100644 GIT binary patch delta 1474 zcmV;z1wHzb0@DkSBYy)CdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+U=HGlH4i` zhTmC5mVg98VmX*g)!9LopPx%R-IL3iRGw1RW(-)!lHilv-c(EggA>97=Q)t$!Xn1#)>Zl>1q@UKh$S z#C9AU`NL75?ZCHVs2oFqkLS3buj4so)8{R;#}4dBY~OBnF(@ZVq!E2&ubMLE#y%>} zt<6A#?&Enl`uOY~s*ISp2MT`mwxbODE>n))2e`pJulbh8O~3&eLV)Fb&bIseG+)l< zG5+FmpV`()hkqB`_w1yB`(fcj8l-;Y;RC&Nk4x@8E|B~j_hR}Kk;dCGzeJ>b`|!_L z=RHQVG5X$Ji3wXyXH$=zkef3oUNZ^SYY9zp3+B37Ml+O41?uLjztAdWVxSxpsZpWf zsIN(-iWnnzMrh1jIV_ohMdlhN^f((0R^V^JkQf!I5`Q4&G2DrTmfyVmRWf*P1XU&& zBfRpz&3#7ccWsPWOGNI}3~j(X(;i_=a_(VY{5%PhR2nT5ZRLC2n&@K=l5pD>QV+aXs zPy}%8@PCfd(q-W-$5#?0B&48Vg8~Jt7zO#G(U3z$f!RRg{7over}5f zjVhW{)ii6dV9~^qshMRfnRCF`STf2nTh6%@_$;tok}J?JkX(F)D_(M?OE0_fRVvb_ z#ws;ctyXg_jaz7_Yq^z99jVk~7uQqQZht-ZGLUN{j5uVZp~FTV<)(J1{?Pt_ z8Xao9NKHMxsX?l`N4N3?MkX^5<47Q`lK>K$Co^vpBTsUZna_->5Jr$P*);Nn5=R$e zCze4syYJ-wh?`6Cx7_%%ZeL(eH6a|0t7YU<# zOn?4%d>eWjdK-EhdK-EhdK>y@4JrP0$nG1?8&?UZYhc6x00D(*LqkwWLqi~Na&Km7 zY-Iodc$|HaJxIeq9K~PL7Nt}i>>whTp*mR*6%kyt3Pq?;YK2xEOfLO`CJjl7i=*IL zaPVWX>fqw6tAnc`2!4P#IXWr2NQwVT3V$tPJUH&hyL*qjcYx5SFx3o<0jg#h=|o)2 z=2pe7SA-Bi5JQ-en5oaDQb~A@uY36TdKcqa-sk=tJxbnWfKMczWx8PzZxByyS~}-_ z;s`5A3h_Dds6iJbe&o9B@*C%(!vfEY7@71uafDbbcCg&RtYoOflf+R))hJ)cx__*2 z-r}rQYOHln{=#rxTUq8h%|Rrvh$W;TLPiZ`RA3=St44~6H0{Sd`~!|ZMJ}0KWiWCq zpb8a|;|KqP-`$#piE%e690!6gw*4^-bnODox@~_S+jjE=@IM1rTH9Z30MnnO*V|h3 z2MD5y92^28 zMao|Hcz1VaZ~vZY_4fmM5^}1n{;UcB000JJOGiWi000000Qp0^e*gdg32;bRa{vGf z6951U69E94oEQKA00(qQO+^Rf3IqlK4rk^qcK`qY8FWQhbVF}#ZDnqB0DnVrWnpw> zWFU8GbZ8()Nlj2!fese{0050iL_t(o!|l+q4T3-vhw)EiXHDw>4!{W379?yyN&QB+ z&P{LudneE(u(YD00rEnQ?g$0{Uw4=9y<84NL_{`r@P`n>4R`<-;007>*2V@?wI>&4 zKm(kIt2@vEWn^Kp_UPKHi#ta7!p|jZ{R2M0e-^$MmL_Yb2bkFpD1h%U@C54E#K`+SFiCN(Iy}9ffq_9bGbEzKIX^cy zHLnE7WngeFN=+yU#$>%*hQGd|yV z8JT;=u&C*ZToU`X%0J1fEfba$xqhgQ z{C2u_NN?>D?{y64=gQZvvE3`bcB`dvvZ;Np?%S(kp4*SEmD_sl^TF8NThh|f{y%43 W!p<$UM diff --git a/textures/lurkcoin_success.png b/textures/lurkcoin_success.png index f7bbb343146cae12624ec411d594b177e0aa4ddb..17ee5252ab6cfb9b3af74e9c8241bf1bbe753268 100644 GIT binary patch delta 2989 zcmV;e3sUrr2C^5BBYy_hdQ@0+Qek%>aB^>EX>4U6ba`-PAZ2)IW&i+q+Ra#Na`Y$+ z{Ld-&2)u;EaS))Yy}=%T8_Z0S$!n6Ywray#BDxaVbX`h0{S*Bd6o1Y@>Bmk(KfN+k=eeP8 zZ?t15%9-Hw-zG}on!t}^s2xKoo|*G?t!L&^gQmB1OlIeO+& zaW2tkM%>0)XyPk8w}~FF-EC;Zn&M0$`TZ-`D%16Cs~^8UVVZRp=Q*X_Q!fM@Aj1-1 zxt`cge~;#y*niyGPd@G$w+L_ldFhY?yZ7v?_cp<|6X&d6wE>@n>=0Twm(w0}U)>j)M()igkXm^!GE&>PL% zSxeaS);(Vjf|*Ca&=_DW;E`_+_spQL4zra@A-Iz>;Q}}=+G80Dx%G=-KqS}+D(wK@ zj<P)%TUJLgvEpe2z&{NLJ6K@b@4l>`!$N@8GBQv+Bz6Zpefz@bKo zG7%MG5~|cnD%l~!O5w8PwsGRj#D$rKD>q4!g`^0JNR?J&O;BU1NXII**48j*gXLCS z!}x|CjhZwoX;D_us;z@QJ$LG*bC+Iw8*!w8JbxZ#@Q_hQn_+@VGf#4}OrA39YzD4b zvTS6<*u<)}J8B2jcgGJ<3kS8hky_*Ujv9KIuhwn8z{tW3h{YU$I4=Z1=(sTR5^|0U zxrLdp5m`YIi=>6k2)>09vrBn~NEYtcy&(4^++4|D;ufDp&MoNv5V?(;oAe5|4^SJc zY=8HS*p-DVramG2aDPgR(pD91?soF0?f=J+acKZgT+<{r5v62Xb--_1L{!s?IN1tN zC{;5Bnz3b;8Aqg$X;qvVl;&KmGn!*kKzt`ztFuqa2CJ24!)W}mMn+QQ^YACF`)jD| zxX*6D{;XHW)tD5GO@R-D-=`jk6WHRUSjcL=&|D$Eo&W&-AGEIE^-iDF-91n zbZ|u%Jy27?j=IA-3-n&!ga?(UP*gvnuGcI(39kVv_hWr}R@hhzBooyY)PE;zw`FFz zW%3@Q%Ry-NSM*n*P5)=u@4livVpQ&=fPmVj_ZCoag7LaFp!F9`oF#;<9#O@nL-WLS zTT(w0y?ai4QCMdg_m47R<1OQ@7KnBRo5<+}A3u+^G`^S-R-zx+nzxSKDnP`GS zzZ>8Oat(l#x4_`_S;Bl(rByGiI>z_Ta zQ)S3+YW$FDbXkGnW13{bD9VhHuPwjj6#ebR7UyVG$%qdMew^6$L= zZQc0q46)%IsJedvyw(Q$*4Dn~0004nX+uL$Nkc;*aB^>EX@6{G004NLeUUv#!$2Ix zU(*()R2=LeBAB5%Sr8QwT(k;Bs8DK!Rvk<({emV9Ns5c3;979-W3lSs;;gHKs~`w| zfH*liDY{6B|4RxjVmvtR$GdxvyLW)ls4&$Gi~*`<8RpQP8@TJ#9$-3BhM+nT%wT_CX>@2HM@dakSAh-} z0007}NklVY#LY*OHxv5484&pibR zSli{>#*9VCx7o* ztDv$CfkYtK$UrT?-;>h4>wWaw_}o{n$5%y`c&>PVKOQ!BgTRFdm}^9Tr!&kf)VCe>D~{dw+}Vq`w8sSdU4|d?y8o%M#K<=?&+Dd(vpIeJBle z1zrQ#n8SuaR2>f+5A6_;<}x#P=d@sIv5P!I09o3d9Opm6$U=WDcEEgK_Yj*QU|5>B0q$4GU&txO9Ke&O2p)gq0uvVrIE2C8zW@LL9cffp zbVF}#ZDnqB0000007G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0&z)1K~z}7?Uzkx6G0Tm ze{Xk_GzJk-G=h|rU8|I$2TSWgZ#@g%Jm}4$;;D%3!Arr5HxGW`Hz-yRp&$r?2T_c8 z(2Ah-GiiUJpwzZ#OKnM;WX6My>~7N!ligf&U}1M>-~9e>-n=)n@UJ(i1*9=Ysu*E6 zkQ6ZHa@-tFFaltO2~JJ3(TsCh342SPYE3>8;XZ^cz?ot_ancBmr$f`7jq7CUGRb^+A|hU%Gm@Kg3XhxHB9ch;qz19xfndqET~(}HH4IJ>ThLD&MjqU1Qhq9 z2>X2S_pxz~gkA~lIhw?xAEC}Q?K7%C>tK|DL6S`<7&8rQ=i-f=yqEi^&ZiJf{lm{~LJ40uo71AvC(* zDNR=(ac>$WVJmuUMb=UDrzTkA?%$H9)ln2Yu~$5xCxEKj@RJR;;)7@KA}9Wc8zAB+ z-uM>XSp77~N|~Mz7;z4Yu+_Ir50q}_w$Xo$(Cq0~94eh|DruH4B}U5R$#y4CTT$^H z;iNC$uVgLmRWs|}y08c7!=)hLWd#@o?kqzemLGHlRn8X(_!Q$Kniq>&C^|Chmi1$HP zGZqhn+|bGj$UfyZnzRr8TupGiX1``TUt&!*Q?Cu`q`+im6<_$@LTJALqu|}K>D$30 P00000NkvXXu0mjfNmWiU