From 0eace77417f1e11b9ea7a65eb9a0b80fbeb41001 Mon Sep 17 00:00:00 2001 From: Hybrid Dog Date: Wed, 6 Sep 2017 15:56:04 +0200 Subject: [PATCH] Add item_drop. prefix to settings --- init.lua | 18 +++++++++--------- settingtypes.txt | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/init.lua b/init.lua index 95a63ec..0bb7e10 100644 --- a/init.lua +++ b/init.lua @@ -1,13 +1,13 @@ -if minetest.settings:get_bool("enable_item_pickup") ~= false then - local pickup_gain = tonumber(minetest.settings:get("item_pickup_gain")) - or 0.4 - local pickup_radius = tonumber(minetest.settings:get("item_pickup_radius")) - or 0.75 - local key_triggered = minetest.settings:get_bool("enable_item_pickup_key") - ~= false +if minetest.settings:get_bool("item_drop.enable_item_pickup") ~= false then + local pickup_gain = tonumber( + minetest.settings:get("item_drop.pickup_sound_gain")) or 0.4 + local pickup_radius = tonumber( + minetest.settings:get("item_drop.pickup_radius")) or 0.75 + local key_triggered = minetest.settings:get_bool( + "item_drop.enable_pickup_key") ~= false local keytype if key_triggered then - keytype = minetest.settings:get("item_pickup_keytype") or "Use" + keytype = minetest.settings:get("item_drop.pickup_keytype") or "Use" end local damage_enabled = minetest.settings:get_bool("enable_damage") @@ -124,7 +124,7 @@ if minetest.settings:get_bool("enable_item_pickup") ~= false then minetest.after(3.0, pickup_step) end -if minetest.settings:get_bool("enable_item_drop") ~= false then +if minetest.settings:get_bool("item_drop.enable_item_drop") ~= false then function minetest.handle_node_drops(pos, drops, digger) local inv diff --git a/settingtypes.txt b/settingtypes.txt index ad5b4cb..6580e29 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -1,17 +1,17 @@ #Pick up items automatically -enable_item_pickup (Enable item pickups) bool true +item_drop.enable_item_pickup (Enable item pickups) bool true #Drop items in-world on dig -enable_item_drop (Enable item drops) bool true +item_drop.enable_item_drop (Enable item drops) bool true #Use a key to pick up items -enable_item_pickup_key (Use pickup key) bool true +item_drop.enable_pickup_key (Use pickup key) bool true #What keytype to use as pickup key -item_pickup_keytype (Pickup keytype) enum Use Use,Sneak,LeftAndRight,RMB,SneakAndRMB +item_drop.pickup_keytype (Pickup keytype) enum Use Use,Sneak,LeftAndRight,RMB,SneakAndRMB #The volume of the pickup sound -item_pickup_gain (Pickup sound gain) float 0.4 +item_drop.pickup_sound_gain (Pickup sound gain) float 0.4 #Player pickup radius -item_pickup_radius (Pickup radius) float 0.75 +item_drop.pickup_radius (Pickup radius) float 0.75