nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-02-23 14:40:22 +01:00
Code Issues Releases Wiki Activity

try to fix issue https://github.com/MinetestForFun/server-minetestforfun/issues/313

Browse Source 
improve builtin_item
This commit is contained in:
crabman77 2015-10-26 18:30:47 +01:00
parent 594e344f24
commit f13e394c4d
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
mods/builtin_item/init.lua
View File

@ -13,6 +13,31 @@ minetest.after(0, function()
end end
end) end)
local get_flowing_dir = function(self)
local pos = self.object:getpos()
local param2 = minetest.get_node(pos).param2
for i,d in ipairs({-1, 1, -1, 1}) do
if i<3 then
pos.x = pos.x+d
else
pos.z = pos.z+d
end
local name = minetest.get_node(pos).name
local par2 = minetest.get_node(pos).param2
if name == "default:water_flowing" and par2 < param2 then
return pos
end
if i<3 then
pos.x = pos.x-d
else
pos.z = pos.z-d
end
end
return nil
end
minetest.register_entity(":__builtin:item", { minetest.register_entity(":__builtin:item", {
initial_properties = { initial_properties = {
hp_max = 1, hp_max = 1,
@ -100,13 +125,15 @@ minetest.register_entity(":__builtin:item", {
self.timer = self.timer + dtime self.timer = self.timer + dtime
if time ~= 0 and (self.timer > time) then if time ~= 0 and (self.timer > time) then
self.object:remove() self.object:remove()
return
end end
local p = self.object:getpos() local p = self.object:getpos()
local name = minetest.get_node(p).name local name = minetest.get_node(p).name
if (minetest.registered_nodes[name] and minetest.registered_nodes[name].damage_per_second > 0) or name == "maptools:igniter" then if not minetest.registered_nodes[name] then return end
minetest.sound_play("builtin_item_lava", {pos = self.object:getpos(), gain = 0.5}) if minetest.registered_nodes[name].damage_per_second > 0 or name == "maptools:igniter" then
minetest.sound_play("builtin_item_lava", {pos = p, gain = 0.5})
self.object:remove() self.object:remove()
return return
end end
@ -117,45 +144,21 @@ minetest.register_entity(":__builtin:item", {
self.object:setacceleration({x = 0, y = -10, z = 0}) self.object:setacceleration({x = 0, y = -10, z = 0})
end end
--]] --]]
if not minetest.registered_nodes[name] then return end
if minetest.registered_nodes[name].liquidtype == "flowing" then if minetest.registered_nodes[name].liquidtype == "flowing" then
local get_flowing_dir = function(self)
local pos = self.object:getpos()
local param2 = minetest.get_node(pos).param2
for i,d in ipairs({-1, 1, -1, 1}) do
if i<3 then
pos.x = pos.x+d
else
pos.z = pos.z+d
end
local name = minetest.get_node(pos).name
local par2 = minetest.get_node(pos).param2
if name == "default:water_flowing" and par2 < param2 then
return pos
end
if i<3 then
pos.x = pos.x-d
else
pos.z = pos.z-d
end
end
end
local vec = get_flowing_dir(self) local vec = get_flowing_dir(self)
if vec then if vec then
local v = self.object:getvelocity() local v = self.object:getvelocity()
if vec and vec.x-p.x > 0 then if v and vec.x-p.x > 0 then
self.object:setacceleration({x = 0, y = 0, z = 0}) self.object:setacceleration({x = 0, y = 0, z = 0})
self.object:setvelocity({x = 1, y = -0.22, z = 0}) self.object:setvelocity({x = 1, y = -0.22, z = 0})
elseif vec and vec.x-p.x < 0 then elseif v and vec.x-p.x < 0 then
self.object:setacceleration({x = 0, y = 0, z = 0}) self.object:setacceleration({x = 0, y = 0, z = 0})
self.object:setvelocity({x = -1, y = -0.22, z = 0}) self.object:setvelocity({x = -1, y = -0.22, z = 0})
elseif vec and vec.z-p.z > 0 then elseif v and vec.z-p.z > 0 then
self.object:setacceleration({x = 0, y = 0, z = 0}) self.object:setacceleration({x = 0, y = 0, z = 0})
self.object:setvelocity({x = 0, y = -0.22, z = 1}) self.object:setvelocity({x = 0, y = -0.22, z = 1})
elseif vec and vec.z-p.z < 0 then elseif v and vec.z-p.z < 0 then
self.object:setacceleration({x = 0, y = 0, z = 0}) self.object:setacceleration({x = 0, y = 0, z = 0})
self.object:setvelocity({x = 0, y = -0.22, z = -1}) self.object:setvelocity({x = 0, y = -0.22, z = -1})
end end