Option to disable bone drops

I've added the option to disable bone drops by adding 'bones.enable = true' which can easily be set to false inside other mods like DropOnDie. Also some code cleanup and a bugfix for sofar's protection bypass check.
This commit is contained in:
tenplus1 2016-03-13 10:55:02 +00:00
parent dfee51c21e
commit 15ee19dfef

View file

@ -1,28 +1,29 @@
-- Minetest 0.4 mod: bones -- Minetest 0.4 mod: bones
-- See README.txt for licensing and other information. -- See README.txt for licensing and other information.
bones = {} bones = {}
bones.enable = true -- enabled by default, can be changed by mods
local function is_owner(pos, name) local function is_owner(pos, name)
local owner = minetest.get_meta(pos):get_string("owner") local owner = minetest.get_meta(pos):get_string("owner")
if owner == "" or owner == name or minetest.check_player_privs(placer, "protection_bypass") then if owner == "" or owner == name or minetest.check_player_privs(name, "protection_bypass") then
return true return true
end end
return false return false
end end
bones.bones_formspec = bones.bones_formspec =
"size[8,9]".. "size[8,9]" ..
default.gui_bg.. default.gui_bg ..
default.gui_bg_img.. default.gui_bg_img ..
default.gui_slots.. default.gui_slots ..
"list[current_name;main;0,0.3;8,4;]".. "list[current_name;main;0,0.3;8,4;]" ..
"list[current_player;main;0,4.85;8,1;]".. "list[current_player;main;0,4.85;8,1;]" ..
"list[current_player;main;0,6.08;8,3;8]".. "list[current_player;main;0,6.08;8,3;8]" ..
default.get_hotbar_bg(0,4.85) default.get_hotbar_bg(0,4.85)
local share_bones_time = tonumber(minetest.setting_get("share_bones_time") or 1200) local share_bones_time = tonumber(minetest.setting_get("share_bones_time") or 1200)
local share_bones_time_early = tonumber(minetest.setting_get("share_bones_time_early") or (share_bones_time/4)) local share_bones_time_early = tonumber(minetest.setting_get("share_bones_time_early") or (share_bones_time / 4))
minetest.register_node("bones:bones", { minetest.register_node("bones:bones", {
description = "Bones", description = "Bones",
@ -35,12 +36,12 @@ minetest.register_node("bones:bones", {
"bones_front.png" "bones_front.png"
}, },
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {dig_immediate=2}, groups = {dig_immediate = 2},
sounds = default.node_sound_dirt_defaults({ sounds = default.node_sound_dirt_defaults({
footstep = {name="default_gravel_footstep", gain=0.5}, footstep = {name = "default_gravel_footstep", gain = 0.5},
dug = {name="default_gravel_footstep", gain=1.0}, dug = {name = "default_gravel_footstep", gain = 1.0},
}), }),
can_dig = function(pos, player) can_dig = function(pos, player)
local inv = minetest.get_meta(pos):get_inventory() local inv = minetest.get_meta(pos):get_inventory()
local name = "" local name = ""
@ -49,46 +50,46 @@ minetest.register_node("bones:bones", {
end end
return is_owner(pos, name) and inv:is_empty("main") return is_owner(pos, name) and inv:is_empty("main")
end, end,
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
if is_owner(pos, player:get_player_name()) then if is_owner(pos, player:get_player_name()) then
return count return count
end end
return 0 return 0
end, end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player) allow_metadata_inventory_put = function(pos, listname, index, stack, player)
return 0 return 0
end, end,
allow_metadata_inventory_take = function(pos, listname, index, stack, player) allow_metadata_inventory_take = function(pos, listname, index, stack, player)
if is_owner(pos, player:get_player_name()) then if is_owner(pos, player:get_player_name()) then
return stack:get_count() return stack:get_count()
end end
return 0 return 0
end, end,
on_metadata_inventory_take = function(pos, listname, index, stack, player) on_metadata_inventory_take = function(pos, listname, index, stack, player)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
if meta:get_inventory():is_empty("main") then if meta:get_inventory():is_empty("main") then
minetest.remove_node(pos) minetest.remove_node(pos)
end end
end, end,
on_punch = function(pos, node, player) on_punch = function(pos, node, player)
if(not is_owner(pos, player:get_player_name())) then if not is_owner(pos, player:get_player_name()) then
return return
end end
if(minetest.get_meta(pos):get_string("infotext") == "") then if minetest.get_meta(pos):get_string("infotext") == "" then
return return
end end
local inv = minetest.get_meta(pos):get_inventory() local inv = minetest.get_meta(pos):get_inventory()
local player_inv = player:get_inventory() local player_inv = player:get_inventory()
local has_space = true local has_space = true
for i=1,inv:get_size("main") do for i = 1, inv:get_size("main") do
local stk = inv:get_stack("main", i) local stk = inv:get_stack("main", i)
if player_inv:room_for_item("main", stk) then if player_inv:room_for_item("main", stk) then
inv:set_stack("main", i, nil) inv:set_stack("main", i, nil)
@ -98,7 +99,7 @@ minetest.register_node("bones:bones", {
break break
end end
end end
-- remove bones if player emptied them -- remove bones if player emptied them
if has_space then if has_space then
if player_inv:room_for_item("main", {name = "bones:bones"}) then if player_inv:room_for_item("main", {name = "bones:bones"}) then
@ -109,12 +110,12 @@ minetest.register_node("bones:bones", {
minetest.remove_node(pos) minetest.remove_node(pos)
end end
end, end,
on_timer = function(pos, elapsed) on_timer = function(pos, elapsed)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local time = meta:get_int("time") + elapsed local time = meta:get_int("time") + elapsed
if time >= share_bones_time then if time >= share_bones_time then
meta:set_string("infotext", meta:get_string("owner").."'s old bones") meta:set_string("infotext", meta:get_string("owner") .. "'s old bones")
meta:set_string("owner", "") meta:set_string("owner", "")
else else
meta:set_int("time", time) meta:set_int("time", time)
@ -153,11 +154,17 @@ local function may_replace(pos, player)
return node_definition.buildable_to and not minetest.is_protected(pos, player:get_player_name()) return node_definition.buildable_to and not minetest.is_protected(pos, player:get_player_name())
end end
if minetest.setting_getbool("creative_mode") == true then
return
end
minetest.register_on_dieplayer(function(player) minetest.register_on_dieplayer(function(player)
if minetest.setting_getbool("creative_mode") then
-- are bones enabled?
if bones.enable ~= true then
return return
end end
local player_inv = player:get_inventory() local player_inv = player:get_inventory()
if player_inv:is_empty("main") and if player_inv:is_empty("main") and
player_inv:is_empty("craft") then player_inv:is_empty("craft") then
@ -165,25 +172,26 @@ minetest.register_on_dieplayer(function(player)
end end
local pos = player:getpos() local pos = player:getpos()
pos.x = math.floor(pos.x+0.5) pos.x = math.floor(pos.x + 0.5)
pos.y = math.floor(pos.y+0.5) pos.y = math.floor(pos.y + 0.5)
pos.z = math.floor(pos.z+0.5) pos.z = math.floor(pos.z + 0.5)
local param2 = minetest.dir_to_facedir(player:get_look_dir()) local param2 = minetest.dir_to_facedir(player:get_look_dir())
local player_name = player:get_player_name() local player_name = player:get_player_name()
local player_inv = player:get_inventory() local player_inv = player:get_inventory()
if (not may_replace(pos, player)) then if (not may_replace(pos, player)) then
if (may_replace({x=pos.x, y=pos.y+1, z=pos.z}, player)) then if (may_replace({x = pos.x, y = pos.y + 1, z = pos.z}, player)) then
-- drop one node above if there's space -- drop one node above if there's space
-- this should solve most cases of protection related deaths in which players dig straight down -- this should solve most cases of protection related deaths
-- in which players dig straight down
-- yet keeps the bones reachable -- yet keeps the bones reachable
pos.y = pos.y+1 pos.y = pos.y + 1
else else
-- drop items instead of delete -- drop items instead of delete
for i=1,player_inv:get_size("main") do for i = 1, player_inv:get_size("main") do
minetest.add_item(pos, player_inv:get_stack("main", i)) minetest.add_item(pos, player_inv:get_stack("main", i))
end end
for i=1,player_inv:get_size("craft") do for i = 1, player_inv:get_size("craft") do
minetest.add_item(pos, player_inv:get_stack("craft", i)) minetest.add_item(pos, player_inv:get_stack("craft", i))
end end
-- empty lists main and craft -- empty lists main and craft
@ -194,12 +202,12 @@ minetest.register_on_dieplayer(function(player)
end end
minetest.set_node(pos, {name="bones:bones", param2=param2}) minetest.set_node(pos, {name="bones:bones", param2=param2})
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
inv:set_size("main", 8*4) inv:set_size("main", 8 * 4)
inv:set_list("main", player_inv:get_list("main")) inv:set_list("main", player_inv:get_list("main"))
for i=1,player_inv:get_size("craft") do for i=1,player_inv:get_size("craft") do
local stack = player_inv:get_stack("craft", i) local stack = player_inv:get_stack("craft", i)
if inv:room_for_item("main", stack) then if inv:room_for_item("main", stack) then
@ -209,15 +217,15 @@ minetest.register_on_dieplayer(function(player)
minetest.add_item(pos, stack) minetest.add_item(pos, stack)
end end
end end
player_inv:set_list("main", {}) player_inv:set_list("main", {})
player_inv:set_list("craft", {}) player_inv:set_list("craft", {})
meta:set_string("formspec", bones.bones_formspec) meta:set_string("formspec", bones.bones_formspec)
meta:set_string("owner", player_name) meta:set_string("owner", player_name)
if share_bones_time ~= 0 then if share_bones_time ~= 0 then
meta:set_string("infotext", player_name.."'s fresh bones") meta:set_string("infotext", player_name .. "'s fresh bones")
if share_bones_time_early == 0 or not minetest.is_protected(pos, player_name) then if share_bones_time_early == 0 or not minetest.is_protected(pos, player_name) then
meta:set_int("time", 0) meta:set_int("time", 0)