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 28 additions and 32 deletions
Showing only changes of commit ee21a24fb6 - Show all commits

View File

@ -7,37 +7,34 @@ end)
-- Totem particle registration -- Totem particle registration
-- TODO: real MC colors, these are randomly selected colors: -- TODO: real MC colors, these are randomly selected colors:
local colors = {"#7FFF00", "#698B22", "#BCEE68", "#EEEE00", "#C5F007"} local colors = {"#7FFF00", "#698B22", "#BCEE68", "#EEEE00", "#C5F007"}
for c, color in pairs(colors) do minetest.register_entity("mcl_totems:totem_particle", {
local colorizing = ".png^[colorize:"..color physical = true,
for n = 1, 4 do collide_with_objects = false,
minetest.register_entity("mcl_totems:totem_particle"..n.."_color"..c, { collisionbox = {-0.02,-0.02,-0.02, 0.02,0.02,0.02},
physical = true, pointable = false,
collide_with_objects = false, visual = "sprite",
collisionbox = {-0.02,-0.02,-0.02, 0.02,0.02,0.02}, visual_size = {x=0.2, y=0.2},
pointable = false, spritediv = {x=1, y=1},
visual = "sprite", initial_sprite_basepos = {x=0, y=0},
visual_size = {x=0.2, y=0.2}, static_save = false,
textures = {"mcl_particles_totem"..n..colorizing}, glow = 5,
spritediv = {x=1, y=1}, on_activate = function(self, staticdata)
initial_sprite_basepos = {x=0, y=0}, self.object:set_properties({
static_save = false, textures = {"mcl_particles_totem"..math.random(1, 4)..".png^[colorize:"..colors[math.random(#colors)]}
glow = 5,
on_activate = function(self, staticdata)
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()})
minetest.after(0.3, 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,80)
if r == 1 then
self.object:remove()
end
end
}) })
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()})
minetest.after(0.3, 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 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)
@ -68,11 +65,10 @@ mcl_damage.register_modifier(function(obj, damage, reason)
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 --Particles
for i = 1, 200 do for i = 1, 150 do
local particle = "mcl_totems:totem_particle"..math.random(1, 4).."_color"..math.random(1, 5)
minetest.after(math.random(1, 2)*math.random(), function() minetest.after(math.random(1, 2)*math.random(), function()
local new_pos = obj:get_pos() local new_pos = obj:get_pos()
minetest.add_entity({x=new_pos.x, y=new_pos.y + 1, z=new_pos.z}, particle) minetest.add_entity({x = new_pos.x, y = new_pos.y + 1, z = new_pos.z}, "mcl_totems:totem_particle")
end) end)
end end