sergiotarxz/Camas
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimize a bit.

Browse Source
This commit is contained in:
melzua 2015-10-16 21:44:43 +02:00
parent 9886c4f5b6
commit 3bb3d59dbb
1 changed files with 22 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mods/item_drop/init.lua
View File

@ -15,26 +15,16 @@ minetest.register_globalstep(
local pos = player:getpos() local pos = player:getpos()
local inv = player:get_inventory() local inv = player:get_inventory()
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 0.5)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and valid(object) then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
if object:get_luaentity().itemstring ~= "" then
minetest.sound_play("item_drop_pickup", {pos = pos, gain = 0.1, max_hear_distance = 8})
end
object:get_luaentity().itemstring = ""
object:remove()
end
end
end
for _,object in ipairs(minetest.get_objects_inside_radius(pos, 1.25)) do for _,object in ipairs(minetest.get_objects_inside_radius(pos, 1.25)) do
if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and valid(object) then if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" and valid(object) then
if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then if inv and inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
local pos1 = pos local pos1 = pos
pos1.y = pos1.y+0.2 pos1.y = pos1.y+0.2
local pos2 = object:getpos() local pos2 = object:getpos()
local vec = vector.normalize({x=pos1.x-pos2.x, y=pos1.y-pos2.y, z=pos1.z-pos2.z}) local vec = {x=pos1.x-pos2.x, y=pos1.y-pos2.y, z=pos1.z-pos2.z}
local len = vector.length(vec)
if len > 0.5 then
vec = vector.divide(vec, len) -- it's a normalize but we have len yet (vector.normalize(vec))
vec.x = vec.x*3 vec.x = vec.x*3
vec.y = vec.y*3 vec.y = vec.y*3
vec.z = vec.z*3 vec.z = vec.z*3
@ -44,31 +34,27 @@ minetest.register_globalstep(
{ {
physical = false physical = false
}) })
else
minetest.after(
1,
function(args)
local lua = object:get_luaentity() local lua = object:get_luaentity()
if object == nil or lua == nil or lua.itemstring == nil then if object == nil or lua == nil or lua.itemstring == nil then
return return
end end
if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then if inv:room_for_item("main", ItemStack(lua.itemstring)) then
inv:add_item("main", ItemStack(object:get_luaentity().itemstring)) inv:add_item("main", ItemStack(lua.itemstring))
if object:get_luaentity().itemstring ~= "" then if lua.itemstring ~= "" then
minetest.sound_play("item_drop_pickup", {pos = pos, gain = 0.3, max_hear_distance = 16}) minetest.sound_play("item_drop_pickup", {pos = pos, gain = 0.3, max_hear_distance = 16})
end end
object:get_luaentity().itemstring = "" lua.itemstring = ""
object:remove() object:remove()
else else
object:setvelocity({x = 0, y = 0, z = 0}) object:setvelocity({x = 0, y = 0, z = 0})
object:get_luaentity().physical_state = true lua.physical_state = true
object:get_luaentity().object:set_properties( lua.object:set_properties(
{ {
physical = true physical = true
}) })
end end
end, {player, object}) end
end end
end end
end end