Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-22 02:21:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Address review comments

Browse source
This commit is contained in:
teknomunk 2024-11-21 05:38:56 -06:00
parent 44ae70d498
commit 94586e0a6d
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
mods/ITEMS/mcl_fire/init.lua
View file

@ -50,26 +50,33 @@ local function has_flammable(pos)
end end
end end
end end
local all_adjacents = {}
for x = 0,1 do local function min_neighbor_fire_age(lowest, pos)
for y = 0,1 do local node = get_node_or_nil(pos)
for z = 0,1 do if not node then return lowest end
all_adjacents[#all_adjacents+1] = vector.new(x*2-1, y*2-1, z*2-1) if get_item_group(node.name, "fire") == 0 then return lowest end
end if not lowest or lowest > node.param2 then return node.param2 end
end return lowest
end end
local function get_adjacent_fire_age(pos) local function get_adjacent_fire_age(pos)
local lowest_age = nil local lowest_age = nil
for k,v in pairs(all_adjacents) do -- Unrolled loop to find minimum age (param2) among adjacent fire nodes
local p = vector.add(pos, v) pos.x = pos.x - 1
local node = get_node_or_nil(p) lowest_age = min_neighbor_fire_age(lowest_age, pos)
if node and get_item_group(node.name, "fire") ~= 0 then pos.x = pos.x + 2
if not lowest_age or node.param2 < lowest_age then lowest_age = min_neighbor_fire_age(lowest_age, pos)
lowest_age = node.param2 pos.x = pos.x - 1
end pos.y = pos.y - 1
end lowest_age = min_neighbor_fire_age(lowest_age, pos)
end pos.y = pos.y + 2
lowest_age = min_neighbor_fire_age(lowest_age, pos)
pos.y = pos.y - 1
pos.z = pos.z - 1
lowest_age = min_neighbor_fire_age(lowest_age, pos)
pos.z = pos.z + 2
lowest_age = min_neighbor_fire_age(lowest_age, pos)
pos.z = pos.z - 1
return lowest_age return lowest_age
end end
@ -142,7 +149,7 @@ local function spawn_fire(pos, age, force)
probability_age = probability_age * 0.80 probability_age = probability_age * 0.80
end end
local probability = math.pow(10,K1 * probability_age) local probability = math.pow(10,K1 * probability_age)
if not force and math.random(65536)/65536 >= probability then if not force and math.random() >= probability then
return return
end end
@ -443,7 +450,7 @@ else -- Fire enabled
if node.name ~= "mcl_fire:eternal_fire" then if node.name ~= "mcl_fire:eternal_fire" then
-- Randomly extinguish fires with increasing probability the older they are -- Randomly extinguish fires with increasing probability the older they are
local extinguish_probability = math.pow(10,K2 * age + C2) local extinguish_probability = math.pow(10,K2 * age + C2)
if math.random(65536)/65536 <= extinguish_probability then if math.random() <= extinguish_probability then
node.name = "air" node.name = "air"
node.param2 = 0 node.param2 = 0
@ -487,10 +494,8 @@ else -- Fire enabled
return return
end end
local node = get_node(p) local def = minetest.registered_nodes[get_node(p).name]
local node_name = node.name local fgroup = def and def.groups.flammable or 0
local def = minetest.registered_nodes[node_name]
local fgroup = minetest.get_item_group(node_name, "flammable")
if def and def._on_burn then if def and def._on_burn then
def._on_burn(p) def._on_burn(p)
@ -530,9 +535,9 @@ function mcl_fire.set_fire(pointed_thing, player, allow_on_fire)
return return
end end
local n_pointed = get_node(pointed_thing.under) if allow_on_fire == false then
if allow_on_fire == false and get_item_group(n_pointed.name, "fire") ~= 0 then local n_pointed = get_node(pointed_thing.under)
return if get_item_group(n_pointed.name, "fire") ~= 0 then return end
end end
local n_fire_pos = get_node(pointed_thing.above) local n_fire_pos = get_node(pointed_thing.above)