From f391bc59b02bc3485b7139a866862b88172c2742 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sat, 17 Jun 2017 19:32:14 -0400 Subject: [PATCH] use texture overlays on lava lamps (water is now blue like it used to be) --- lavalamp/init.lua | 7 ++++++- lavalamp/textures/lavalamp_lamp_anim.png | Bin 4804 -> 5640 bytes lavalamp/textures/lavalamp_lamp_liquid.png | Bin 0 -> 412 bytes 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 lavalamp/textures/lavalamp_lamp_liquid.png diff --git a/lavalamp/init.lua b/lavalamp/init.lua index 4260c362..54909cb7 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -8,7 +8,11 @@ minetest.register_node("lavalamp:lavalamp", { drawtype = "mesh", mesh = "lavalamp.obj", tiles = { - { name = "lavalamp_metal.png", color = 0xffffffff}, + { name = "lavalamp_metal.png", color = "white" }, + { name = "lavalamp_lamp_liquid.png", color = "white" }, + }, + overlay_tiles = { + "", { name="lavalamp_lamp_anim.png", animation={ @@ -19,6 +23,7 @@ minetest.register_node("lavalamp:lavalamp", { }, }, }, + use_texture_alpha = true, inventory_image = "lavalamp_lamp_inv.png", paramtype = "light", paramtype2 = "color", diff --git a/lavalamp/textures/lavalamp_lamp_anim.png b/lavalamp/textures/lavalamp_lamp_anim.png index d9f7d53e5e0a507d9c5c3ca7888a00994da889a8..a6f60e7d93df86ee76ddadeaf931f059e0f5559a 100644 GIT binary patch literal 5640 zcmXwdc|278`~G3d6fuLLNtP^0b|vdrng-cQn50ZuW3o&LBZTZsvV<^}#}hJkGO~}d z3)N&xj3tI-C)vN}`TSnLzs@=L>wWI?e!cJOzV7QfF=jUmIN1f*0RZ4MypAykuW$fh z1x~PmcX9Q<=>WhtV2HVDN&LQ)<@#9ADy8!%s3G9HU%ghUek{Ves~tU^iuF5n@c`MNt?u=mSN1@&SoAtN8E zhCSibPj^z~1o3YSiwiro#)Af)J$~t8s()E4Rz_j&c9BHdH@{u&{*`R+<)&ccZAP%p z6c%xu<_oZeq@8gvB~`Ytor84sRt3U!ziuDIe}JH)>FDSgQsq_Aa7n)5_pZZb{U(y$ zK?Vk$Hy3~X+Re6`Dm+NUka=ldo96G#-%4%v|=0%8) zi{@-l=oxOq>M|O2>0Zpd1J(V4(ZPMn>MCE6CFN%7Y)Jt=n5;^eXaMtiB}tfa293r~ zk!#OHvh@24(qilD>j~i^@}I)IX4!GWqTvYuZKJU__9*x3XPbvewkJ3!Q!sv}B6c~U{{?(RqLo*nE8CA$4nT)gNx?4w#t(fIN0 z+vew_^TvNvR8?1Ae9L}5%Eig)?kUK`5f>43<+BfWae8LE%`KwI-K0_K0Y)P$HEvDP zO0nRLleK|E-iLVW)TupfUNk^+!q#L(Kf8K$Ehs0DAyOnV zRf&3i83TF_maCK5=W+RzxJ6%KaJQ#mm3yXaub9}=cNzIj5z&9biRT16yT_>G{IjiN z(er5-$1gc?=kgly8Af$hhg{r3l44QOjjT{~`-MEH`YZ(tZ~)Y+*Xn5_3Gbh0)j2|8U3PN%b^I$hC-ul`0|dPZ07 z3}i6$FpN@ui7~e^{?OnAKfw#vFn$J4M|{R_hzZD68NG~-e_u9ct#ZG@y+QBRD+S<= zC4vX+mY(lM(a@bUcg{u6tCpui0Y#M;P_lQ2dYTW;>b{k*EQ@0B5bAoq`5H4jV7a(# zapGcc)c`Wn43Yl;J2^#eFcl?g( zn)ULDv`bj5e_LEE4)8g&*&D}Q?$A(YddR0Wv@4RlQ})B~gj~ua878@iVicR#W;49> z1m|~dzO9E3glMWamnofwjGOhUTVzqBE5~>rUch1r3im?G7Na;nK7N7|`GX=DN+$0J z0wTa!5s|d$6G;-|+78F7WVhAgHy)&$%<+=F&(g@bIpOft{xqXCfaYv8q7A7y*X7tKE&RJuw)o1YFapc_V>GmA zn}+YRTP2Q({2}hZAHyQcSoR$VZdm-9pO@Eq;9+hw^jYJr4+8VFmgw@9C`dbc$dC9=#?@lR7z5dGI+@wR_9 zQ-bH@g(NvZ*VwqXI@RgCrlzJJ8*dy%$yr%NB_pE%H>cL`Wth}eRg&5jx7gO!_5%Xt zdQDQYLw2mB$>W|5jEsyt!VN>mzJGrPkGQVt-Tx1T(uTa}ySus25Dwq)sv~C_<;%Of zx$S4zA;o8H$fphT^>ZoGtQxAW8NTegpQuYOoiC;PQ{5RnH{wi+bx+s{M6&4J3YYEm zQj|G;Y{Aa(gl7bWB4k&6JNEYM$$oW&o+uW3u=3>s^O56bWX*ztjqKTI*x9M2!Q#dy-SycLwnrx=9j7`R1~jeTTRcvV`B}~_Q#VXzO1gUs@}-b*!r9( zZa`&ypX4n}S1vtH>i~%)s+YChlPvRRg~2GKNGo+5b0}F2kPHtgz(eJmHosyoub<K+3!%4nqyx<6jM754DQsvn9#N^+NP+y$OLPQ7E>gEQn%ZMXrj9 z$}_#BHxpiS`!ip@+%hVpi*<=S8`wU$Om*MGY{K|zp9azM5;^Xch}KVA*Gs+F@o;66D8Yw5&-4K0Xo_>h>;`HTa_=>qpCHKY%`pH<^Up=bR!#e z@%Yf_4?5jDNF{UpGkDN@Jt;CU{Tmn|?LcC0S67#5oy~F+fMf=qW$v%;ZY{3J+-sej zJZFL3a!_dgJKe(KvL5sx$>~hl;&Y|cES=!P+S_F|{tS|E?2KA%j#hv#FSGIDK1)VH z>vj-G+bc)Z0{jhI6N@@0(PNmCsy>p!E}_98c_BZE@@WB;wtL!*UH5zR(! z&ie{7g)p18)|a`~Cha>t^=*dvnpb$a4MVLNu4BIUz|(Y+`46mtN=~+F z4X)by*eViugroC>IB$!ES^uzUS$)VJqRA2n&~lIt|B@s*gHGt)&FI1u*T}dn$>ZhlcJzb(P>)iIIHs@5ekYO zXdoll$_2lnY`VuNE^poy=Np*b{PV}R)4sAd%vbmbGG6HeAc8wxG^>mGm$fl%JncFUBWix)uX zu{gLr2nsrIeD&9pU21B>fJGNEMs@!2Iw97p=(JLYa=*W7h$oO9!tx)II_qpao_KjB z@yp%CM5s!y+Vao>Se^hxXvofa;;L-OHI~PbEUT(em;iW`Xq2v_@bB+6u7&XFuX$a! zrDE4-6k!P9{al7?0himENIM@tzata+JHGQILnF!L&R)rL@j{x^*^x>IS3W&EmVUEU z7;wG5%u0oMu($2!Ts>MG$DnNotu=2q5mE~9EtzYafbGs`zQZ6XNro%- z$}djMu!7?D$=s(i0zyJBp4fz>OotZWC&?DtIW1*hJwxqwl3%;%5fq$OW9ZmKTLf9<&^eQz*hx_d=bleKHE67U+fLy|Z2fE5z*PbbB1( zCs~B_?o-4yJI1z-OUA>E?s)aoH+HMSfhNoewm|eG4dtXtYGJ@;?XTFMC_0Rpv2f7qfE7arAg~mL?tlE1WB=# zzV@)2EN?lMwD>kc@>VBLlaxvkFi>OH?aXB|2V6|3?zJnU)y$0o{Ii-70TzOvhMKOkksQ2mbCaSoN)f&2yGi2{}#Zz`jeK2N4 zHjqkhKgk;v?E(FKY_c{eHve1EeAoFdk;7Nf%hJDPZns0kcKvB#AJz|j zdaL+vTeQZV|ATB1Nr5hg!wDRwj1O#w1~F1w8Ed++#KYVQ4pe)X9|UPf>Vxe=EGJu& z>BPrBySTTKjO9V}Ec4z(t&N`Rs^?^`c!Z1ivL4xvlPpH7WWkLMD4QODNY6p}{Q8D# zUa9S>3UpkXZm+GOQV*+2t_Vauzd|95|KT<oJ8XWpksRK*~V`5_BY~AxaveZ=X`^cErD|?Xkx&EFV zC_4IM4CVtU+lq)NuKt}XiA~975ibkq3uGtjC})SPh^3E5k8#`U6cG|y;^Mv;_+ciw zT>6vGz=pmlJy1KjJ3+SB;ta`By1l^Zav}Ww{_*00uuHxU~NEQ)mE!NM;&jDaKa<; z=ZS!58waVfFamB+NUV4~g-*RLLAI3kSp!>`-8!`fR1eQOJjsjCZ*{Z&4a<`nBfOuA z)GSC+OquZPj2F@Z8R}y!pNvY)yLZ2hC3qe>IxY+gERZC$&!L1^AM?!i_FSwo@N< zQNmI1=?Bsigi}YM@DHaR7Q)e883hLcSUM=#YNPru+_2<)m20R8S=@j4YMys_HEz?WRe|l zAStCOQTb_t)~VIaD+*jo3Kbv1;ppG?q$O_j-||%$*u_GfF)X?_Zw^?Q(i_EB^(B!G z2NcS3ILRjHgM(L4%F6GCl>0DPPLo2q5?y%={3TGHb+JrdQ!cst4Tr4> zU0JAFj+d9$5A?d~3r{p|Uom6f&SEh`3F~MOCK?B;>sQ>6Y=CS|Ul7wNVo>^Z(ZL`Z z%dX=525?u!Dl@13MUcqjwPhk@sn_G8=S9Ud3@|zrjZPjfPZd5!3Hgyj+g?8rw*gK3 zb6Oy5|0;*W?=WEQEu|jDBv{CUF6Ej_DN&eq6$prcdpq~!I2e&8+#Xu~}YNFm}aRwdT7n^tL z0#8iT-Me@Hl-;e7&Ik-$$?;R$-QA^<;^UiBesbLRDOwO|+}eUoJVyPk&y(7kf;w4i zcO&<5uA}Ccm+xz8XlR^&kc!H{m__GJa{=Ro6#)}qv zZV?sTuM3<#Tb*vAf2{VgOJBwnm_%~7EyNcn*M|yz`uc^;OruW^O504#LuP3OmB)Q3($}hSe@j zH0{A1Oq@vFV4hUUbSTpw-(UAZ{dA<=Pr=TGPqSWeJ!`ptFTt5)nT!H;Qe|TSz6m3d zqWP#8!HpkL?$fjxb_Yj!i`@3Fw-qI-Y~9TKvcYRtt9 z9N9iN51LVKEcSvaT`Na{$3&=_I8UFsCwzPq=U;n8bBj1hFV$ zIoe5fu^SPhrey;1j?&~=T=B5|KMPx-lAdoo8 zNZ%5;OMpQ9AYp!BBrtL>76g(^BI)Z|k;j&D8D?^}?Do0vg5~5o@i&ot2hg1Y_Eg0_ zgOCHKtkZF02DUrSn>AL86%3<{u?FL($`!|-rAXee#=eh?x_V7+QvBMzTa#aV?x}tp zQM@_Xu=C9h-Fas1LmqECe=87kbLJ`Azf3x#CS&_;H`p(o$0U_U%&@y9SSQAFZpao1JyfDNWgP`t#!l z4hX}%4C_=CWAd7AvhX+Uq~ctgZvLI=o}>8u^WDc(Ou}4n{@j_=5^Q3rXJWA*fPKVOpLpg_F{DiQ)ERi3u7*6xQX}DR$ZVRC>=7mM57H(RJ*Kk}y93{^bG-ZtC8r-zi*1(uUdF=Q?LULdjXDK_-1;Cv4|seEyIZK$@2aI|L*S^!4Scpj%D zCD5TN_B;KlWrDjMiK;5*eL5F5hSHVj-|ELZ9?!s=Fs|3v!n&5P*Z24%I{ou7BtKcM zZKiwv9Eti)^%Be=;9H!lW@=1LRaFlSmsnhkt?gc=;VSK`kSNsUf{5LX%H`UYmI|z~ zDm+%h9|0jbRoSra9y%?eJ#cqN5E_mCz+^J}`uq_dIf@1r_wL=BjM&rKW~qu{rrppI zprU6sm58pCXg~swMz0hnFJ*4>%PPp@lL5 zjzNerA{58?%vs%9|8+FIM_+-@zC;>|HzAU_?W)Navy^4x9x~^)xP=wRzsgG{402Yr z3CU?`B|C>uC?=3`%LyofSyB)?{(}zA136?E3&QklkTz0iP3ij316D; z9EFKQEe8HOUAfibSfe*OdTVPdL0?ZIHY-^38tT)+Z-8usm||?$5Ab%aD;$V)X`q>0 zi@V5bAa;X=nZd!JCDEXHCfLAY+HXWP*+F^u1|CCNWYYikZ51S7Boo}!Mw1|RnMaQv z-4FGBy=+)y?l1KKWUY5r_Oaar!(xrqq+m zUpOn5B7`V72X(3mx_(_~4Q8XFqH?$hZ<0PgB`=#&JOrXw{r#f<*fPPafv2jWFNw_)xPV4VNl7^@bf{jk_=l0Da-qb6L=_^m1Eg$yU3BFw)3F)79 zTmmy_iN%q5Z>N9PK>>F2RSke9Cc8j=nC$7{U`tsg#zqyUEN74#@hPOp+n;%BO`1!rx$F(Dk&*JbVV^K zt|RZ>=_{r$c%k0Ee}C33kW7Z_N$9*LLg8_aZQ(o4?J>-`boY&eK;$<;zmTChjM?7V zmCenwOx_`aIfkT1824(t-TY;6&`RMU7A8{anVOvZJF)EHwPPg7?I)FCXb%q$-Fx0S zfiv&Lb4p7F<|ihQ`gaQH)5nCP(WI4sAkk5rHT4)^p- zDD`CFUBO>=j?h)%aVN#j!#X*`HS8uJ*_&(zgOPpd{kS%;HQCuRWE&$w``Nb1G&1_v zL~9aR)g&F$Q&c2xZ5^CX@%^glR5>IZ4GJ6Tq4)G8U=x=J`U?96`uCD4m9{m2G*3lY zTAz|l5sK+pUS7VnOD*-hc<~~K!|8F8G*e9PHeH|99lpEBG9wz4F3h55W^1N-JRUr5 zzraZ%k*KA$q-k0|`rM|n@A{pfAnA8f_#a7=t7HOqU|`^3*UVoOIuxailS3KeV!9H@GzdAq^QxSjT;XvhcWQmhz(T(Xyb+pV?C#_9p;Ox&W{s0N{4m}X zE+KR(*M!|vIplSZdoPaSb6S)LHjXV_00zog=Kv`*hY2deZQ284q=#jQV&dXJ4sDZ@ z%1u;E--i#8Q?KJuR@T-qcP}rmkdUzqNKWa@GP%*-F80zr-yFQEBHx{DY6a}iaAGmG+xj~%SQ@GG?5w2|Jg$fK+%rcM zN~hD82<=|%rt?Mpy}gN|&%IbayE1|RKc6j9+3EGmx;p>f^OIy*GB(5b+_`gr3Y&4K65lagUQhAe{yMe5poRMR zNu+hzWe(ll87R4+OqkNVm2nH5uIJRNUvI!MgW0~TTRScl54rw`VV~1?9f$FK_aWR3 zopgT5DZcUwk<3{KAT#7XikYeD*nHPi3%*@0?;$Iyh zh3sx`0OeCr@l5iL7pm}<9u?E&zZ#-dz~r=;QlAuKe=g(QT(yu;6BfWSWZDIoL4Wjo z)yEM?V)5tUVSofxHkYjr=E;%Y>J?30MMXkL)KG0yNTiGEJa5B^23kJAsgsJ0Jaz5hk${==VQYUv_qOUctpJBJd`FF6$=rw<0yv z)en;_&p|WYfz}*2MbMw!iM{^t1gc~_=^Rqv zCX)`nw3HMBg@@DA(}9=yAx9Gx1|11V<|G4ryXhRckT&{bU|>Jj948f=-{wDKc<-ez z{QctM;^)s&@1h8v z`a9_5VMb-FEM-T%=<d z1xdQI0~H=V8}dplHlhZEhHiiBIS}V+zSHp(3E5?@tu?vAjSlnw-MZ*+gqS)Yjckvg zWJP_C+g%07dfmfAP*;;c@EJb&lhBV3+giI>z=SN@m0R&Eea@hG4_E81$x>+#_!m0Q zznVXftQfeFmj$VXVn?>*g5gM{VLm`90p0CQPL1*|^(Gq?vF(3P3Y`Du3NC!PQ@U&w zGJktIIGjwrGQ3(|ek>l;0cxOgtV61d?De7X^*lPf`{4toGnzmipr@u(l zfQ8{g&&|<#4=9olsRfsn<*!>Bs_CHNp4f`f0mo!XZCzv)p6Pfcd+3msZP?lDOSch_ z&NbfWnZf}6v~M55!l(a{1kA{pYe7giJHYosvUOXYOG7VTz6?;KHUsFVwCCyR=}v@L zJ$X!Mhl_-)P|J!$QsHSv0MV2JkO1?2}lDFhKO^m?+RL-*|CRKt>r3aO;dt~Av7n!<~1LW^@Vnjclg z>@s;9p;#Dy7%SV?py#fiR*h4u$RQ}uDW26VTzb>^7{YF9b@DA4i2QOj0*UqoOS#>? zO|!3Bn+EJ!ExJDvY&k-q*jGu3-0z)Ld$~Wwu*9}ah(T+#uQJEFsmY-C$y{CEJ%agE zJ9Z!Pz~qnGx2kEZ&f&ln9jY5(^%VkMwPzR~VbG3e^vWO=6&1fOYq~i)E1z?Lf9Guk z1_tUF+GXyP5c2Bbz`*oIXO%1HTJKzy`OKvm|FR{GORHc7V?Md+U#)abgp^*QZLvlYjHJ16;AMtIML;A{u-Ob zSXwJ$Ie!gC(iQ-C3$eYNRh#1nUwYU^{Iv`^G6-1tkp?HiNR#-j%$sa=b#*{t!^n|d z5Nr)#^qkT-Lrg&5T6YF3~P^onS-4y`gb?=$CaVVI9i#k4}ztfSEkNu5kN!YcHCzG&a{?>=PGP!r=(v z+b>JB$7Re850KZ#gNnWbF*es#io$)L!G8Z*w}A;RPidM)An_*WcdA51MZLYf!^pxy zG2J-Cp+oXo`#06Hv4ZKJaKo>BGNF|X-5{Q z0ze=ezY0h97eM0oIZOY$nqkd7uG#k@2W95Rk9uj}n#rIpxwY^+chnL4hB>QFKtmGR zx=3{cYD%TrmWT@27UYkLi2)nIRu_ET;qUQ%1>u`Lzt&48qIoNziQkpWs*fW6T;@Ud zh{1p(KSEn$g+yXzFdtWrMamokO0yYgbxQgfm#WAV(u&7W^0FYqG5^o+`KyqZ6dgIBq=GW zf0gCE8#TA#psb;#mEwAZfc!<=Yv+ZQTScFie^9N>gK~YUY`nd^77u<$-N-?HAc}oQ z?T&3ggn3S`yL|siG^mf5$IxzI5(8#jRri3@;s5#S|A7Wja@qYK9`AnHj&ZkpYPrDW zN@&*%a}ZtA&fy#GFE$_nOFw?J8}1Bj{&%3qYtwt6$pF diff --git a/lavalamp/textures/lavalamp_lamp_liquid.png b/lavalamp/textures/lavalamp_lamp_liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..565f4a90a17ec8499ee167526d9587b18f3f0097 GIT binary patch literal 412 zcmV;N0b~A&P)!*y-5$<0R4bucdJSrX*5wXHpV#iv>@#Fd4th;y9df2okI znf5h_tfsrUGI5DZISP(D5hCQczkLA19{wc-Ow1B9M#1ZRsu=Lu(|8kP6