nalc/item_drop
1
0
Fork 0
forked from minetest-mods/item_drop
Code Issues Pull Requests Releases Wiki Activity

Play the pickup sound positional to all players

Browse Source
This commit is contained in:
Hybrid Dog
2017-09-07 21:19:33 +02:00
parent fced0590c6
commit 31229760e8
1 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
init.lua
View File

@@ -18,6 +18,17 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
local zero_velocity_mode = pickup_age == -1 local zero_velocity_mode = pickup_age == -1
and pickup_radius <= inner_radius and pickup_radius <= inner_radius
-- adds the item to the inventory and removes the object
local function collect_item(inv, item, ent, object, pos)
inv:add_item("main", item)
minetest.sound_play("item_drop_pickup", {
pos = pos,
gain = pickup_gain,
})
ent.itemstring = ""
object:remove()
end
-- opt_get_ent gets the object's luaentity if it can be collected -- opt_get_ent gets the object's luaentity if it can be collected
local opt_get_ent, afterflight local opt_get_ent, afterflight
if zero_velocity_mode then if zero_velocity_mode then
@@ -50,23 +61,15 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
end end
-- take item or reset velocity after flying a second -- take item or reset velocity after flying a second
function afterflight(object, inv, player) function afterflight(object, inv)
local ent = opt_get_ent(object) local ent = opt_get_ent(object)
if not ent then if not ent then
return return
end end
local item = ItemStack(ent.itemstring)
if inv if inv
and inv:room_for_item("main", and inv:room_for_item("main", item) then
ItemStack(ent.itemstring) collect_item(inv, item, ent, object, object:get_pos())
) then
inv:add_item("main",
ItemStack(ent.itemstring))
minetest.sound_play("item_drop_pickup", {
to_player = player:get_player_name(),
gain = pickup_gain,
})
ent.itemstring = ""
object:remove()
else else
object:setvelocity({x=0,y=0,z=0}) object:setvelocity({x=0,y=0,z=0})
ent.physical_state = true ent.physical_state = true
@@ -117,18 +120,12 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
return return
end end
end end
if inv:room_for_item("main", ItemStack(ent.itemstring)) then local item = ItemStack(ent.itemstring)
if inv:room_for_item("main", item) then
local pos2 = object:getpos() local pos2 = object:getpos()
local distance = vector.distance(pos, pos2) local distance = vector.distance(pos, pos2)
if distance <= inner_radius then if distance <= inner_radius then
inv:add_item("main", ItemStack( collect_item(inv, item, ent, object, pos)
ent.itemstring))
minetest.sound_play("item_drop_pickup", {
to_player = player:get_player_name(),
gain = pickup_gain,
})
ent.itemstring = ""
object:remove()
else else
local vel = vector.multiply( local vel = vector.multiply(
vector.subtract(pos, pos2), 3) vector.subtract(pos, pos2), 3)
@@ -139,8 +136,7 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
physical = false physical = false
}) })
minetest.after(1.0, afterflight, minetest.after(1.0, afterflight, object, inv)
object, inv, player)
end end
end end
end end