From 57b2df505477d17e5b383a73ccae6662afb662a9 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Sun, 14 Dec 2014 22:33:57 +0100 Subject: [PATCH] Merge various fire's bug fixs and doors textures --- minetestforfun_game/mods/bucket/init.lua | 4 ++-- minetestforfun_game/mods/default/functions.lua | 2 +- .../mods/doors/textures/door_brown.png | Bin 137 -> 127 bytes .../mods/doors/textures/door_grey.png | Bin 124 -> 115 bytes .../mods/doors/textures/door_steel_a.png | Bin 498 -> 449 bytes .../mods/doors/textures/door_steel_b.png | Bin 471 -> 461 bytes .../mods/doors/textures/door_wood_a.png | Bin 565 -> 555 bytes .../mods/doors/textures/door_wood_b.png | Bin 586 -> 539 bytes minetestforfun_game/mods/fire/init.lua | 12 ++---------- 9 files changed, 5 insertions(+), 13 deletions(-) diff --git a/minetestforfun_game/mods/bucket/init.lua b/minetestforfun_game/mods/bucket/init.lua index 4d2d9b90..2ede571a 100644 --- a/minetestforfun_game/mods/bucket/init.lua +++ b/minetestforfun_game/mods/bucket/init.lua @@ -138,8 +138,8 @@ minetest.register_craftitem(":bucket:bucket_empty", { return end -- Check if pointing to a liquid source. - node = minetest.get_node(pointed_thing.under) - liquiddef = bucket.liquids[node.name] + local node = minetest.get_node(pointed_thing.under) + local liquiddef = bucket.liquids[node.name] if liquiddef ~= nil and liquiddef.itemname ~= nil and (node.name == liquiddef.source or (node.name == liquiddef.flowing and diff --git a/minetestforfun_game/mods/default/functions.lua b/minetestforfun_game/mods/default/functions.lua index 80f3374a..e666ab7e 100644 --- a/minetestforfun_game/mods/default/functions.lua +++ b/minetestforfun_game/mods/default/functions.lua @@ -405,7 +405,7 @@ minetest.register_abm({ end if not do_preserve then -- Drop stuff other than the node itself: - itemstacks = minetest.get_node_drops(n0.name) + local itemstacks = minetest.get_node_drops(n0.name) for _, itemname in ipairs(itemstacks) do if minetest.get_item_group(n0.name, "leafdecay_drop") ~= 0 or itemname ~= n0.name then diff --git a/minetestforfun_game/mods/doors/textures/door_brown.png b/minetestforfun_game/mods/doors/textures/door_brown.png index 2d3b17e68c45608c0ecacaf7803a814cad630fb1..77f748d8543c5f0da92f09e277d449a6507f2bb9 100644 GIT binary patch delta 97 zcmV-n0G|Je0e_GrTSiGlK~xBtP07IxfFKY>!OvU37;CT*d$9jHObAiKE?%AM=sfnx z)o!sAL@h-?60JWXTM}j_+(URwv90yL!>6bj@s7|3L4X#eoEI^=00000NkvXXu0mjf D#Lp;3 delta 107 zcmV-x0F?iKi2;x#Wl%{(K~xBtCCDKTfG`jQz|C@^;b`DQ4H{m6<12iEKSK~8X%pNb zDrc~7t7DnX*{gtT1k@nld1ur+$^e*|b4mcm)PZmLz^DPdo(#rTDu1DW5HrD7V0i!l N002ovPDHLkV1gr?E71S| diff --git a/minetestforfun_game/mods/doors/textures/door_grey.png b/minetestforfun_game/mods/doors/textures/door_grey.png index 29d399dcb3b00d786def7bd1a24f276e824fcb72..13665d2060dd8f1e5a7bc37e8ee47689412898d0 100644 GIT binary patch delta 84 zcmb;^o}l7y<>}%W!ZB0#h@sE{1rCOTk0omNzYmqTl+yiljj( oP_3W#EZ#+-!MORoZA|t@#x;^6=RO@P5n})XPgg&ebxsLQ0I|p-9smFU delta 93 zcmXS}nV=Hk?CIhd!ZB0#^hRC=MV_MpubE?8rYLTTSeB3z)zzWhcdV*6GCMX@)av=3 xGnVtCvIPXi%lDu1VOe0v_WxS7dv$(FTFul65|#_pCH64@fv2mV%Q~loCIGc*Bj^AC diff --git a/minetestforfun_game/mods/doors/textures/door_steel_a.png b/minetestforfun_game/mods/doors/textures/door_steel_a.png index 650b339dcc62849695c29125942e448522d1de81..515dafc08be5cfad9f8720852cb253d7723d4712 100644 GIT binary patch delta 423 zcmV;Y0a*U>1Hl83B!7rWL_t(IjeV0rZX!VpMW0m{#b=jUpcU6YKjHT{{%l7~Fw`ILvM=1pW8Gbqcz}<0oL&b)to3U zQfi5l$>bvH?d>%_KYuZuPA~lX{cBh$EEWsY%z8u*zFP!W$bGC45u8pZR8@(%PW~!# z{pJxAbC$~`>h68N{JY34OM@b927Pb)sE8uc(5t_G2&gI|(yLGdkH=%99RwC@9U|2855RYieeiEd0g`hi^y(W9|eRYg=U z*0kCU1zU?1xMv{3EfMNH{LgZ|frwzc-8L269W$d?VYAspjr*GcK<>H@B6xiKiPfDL zZlILH-T1CuUM(Ublu{_A3=BkgetE&nIG@j~R;$)yl^{+;n}i~QsxqI?`2!(j{Z;)3 R{`vp_002ovPDHLkV1gIzyvzUq delta 472 zcmV;}0Vn>!1M&lqB!9U{L_t(Ijg3=Fswy!MJ*lMa4~-w33WBsV*W<{M?!q;=4HqDY zC^%4@xC;j&?Z5^Fh4jyQ178P!_i_)^AeG8Vol}VzjYfREUI73?2rx5hwHmb6&|1T` zZD_3_gfPL(s8*{0041eFr_+IL+pujLQc5VLP~d*Qe?*pLNPm(9+wB(Wa=D=0ZezFG z!F63oDIukNAz)@OGx9t~mSxadBM1V-aSTM^U-QpIs#2*K zqt@#+3n5+(Gk-Id%Ow{wnc0kWI-NpktxfTMzyFXTgg_XEU}g{zgb;}17|muAr_%{$ z;LMC(ulM5iYPI6S;qZ~4&*w};==b}e-!%R|AKK=oGVHX3kpf`;G O0000%l43L za`FrTA0&;}(M7)mL4bH5j2cDmw`S|#ts(5?*iDb5I!-j~Y_hgNTpsF~Z&%^>~ zt&K|zk=P5sL?o>>A`T4pedqoConBSg=GXNKK+adTv5h1mf`7P=1|Cl*B+*yqjNs|% z2bm4qlPXA_dn237GF3GxUY4EUBk2rOd_)~z*q=2y_Z711Cwh8pvH zAc7?bkj-AgHYtsTG0_GS=`Iihg3J*p0nl==Iy6}JIF@)O0s@f1u0vP?GLwk-Vz6>$ z4!<=6f>Dy^yMNY_oHkb#9iXa)U6Vy-jx!4)kad7(Brup{CdrX?`Rt<{$&^HuFk%V* zWi7*n$Q;VgOCn|mGUu@`=_m!@<>h6RkP+bFb6IG1rzFgnTXxL;ts8H*+hDL7=lAW; zfxg6*MaxF!#{c8>^_9MD8&$>W^f)Nq0W5Jd^RR7or7R@&eII>rogZmktcUlXY0b-_ d-aEZ_J^@VYUlVqA;u!z{002ovPDHLkV1lf|()$1a delta 445 zcmV;u0Yd)G1J?tPB!8YsL_t(Ijct=Vj>0eyhCe@&5D|p}dI}_tz=604HJpPJa0(=j zKt}-*K~O}*A&$3L+3TPk$wg*7|6?W=yWP&s=W{lj4cF@xfc<`t5CQ;eEzUWdbM$?W za}H}QpU;QW>4a8Fp|xha-I8S)Qc9Fk00<#MQ{VRitZm!yt$$yy7ipSuKA*|+9HkUW zDV%cvp&6j-I;^!cO~Ycbz!-y`PN!s9MxN)aRx6ZJLB41AK-OBUwOlS2k|ec6=zM(38nz zupWQu8_cu&x_=OY!{LB#nr0xm@B6_FVp|@_=kE7AI?wZgZ_gAr|2I%6CF}JX?ROkU z%p`;e?B5^&ax@wZnBvPGD6V;%07;S{t+oG3{br1F@yzsiJf`b9+P39(yA9;U7U1t; zHBEz*60J45sw!r)8O!C8BuNIc{V>1(2c;Co7@p7P?=}{W$75i4zu)0O2_dNKnzAf; nJRYQJN?DdvRYg%06h*-gwT??K@bn5W00000NkvXXu0mjfr~1uc diff --git a/minetestforfun_game/mods/doors/textures/door_wood_a.png b/minetestforfun_game/mods/doors/textures/door_wood_a.png index b85f53ceedd61bfb68bdd2eef3ec53f618444822..0317b1f18edf000e9f2bfa4ca7000fd2f0093bef 100644 GIT binary patch delta 530 zcmV+t0`2{^1giv)B!BWrL_t(Ijct?9YLr0`#DCrMXS1w`iWm^_1-vQ=diN+sgn$2|Ne~zY9T? zpgkfo?*IaGF`w_3Zwy#UN=z{#Igq2WxwSv7p5figRo~km^Xbd(CH}+uW3OjN9CHh8 zW;ilezldgzwME_lcjx5fgjmfHXFlphxP!Yb@TF8r*K==lN*pa^%p*C+g~FVK6m@|Y znK}`J5Z#Ozlz$kMkFTD1YfiI&T?Kf*zB>2N0k>(~Ap~Nn4JnnrHnxB4P}?+b02M(5 zzHjgRKLdAe4rtAYU1`u&y3+Xk?Q#ll)>eEx-eYrXe2IViV#UkpA6>mxVvL!sKBK3lu|kCdSXgSY|8!R5z_x6s3NMkJ5=ND z?ICnW1OYwIQ6MKJMCt3sx+ORNjF- z5*wa?@_LncgNp7z0=kHrR*p+9*olb~U#1IFs$`hu(K+AD{1kqTOt|07aXu7BDnUZUD=jUugc+kc1ogE+O>)RgR?o53!2>8&Y zngiXjDKV#SXVYUccHwSf=o`(9AHSn2wc)pL8p;49X@5qNn%&V_GoGeQlN9MWO&({< zSB(Ho+XMrY`I45?K%5;P=x`7)j27&F+%t^Vw>|bh?xEMV=ucQ>l;_ka{W@L0j$VxM zJqPu?jmxZHr|ZyCDbf-=#tHhF)b;BuvI6BfO=_jb*PDtw_&(tH)0>x@e6K+?dqN0S e-~iE+<`pj_a_3>A_{~`W0000oDYfs diff --git a/minetestforfun_game/mods/doors/textures/door_wood_b.png b/minetestforfun_game/mods/doors/textures/door_wood_b.png index e618e2a5ad13a1670c48297176a218e9313c3755..f016933c436d9e55d1bf7315e30018bdad9ad88a 100644 GIT binary patch delta 514 zcmV+d0{#8U1e*kqBYy$nNklS5yT{%6SQ7`V$eCKprvgfJbmFC#)DO0)Jn=FCVY@tB+Pw1y_l-#i4P9PA$aK{65RS*$q zD5#TE2oVVI?M(&i9!RiC6(Yci3n+Jo5Znb3a1SJP>eBdeTCl5q!NVxUIPCHYX+`~q zZ3V=73@iy6?tfTPEGgM^N{xqh3C#Ls238f4D%p&b5?1>_YNz!{p{}W-g;enN`girY;&j}O}ROR9-GCMQX23Njfbg(Q4lj+mgd?$qYo*L(gi`xU})Cp;!-I(6yX-Q8iQ z`^s1vwKax4L*xOR$J#bz?t(iZAhl6z=f%|t%UMZXd3k(<)Z3N3LIggXJ{(m+71Fkj z!enNO9d?CJU;AbIhOgVloVpQ#M4$>eCj`0tJ?t~T0JOOiREO$9TL1t607*qoM6N<$ Ef-Yv~iU0rr delta 562 zcmV-20?qxK1j+=EBYy%BNklfO!N%$d1I--s`tKj<`G@O5f)dwUDO)yKCy zuSRRKO@(d`y=k~YTzz`4=kpojpCh1ww$=N!l-;g}-ZHCDBY)SVDJ;HER}38sA)cee z9#?Oh4rCad1{QVGqNJga0!FUQ#l%53HJ;leUlp`kV<__xq^nUdCXE+JV~c8=n!xwC zUW7Dtg`q4~_YJ}@F#svS9hfK~_ke!S#PDq5tU#r!E%W)3d{eVXDxiAR!O4lqY_{ke zT$~I!9&Gt>lYeq~HhMwj(`wq5R+;F)?i^(6d-A+sUDU*RK~q<+Lf%Y#3}rK2+b96v zwTZKm!0WNCEq>24My`#N@^yuBzeg)+3@bn2cWGhJg0}c4m0LaPMVjTpFaIW4Um=( zb6W(*9!UvFm=h)yQCgygj!ElVjC~7T#`r@AwXn>Ph-=f?$ z-3Y&?dMiKMO?=ly@Zg+pKO=;ILBGdiub$K6FF07*qoM6N<$g8xzw A=>Px# diff --git a/minetestforfun_game/mods/fire/init.lua b/minetestforfun_game/mods/fire/init.lua index 4ce9f6a7..6e8c8e5d 100644 --- a/minetestforfun_game/mods/fire/init.lua +++ b/minetestforfun_game/mods/fire/init.lua @@ -15,16 +15,15 @@ minetest.register_node("fire:basic_flame", { buildable_to = true, damage_per_second = 4, - after_place_node = function(pos, placer) + on_construct = function(pos, placer) fire.on_flame_add_at(pos) end, - after_dig_node = function(pos, oldnode, oldmetadata, digger) + on_destruct = function(pos, oldnode, oldmetadata, digger) fire.on_flame_remove_at(pos) end, }) -fire = {} fire.D = 6 -- key: position hash of low corner of area -- value: {handle=sound handle, name=sound name} @@ -81,12 +80,10 @@ function fire.update_sounds_around(pos) end function fire.on_flame_add_at(pos) - --print("flame added at "..minetest.pos_to_string(pos)) fire.update_sounds_around(pos) end function fire.on_flame_remove_at(pos) - --print("flame removed at "..minetest.pos_to_string(pos)) fire.update_sounds_around(pos) end @@ -117,7 +114,6 @@ minetest.register_abm({ local p = fire.find_pos_for_flame_around(p0) if p then minetest.set_node(p, {name="fire:basic_flame"}) - fire.on_flame_add_at(p) end end, }) @@ -143,7 +139,6 @@ minetest.register_abm({ local p2 = fire.find_pos_for_flame_around(p) if p2 then minetest.set_node(p2, {name="fire:basic_flame"}) - fire.on_flame_add_at(p2) end end end, @@ -158,7 +153,6 @@ minetest.register_abm({ -- If there is water or stuff like that around flame, remove flame if fire.flame_should_extinguish(p0) then minetest.remove_node(p0) - fire.on_flame_remove_at(p0) return end -- Make the following things rarer @@ -168,7 +162,6 @@ minetest.register_abm({ -- If there are no flammable nodes around flame, remove flame if not minetest.find_node_near(p0, 1, {"group:flammable"}) then minetest.remove_node(p0) - fire.on_flame_remove_at(p0) return end if math.random(1,4) == 1 then @@ -185,7 +178,6 @@ minetest.register_abm({ else -- remove flame minetest.remove_node(p0) - fire.on_flame_remove_at(p0) end end, })