master #12

Merged
NO11 merged 149 commits from VoxeLibre/VoxeLibre:master into master 2021-11-12 22:46:33 +01:00
1 changed files with 20 additions and 57 deletions
Showing only changes of commit dafe860e56 - Show all commits

View File

@ -4,49 +4,7 @@ minetest.register_on_leaveplayer(function(player)
hud_totem[player] = nil hud_totem[player] = nil
end) end)
-- Totem particle registration local particle_colors = {"98BF22", "C49E09", "337D0B", "B0B021", "1E9200"} -- TODO: real MC colors
function rgb_to_hex(r, g, b)
return string.format("%02x%02x%02x", r, g, b)
end
minetest.register_entity("mcl_totems:totem_particle", {
physical = true,
collide_with_objects = false,
collisionbox = { -0.02, -0.02, -0.02, 0.02, 0.02, 0.02 },
pointable = false,
visual = "sprite",
visual_size = { x = 0.2, y = 0.2 },
spritediv = { x = 1, y = 1 },
initial_sprite_basepos = { x = 0, y = 0 },
static_save = false,
glow = 14,
on_activate = function(self, staticdata)
local color
if math.random(0, 3) == 0 then
color = rgb_to_hex( 153 + math.random() * 51, 153 + math.random() * 76.5, math.random() * 51)
else
color = rgb_to_hex(25.5 + math.random() * 102, 153 + math.random() * 76.5, math.random() * 51)
end
self.object:set_properties({
textures = { "mcl_particles_totem"..math.random(1, 4)..".png^[colorize:#"..color }
})
local t = math.random(1, 2)*math.random()
minetest.after(t, function()
self.object:set_velocity({ x = math.random(-4, 4) * math.random(), y = math.random(-1, 4) * math.random(), z = math.random(-4, 4) * math.random() })
end)
minetest.after(0.3 + t, function()
self.object:set_acceleration({ x = 0, y = -4, z = 0 })
self.object:set_velocity({ x = 0, y = 0, z = 0 })
end)
end,
on_step = function(self, dtime)
local r = math.random(1, 50)
if r == 1 then
self.object:remove()
end
end
})
-- 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)
@ -76,16 +34,21 @@ mcl_damage.register_modifier(function(obj, damage, reason)
-- 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)
--Particles for i = 1, 100 do
minetest.add_particle({
pos = vector.offset(ppos, 0, math.random(-10, 10) / 10, 0),
velocity = vector.new(math.random(-15, 15) / 10, math.random(0, 15) / 10, math.random(-15, 15) / 10),
acceleration = vector.new(0, -math.random(1, 10) / 10, 0),
expirationtime = math.random(1, 3),
size = math.random(1, 2),
collisiondetection = true,
collision_removal = true,
object_collision = false,
texture = "mcl_particles_totem" .. math.random(1, 4) .. ".png^[colorize:#" .. particle_colors[math.random(#particle_colors)],
glow = 10,
})
minetest.after(0.1, function()
local new_pos = obj:get_pos()
if not new_pos then return end
local particlepos = { x = new_pos.x, y = new_pos.y + 1, z = new_pos.z }
for i = 1, 150 do
minetest.add_entity(particlepos, "mcl_totems:totem_particle")
end end
end)
-- Big totem overlay -- Big totem overlay
if not hud_totem[obj] then if not hud_totem[obj] then