From 595ed5045171ac45c92551e093fe582e0ca2508e Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Mon, 15 Apr 2013 08:33:01 +0200 Subject: avoid nil --- item_drop/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'item_drop/init.lua') diff --git a/item_drop/init.lua b/item_drop/init.lua index 8cd3b14..f51469b 100644 --- a/item_drop/init.lua +++ b/item_drop/init.lua @@ -8,7 +8,7 @@ minetest.register_globalstep(function(dtime) 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 + 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", { @@ -137,4 +137,4 @@ minetest.register_on_dieplayer(function(name, pos) end end) ]]-- -print("DROPS LOADED!") \ No newline at end of file +print("DROPS LOADED!") -- cgit v1.2.3 From 1cbe991a57945033cb38e727e59de8825b710310 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Apr 2013 05:39:41 +0200 Subject: item pick-up overhaul --- item_drop/init.lua | 69 ++++++++++-------------------------------------------- 1 file changed, 13 insertions(+), 56 deletions(-) (limited to 'item_drop/init.lua') diff --git a/item_drop/init.lua b/item_drop/init.lua index f51469b..131265c 100644 --- 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 -- cgit v1.2.3 From 5db0041896c9d01f8edc5b7a2ec86ae9d50eb8e8 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Apr 2013 07:43:49 +0200 Subject: Item drop sounds range fix --- item_drop/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'item_drop/init.lua') diff --git a/item_drop/init.lua b/item_drop/init.lua index 131265c..5033eca 100644 --- a/item_drop/init.lua +++ b/item_drop/init.lua @@ -13,7 +13,7 @@ minetest.register_globalstep(function(dtime) if obj.timer > time_pick then inv:add_item("main", ItemStack(obj.itemstring)) if obj.itemstring ~= "" then - minetest.sound_play("item_drop_pickup") + minetest.sound_play("item_drop_pickup",gain = 1.0, max_hear_distance = 10) end if object:get_luaentity() then object:get_luaentity().itemstring = "" -- cgit v1.2.3 From 0992a6a6fc1a5331ee6cea5ce42adb5cc71c8a86 Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Apr 2013 07:53:35 +0200 Subject: bug fix --- item_drop/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'item_drop/init.lua') diff --git a/item_drop/init.lua b/item_drop/init.lua index 5033eca..8a7afe8 100644 --- a/item_drop/init.lua +++ b/item_drop/init.lua @@ -13,7 +13,7 @@ minetest.register_globalstep(function(dtime) if obj.timer > time_pick then inv:add_item("main", ItemStack(obj.itemstring)) if obj.itemstring ~= "" then - minetest.sound_play("item_drop_pickup",gain = 1.0, max_hear_distance = 10) + minetest.sound_play("item_drop_pickup",{pos, gain = 1.0, max_hear_distance = 10}) end if object:get_luaentity() then object:get_luaentity().itemstring = "" -- cgit v1.2.3 From 85f2692ef04fd11de9b21d10f67e352052eb381e Mon Sep 17 00:00:00 2001 From: RealBadAngel Date: Sat, 20 Apr 2013 08:13:58 +0200 Subject: range fix again --- item_drop/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'item_drop/init.lua') diff --git a/item_drop/init.lua b/item_drop/init.lua index 8a7afe8..a25a3b5 100644 --- a/item_drop/init.lua +++ b/item_drop/init.lua @@ -13,7 +13,7 @@ minetest.register_globalstep(function(dtime) if obj.timer > time_pick then inv:add_item("main", ItemStack(obj.itemstring)) if obj.itemstring ~= "" then - minetest.sound_play("item_drop_pickup",{pos, gain = 1.0, max_hear_distance = 10}) + minetest.sound_play("item_drop_pickup",{pos = pos, gain = 1.0, max_hear_distance = 10}) end if object:get_luaentity() then object:get_luaentity().itemstring = "" -- cgit v1.2.3 From 00328622d9cc38a7768a7bf449f5c52ddba666f7 Mon Sep 17 00:00:00 2001 From: ShadowNinja Date: Thu, 25 Apr 2013 21:39:08 -0400 Subject: Store configuration in the world directory. --- item_drop/init.lua | 104 ++++++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 49 deletions(-) (limited to 'item_drop/init.lua') diff --git a/item_drop/init.lua b/item_drop/init.lua index a25a3b5..db1f2a3 100644 --- a/item_drop/init.lua +++ b/item_drop/init.lua @@ -1,66 +1,72 @@ 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, 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",{pos = pos, gain = 1.0, max_hear_distance = 10}) - end - if object:get_luaentity() then - object:get_luaentity().itemstring = "" - object:remove() + +if technic.config:getBool("enable_item_pickup") then + 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, 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",{pos = pos, gain = 1.0, max_hear_distance = 10}) + end + if object:get_luaentity() then + object:get_luaentity().itemstring = "" + object:remove() + end end end 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:getBool("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() -- cgit v1.2.3