Skip to content

Commit 03c9aed

Browse files
author
Maksim
authoredApr 6, 2020
Fire mod: Code cleanup, compress textures
·
5.8.05.3.0
1 parent 720b24e commit 03c9aed

File tree

4 files changed

+55
-112
lines changed

4 files changed

+55
-112
lines changed
 

‎mods/fire/init.lua

+55-112
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
-- fire/init.lua
22

33
-- Global namespace for functions
4-
54
fire = {}
65

76
-- Load support for MT game translation.
87
local S = minetest.get_translator("fire")
98

10-
119
-- 'Enable fire' setting
12-
1310
local fire_enabled = minetest.settings:get_bool("enable_fire")
1411
if fire_enabled == nil then
1512
-- enable_fire setting not specified, check for disable_fire
@@ -27,12 +24,9 @@ end
2724
--
2825

2926
-- Flood flame function
30-
31-
local function flood_flame(pos, oldnode, newnode)
27+
local function flood_flame(pos, _, newnode)
3228
-- Play flame extinguish sound if liquid is not an 'igniter'
33-
local nodedef = minetest.registered_items[newnode.name]
34-
if not (nodedef and nodedef.groups and
35-
nodedef.groups.igniter and nodedef.groups.igniter > 0) then
29+
if minetest.get_item_group(newnode.name, "igniter") == 0 then
3630
minetest.sound_play("fire_extinguish_flame",
3731
{pos = pos, max_hear_distance = 16, gain = 0.15}, true)
3832
end
@@ -41,19 +35,16 @@ local function flood_flame(pos, oldnode, newnode)
4135
end
4236

4337
-- Flame nodes
44-
45-
minetest.register_node("fire:basic_flame", {
38+
local fire_node = {
4639
drawtype = "firelike",
47-
tiles = {
48-
{
49-
name = "fire_basic_flame_animated.png",
50-
animation = {
51-
type = "vertical_frames",
52-
aspect_w = 16,
53-
aspect_h = 16,
54-
length = 1
55-
},
56-
},
40+
tiles = {{
41+
name = "fire_basic_flame_animated.png",
42+
animation = {
43+
type = "vertical_frames",
44+
aspect_w = 16,
45+
aspect_h = 16,
46+
length = 1
47+
}}
5748
},
5849
inventory_image = "fire_basic_flame.png",
5950
paramtype = "light",
@@ -63,73 +54,44 @@ minetest.register_node("fire:basic_flame", {
6354
sunlight_propagates = true,
6455
floodable = true,
6556
damage_per_second = 4,
66-
groups = {igniter = 2, dig_immediate = 3, not_in_creative_inventory = 1},
67-
drop = "",
68-
69-
on_timer = function(pos)
70-
local f = minetest.find_node_near(pos, 1, {"group:flammable"})
71-
if not fire_enabled or not f then
72-
minetest.remove_node(pos)
73-
return
74-
end
75-
-- Restart timer
76-
return true
77-
end,
78-
79-
on_construct = function(pos)
80-
if not fire_enabled then
81-
minetest.remove_node(pos)
82-
else
83-
minetest.get_node_timer(pos):start(math.random(30, 60))
84-
end
85-
end,
86-
87-
on_flood = flood_flame,
88-
})
89-
90-
minetest.register_node("fire:permanent_flame", {
91-
description = S("Permanent Flame"),
92-
drawtype = "firelike",
93-
tiles = {
94-
{
95-
name = "fire_basic_flame_animated.png",
96-
animation = {
97-
type = "vertical_frames",
98-
aspect_w = 16,
99-
aspect_h = 16,
100-
length = 1
101-
},
102-
},
103-
},
104-
inventory_image = "fire_basic_flame.png",
105-
paramtype = "light",
106-
light_source = 13,
107-
walkable = false,
108-
buildable_to = true,
109-
sunlight_propagates = true,
110-
floodable = true,
111-
damage_per_second = 4,
112-
groups = {igniter = 2, dig_immediate = 3},
57+
groups = {igniter = 2, dig_immediate = 3, fire = 1},
11358
drop = "",
59+
on_flood = flood_flame
60+
}
61+
62+
-- Basic flame node
63+
local flame_fire_node = table.copy(fire_node)
64+
flame_fire_node.groups.not_in_creative_inventory = 1
65+
flame_fire_node.on_timer = function(pos)
66+
if not minetest.find_node_near(pos, 1, {"group:flammable"}) then
67+
minetest.remove_node(pos)
68+
return
69+
end
70+
-- Restart timer
71+
return true
72+
end
73+
flame_fire_node.on_construct = function(pos)
74+
minetest.get_node_timer(pos):start(math.random(30, 60))
75+
end
11476

115-
on_flood = flood_flame,
116-
})
77+
minetest.register_node("fire:basic_flame", flame_fire_node)
11778

79+
-- Permanent flame node
80+
local permanent_fire_node = table.copy(fire_node)
81+
permanent_fire_node.description = S("Permanent Flame")
11882

119-
-- Flint and steel
83+
minetest.register_node("fire:permanent_flame", permanent_fire_node)
12084

85+
-- Flint and Steel
12186
minetest.register_tool("fire:flint_and_steel", {
12287
description = S("Flint and Steel"),
12388
inventory_image = "fire_flint_steel.png",
12489
sound = {breaks = "default_tool_breaks"},
12590

12691
on_use = function(itemstack, user, pointed_thing)
12792
local sound_pos = pointed_thing.above or user:get_pos()
128-
minetest.sound_play(
129-
"fire_flint_and_steel",
130-
{pos = sound_pos, gain = 0.5, max_hear_distance = 8},
131-
true
132-
)
93+
minetest.sound_play("fire_flint_and_steel",
94+
{pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true)
13395
local player_name = user:get_player_name()
13496
if pointed_thing.type == "node" then
13597
local node_under = minetest.get_node(pointed_thing.under).name
@@ -153,10 +115,11 @@ minetest.register_tool("fire:flint_and_steel", {
153115
-- Wear tool
154116
local wdef = itemstack:get_definition()
155117
itemstack:add_wear(1000)
118+
156119
-- Tool break sound
157120
if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then
158-
minetest.sound_play(wdef.sound.breaks, {pos = sound_pos,
159-
gain = 0.5}, true)
121+
minetest.sound_play(wdef.sound.breaks,
122+
{pos = sound_pos, gain = 0.5}, true)
160123
end
161124
return itemstack
162125
end
@@ -170,48 +133,40 @@ minetest.register_craft({
170133
}
171134
})
172135

173-
174136
-- Override coalblock to enable permanent flame above
175137
-- Coalblock is non-flammable to avoid unwanted basic_flame nodes
176-
177138
minetest.override_item("default:coalblock", {
178-
after_destruct = function(pos, oldnode)
139+
after_destruct = function(pos)
179140
pos.y = pos.y + 1
180141
if minetest.get_node(pos).name == "fire:permanent_flame" then
181142
minetest.remove_node(pos)
182143
end
183144
end,
184-
on_ignite = function(pos, igniter)
145+
on_ignite = function(pos)
185146
local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z}
186147
if minetest.get_node(flame_pos).name == "air" then
187148
minetest.set_node(flame_pos, {name = "fire:permanent_flame"})
188149
end
189-
end,
150+
end
190151
})
191152

192153

193154
--
194155
-- Sound
195156
--
196157

197-
local flame_sound = minetest.settings:get_bool("flame_sound")
198-
if flame_sound == nil then
199-
-- Enable if no setting present
200-
flame_sound = true
201-
end
158+
-- Enable if no setting present
159+
local flame_sound = minetest.settings:get_bool("flame_sound", true)
202160

203161
if flame_sound then
204-
205162
local handles = {}
206163
local timer = 0
207164

208165
-- Parameters
209-
210166
local radius = 8 -- Flame node search radius around player
211167
local cycle = 3 -- Cycle time for sound updates
212168

213169
-- Update sound for player
214-
215170
function fire.update_player_sound(player)
216171
local player_name = player:get_player_name()
217172
-- Search for flame nodes in radius around player
@@ -263,16 +218,13 @@ if flame_sound then
263218
fposmid = vector.divide(vector.add(fposmin, fposmax), 2)
264219
end
265220
-- Play sound
266-
local handle = minetest.sound_play(
267-
"fire_fire",
268-
{
269-
pos = fposmid,
270-
to_player = player_name,
271-
gain = math.min(0.06 * (1 + flames * 0.125), 0.18),
272-
max_hear_distance = 32,
273-
loop = true, -- In case of lag
274-
}
275-
)
221+
local handle = minetest.sound_play("fire_fire", {
222+
pos = fposmid,
223+
to_player = player_name,
224+
gain = math.min(0.06 * (1 + flames * 0.125), 0.18),
225+
max_hear_distance = 32,
226+
loop = true -- In case of lag
227+
})
276228
-- Store sound handle for this player
277229
if handle then
278230
handles[player_name] = handle
@@ -281,7 +233,6 @@ if flame_sound then
281233
end
282234

283235
-- Cycle for updating players sounds
284-
285236
minetest.register_globalstep(function(dtime)
286237
timer = timer + dtime
287238
if timer < cycle then
@@ -296,7 +247,6 @@ if flame_sound then
296247
end)
297248

298249
-- Stop sound and clear handle on player leave
299-
300250
minetest.register_on_leaveplayer(function(player)
301251
local player_name = player:get_player_name()
302252
if handles[player_name] then
@@ -308,19 +258,14 @@ end
308258

309259

310260
-- Deprecated function kept temporarily to avoid crashes if mod fire nodes call it
311-
312-
function fire.update_sounds_around(pos)
313-
end
314-
261+
function fire.update_sounds_around() end
315262

316263
--
317264
-- ABMs
318265
--
319266

320267
if fire_enabled then
321-
322268
-- Ignite neighboring nodes, add basic flames
323-
324269
minetest.register_abm({
325270
label = "Ignite flame",
326271
nodenames = {"group:flammable"},
@@ -333,11 +278,10 @@ if fire_enabled then
333278
if p then
334279
minetest.set_node(p, {name = "fire:basic_flame"})
335280
end
336-
end,
281+
end
337282
})
338283

339284
-- Remove flammable nodes around basic flame
340-
341285
minetest.register_abm({
342286
label = "Remove flammable nodes",
343287
nodenames = {"fire:basic_flame"},
@@ -358,7 +302,6 @@ if fire_enabled then
358302
minetest.remove_node(p)
359303
minetest.check_for_falling(p)
360304
end
361-
end,
305+
end
362306
})
363-
364307
end

‎mods/fire/textures/fire_basic_flame.png

-52 Bytes
Loading

‎mods/fire/textures/fire_basic_flame_animated.png

-22 Bytes
Loading

‎mods/fire/textures/fire_flint_steel.png

-254 Bytes
Loading

0 commit comments

Comments
 (0)
Please sign in to comment.