From 03c9aed2212099c764912e4c7b1c86679237f00d Mon Sep 17 00:00:00 2001
From: Maksim <MoNTE48@mail.ua>
Date: Mon, 6 Apr 2020 22:09:39 +0200
Subject: [PATCH] Fire mod: Code cleanup, compress textures
---
mods/fire/init.lua | 167 ++++++------------
mods/fire/textures/fire_basic_flame.png | Bin 646 -> 594 bytes
.../textures/fire_basic_flame_animated.png | Bin 1051 -> 1029 bytes
mods/fire/textures/fire_flint_steel.png | Bin 459 -> 205 bytes
4 files changed, 55 insertions(+), 112 deletions(-)
diff --git a/mods/fire/init.lua b/mods/fire/init.lua
index c35207e2..298063e5 100644
--- a/mods/fire/init.lua
+++ b/mods/fire/init.lua
@@ -1,15 +1,12 @@
-- fire/init.lua
-- Global namespace for functions
-
fire = {}
-- Load support for MT game translation.
local S = minetest.get_translator("fire")
-
-- 'Enable fire' setting
-
local fire_enabled = minetest.settings:get_bool("enable_fire")
if fire_enabled == nil then
-- enable_fire setting not specified, check for disable_fire
@@ -27,12 +24,9 @@ end
--
-- Flood flame function
-
-local function flood_flame(pos, oldnode, newnode)
+local function flood_flame(pos, _, newnode)
-- Play flame extinguish sound if liquid is not an 'igniter'
- local nodedef = minetest.registered_items[newnode.name]
- if not (nodedef and nodedef.groups and
- nodedef.groups.igniter and nodedef.groups.igniter > 0) then
+ if minetest.get_item_group(newnode.name, "igniter") == 0 then
minetest.sound_play("fire_extinguish_flame",
{pos = pos, max_hear_distance = 16, gain = 0.15}, true)
end
@@ -41,19 +35,16 @@ local function flood_flame(pos, oldnode, newnode)
end
-- Flame nodes
-
-minetest.register_node("fire:basic_flame", {
+local fire_node = {
drawtype = "firelike",
- tiles = {
- {
- name = "fire_basic_flame_animated.png",
- animation = {
- type = "vertical_frames",
- aspect_w = 16,
- aspect_h = 16,
- length = 1
- },
- },
+ tiles = {{
+ name = "fire_basic_flame_animated.png",
+ animation = {
+ type = "vertical_frames",
+ aspect_w = 16,
+ aspect_h = 16,
+ length = 1
+ }}
},
inventory_image = "fire_basic_flame.png",
paramtype = "light",
@@ -63,61 +54,35 @@ minetest.register_node("fire:basic_flame", {
sunlight_propagates = true,
floodable = true,
damage_per_second = 4,
- groups = {igniter = 2, dig_immediate = 3, not_in_creative_inventory = 1},
- drop = "",
-
- on_timer = function(pos)
- local f = minetest.find_node_near(pos, 1, {"group:flammable"})
- if not fire_enabled or not f then
- minetest.remove_node(pos)
- return
- end
- -- Restart timer
- return true
- end,
-
- on_construct = function(pos)
- if not fire_enabled then
- minetest.remove_node(pos)
- else
- minetest.get_node_timer(pos):start(math.random(30, 60))
- end
- end,
-
- on_flood = flood_flame,
-})
-
-minetest.register_node("fire:permanent_flame", {
- description = S("Permanent Flame"),
- drawtype = "firelike",
- tiles = {
- {
- name = "fire_basic_flame_animated.png",
- animation = {
- type = "vertical_frames",
- aspect_w = 16,
- aspect_h = 16,
- length = 1
- },
- },
- },
- inventory_image = "fire_basic_flame.png",
- paramtype = "light",
- light_source = 13,
- walkable = false,
- buildable_to = true,
- sunlight_propagates = true,
- floodable = true,
- damage_per_second = 4,
- groups = {igniter = 2, dig_immediate = 3},
+ groups = {igniter = 2, dig_immediate = 3, fire = 1},
drop = "",
+ on_flood = flood_flame
+}
+
+-- Basic flame node
+local flame_fire_node = table.copy(fire_node)
+flame_fire_node.groups.not_in_creative_inventory = 1
+flame_fire_node.on_timer = function(pos)
+ if not minetest.find_node_near(pos, 1, {"group:flammable"}) then
+ minetest.remove_node(pos)
+ return
+ end
+ -- Restart timer
+ return true
+end
+flame_fire_node.on_construct = function(pos)
+ minetest.get_node_timer(pos):start(math.random(30, 60))
+end
- on_flood = flood_flame,
-})
+minetest.register_node("fire:basic_flame", flame_fire_node)
+-- Permanent flame node
+local permanent_fire_node = table.copy(fire_node)
+permanent_fire_node.description = S("Permanent Flame")
--- Flint and steel
+minetest.register_node("fire:permanent_flame", permanent_fire_node)
+-- Flint and Steel
minetest.register_tool("fire:flint_and_steel", {
description = S("Flint and Steel"),
inventory_image = "fire_flint_steel.png",
@@ -125,11 +90,8 @@ minetest.register_tool("fire:flint_and_steel", {
on_use = function(itemstack, user, pointed_thing)
local sound_pos = pointed_thing.above or user:get_pos()
- minetest.sound_play(
- "fire_flint_and_steel",
- {pos = sound_pos, gain = 0.5, max_hear_distance = 8},
- true
- )
+ minetest.sound_play("fire_flint_and_steel",
+ {pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true)
local player_name = user:get_player_name()
if pointed_thing.type == "node" then
local node_under = minetest.get_node(pointed_thing.under).name
@@ -153,10 +115,11 @@ minetest.register_tool("fire:flint_and_steel", {
-- Wear tool
local wdef = itemstack:get_definition()
itemstack:add_wear(1000)
+
-- Tool break sound
if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then
- minetest.sound_play(wdef.sound.breaks, {pos = sound_pos,
- gain = 0.5}, true)
+ minetest.sound_play(wdef.sound.breaks,
+ {pos = sound_pos, gain = 0.5}, true)
end
return itemstack
end
@@ -170,23 +133,21 @@ minetest.register_craft({
}
})
-
-- Override coalblock to enable permanent flame above
-- Coalblock is non-flammable to avoid unwanted basic_flame nodes
-
minetest.override_item("default:coalblock", {
- after_destruct = function(pos, oldnode)
+ after_destruct = function(pos)
pos.y = pos.y + 1
if minetest.get_node(pos).name == "fire:permanent_flame" then
minetest.remove_node(pos)
end
end,
- on_ignite = function(pos, igniter)
+ on_ignite = function(pos)
local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z}
if minetest.get_node(flame_pos).name == "air" then
minetest.set_node(flame_pos, {name = "fire:permanent_flame"})
end
- end,
+ end
})
@@ -194,24 +155,18 @@ minetest.override_item("default:coalblock", {
-- Sound
--
-local flame_sound = minetest.settings:get_bool("flame_sound")
-if flame_sound == nil then
- -- Enable if no setting present
- flame_sound = true
-end
+-- Enable if no setting present
+local flame_sound = minetest.settings:get_bool("flame_sound", true)
if flame_sound then
-
local handles = {}
local timer = 0
-- Parameters
-
local radius = 8 -- Flame node search radius around player
local cycle = 3 -- Cycle time for sound updates
-- Update sound for player
-
function fire.update_player_sound(player)
local player_name = player:get_player_name()
-- Search for flame nodes in radius around player
@@ -263,16 +218,13 @@ if flame_sound then
fposmid = vector.divide(vector.add(fposmin, fposmax), 2)
end
-- Play sound
- local handle = minetest.sound_play(
- "fire_fire",
- {
- pos = fposmid,
- to_player = player_name,
- gain = math.min(0.06 * (1 + flames * 0.125), 0.18),
- max_hear_distance = 32,
- loop = true, -- In case of lag
- }
- )
+ local handle = minetest.sound_play("fire_fire", {
+ pos = fposmid,
+ to_player = player_name,
+ gain = math.min(0.06 * (1 + flames * 0.125), 0.18),
+ max_hear_distance = 32,
+ loop = true -- In case of lag
+ })
-- Store sound handle for this player
if handle then
handles[player_name] = handle
@@ -281,7 +233,6 @@ if flame_sound then
end
-- Cycle for updating players sounds
-
minetest.register_globalstep(function(dtime)
timer = timer + dtime
if timer < cycle then
@@ -296,7 +247,6 @@ if flame_sound then
end)
-- Stop sound and clear handle on player leave
-
minetest.register_on_leaveplayer(function(player)
local player_name = player:get_player_name()
if handles[player_name] then
@@ -308,19 +258,14 @@ end
-- Deprecated function kept temporarily to avoid crashes if mod fire nodes call it
-
-function fire.update_sounds_around(pos)
-end
-
+function fire.update_sounds_around() end
--
-- ABMs
--
if fire_enabled then
-
-- Ignite neighboring nodes, add basic flames
-
minetest.register_abm({
label = "Ignite flame",
nodenames = {"group:flammable"},
@@ -333,11 +278,10 @@ if fire_enabled then
if p then
minetest.set_node(p, {name = "fire:basic_flame"})
end
- end,
+ end
})
-- Remove flammable nodes around basic flame
-
minetest.register_abm({
label = "Remove flammable nodes",
nodenames = {"fire:basic_flame"},
@@ -358,7 +302,6 @@ if fire_enabled then
minetest.remove_node(p)
minetest.check_for_falling(p)
end
- end,
+ end
})
-
end
diff --git a/mods/fire/textures/fire_basic_flame.png b/mods/fire/textures/fire_basic_flame.png
index 1da0702d85369becb732573b894c97f198246fa9..484bcb1957b80a64bdd670241c8e08b464545a3d 100644
GIT binary patch
delta 580
zcmV-K0=xZ&1=0kN8Gix*005AYXf^-<00wkYPE!B?00000Zl(v300069Nkl<ZcmZM{
z2~<n)qwsw=v8!9J%z@yfit@nO%T*bUSWCjWHi8^(f*>>MB-sIFQUib-Fc3^_+wP&Z
zZQHhO+qP}vZQHhO8~c+pVhn;sd!|htzIv%;B?aP2qbeZm>wi#tWz&Y*K3}`m<DLEB
z`Wu>YDnRc=O=+LNWq?dVuSb3F=^ZtBQL~$>PIFcZla{vipV$aODU156Ze_3Pn7OSh
zqYHh}<*je8V1gqZc#W<DP{RC{7#HmmKn4B`dYBjQ6@<)hn|ZvW6o)o{Z)ZqkuWM6!
zyeFn~XH?#)et-EN$I0x%XVuTY(xc32aOi@10AZ!%@o2g@EN)%Xe7k;}@IsJeBFMVl
zO-4vuTrc-UA9^<m+cBqFlfevnIi+Z4yP}(YC}1MFO!ivDC~rpU_m(n3?$$QAM!D@M
z_h+@qY64b(gGB8A9%L~w-(doUEiVdLlWjPNrEceUkbfQ;P{>QC38o#%YIuR(i0~^N
zfuqu0;SM9RT_>>YgB|ctK;XEApL$5qbW?!)z|C<kE7ToEk+Yrl@;Kn;I7WH+L@AEb
zF1E^g)q}jIV$t(^ErXS;^!u2skHaZ(jp>~F37aM{@*n2<s69C^=9jzFqrh<@Wvs&O
zaZz$zn?3YURCsq7INyg<La6R;UYmUw$H;Ov-n8`h?1cAS(5eRW;pR1&da3}t4eF*%
SP0nEe0000<MNUMnLSTX#IT|nk
delta 632
zcmV-;0*C$51cn8W8Gi!+001a04^sdD0ccQ6R7C&)0RPuS|G`7yP853>5B#o9|I0@H
z-bDPWKmNo$|Diqo$u{!1HTK0Z|AR2}n=kf<EAw6`|8XbqX(aY=BJy1z^<p0BSRC?U
z8{>T%#5)<~VHDOx5nL1y#x@SoJ`2v73a2Fi|NL$L%wYfMUw`@AU;po2|J_>u%2xm2
zPXEA8|Mg4%w@d%gNdKHi=Ve9r$VC6YMDol-_Qyl^q(S?ZKL3wB-p4!lwLAa8I`O1B
z|JFJ9v^n^YIsb$?>s2!KeKGlrFZ_Be<gzRHr7Q8BEB}Qn>69tyyC?sfC;yBm`Ee)u
za3}GKCFi0e=YPB)-iILYdLYtDAo6q{%#|MbY#r=s9NSVH^k^I9gc<Cr80S(LqA3)-
zPY&Kq4z()|=vEEfQw^vj4P_M!e;W&96$^163T_q((5eYW5ecs&2zC|-JP`<f83%_E
z1FAOx%QFFm7y-#}0JmHK(NzG*PynMr089x0qiKA50Dk}g0d!JMQvg8b*k%9#0L)25
zK~xyiUC6_BLjeE)(Rqm3*r;vWw%x|Iem^-US!H%}=}QKn)w?V}3<!IGe1-yXr~pMz
z(hmSp2qf@-TgveF*fj}Y!08L@0obh=tq!Rp5VU`B<+I@A`t5-rHpz9!>i#nDYt}_v
ztn7LXTydP=0RJYf!96|uav&({Q=h=QLlY7aOh*e#V<UQA!6v%lZe#skKe)EYlM(MR
zT<SuN?TKnwM56*ePG(f;ntF5iXO6Asap81+RI401+fkR~6wOJq;#L93IRM(Ra2_D7
S43w$>0000<MNUMnLSTZ8?kJN0
diff --git a/mods/fire/textures/fire_basic_flame_animated.png b/mods/fire/textures/fire_basic_flame_animated.png
index 1cdd9fdba8380f17e71eeed5f8feef1e5c0d15ca..b01f7036278f3c1ac1fce6bca2e7a5a2acc2cbc1 100644
GIT binary patch
delta 999
zcmV<D0~q|92!#lcEPtmZ0Ptxd|AH{wQw{&gM*hS+$#4Mwp*rDC6zNzT)Itx$Hw^1l
zGV)y@up<b284vMe8__-t=u#K@aVPP4ANOw|{CX_^k3HT^4)%sD{Kz%KIv4tqJL6v!
z>ANTKiY4WK8~JP<|JOrC5ed;%0B;%!|G`A{nlJyqMDVpW?0;$;;eHtSwL0^<HUIo=
z=3^88;7<PEL-Cy}|JFJG%2)q#C3Y4FWEBhl^-Io~3jc&TObGzysweivG5g$Je;Ntb
zMiu|TL-L$2|DQqLhaiU$1OK;6^2|f^eKGi@EB}Tn$WQ?Jj4z@o6vs6X|IbIzstLDT
z0RN~y=Ve7+7=IAVl^*P>8289T^k^IDlqvYDL8Czc|G-ZCu1?!h9P?Z!=e!`iPYyg0
z2=ZYng%|-_5fJvrL;vqxs3Z;E$2<0<L8><a%QFH0n<w$4I{)Zjj8-y$00001bW%=J
z06^y0W&i*JU`a$lRCwBa(}R-rS{Q`kciXmY+Zg|2TYtya{g=+#$yl9Iy4X*Bi#M?Y
zFh-6Ipbsd*z>jI>;^SvvJ)HdoDZj&hpVPhW-(XupiUHs|qseRmuqsh09isaQoK_d^
zr7lL?_a2;h4Gtgv%|C%aFr;=68AYf36N>|`mDOotV>P*((qsnbz@=3?%#q4Z3ct=~
zMM~gZE`P)K+R9qB_Qy9oD(YLX9UAUb8ahP|Z4*ee4w{EY$N&EK!wK!PPHOw&H~m59
zDsugoJ<H8)@NRMk*n2!>Ebq73;1x$2+k;1VUG_lo*cTp(EC`>M9!4Ic>@Pe_3lEnY
zfn-oB4IbfPkv*(H;NGKlM7++Z&*$HaOCD<Bk$;pur1`;xM?RU-XkxO*iZ+ph{BAW<
zTX?AITV;etrLfkh<%(!wS$MQUhdULWPVo(GTh$T&&6ghA2oL?0J#vlY(GiVaPp=2B
z=cmEOtE8XqWBr{+IEyh2FFi~jc(`N_rR-sO@K}2ENIrO+f90Wh@(9WvsYXolkk$*2
zLVtBlSNkSBRFq$Mh@wrW^Tq?o!`^%LK>x<$>3KZg1JCKR4+>s9A+cU6(&@Pj)Mt;b
z(PS~ZWFP~l?3ub|vlB7j3QClQg^<_jboq&kCJ+dyQ71=2$nB5EMRDm-uR0>hXez4l
z4F&*OwK}(vAMIvh8Ua))U9Kb&iH!<XO<-nLEJCSXM*y`7hr&ZwL`A(!OC)rx(=`+d
z&QvOvxo9@^N1{1V(AF;QW3m4@0(Q7*--<>rNP0cdWd9$z<;Q6GF<O3%mLH?#2LNj0
V<w=F}(*6Jd002ovPDHLkV1ka?=9T~e
delta 1021
zcmV<Z0|NYo2%89yEPwx@I{(U7+*1w7Z~*?qJn(5EWEBhXoh#*j8|YFO(LM}D5ecv(
z2&W|g|H(%1wKeixAk;z+-c1hv-$VM6JL^?4|AH{-yC?c_C;4n0@naj|P853?4|Wy^
z|G`B6);acuEb)0C^k^IGsu<&671u@;ZyE}J8VO7Z0RQ}L|9{s*|ENCrwL132G4+}+
z{CX_^hARJZCG2V(qA3)|H4wx%4A80xhY<t&++P3nOaHe^_sB&5pF#hRJ^zF`{Kz%<
zr7Q7@CHHS3=~x`YIv3_+6J8h)|KLvlz)t67MgPA<|G`7^x;67$C*Fr3%#|MDei*1E
z4TTs1w_E_xReu1ZK>+{gU;po2^2|f{t3mOkI`w@q@|-XEj4$$GD*u}&=e!`>QXITb
z4m=SE%QFGUPyqa{PXEtG>69tvswd8w3iiiC_M}1H$2(gQ5UMu;pI62-00001bW%=J
z06^y0W&i*Jc1c7*R7l6{)Yn!TQ5Xf_JxrlGLmzrmKz~65L9rv!M3E?om}t}_Cb6cy
z|5g4oLzzXg@&ws)b@tu<);WWjM8UEIJ#(O#0my9tUmRGZ4{rc$wzEH><u$Nw#^GA|
zD=?SQy9g++TJEYJ6qf{53RCw1u)AysX3A(Gc$b15%}BU}+Vyt;o@AX5!?&Ma!N))Y
zfbC{)#ecf97rM<W!|eqC^Dglvj(qXC_iby-i3-p>833Qe!f8ME;}R(qodaOC{&HXF
z3UVBx7l76B=-oJ9e*gCKF%oB{{OayI?$Pw*yZRN);^HXz@ch7r$1us#lD?kJH*z>I
zH}Yt2>K@QM*2zQ80_0=#Xki@5%skx8!xlt_fPW+@k|Gbk?%`td?^1l&*R-cgrP_5v
z^We!Nq<d)dlgy(S$}37h_qY+QaiDnHALf{c+Bq12JPN(jZZ7VG2%M0IrM_`r5Cr)W
zVnQ|1*=zJz1$l5!QQs9b4-+*UhgfXNF<#H+8{?SVkIg?k+F7*dZ1iyd#lxn1NV<oA
z<bRPFdxS<F3;*&^CLT%MBi{{Z9&A1H==D#9+$DLa7#KXLNWf&8@qp$LjZHnk&3H_n
z$Mim68Z&6W48s$m^;+R@Eb2gJtfAa;`>Qq`D1t+*xy#k69W>uX9*`nTsA;#`YG_d7
z@pyRfp?wkx)*1~e=2QG$*cVFY(@JT38+H_t=i@uY{o7$cA)rcS{>Eyx?iA2hhFeZ2
zQ0a6)K$hMHc?eFZ=nP<?)RzUJE6X@jRh(eg>*da=IhK(S+5KSqmwiAKxJVpP!x2d=
rMosqr|Ks;Y%a76WW3>DrxBLJAts&A)NM9EG00000NkvXXu0mjfDL(rU
diff --git a/mods/fire/textures/fire_flint_steel.png b/mods/fire/textures/fire_flint_steel.png
index c262ebc096f471c95e66b33ca3cd44a14494419d..9d32d85b001c0836b969989ffeb7bc16856eb71c 100644
GIT binary patch
delta 189
zcmX@je3o&7L_G^L0|Ud`yN`l^lx~1ei0l9V|7~n+qQe3*Q({F#M9PbDyj<*@oSZCx
zz*u+f+O<=rOfl8htgf!k&(D`SlRFWpk+CGmFPOpM*^M+H$IsKnF{FYq`2d?lB99{D
ziiU~IQv{zKxOa~sg~Q$N<*itTl#Y3G_H7e8A}~ABZ0p?jRudjh+qkW9FVl&H!ux!t
p?aA-CIhyxAvO4pIYfTt4!*n*mIRyeM-vW(h@O1TaS?83{1ORHON4Nk0
delta 445
zcmV;u0Yd)G0m}oB7=H)`0000V^Z#K0000DMK}|sb0I`n?{9y$E0004VQb$4o*~u(_
z0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006VoOIv
z0RI600RN!9r;`8x0XIoRK~y-)#go5F!%z^%Kd)x#4as7Lx_=ZQg9r%@B4o~=(>edv
z`w!y!KuVDa($P*C0u~{hAi{I7scp4l>EJE*IPShbj(f&?&oMDLY8nXoM}D1s6^D_3
ze|<3kZdxCvAQ(n|e0EAOjQ-?pusfVyoC7eQ&kwWEM;Jydo)!Q|6jKxhfLB#SgjF_G
zRc!-ovOh1EB!A-(bzS=;Nhr&brfC4M*6z0uh7q?bWPmKoD9e)BY=*UV4YC*Dp{_Xz
zg0=j~WJ1$4IOhON*LCE14zOOZ=?^K6V}EmX`DvkhTQgTxg@~9{zXwoNoO5Pt2g!J3
z?(QFbFTH2p7zQu^BJ$mWo7S{#YudIostQ1!=cH-sRW^0+O$0v`MFeXts!CB5Ta3Rh
naYw2V5#yYrSM+1!zyHP$nva4h^9C`w00000NkvXXu0mjfj*zl<
--
GitLab