item pick-up overhaul

diff --git a/item_drop/init.lua b/item_drop/init.lua
index f51469b64e418291723280482c858a09d4e80754..131265c2acb4b3862816fd29c85bf96754264fcb 100644 (file)
--- a/item_drop/init.lua
+++ b/item_drop/init.lua
@@ -5,64 +5,21 @@ minetest.register_globalstep(function(dtime)
                local pos = player:getpos()
                pos.y = pos.y+0.5
                local inv = player:get_inventory()
-               for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do
-                       if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
-                               if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
-                                       if object:get_luaentity() and object:get_luaentity().timer > time_pick then
-                                               inv:add_item("main", ItemStack(object:get_luaentity().itemstring))
-                                               if object:get_luaentity().itemstring ~= "" then
-                                                       minetest.sound_play("item_drop_pickup", {
-                                                               to_player = player:get_player_name(),
-                                                       })
-                                               end
-                                               object:get_luaentity().itemstring = ""
-                                               object:remove()
-                                       end
-                               end
-                       end
-               end
-               
-               for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 3)) do
-                       if not object:is_player() and object:get_luaentity() and object:get_luaentity().name == "__builtin:item" then
-                               --print(dump(object:getpos().y-player:getpos().y))
-                               if object:getpos().y-player:getpos().y > 0 then
-                                       if object:get_luaentity().collect then
-                                               if inv:room_for_item("main", ItemStack(object:get_luaentity().itemstring)) then
-                                                       if object:get_luaentity().timer > time_pick then
-                                                               local pos1 = pos
-                                                               pos1.y = pos1.y+0.2
-                                                               local pos2 = object:getpos()
-                                                               local vec = {x=pos1.x-pos2.x, y=pos1.y-pos2.y, z=pos1.z-pos2.z}
-                                                               vec.x = vec.x*3
-                                                               vec.y = vec.y*3
-                                                               vec.z = vec.z*3
-                                                               object:setvelocity(vec)
-                                                               
-                                                               minetest.after(1, function(args)
-                                                                       local lua = object:get_luaentity()
-                                                                       if object == nil or lua == nil or lua.itemstring == nil then
-                                                                               return
-                                                                       end
-                                                                       if 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", {
-                                                                                               to_player = player:get_player_name(),
-                                                                                       })
-                                                                               end
-                                                                               object:get_luaentity().itemstring = ""
-                                                                               object:remove()
-                                                                       else
-                                                                               object:setvelocity({x=0,y=0,z=0})
-                                                                       end
-                                                               end, {player, object})
+               for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 2)) do
+                       if not object:is_player() and object:get_luaentity() then 
+                               local obj=object:get_luaentity() 
+                               if obj.name == "__builtin:item" then
+                                       if inv:room_for_item("main", ItemStack(obj.itemstring)) then
+                                               if obj.timer > time_pick then
+                                                       inv:add_item("main", ItemStack(obj.itemstring))
+                                                       if obj.itemstring ~= "" then
+                                                               minetest.sound_play("item_drop_pickup") 
+                                                       end
+                                                       if object:get_luaentity() then 
+                                                               object:get_luaentity().itemstring = ""
+                                                               object:remove()
                                                        end
-                                                       
                                                end
-                                       else
-                                               minetest.after(0.5, function(entity)
-                                                       entity.collect = true
-                                               end, object:get_luaentity())
                                        end
                                end
                        end