mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-29 22:11:10 +01:00
Merge pull request 'Make end crystals explode when nearby crystals are punched and explode' (#3714) from end_crystal_explosion into master
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3714 Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
This commit is contained in:
commit
00a950721d
2 changed files with 18 additions and 1 deletions
|
@ -352,6 +352,23 @@ local function trace_explode(pos, strength, raydirs, radius, info, direct, sourc
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Punch End Crystals to make them explode
|
||||||
|
if ent and ent.name == "mcl_end:crystal" then
|
||||||
|
if direct then
|
||||||
|
local puncher = direct:get_luaentity()
|
||||||
|
if puncher and puncher.name == "mcl_end:crystal" then
|
||||||
|
ent.object:punch(direct, 1.0, { -- End Crystal nearby, trigger it.
|
||||||
|
full_punch_interval = 1.0,
|
||||||
|
damage_groups = {fleshy = 1},
|
||||||
|
}, nil, nil)
|
||||||
|
else
|
||||||
|
ent.object:remove() -- Direct Exists, but it is not an end crystal, remove crystal.
|
||||||
|
end
|
||||||
|
else
|
||||||
|
ent.object:remove() -- Node exploded the end crystal, remove it.
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local airs, fires = {}, {}
|
local airs, fires = {}, {}
|
||||||
|
|
|
@ -40,8 +40,8 @@ local function crystal_explode(self, puncher)
|
||||||
mcl_damage.finish_reason(reason)
|
mcl_damage.finish_reason(reason)
|
||||||
source = reason.source
|
source = reason.source
|
||||||
end
|
end
|
||||||
mcl_explosions.explode(vector.add(self.object:get_pos(), {x = 0, y = 1.5, z = 0}), strength, {drop_chance = 1}, self.object, source)
|
|
||||||
minetest.after(0, self.object.remove, self.object)
|
minetest.after(0, self.object.remove, self.object)
|
||||||
|
mcl_explosions.explode(vector.add(self.object:get_pos(), {x = 0, y = 1.5, z = 0}), strength, {drop_chance = 1}, self.object, source)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function set_crystal_animation(self)
|
local function set_crystal_animation(self)
|
||||||
|
|
Loading…
Reference in a new issue