Tweaked & Tidied code
This commit is contained in:
parent
3b4a227fd7
commit
b7c8a94651
1 changed files with 164 additions and 136 deletions
300
init.lua
300
init.lua
|
|
@ -23,11 +23,11 @@ end
|
||||||
protector.add_member = function(meta, name)
|
protector.add_member = function(meta, name)
|
||||||
if protector.is_member(meta, name) then return end
|
if protector.is_member(meta, name) then return end
|
||||||
local list = protector.get_member_list(meta)
|
local list = protector.get_member_list(meta)
|
||||||
table.insert(list,name)
|
table.insert(list, name)
|
||||||
protector.set_member_list(meta,list)
|
protector.set_member_list(meta,list)
|
||||||
end
|
end
|
||||||
|
|
||||||
protector.del_member = function(meta,name)
|
protector.del_member = function(meta, name)
|
||||||
local list = protector.get_member_list(meta)
|
local list = protector.get_member_list(meta)
|
||||||
for i, n in ipairs(list) do
|
for i, n in ipairs(list) do
|
||||||
if n == name then
|
if n == name then
|
||||||
|
|
@ -35,14 +35,15 @@ protector.del_member = function(meta,name)
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
protector.set_member_list(meta,list)
|
protector.set_member_list(meta, list)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Protector Interface
|
-- Protector Interface
|
||||||
|
|
||||||
protector.generate_formspec = function(meta)
|
protector.generate_formspec = function(meta)
|
||||||
|
|
||||||
local formspec = "size[8,7]"..default.gui_bg..default.gui_bg_img..default.gui_slots
|
local formspec = "size[8,7]"
|
||||||
|
..default.gui_bg..default.gui_bg_img..default.gui_slots
|
||||||
.."label[2.5,0;-- Protector interface --]"
|
.."label[2.5,0;-- Protector interface --]"
|
||||||
.."label[0,1;PUNCH node to show protected area or USE for area check]"
|
.."label[0,1;PUNCH node to show protected area or USE for area check]"
|
||||||
.."label[0,2;Members: (type player name then press Enter to add)]"
|
.."label[0,2;Members: (type player name then press Enter to add)]"
|
||||||
|
|
@ -50,23 +51,24 @@ protector.generate_formspec = function(meta)
|
||||||
local members = protector.get_member_list(meta)
|
local members = protector.get_member_list(meta)
|
||||||
local npp = 12
|
local npp = 12
|
||||||
local i = 0
|
local i = 0
|
||||||
|
|
||||||
for _, member in ipairs(members) do
|
for _, member in ipairs(members) do
|
||||||
if i < npp then
|
if i < npp then
|
||||||
formspec = formspec .. "button["..(i%4*2)..","
|
formspec = formspec .. "button[" .. (i % 4 * 2)
|
||||||
..math.floor(i/4+3)..";1.5,.5;protector_member;"..member.."]"
|
.. "," .. math.floor(i / 4 + 3)
|
||||||
formspec = formspec .. "button["..(i%4*2+1.25)..","
|
.. ";1.5,.5;protector_member;" .. member .. "]"
|
||||||
..math.floor(i/4+3)..";.75,.5;protector_del_member_"..member..";X]"
|
.. "button[" .. (i % 4 * 2 + 1.25) .. ","
|
||||||
|
.. math.floor(i / 4 + 3)
|
||||||
|
.. ";.75,.5;protector_del_member_" .. member .. ";X]"
|
||||||
end
|
end
|
||||||
i = i + 1
|
i = i + 1
|
||||||
end
|
end
|
||||||
|
|
||||||
if i < npp then
|
if i < npp then
|
||||||
formspec = formspec
|
formspec = formspec .. "field[" .. (i % 4 * 2 + 1 / 3) .. ","
|
||||||
.."field["..(i%4*2+1/3)..","..(math.floor(i/4+3)+1/3)..";1.433,.5;protector_add_member;;]"
|
.. (math.floor(i / 4 + 3) + 1 / 3) .. ";1.433,.5;protector_add_member;;]"
|
||||||
end
|
end
|
||||||
|
|
||||||
formspec = formspec.."button_exit[2.5,6.2;3,0.5;close_me;Close]"
|
formspec = formspec .. "button_exit[2.5,6.2;3,0.5;close_me;Close]"
|
||||||
|
|
||||||
return formspec
|
return formspec
|
||||||
end
|
end
|
||||||
|
|
@ -79,7 +81,7 @@ end
|
||||||
-- 2 for "This area is owned by <owner>.
|
-- 2 for "This area is owned by <owner>.
|
||||||
-- 3 for checking protector overlaps
|
-- 3 for checking protector overlaps
|
||||||
|
|
||||||
protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
|
protector.can_dig = function(r, pos, digger, onlyowner, infolevel)
|
||||||
|
|
||||||
if not digger then
|
if not digger then
|
||||||
return false
|
return false
|
||||||
|
|
@ -87,7 +89,8 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
|
||||||
|
|
||||||
-- Delprotect privileged users can override protections
|
-- Delprotect privileged users can override protections
|
||||||
|
|
||||||
if minetest.check_player_privs(digger, {delprotect=true}) and infolevel == 1 then
|
if minetest.check_player_privs(digger, {delprotect = true})
|
||||||
|
and infolevel == 1 then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -96,8 +99,8 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
|
||||||
-- Find the protector nodes
|
-- Find the protector nodes
|
||||||
|
|
||||||
local positions = minetest.find_nodes_in_area(
|
local positions = minetest.find_nodes_in_area(
|
||||||
{x=pos.x-r, y=pos.y-r, z=pos.z-r},
|
{x = pos.x - r, y = pos.y - r, z = pos.z - r},
|
||||||
{x=pos.x+r, y=pos.y+r, z=pos.z+r},
|
{x = pos.x + r, y = pos.y + r, z = pos.z + r},
|
||||||
{"protector:protect", "protector:protect2"})
|
{"protector:protect", "protector:protect2"})
|
||||||
|
|
||||||
local meta, owner, members
|
local meta, owner, members
|
||||||
|
|
@ -109,12 +112,16 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
|
||||||
if owner ~= digger then
|
if owner ~= digger then
|
||||||
if onlyowner or not protector.is_member(meta, digger) then
|
if onlyowner or not protector.is_member(meta, digger) then
|
||||||
if infolevel == 1 then
|
if infolevel == 1 then
|
||||||
minetest.chat_send_player(digger,"This area is owned by "..owner.." !")
|
minetest.chat_send_player(digger,
|
||||||
|
"This area is owned by " .. owner .. " !")
|
||||||
elseif infolevel == 2 then
|
elseif infolevel == 2 then
|
||||||
minetest.chat_send_player(digger,"This area is owned by "..owner..".")
|
minetest.chat_send_player(digger,
|
||||||
minetest.chat_send_player(digger,"Protection located at: "..minetest.pos_to_string(pos))
|
"This area is owned by " .. owner .. ".")
|
||||||
|
minetest.chat_send_player(digger,
|
||||||
|
"Protection located at: " .. minetest.pos_to_string(pos))
|
||||||
if members ~= "" then
|
if members ~= "" then
|
||||||
minetest.chat_send_player(digger,"Members: "..members..".")
|
minetest.chat_send_player(digger,
|
||||||
|
"Members: " .. members .. ".")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
|
@ -122,10 +129,13 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
|
||||||
end
|
end
|
||||||
|
|
||||||
if infolevel == 2 then
|
if infolevel == 2 then
|
||||||
minetest.chat_send_player(digger,"This area is owned by "..owner..".")
|
minetest.chat_send_player(digger,
|
||||||
minetest.chat_send_player(digger,"Protection located at: "..minetest.pos_to_string(positions[1]))
|
"This area is owned by " .. owner .. ".")
|
||||||
|
minetest.chat_send_player(digger,
|
||||||
|
"Protection located at: " .. minetest.pos_to_string(positions[1]))
|
||||||
if members ~= "" then
|
if members ~= "" then
|
||||||
minetest.chat_send_player(digger,"Members: "..members..".")
|
minetest.chat_send_player(digger,
|
||||||
|
"Members: " .. members .. ".")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -133,9 +143,10 @@ protector.can_dig = function(r,pos,digger,onlyowner,infolevel)
|
||||||
|
|
||||||
if infolevel == 2 then
|
if infolevel == 2 then
|
||||||
if #positions < 1 then
|
if #positions < 1 then
|
||||||
minetest.chat_send_player(digger,"This area is not protected.")
|
minetest.chat_send_player(digger,
|
||||||
|
"This area is not protected.")
|
||||||
end
|
end
|
||||||
minetest.chat_send_player(digger,"You can build here.")
|
minetest.chat_send_player(digger, "You can build here.")
|
||||||
end
|
end
|
||||||
|
|
||||||
return true
|
return true
|
||||||
|
|
@ -144,25 +155,28 @@ end
|
||||||
-- Can node be added or removed, if so return node else true (for protected)
|
-- Can node be added or removed, if so return node else true (for protected)
|
||||||
|
|
||||||
protector.old_is_protected = minetest.is_protected
|
protector.old_is_protected = minetest.is_protected
|
||||||
minetest.is_protected = function(pos, digger)
|
|
||||||
|
|
||||||
if protector.can_dig(protector.radius, pos, digger, false, 1) then
|
function minetest.is_protected(pos, digger)
|
||||||
return protector.old_is_protected(pos, digger)
|
|
||||||
else
|
if not protector.can_dig(protector.radius, pos, digger, false, 1) then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
return protector.old_is_protected(pos, digger)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Make sure protection block doesn't overlap another protector's area
|
-- Make sure protection block doesn't overlap another protector's area
|
||||||
|
|
||||||
protector.old_node_place = minetest.item_place
|
protector.old_node_place = minetest.item_place
|
||||||
|
|
||||||
function minetest.item_place(itemstack, placer, pointed_thing)
|
function minetest.item_place(itemstack, placer, pointed_thing)
|
||||||
|
|
||||||
if itemstack:get_name() == "protector:protect"
|
if itemstack:get_name() == "protector:protect"
|
||||||
or itemstack:get_name() == "protector:protect2" then
|
or itemstack:get_name() == "protector:protect2" then
|
||||||
local user = placer:get_player_name()
|
local user = placer:get_player_name()
|
||||||
if not protector.can_dig(protector.radius * 2, pointed_thing.above, user, true, 3) then
|
if not protector.can_dig(protector.radius * 2, pointed_thing.above, user, true, 3) then
|
||||||
minetest.chat_send_player(user, "Overlaps into another protected area")
|
minetest.chat_send_player(user,
|
||||||
|
"Overlaps into another protected area")
|
||||||
return protector.old_node_place(itemstack, placer, pointed_thing.above)
|
return protector.old_node_place(itemstack, placer, pointed_thing.above)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -176,56 +190,54 @@ end
|
||||||
|
|
||||||
minetest.register_node("protector:protect", {
|
minetest.register_node("protector:protect", {
|
||||||
description = "Protection Block",
|
description = "Protection Block",
|
||||||
tiles = {"moreblocks_circle_stone_bricks.png","moreblocks_circle_stone_bricks.png","moreblocks_circle_stone_bricks.png^protector_logo.png"},
|
tiles = {
|
||||||
sounds = default.node_sound_stone_defaults(),
|
"moreblocks_circle_stone_bricks.png",
|
||||||
groups = {dig_immediate=2,unbreakable=1},
|
"moreblocks_circle_stone_bricks.png",
|
||||||
drawtype = "nodebox",
|
"moreblocks_circle_stone_bricks.png^protector_logo.png"
|
||||||
node_box = {
|
|
||||||
type="fixed",
|
|
||||||
fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 },
|
|
||||||
},
|
},
|
||||||
selection_box = { type="regular" },
|
sounds = default.node_sound_stone_defaults(),
|
||||||
|
groups = {dig_immediate = 2, unbreakable = 1},
|
||||||
paramtype = "light",
|
paramtype = "light",
|
||||||
light_source = 2,
|
light_source = 2,
|
||||||
|
|
||||||
after_place_node = function(pos, placer)
|
after_place_node = function(pos, placer)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
meta:set_string("owner", placer:get_player_name() or "")
|
meta:set_string("owner", placer:get_player_name() or "")
|
||||||
meta:set_string("infotext", "Protection (owned by "..meta:get_string("owner")..")")
|
meta:set_string("infotext", "Protection (owned by " .. meta:get_string("owner") .. ")")
|
||||||
meta:set_string("members", "")
|
meta:set_string("members", "")
|
||||||
end,
|
end,
|
||||||
|
|
||||||
on_use = function(itemstack, user, pointed_thing)
|
on_use = function(itemstack, user, pointed_thing)
|
||||||
if pointed_thing.type ~= "node" then return end
|
if pointed_thing.type ~= "node" then return end
|
||||||
protector.can_dig(protector.radius,pointed_thing.under,user:get_player_name(),false,2)
|
protector.can_dig(protector.radius, pointed_thing.under, user:get_player_name(), false, 2)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
on_rightclick = function(pos, node, clicker, itemstack)
|
on_rightclick = function(pos, node, clicker, itemstack)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
if protector.can_dig(1,pos,clicker:get_player_name(),true,1) then
|
if protector.can_dig(1, pos,clicker:get_player_name(), true, 1) then
|
||||||
minetest.show_formspec(clicker:get_player_name(),
|
minetest.show_formspec(clicker:get_player_name(),
|
||||||
"protector:node_"..minetest.pos_to_string(pos), protector.generate_formspec(meta))
|
"protector:node_" .. minetest.pos_to_string(pos), protector.generate_formspec(meta))
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
||||||
on_punch = function(pos, node, puncher)
|
on_punch = function(pos, node, puncher)
|
||||||
if not protector.can_dig(1,pos,puncher:get_player_name(),true,1) then
|
if not protector.can_dig(1, pos, puncher:get_player_name(), true, 1) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
minetest.add_entity(pos, "protector:display")
|
minetest.add_entity(pos, "protector:display")
|
||||||
end,
|
end,
|
||||||
|
|
||||||
can_dig = function(pos, player)
|
can_dig = function(pos, player)
|
||||||
return protector.can_dig(1,pos,player:get_player_name(),true,1)
|
return protector.can_dig(1, pos, player:get_player_name(), true, 1)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = "protector:protect 4",
|
output = "protector:protect 4",
|
||||||
recipe = {
|
recipe = {
|
||||||
{"default:stone","default:stone","default:stone"},
|
{"default:stone", "default:stone", "default:stone"},
|
||||||
{"default:stone","default:steel_ingot","default:stone"},
|
{"default:stone", "default:steel_ingot", "default:stone"},
|
||||||
{"default:stone","default:stone","default:stone"},
|
{"default:stone", "default:stone", "default:stone"},
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
@ -237,7 +249,7 @@ minetest.register_node("protector:protect2", {
|
||||||
wield_image = "protector_logo.png",
|
wield_image = "protector_logo.png",
|
||||||
inventory_image = "protector_logo.png",
|
inventory_image = "protector_logo.png",
|
||||||
sounds = default.node_sound_stone_defaults(),
|
sounds = default.node_sound_stone_defaults(),
|
||||||
groups = {dig_immediate=2,unbreakable=1},
|
groups = {dig_immediate = 2, unbreakable = 1},
|
||||||
paramtype = 'light',
|
paramtype = 'light',
|
||||||
paramtype2 = "wallmounted",
|
paramtype2 = "wallmounted",
|
||||||
light_source = 2,
|
light_source = 2,
|
||||||
|
|
@ -255,66 +267,66 @@ minetest.register_node("protector:protect2", {
|
||||||
after_place_node = function(pos, placer)
|
after_place_node = function(pos, placer)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
meta:set_string("owner", placer:get_player_name() or "")
|
meta:set_string("owner", placer:get_player_name() or "")
|
||||||
meta:set_string("infotext", "Protection (owned by "..meta:get_string("owner")..")")
|
meta:set_string("infotext", "Protection (owned by " .. meta:get_string("owner") .. ")")
|
||||||
meta:set_string("members", "")
|
meta:set_string("members", "")
|
||||||
end,
|
end,
|
||||||
|
|
||||||
on_use = function(itemstack, user, pointed_thing)
|
on_use = function(itemstack, user, pointed_thing)
|
||||||
if pointed_thing.type ~= "node" then return end
|
if pointed_thing.type ~= "node" then return end
|
||||||
protector.can_dig(protector.radius,pointed_thing.under,user:get_player_name(),false,2)
|
protector.can_dig(protector.radius, pointed_thing.under, user:get_player_name(), false, 2)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
on_rightclick = function(pos, node, clicker, itemstack)
|
on_rightclick = function(pos, node, clicker, itemstack)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
if protector.can_dig(1,pos,clicker:get_player_name(),true,1) then
|
if protector.can_dig(1, pos, clicker:get_player_name(), true, 1) then
|
||||||
minetest.show_formspec(clicker:get_player_name(),
|
minetest.show_formspec(clicker:get_player_name(),
|
||||||
"protector:node_"..minetest.pos_to_string(pos), protector.generate_formspec(meta))
|
"protector:node_" .. minetest.pos_to_string(pos), protector.generate_formspec(meta))
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
||||||
on_punch = function(pos, node, puncher)
|
on_punch = function(pos, node, puncher)
|
||||||
if not protector.can_dig(1,pos,puncher:get_player_name(),true,1) then
|
if not protector.can_dig(1, pos, puncher:get_player_name(), true, 1) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
minetest.add_entity(pos, "protector:display")
|
minetest.add_entity(pos, "protector:display")
|
||||||
end,
|
end,
|
||||||
|
|
||||||
can_dig = function(pos, player)
|
can_dig = function(pos, player)
|
||||||
return protector.can_dig(1,pos,player:get_player_name(),true,1)
|
return protector.can_dig(1, pos, player:get_player_name(), true, 1)
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
minetest.register_craft({
|
||||||
output = "protector:protect2 4",
|
output = "protector:protect2 4",
|
||||||
recipe = {
|
recipe = {
|
||||||
{"default:stone","default:stone","default:stone"},
|
{"default:stone", "default:stone", "default:stone"},
|
||||||
{"default:stone","default:copper_ingot","default:stone"},
|
{"default:stone", "default:copper_ingot", "default:stone"},
|
||||||
{"default:stone","default:stone","default:stone"},
|
{"default:stone", "default:stone", "default:stone"},
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
-- If name entered or button press
|
-- If name entered or button press
|
||||||
minetest.register_on_player_receive_fields(function(player,formname,fields)
|
minetest.register_on_player_receive_fields(function(player,formname,fields)
|
||||||
|
|
||||||
if string.sub(formname,0,string.len("protector:node_")) == "protector:node_" then
|
if string.sub(formname, 0, string.len("protector:node_")) == "protector:node_" then
|
||||||
|
|
||||||
local pos_s = string.sub(formname,string.len("protector:node_")+1)
|
local pos_s = string.sub(formname, string.len("protector:node_") + 1)
|
||||||
local pos = minetest.string_to_pos(pos_s)
|
local pos = minetest.string_to_pos(pos_s)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
|
|
||||||
if not protector.can_dig(1,pos,player:get_player_name(),true,1) then
|
if not protector.can_dig(1, pos, player:get_player_name(), true, 1) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if fields.protector_add_member then
|
if fields.protector_add_member then
|
||||||
for _, i in ipairs(fields.protector_add_member:split(" ")) do
|
for _, i in ipairs(fields.protector_add_member:split(" ")) do
|
||||||
protector.add_member(meta,i)
|
protector.add_member(meta, i)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
for field, value in pairs(fields) do
|
for field, value in pairs(fields) do
|
||||||
if string.sub(field,0,string.len("protector_del_member_"))=="protector_del_member_" then
|
if string.sub(field, 0, string.len("protector_del_member_")) == "protector_del_member_" then
|
||||||
protector.del_member(meta, string.sub(field,string.len("protector_del_member_")+1))
|
protector.del_member(meta, string.sub(field,string.len("protector_del_member_") + 1))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -328,9 +340,10 @@ end)
|
||||||
|
|
||||||
minetest.register_entity("protector:display", {
|
minetest.register_entity("protector:display", {
|
||||||
physical = false,
|
physical = false,
|
||||||
collisionbox = {0,0,0,0,0,0},
|
collisionbox = {0, 0, 0, 0, 0, 0},
|
||||||
visual = "wielditem",
|
visual = "wielditem",
|
||||||
visual_size = {x=1.0/1.5,y=1.0/1.5}, -- wielditem seems to be scaled to 1.5 times original node size
|
-- wielditem seems to be scaled to 1.5 times original node size
|
||||||
|
visual_size = {x = 1.0 / 1.5, y = 1.0 / 1.5},
|
||||||
textures = {"protector:display_node"},
|
textures = {"protector:display_node"},
|
||||||
on_step = function(self, dtime)
|
on_step = function(self, dtime)
|
||||||
self.timer = (self.timer or 0) + dtime
|
self.timer = (self.timer or 0) + dtime
|
||||||
|
|
@ -340,7 +353,8 @@ minetest.register_entity("protector:display", {
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Display-zone node, Do NOT place the display as a node, it is made to be used as an entity (see above)
|
-- Display-zone node, Do NOT place the display as a node,
|
||||||
|
-- it is made to be used as an entity (see above)
|
||||||
local x = protector.radius
|
local x = protector.radius
|
||||||
minetest.register_node("protector:display_node", {
|
minetest.register_node("protector:display_node", {
|
||||||
tiles = {"protector_display.png"},
|
tiles = {"protector_display.png"},
|
||||||
|
|
@ -367,7 +381,7 @@ minetest.register_node("protector:display_node", {
|
||||||
type = "regular",
|
type = "regular",
|
||||||
},
|
},
|
||||||
paramtype = "light",
|
paramtype = "light",
|
||||||
groups = {dig_immediate=3,not_in_creative_inventory=1},
|
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
|
||||||
drop = "",
|
drop = "",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
@ -379,12 +393,12 @@ local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
local p2 = minetest.get_node(pos).param2
|
local p2 = minetest.get_node(pos).param2
|
||||||
p2 = params[p2+1]
|
p2 = params[p2 + 1]
|
||||||
|
|
||||||
minetest.swap_node(pos, {name=replace_dir, param2=p2})
|
minetest.swap_node(pos, {name = replace_dir, param2 = p2})
|
||||||
|
|
||||||
pos.y = pos.y-dir
|
pos.y = pos.y-dir
|
||||||
minetest.swap_node(pos, {name=replace, param2=p2})
|
minetest.swap_node(pos, {name = replace, param2 = p2})
|
||||||
|
|
||||||
local snd_1 = "doors_door_close"
|
local snd_1 = "doors_door_close"
|
||||||
local snd_2 = "doors_door_open"
|
local snd_2 = "doors_door_open"
|
||||||
|
|
@ -394,9 +408,11 @@ local function on_rightclick(pos, dir, check_name, replace, replace_dir, params)
|
||||||
end
|
end
|
||||||
|
|
||||||
if minetest.get_meta(pos):get_int("right") ~= 0 then
|
if minetest.get_meta(pos):get_int("right") ~= 0 then
|
||||||
minetest.sound_play(snd_1, {pos = pos, gain = 0.3, max_hear_distance = 10})
|
minetest.sound_play(snd_1, {
|
||||||
|
pos = pos, gain = 0.3, max_hear_distance = 10})
|
||||||
else
|
else
|
||||||
minetest.sound_play(snd_2, {pos = pos, gain = 0.3, max_hear_distance = 10})
|
minetest.sound_play(snd_2, {
|
||||||
|
pos = pos, gain = 0.3, max_hear_distance = 10})
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -407,17 +423,21 @@ local name = "protector:door_wood"
|
||||||
doors.register_door(name, {
|
doors.register_door(name, {
|
||||||
description = "Protected Wooden Door",
|
description = "Protected Wooden Door",
|
||||||
inventory_image = "doors_wood.png^protector_logo.png",
|
inventory_image = "doors_wood.png^protector_logo.png",
|
||||||
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=2,door=1},
|
groups = {
|
||||||
|
snappy = 1, choppy = 2, oddly_breakable_by_hand = 2,
|
||||||
|
door = 1, unbreakable = 1
|
||||||
|
},
|
||||||
tiles_bottom = {"doors_wood_b.png^protector_logo.png", "doors_brown.png"},
|
tiles_bottom = {"doors_wood_b.png^protector_logo.png", "doors_brown.png"},
|
||||||
tiles_top = {"doors_wood_a.png", "doors_brown.png"},
|
tiles_top = {"doors_wood_a.png", "doors_brown.png"},
|
||||||
sounds = default.node_sound_wood_defaults(),
|
sounds = default.node_sound_wood_defaults(),
|
||||||
sunlight = false,
|
sunlight = false,
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.override_item(name.."_b_1", {
|
minetest.override_item(name .. "_b_1", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
|
on_rightclick(pos, 1,
|
||||||
|
name .. "_t_1", name .. "_b_2", name .. "_t_2", {1, 2, 3, 0})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -425,7 +445,8 @@ minetest.override_item(name.."_b_1", {
|
||||||
minetest.override_item(name.."_t_1", {
|
minetest.override_item(name.."_t_1", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, -1, name.."_b_1", name.."_t_2", name.."_b_2", {1,2,3,0})
|
on_rightclick(pos, -1,
|
||||||
|
name .. "_b_1", name .. "_t_2", name .. "_b_2", {1, 2, 3, 0})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -433,7 +454,8 @@ minetest.override_item(name.."_t_1", {
|
||||||
minetest.override_item(name.."_b_2", {
|
minetest.override_item(name.."_b_2", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
|
on_rightclick(pos, 1,
|
||||||
|
name .. "_t_2", name .. "_b_1", name .. "_t_1", {3, 0, 1, 2})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -441,7 +463,8 @@ minetest.override_item(name.."_b_2", {
|
||||||
minetest.override_item(name.."_t_2", {
|
minetest.override_item(name.."_t_2", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, -1, name.."_b_2", name.."_t_1", name.."_b_1", {3,0,1,2})
|
on_rightclick(pos, -1,
|
||||||
|
name .. "_b_2", name .. "_t_1", name .. "_b_1", {3, 0, 1, 2})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -469,7 +492,10 @@ local name = "protector:door_steel"
|
||||||
doors.register_door(name, {
|
doors.register_door(name, {
|
||||||
description = "Protected Steel Door",
|
description = "Protected Steel Door",
|
||||||
inventory_image = "doors_steel.png^protector_logo.png",
|
inventory_image = "doors_steel.png^protector_logo.png",
|
||||||
groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2,door=1},
|
groups = {
|
||||||
|
snappy = 1, bendy = 2, cracky = 1,
|
||||||
|
level = 2, door = 1, unbreakable = 1
|
||||||
|
},
|
||||||
tiles_bottom = {"doors_steel_b.png^protector_logo.png", "doors_grey.png"},
|
tiles_bottom = {"doors_steel_b.png^protector_logo.png", "doors_grey.png"},
|
||||||
tiles_top = {"doors_steel_a.png", "doors_grey.png"},
|
tiles_top = {"doors_steel_a.png", "doors_grey.png"},
|
||||||
sounds = default.node_sound_wood_defaults(),
|
sounds = default.node_sound_wood_defaults(),
|
||||||
|
|
@ -479,7 +505,8 @@ doors.register_door(name, {
|
||||||
minetest.override_item(name.."_b_1", {
|
minetest.override_item(name.."_b_1", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2", {1,2,3,0})
|
on_rightclick(pos, 1,
|
||||||
|
name .. "_t_1", name .. "_b_2", name .. "_t_2", {1, 2, 3, 0})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -487,7 +514,8 @@ minetest.override_item(name.."_b_1", {
|
||||||
minetest.override_item(name.."_t_1", {
|
minetest.override_item(name.."_t_1", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, -1, name.."_b_1", name.."_t_2", name.."_b_2", {1,2,3,0})
|
on_rightclick(pos, -1,
|
||||||
|
name .. "_b_1", name .. "_t_2", name .. "_b_2", {1, 2, 3, 0})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -495,7 +523,8 @@ minetest.override_item(name.."_t_1", {
|
||||||
minetest.override_item(name.."_b_2", {
|
minetest.override_item(name.."_b_2", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1", {3,0,1,2})
|
on_rightclick(pos, 1,
|
||||||
|
name .. "_t_2", name .. "_b_1", name .. "_t_1", {3, 0, 1, 2})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -503,7 +532,8 @@ minetest.override_item(name.."_b_2", {
|
||||||
minetest.override_item(name.."_t_2", {
|
minetest.override_item(name.."_t_2", {
|
||||||
on_rightclick = function(pos, node, clicker)
|
on_rightclick = function(pos, node, clicker)
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
on_rightclick(pos, -1, name.."_b_2", name.."_t_1", name.."_b_1", {3,0,1,2})
|
on_rightclick(pos, -1,
|
||||||
|
name .. "_b_2", name .. "_t_1", name .. "_b_1", {3, 0, 1, 2})
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
@ -528,20 +558,25 @@ minetest.register_craft({
|
||||||
|
|
||||||
minetest.register_node("protector:chest", {
|
minetest.register_node("protector:chest", {
|
||||||
description = "Protected Chest",
|
description = "Protected Chest",
|
||||||
tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png",
|
tiles = {
|
||||||
"default_chest_side.png", "default_chest_side.png", "default_chest_front.png^protector_logo.png"},
|
"default_chest_top.png", "default_chest_top.png",
|
||||||
|
"default_chest_side.png", "default_chest_side.png",
|
||||||
|
"default_chest_side.png", "default_chest_front.png^protector_logo.png"
|
||||||
|
},
|
||||||
paramtype2 = "facedir",
|
paramtype2 = "facedir",
|
||||||
groups = {choppy=2,oddly_breakable_by_hand=2,unbreakable=1},
|
groups = {choppy = 2, oddly_breakable_by_hand = 2, unbreakable = 1},
|
||||||
legacy_facedir_simple = true,
|
legacy_facedir_simple = true,
|
||||||
is_ground_content = false,
|
is_ground_content = false,
|
||||||
sounds = default.node_sound_wood_defaults(),
|
sounds = default.node_sound_wood_defaults(),
|
||||||
|
|
||||||
on_construct = function(pos)
|
on_construct = function(pos)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
meta:set_string("infotext", "Protected Chest")
|
meta:set_string("infotext", "Protected Chest")
|
||||||
meta:set_string("name", "")
|
meta:set_string("name", "")
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
inv:set_size("main", 8*4)
|
inv:set_size("main", 8 * 4)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
can_dig = function(pos,player)
|
can_dig = function(pos,player)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
local inv = meta:get_inventory()
|
local inv = meta:get_inventory()
|
||||||
|
|
@ -551,69 +586,61 @@ minetest.register_node("protector:chest", {
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
|
|
||||||
return count
|
|
||||||
end,
|
|
||||||
allow_metadata_inventory_put = function(pos, listname, index, stack, player)
|
|
||||||
return stack:get_count()
|
|
||||||
end,
|
|
||||||
allow_metadata_inventory_take = function(pos, listname, index, stack, player)
|
|
||||||
return stack:get_count()
|
|
||||||
end,
|
|
||||||
on_metadata_inventory_put = function(pos, listname, index, stack, player)
|
|
||||||
minetest.log("action", player:get_player_name()..
|
|
||||||
" moves stuff to protected chest at "..minetest.pos_to_string(pos))
|
|
||||||
end,
|
|
||||||
on_metadata_inventory_take = function(pos, listname, index, stack, player)
|
|
||||||
minetest.log("action", player:get_player_name()..
|
|
||||||
" takes stuff from protected chest at "..minetest.pos_to_string(pos))
|
|
||||||
end,
|
|
||||||
on_rightclick = function(pos, node, clicker)
|
|
||||||
local meta = minetest.get_meta(pos)
|
|
||||||
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
|
||||||
|
|
||||||
|
on_metadata_inventory_put = function(pos, listname, index, stack, player)
|
||||||
|
minetest.log("action", player:get_player_name() ..
|
||||||
|
" moves stuff to protected chest at " .. minetest.pos_to_string(pos))
|
||||||
|
end,
|
||||||
|
|
||||||
|
on_metadata_inventory_take = function(pos, listname, index, stack, player)
|
||||||
|
minetest.log("action", player:get_player_name() ..
|
||||||
|
" takes stuff from protected chest at " .. minetest.pos_to_string(pos))
|
||||||
|
end,
|
||||||
|
|
||||||
|
on_rightclick = function(pos, node, clicker)
|
||||||
|
if not minetest.is_protected(pos, clicker:get_player_name()) then
|
||||||
|
local meta = minetest.get_meta(pos)
|
||||||
local spos = pos.x .. "," .. pos.y .. "," ..pos.z
|
local spos = pos.x .. "," .. pos.y .. "," ..pos.z
|
||||||
local formspec = "size[8,9]"..
|
local formspec = "size[8,9]"..
|
||||||
default.gui_bg..default.gui_bg_img..default.gui_slots..
|
default.gui_bg..default.gui_bg_img..default.gui_slots
|
||||||
"list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
|
.. "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"
|
||||||
"button[0,4.5;2,0.25;toup;To Chest]"..
|
.. "button[0,4.5;2,0.25;toup;To Chest]"
|
||||||
"field[2.3,4.8;4,0.25;chestname;;"..meta:get_string("name").."]"..
|
.. "field[2.3,4.8;4,0.25;chestname;;"
|
||||||
"button[6,4.5;2,0.25;todn;To Inventory]"..
|
.. meta:get_string("name") .. "]"
|
||||||
"list[current_player;main;0,5;8,1;]"..
|
.. "button[6,4.5;2,0.25;todn;To Inventory]"
|
||||||
"list[current_player;main;0,6.08;8,3;8]"..
|
.. "list[current_player;main;0,5;8,1;]"
|
||||||
default.get_hotbar_bg(0,5)
|
.. "list[current_player;main;0,6.08;8,3;8]"
|
||||||
|
.. default.get_hotbar_bg(0,5)
|
||||||
|
|
||||||
minetest.show_formspec(
|
minetest.show_formspec(
|
||||||
clicker:get_player_name(),
|
clicker:get_player_name(),
|
||||||
"protector:chest_"..minetest.pos_to_string(pos),
|
"protector:chest_" .. minetest.pos_to_string(pos),
|
||||||
formspec
|
formspec)
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
-- Protected Chest formspec buttons
|
-- Protected Chest formspec buttons
|
||||||
|
|
||||||
minetest.register_on_player_receive_fields(function(player,formname,fields)
|
minetest.register_on_player_receive_fields(function(player, formname, fields)
|
||||||
|
|
||||||
if string.sub(formname,0,string.len("protector:chest_")) == "protector:chest_" then
|
if string.sub(formname, 0, string.len("protector:chest_")) == "protector:chest_" then
|
||||||
|
|
||||||
local pos_s = string.sub(formname,string.len("protector:chest_")+1)
|
local pos_s = string.sub(formname,string.len("protector:chest_") + 1)
|
||||||
local pos = minetest.string_to_pos(pos_s)
|
local pos = minetest.string_to_pos(pos_s)
|
||||||
local meta = minetest.get_meta(pos)
|
local meta = minetest.get_meta(pos)
|
||||||
|
|
||||||
local chest_inv = meta:get_inventory()
|
local chest_inv = meta:get_inventory()
|
||||||
local player_inv = player:get_inventory()
|
local player_inv = player:get_inventory()
|
||||||
|
|
||||||
if fields.toup then
|
if fields.toup then
|
||||||
|
|
||||||
-- copy contents of players inventory to chest
|
-- copy contents of players inventory to chest
|
||||||
for i,v in ipairs( player_inv:get_list( "main" ) or {}) do
|
for i, v in ipairs (player_inv:get_list("main") or {}) do
|
||||||
if( chest_inv and chest_inv:room_for_item('main', v)) then
|
if (chest_inv and chest_inv:room_for_item('main', v)) then
|
||||||
local leftover = chest_inv:add_item( 'main', v )
|
local leftover = chest_inv:add_item('main', v)
|
||||||
player_inv:remove_item( "main", v )
|
player_inv:remove_item("main", v)
|
||||||
if( leftover and not( leftover:is_empty() )) then
|
if (leftover and not(leftover:is_empty())) then
|
||||||
player_inv:add_item( "main", v )
|
player_inv:add_item("main", v)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -621,12 +648,12 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
|
||||||
elseif fields.todn then
|
elseif fields.todn then
|
||||||
|
|
||||||
-- copy contents of chest to players inventory
|
-- copy contents of chest to players inventory
|
||||||
for i,v in ipairs( chest_inv:get_list( 'main' ) or {}) do
|
for i, v in ipairs (chest_inv:get_list('main') or {}) do
|
||||||
if( player_inv:room_for_item( "main", v)) then
|
if (player_inv:room_for_item("main", v)) then
|
||||||
local leftover = player_inv:add_item( "main", v )
|
local leftover = player_inv:add_item("main", v)
|
||||||
chest_inv:remove_item( 'main', v )
|
chest_inv:remove_item('main', v)
|
||||||
if( leftover and not( leftover:is_empty() )) then
|
if( leftover and not(leftover:is_empty())) then
|
||||||
chest_inv:add_item( 'main', v )
|
chest_inv:add_item('main', v)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
@ -636,7 +663,8 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
|
||||||
-- change chest infotext to display name
|
-- change chest infotext to display name
|
||||||
if fields.chestname ~= "" then
|
if fields.chestname ~= "" then
|
||||||
meta:set_string("name", fields.chestname)
|
meta:set_string("name", fields.chestname)
|
||||||
meta:set_string("infotext", "Protected Chest ("..fields.chestname..")")
|
meta:set_string("infotext",
|
||||||
|
"Protected Chest (" .. fields.chestname .. ")")
|
||||||
else
|
else
|
||||||
meta:set_string("infotext", "Protected Chest")
|
meta:set_string("infotext", "Protected Chest")
|
||||||
end
|
end
|
||||||
|
|
@ -662,4 +690,4 @@ minetest.register_craft({
|
||||||
recipe = {
|
recipe = {
|
||||||
{'default:chest', 'default:copper_ingot', ''},
|
{'default:chest', 'default:copper_ingot', ''},
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
Loading…
Add table
Add a link
Reference in a new issue