Merge pull request 'mcl_explosions fixes' (#2830) from mcl-explosions-fixes into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2830 Reviewed-by: cora <cora@noreply.git.minetest.land>
This commit is contained in:
commit
bbe4224b79
|
@ -130,10 +130,10 @@ local function add_particles(pos, radius)
|
||||||
time = 0.125,
|
time = 0.125,
|
||||||
minpos = pos,
|
minpos = pos,
|
||||||
maxpos = pos,
|
maxpos = pos,
|
||||||
minvel = {x = -radius, y = -radius, z = -radius},
|
minvel = vector.new(-radius, -radius, -radius),
|
||||||
maxvel = {x = radius, y = radius, z = radius},
|
maxvel = vector.new(radius, radius, radius),
|
||||||
minacc = vector.new(),
|
minacc = vector.zero(),
|
||||||
maxacc = vector.new(),
|
maxacc = vector.zero(),
|
||||||
minexptime = 0.5,
|
minexptime = 0.5,
|
||||||
maxexptime = 1.0,
|
maxexptime = 1.0,
|
||||||
minsize = radius * 0.5,
|
minsize = radius * 0.5,
|
||||||
|
@ -207,7 +207,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
local npos_z = math.floor(rpos_z + 0.5)
|
local npos_z = math.floor(rpos_z + 0.5)
|
||||||
local npos = { x = npos_x, y = npos_y, z = npos_z }
|
local npos = { x = npos_x, y = npos_y, z = npos_z }
|
||||||
local idx = (npos_z - emin_z) * zstride + (npos_y - emin_y) * ystride +
|
local idx = (npos_z - emin_z) * zstride + (npos_y - emin_y) * ystride +
|
||||||
npos_x - emin_x + 1
|
npos_x - emin_x + 1
|
||||||
|
|
||||||
local cid = data[idx]
|
local cid = data[idx]
|
||||||
local br = node_blastres[cid] or INDESTRUCT_BLASTRES
|
local br = node_blastres[cid] or INDESTRUCT_BLASTRES
|
||||||
|
@ -288,7 +288,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
rdir_y = rdir_y / rdir_len
|
rdir_y = rdir_y / rdir_len
|
||||||
rdir_z = rdir_z / rdir_len
|
rdir_z = rdir_z / rdir_len
|
||||||
|
|
||||||
for i=0, rdir_len / STEP_LENGTH do
|
for i = 0, rdir_len / STEP_LENGTH do
|
||||||
rpos_x = rpos_x + rdir_x * STEP_LENGTH
|
rpos_x = rpos_x + rdir_x * STEP_LENGTH
|
||||||
rpos_y = rpos_y + rdir_y * STEP_LENGTH
|
rpos_y = rpos_y + rdir_y * STEP_LENGTH
|
||||||
rpos_z = rpos_z + rdir_z * STEP_LENGTH
|
rpos_z = rpos_z + rdir_z * STEP_LENGTH
|
||||||
|
@ -296,7 +296,7 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
local npos_y = math.floor(rpos_y + 0.5)
|
local npos_y = math.floor(rpos_y + 0.5)
|
||||||
local npos_z = math.floor(rpos_z + 0.5)
|
local npos_z = math.floor(rpos_z + 0.5)
|
||||||
local idx = (npos_z - emin_z) * zstride + (npos_y - emin_y) * ystride +
|
local idx = (npos_z - emin_z) * zstride + (npos_y - emin_y) * ystride +
|
||||||
npos_x - emin_x + 1
|
npos_x - emin_x + 1
|
||||||
|
|
||||||
|
|
||||||
local cid = data[idx]
|
local cid = data[idx]
|
||||||
|
@ -333,16 +333,17 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
end
|
end
|
||||||
|
|
||||||
if sleep_formspec_doesnt_close_mt53 then
|
if sleep_formspec_doesnt_close_mt53 then
|
||||||
minetest.after(0.3, function() -- 0.2 is minimum delay for closing old formspec and open died formspec -- TODO: REMOVE THIS IN THE FUTURE
|
minetest.after(0.3,
|
||||||
if not obj:is_player() then
|
function() -- 0.2 is minimum delay for closing old formspec and open died formspec -- TODO: REMOVE THIS IN THE FUTURE
|
||||||
return
|
if not obj:is_player() then
|
||||||
end
|
return
|
||||||
mcl_util.deal_damage(obj, damage, {type = "explosion", direct = direct, source = source})
|
end
|
||||||
|
mcl_util.deal_damage(obj, damage, { type = "explosion", direct = direct, source = source })
|
||||||
|
|
||||||
obj:add_velocity(vector.multiply(punch_dir, impact * 20))
|
obj:add_velocity(vector.multiply(punch_dir, impact * 20))
|
||||||
end)
|
end)
|
||||||
else
|
else
|
||||||
mcl_util.deal_damage(obj, damage, {type = "explosion", direct = direct, source = source})
|
mcl_util.deal_damage(obj, damage, { type = "explosion", direct = direct, source = source })
|
||||||
|
|
||||||
if obj:is_player() or ent.tnt_knockback then
|
if obj:is_player() or ent.tnt_knockback then
|
||||||
obj:add_velocity(vector.multiply(punch_dir, impact * 20))
|
obj:add_velocity(vector.multiply(punch_dir, impact * 20))
|
||||||
|
@ -388,23 +389,24 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
-- We use bulk_set_node instead of LVM because we want to have on_destruct and
|
-- We use bulk_set_node instead of LVM because we want to have on_destruct and
|
||||||
-- on_construct being called
|
-- on_construct being called
|
||||||
if #airs > 0 then
|
if #airs > 0 then
|
||||||
bulk_set_node(airs, {name="air"})
|
bulk_set_node(airs, { name = "air" })
|
||||||
end
|
end
|
||||||
if #fires > 0 then
|
if #fires > 0 then
|
||||||
bulk_set_node(fires, {name="mcl_fire:fire"})
|
bulk_set_node(fires, { name = "mcl_fire:fire" })
|
||||||
end
|
end
|
||||||
-- Update falling nodes
|
-- Update falling nodes
|
||||||
for a=1, #airs do
|
for a = 1, #airs do
|
||||||
local p = airs[a]
|
local p = airs[a]
|
||||||
check_for_falling({x=p.x, y=p.y+1, z=p.z})
|
check_for_falling(vector.offset(p, 0, 1, 0))
|
||||||
end
|
end
|
||||||
for f=1, #fires do
|
for f = 1, #fires do
|
||||||
local p = fires[f]
|
local p = fires[f]
|
||||||
check_for_falling({x=p.x, y=p.y+1, z=p.z})
|
check_for_falling(vector.offset(p, 0, 1, 0))
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Log explosion
|
-- Log explosion
|
||||||
minetest.log("action", "Explosion at "..pos_to_string(pos).." with strength "..strength.." and radius "..radius)
|
minetest.log("action", "Explosion at " .. pos_to_string(pos) .. " with strength " .. strength .. " and radius " ..
|
||||||
|
radius)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Create an explosion with strength at pos.
|
-- Create an explosion with strength at pos.
|
||||||
|
@ -428,6 +430,11 @@ end
|
||||||
-- griefing - If true, the explosion will destroy nodes (default: true)
|
-- griefing - If true, the explosion will destroy nodes (default: true)
|
||||||
-- grief_protected - If true, the explosion will also destroy nodes which have
|
-- grief_protected - If true, the explosion will also destroy nodes which have
|
||||||
-- been protected (default: false)
|
-- been protected (default: false)
|
||||||
|
---@param pos Vector
|
||||||
|
---@param strength number
|
||||||
|
---@param info {drop_chance: number, max_blast_resistance: number, sound: boolean, particles: boolean, fire: boolean, griefing: boolean, grief_protected: boolean}
|
||||||
|
---@param direct? ObjectRef
|
||||||
|
---@param source? ObjectRef
|
||||||
function mcl_explosions.explode(pos, strength, info, direct, source)
|
function mcl_explosions.explode(pos, strength, info, direct, source)
|
||||||
if info == nil then
|
if info == nil then
|
||||||
info = {}
|
info = {}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user