Mirrorlandia_minetest/item_drop
1
0
Fork 0
mirror of https://github.com/minetest-mods/item_drop.git synced 2024-12-22 22:02:26 +01:00
Code Issues Projects Releases Wiki Activity

Add magnet_radius setting

Browse Source
This commit is contained in:
Hybrid Dog 2017-09-08 20:25:16 +02:00
parent bc5ef09e21
commit 4b5e362395
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
init.lua
View File

@ -3,7 +3,8 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
minetest.settings:get("item_drop.pickup_sound_gain")) or 0.4 minetest.settings:get("item_drop.pickup_sound_gain")) or 0.4
local pickup_radius = tonumber( local pickup_radius = tonumber(
minetest.settings:get("item_drop.pickup_radius")) or 0.75 minetest.settings:get("item_drop.pickup_radius")) or 0.75
local inner_radius = 1 local magnet_radius = tonumber(
minetest.settings:get("item_drop.magnet_radius")) or -1
local pickup_age = tonumber( local pickup_age = tonumber(
minetest.settings:get("item_drop.pickup_age")) or 0.5 minetest.settings:get("item_drop.pickup_age")) or 0.5
local key_triggered = minetest.settings:get_bool( local key_triggered = minetest.settings:get_bool(
@ -14,9 +15,12 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
end end
local damage_enabled = minetest.settings:get_bool("enable_damage") local damage_enabled = minetest.settings:get_bool("enable_damage")
-- TODO add proper magnet range settings local magnet_mode = magnet_radius > pickup_radius
local zero_velocity_mode = pickup_age == -1 local zero_velocity_mode = pickup_age == -1
and pickup_radius <= inner_radius if magnet_mode
and zero_velocity_mode then
error"zero velocity mode can't be used together with magnet mode"
end
-- adds the item to the inventory and removes the object -- adds the item to the inventory and removes the object
local function collect_item(inv, item, ent, object, pos) local function collect_item(inv, item, ent, object, pos)
@ -30,7 +34,7 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
end 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
if zero_velocity_mode then if zero_velocity_mode then
function opt_get_ent(object) function opt_get_ent(object)
if object:is_player() if object:is_player()
@ -59,7 +63,10 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
end end
return ent return ent
end end
end
local afterflight
if magnet_mode then
-- take item or reset velocity after flying a second -- take item or reset velocity after flying a second
function afterflight(object, inv) function afterflight(object, inv)
local ent = opt_get_ent(object) local ent = opt_get_ent(object)
@ -107,7 +114,7 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
local inv local inv
local objectlist = minetest.get_objects_inside_radius(pos, local objectlist = minetest.get_objects_inside_radius(pos,
pickup_radius) magnet_mode and magnet_radius or pickup_radius)
for i = 1,#objectlist do for i = 1,#objectlist do
local object = objectlist[i] local object = objectlist[i]
local ent = opt_get_ent(object) local ent = opt_get_ent(object)
@ -124,7 +131,7 @@ if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then
if inv:room_for_item("main", item) then 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 <= pickup_radius then
collect_item(inv, item, ent, object, pos) collect_item(inv, item, ent, object, pos)
else else
local vel = vector.multiply( local vel = vector.multiply(

7
settingtypes.txt
View File

@ -13,8 +13,13 @@ item_drop.pickup_keytype (Pickup keytype) enum Use Use,Sneak,LeftAndRight,RMB,Sn
#The volume of the pickup sound #The volume of the pickup sound
item_drop.pickup_sound_gain (Pickup sound gain) float 0.4 item_drop.pickup_sound_gain (Pickup sound gain) float 0.4
#Player pickup radius #Player pickup radius, the maximum distance from which items can be collected
item_drop.pickup_radius (Pickup radius) float 0.75 item_drop.pickup_radius (Pickup radius) float 0.75
#Magnet radius, items between pickup_radius and this begin flying to the player
#Set it to -1 (or something else smaller than pickup_radius) to disable item
#flying
item_drop.magnet_radius (Magnet radius) float -1
#Time delay in seconds after autopicking an item if it's dropped by a player #Time delay in seconds after autopicking an item if it's dropped by a player
item_drop.pickup_age (Pickup age) float 0.5 item_drop.pickup_age (Pickup age) float 0.5