nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2024-11-08 11:30:21 +01:00
Code Issues Releases Wiki Activity

[item_drop] Reduce player pickup time to 1.5s; this delay is now ONLY for player drops

Browse Source
This commit is contained in:
Wouters Dorian 2015-07-10 11:57:37 +02:00
parent 2d6871072d
commit f45c080dc0
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mods/item_drop/init.lua
View File

@ -12,7 +12,7 @@ local pickup_range_squared = pickup_range*pickup_range
local player_half_height = 0.9 local player_half_height = 0.9
local scan_range = math.sqrt(player_half_height*player_half_height + pickup_range_squared) local scan_range = math.sqrt(player_half_height*player_half_height + pickup_range_squared)
-- Node drops are insta-pickup, everything else (player drops) are not -- Node drops are insta-pickup, everything else (player drops) are not
local delay_before_playerdrop_pickup = 2 local delay_before_playerdrop_pickup = 1.5
-- Time in which the node comes to the player -- Time in which the node comes to the player
local pickup_duration = 0.2 local pickup_duration = 0.2
-- Little treshold so the items aren't already on the player's middle -- Little treshold so the items aren't already on the player's middle
@ -28,17 +28,15 @@ minetest.register_globalstep(function(dtime)
for _,object in ipairs(minetest.get_objects_inside_radius(pos, scan_range)) do for _,object in ipairs(minetest.get_objects_inside_radius(pos, scan_range)) do
local luaEnt = object:get_luaentity() local luaEnt = object:get_luaentity()
if not object:is_player() and luaEnt and luaEnt.name == "__builtin:item" then if not object:is_player() and luaEnt and luaEnt.name == "__builtin:item" then
if not luaEnt.always_collect then local ticky = luaEnt.item_drop_delay
local ticky = luaEnt.item_drop_delay or delay_before_playerdrop_pickup if ticky then
ticky = ticky - dtime ticky = ticky - dtime
if ticky <= 0 then if ticky <= 0 then
luaEnt.always_collect = true
luaEnt.item_drop_delay = nil luaEnt.item_drop_delay = nil
else else
luaEnt.item_drop_delay = ticky luaEnt.item_drop_delay = ticky
end end
end elseif not luaEnt.item_drop_nopickup then
if luaEnt.always_collect and luaEnt.item_drop_nopickup == nil then
-- Point-line distance computation, heavily simplified since the wanted line, -- Point-line distance computation, heavily simplified since the wanted line,
-- being the player, is completely upright (no variation on X or Z) -- being the player, is completely upright (no variation on X or Z)
local pos2 = object:getpos() local pos2 = object:getpos()
@ -87,7 +85,6 @@ minetest.register_globalstep(function(dtime)
luaEnt.item_drop_nopickup = nil luaEnt.item_drop_nopickup = nil
end end
end, {player, object}) end, {player, object})
end end
end end
end end
@ -122,7 +119,6 @@ function minetest.handle_node_drops(pos, drops, digger)
obj = minetest.spawn_item(pos, name) obj = minetest.spawn_item(pos, name)
if obj ~= nil then if obj ~= nil then
obj:get_luaentity().always_collect = true
obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z}) obj:setvelocity({x=1/x, y=obj:getvelocity().y, z=1/z})
end end
end end
@ -130,7 +126,31 @@ function minetest.handle_node_drops(pos, drops, digger)
end end
end end
local mt_item_drop = minetest.item_drop
function minetest.item_drop(itemstack, dropper, pos)
if dropper.is_player then
local v = dropper:get_look_dir()
local p = {x=pos.x, y=pos.y+1.2, z=pos.z}
local cs = itemstack:get_count()
if dropper:get_player_control().sneak then
cs = 1
end
local item = itemstack:take_item(cs)
local obj = core.add_item(p, item)
if obj then
v.x = v.x*2
v.y = v.y*2 + 2
v.z = v.z*2
obj:setvelocity(v)
obj:get_luaentity().item_drop_delay = delay_before_playerdrop_pickup
end
else
core.add_item(pos, itemstack)
end
return itemstack
end
if minetest.setting_getbool("log_mods") then if minetest.setting_getbool("log_mods") then
minetest.log("action", "[item_drop] item_drop overriden: " .. tostring(mt_item_drop) .. " " .. tostring(minetest.item_drop))
minetest.log("action", "[item_drop] loaded.") minetest.log("action", "[item_drop] loaded.")
end end