Partial rewrite

ShadowNinja

2013-07-17 ee0765804c0a21deeb2f33c22ac1a36cb0db5f43

 item_drop/init.lua

@@ -1,109 +1,75 @@
dofile(minetest.get_modpath("item_drop").."/item_entity.lua")
time_pick = 3
minetest.register_globalstep(function(dtime)
   for _,player in ipairs(minetest.get_connected_players()) do
      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().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

if technic.config:get_bool("enable_item_pickup") then
   minetest.register_globalstep(function(dtime)
      for _,player in ipairs(minetest.get_connected_players()) do
         if player and player:get_hp() > 0 then
            local pos = player:getpos()
            pos.y = pos.y + 0.5
            local inv = player:get_inventory()
            for _, object in ipairs(minetest.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 and 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",
                                 {pos = pos, gain = 1.0, max_hear_distance = 10}) 
                           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
                           if object:get_luaentity() then
                              object:get_luaentity().itemstring = ""
                              object:remove()
                           else
                              object:setvelocity({x=0,y=0,z=0})
                           end
                        end, {player, object})
                        end
                     end
							
                  end
               else
                  minetest.after(0.5, function(entity)
                     entity.collect = true
                  end, object:get_luaentity())
               end
            end
         end
      end
   end
end)
   end)
end

function minetest.handle_node_drops(pos, drops, digger)
   for _,item in ipairs(drops) do
      local count, name
      if type(item) == "string" then
         count = 1
         name = item
      else
         count = item:get_count()
         name = item:get_name()
      end
      for i=1,count do
         local obj = minetest.env:add_item(pos, name)
         if obj ~= nil then
            obj:get_luaentity().collect = true
            local x = math.random(1, 5)
            if math.random(1,2) == 1 then
               x = -x
            end
            local z = math.random(1, 5)
            if math.random(1,2) == 1 then
               z = -z
            end
            obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z})
            obj:get_luaentity().timer = time_pick
            -- FIXME this doesnt work for deactiveted objects
            if minetest.setting_get("remove_items") and tonumber(minetest.setting_get("remove_items")) then
               minetest.after(tonumber(minetest.setting_get("remove_items")), function(obj)
                  obj:remove()
               end, obj)
if technic.config:get_bool("enable_item_drop") then
   function minetest.handle_node_drops(pos, drops, digger)
      for _,item in ipairs(drops) do
         local count, name
         if type(item) == "string" then
            count = 1
            name = item
         else
            count = item:get_count()
            name = item:get_name()
         end
         for i=1,count do
            local obj = minetest.env:add_item(pos, name)
            if obj ~= nil then
               obj:get_luaentity().collect = true
               local x = math.random(1, 5)
               if math.random(1,2) == 1 then
                  x = -x
               end
               local z = math.random(1, 5)
               if math.random(1,2) == 1 then
                  z = -z
               end
               obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z})
               obj:get_luaentity().timer = time_pick
               -- FIXME this doesnt work for deactiveted objects
               if minetest.setting_get("remove_items") and tonumber(minetest.setting_get("remove_items")) then
                  minetest.after(tonumber(minetest.setting_get("remove_items")), function(obj)
                     obj:remove()
                  end, obj)
               end
            end
         end
      end
   end
end

--[[
minetest.register_on_dieplayer(function(name, pos)
   local inv = name:get_inventory()
@@ -137,4 +103,4 @@
   end
end)
]]--
print("DROPS LOADED!")
print("DROPS LOADED!")