Merge pull request 'Totem particles (Fix #1745)' (#1768) from totem_particles into master

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/1768
NO11 2021-10-28 09:08:17 +00:00
commit aaee3b6de7
5 changed files with 32 additions and 5 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

@ -4,6 +4,8 @@ minetest.register_on_leaveplayer(function(player)
hud_totem[player] = nil hud_totem[player] = nil
end) end)
local particle_colors = {"98BF22", "C49E09", "337D0B", "B0B021", "1E9200"} -- TODO: real MC colors
-- Save the player from death when holding totem of undying in hand -- Save the player from death when holding totem of undying in hand
mcl_damage.register_modifier(function(obj, damage, reason) mcl_damage.register_modifier(function(obj, damage, reason)
if obj:is_player() then if obj:is_player() then
@ -14,7 +16,7 @@ mcl_damage.register_modifier(function(obj, damage, reason)
local ppos = obj:get_pos() local ppos = obj:get_pos()
local pnname = minetest.get_node(ppos).name local pnname = minetest.get_node(ppos).name
-- Some exceptions when _not_ to save the player -- Some exceptions when _not_ to save the player
for n=1, #mobs_mc.misc.totem_fail_nodes do for n = 1, #mobs_mc.misc.totem_fail_nodes do
if pnname == mobs_mc.misc.totem_fail_nodes[n] then if pnname == mobs_mc.misc.totem_fail_nodes[n] then
return return
end end
@ -30,16 +32,41 @@ mcl_damage.register_modifier(function(obj, damage, reason)
end end
-- Effects -- Effects
minetest.sound_play({name = "mcl_totems_totem", gain=1}, {pos=ppos, max_hear_distance=16}, true) minetest.sound_play({name = "mcl_totems_totem", gain = 1}, {pos=ppos, max_hear_distance = 16}, true)
for i = 1, 4 do
for c = 1, #particle_colors do
minetest.add_particlespawner({
amount = math.floor(100 / (4 * #particle_colors)),
time = 1,
minpos = vector.offset(ppos, 0, -1, 0),
maxpos = vector.offset(ppos, 0, 1, 0),
minvel = vector.new(-1.5, 0, -1.5),
maxvel = vector.new(1.5, 1.5, 1.5),
minacc = vector.new(0, -0.1, 0),
maxacc = vector.new(0, -1, 0),
minexptime = 1,
maxexptime = 3,
minsize = 1,
maxsize = 2,
collisiondetection = true,
collision_removal = true,
object_collision = false,
vertical = false,
texture = "mcl_particles_totem" .. i .. ".png^[colorize:#" .. particle_colors[c],
glow = 10,
})
end
end
-- Big totem overlay -- Big totem overlay
if not hud_totem[obj] then if not hud_totem[obj] then
hud_totem[obj] = obj:hud_add({ hud_totem[obj] = obj:hud_add({
hud_elem_type = "image", hud_elem_type = "image",
text = "mcl_totems_totem.png", text = "mcl_totems_totem.png",
position = { x=0.5, y=1 }, position = {x = 0.5, y = 1},
scale = { x=17, y=17 }, scale = {x = 17, y = 17},
offset = { x=0, y=-178 }, offset = {x = 0, y = -178},
z_index = 100, z_index = 100,
}) })
minetest.after(3, function() minetest.after(3, function()