minenux
/
minetest-game-adventuretest
1
0
Fork 0
Code Issues 5 Pull Requests 3 Releases Wiki Activity

add velocity and acceleration to default.drop_item, add decceleration to builtin_item

pull/2/head
Brandon 2014-05-17 23:29:01 -05:00
parent c948715d24
commit e791859950
3 changed files with 8 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
mods/builtin_item/init.lua
View File

@ -91,83 +91,14 @@ minetest.register_entity(":__builtin:item", {
end
local p = self.object:getpos()
local vel = self.object:getvelocity()
self.object:setacceleration({x=((vel.x)*-1), y=-10, z=((vel.z)*-1)})
local name = minetest.env:get_node(p).name
if name == "default:lava_flowing" or name == "default:lava_source" then
minetest.sound_play("builtin_item_lava", {pos=self.object:getpos()})
self.object:remove()
return
end
--[[
if minetest.registered_nodes[name].liquidtype == "flowing" then
get_flowing_dir = function(self)
local pos = self.object:getpos()
local param2 = minetest.env: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.env:get_node(pos).name
local par2 = minetest.env: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)
if vec then
local v = self.object:getvelocity()
if vec and vec.x-p.x > 0 then
self.object:setvelocity({x=0.5,y=v.y,z=0})
elseif vec and vec.x-p.x < 0 then
self.object:setvelocity({x=-0.5,y=v.y,z=0})
elseif vec and vec.z-p.z > 0 then
self.object:setvelocity({x=0,y=v.y,z=0.5})
elseif vec and vec.z-p.z < 0 then
self.object:setvelocity({x=0,y=v.y,z=-0.5})
end
self.object:setacceleration({x=0, y=-10, z=0})
self.physical_state = true
self.object:set_properties({
physical = true
})
return
end
end
p.y = p.y - 0.3
local nn = minetest.env:get_node(p).name
-- If node is not registered or node is walkably solid
if not minetest.registered_nodes[nn] or minetest.registered_nodes[nn].walkable then
if self.physical_state then
self.object:setvelocity({x=0,y=0,z=0})
self.object:setacceleration({x=0, y=0, z=0})
self.physical_state = false
self.object:set_properties({
physical = false
})
end
else
if not self.physical_state then
self.object:setvelocity({x=0,y=0,z=0})
self.object:setacceleration({x=0, y=-10, z=0})
self.physical_state = true
self.object:set_properties({
physical = true
})
end
end
]]
end,
on_punch = function(self, hitter)

6
mods/default/functions.lua
View File

@ -423,7 +423,7 @@ function default.dump_inv(pos,listname,inv)
end
end
function default.drop_item(pos,itemstack)
function default.drop_item(pos,itemstack,vel,acc)
-- math.randomseed(os.time() + os.clock())
local x = math.random(0, 15)/10 - 0.5
local z = math.random(0, 15)/10 - 0.5
@ -435,5 +435,9 @@ function default.drop_item(pos,itemstack)
local obj = minetest.add_item(np, itemstack)
if obj then
obj:get_luaentity().collect = true
if vel ~= nil and acc ~= nil then
obj:get_luaentity().object:setvelocity(vel)
obj:get_luaentity().object:setacceleration(acc)
end
end
end

2
mods/mobs

@ -1 +1 @@
Subproject commit 019f2379273984e04c5e91a846f2d147eb9bb33b
Subproject commit a6c3db71f152e13ad5068c8536edec60db59e099