move the check_and_place and pointed_thing functions to their own file
(makes the check function global, but still in the streetlights namespace)
This commit is contained in:
Vanessa Dannenberg
parent
c6b10e16e5
commit
5815180b0e
163
functions.lua
Normal file
163
functions.lua
Normal file
@ -0,0 +1,163 @@
|
|||||||
|
local fdir_to_right = {
|
||||||
|
{ 1, 0 },
|
||||||
|
{ 0, -1 },
|
||||||
|
{ -1, 0 },
|
||||||
|
{ 0, 1 }
|
||||||
|
}
|
||||||
|
|
||||||
|
--digilines compatibility
|
||||||
|
|
||||||
|
local rules_alldir = {
|
||||||
|
{x = 0, y = 0, z = -1}, -- borrowed from lightstones
|
||||||
|
{x = 1, y = 0, z = 0},
|
||||||
|
{x = -1, y = 0, z = 0},
|
||||||
|
{x = 0, y = 0, z = 1},
|
||||||
|
{x = 1, y = 1, z = 0},
|
||||||
|
{x = 1, y = -1, z = 0},
|
||||||
|
{x = -1, y = 1, z = 0},
|
||||||
|
{x = -1, y = -1, z = 0},
|
||||||
|
{x = 0, y = 1, z = 1},
|
||||||
|
{x = 0, y = -1, z = 1},
|
||||||
|
{x = 0, y = 1, z = -1},
|
||||||
|
{x = 0, y = -1, z = -1},
|
||||||
|
{x = 0, y = -1, z = 0},
|
||||||
|
}
|
||||||
|
|
||||||
|
function streetlights.rightclick_pointed_thing(pos, placer, itemstack, pointed_thing)
|
||||||
|
local node = minetest.get_node_or_nil(pos)
|
||||||
|
if not node then return false end
|
||||||
|
local def = minetest.registered_nodes[node.name]
|
||||||
|
if not def or not def.on_rightclick then return false end
|
||||||
|
return def.on_rightclick(pos, node, placer, itemstack, pointed_thing) or itemstack
|
||||||
|
end
|
||||||
|
|
||||||
|
function streetlights.check_and_place(itemstack, placer, pointed_thing, pole, light, param2, needs_digiline_wire, distributor_node)
|
||||||
|
local controls = placer:get_player_control()
|
||||||
|
if not placer then return end
|
||||||
|
local playername = placer:get_player_name()
|
||||||
|
|
||||||
|
local player_name = placer:get_player_name()
|
||||||
|
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
||||||
|
|
||||||
|
local pos1 = minetest.get_pointed_thing_position(pointed_thing)
|
||||||
|
local node1 = minetest.get_node(pos1)
|
||||||
|
if not node1 or node1.name == "ignore" then return end
|
||||||
|
local def1 = minetest.registered_items[node1.name]
|
||||||
|
|
||||||
|
if (def1 and def1.buildable_to) then
|
||||||
|
pos1.y = pos1.y-1
|
||||||
|
end
|
||||||
|
|
||||||
|
local rc = streetlights.rightclick_pointed_thing(pos1, placer, itemstack, pointed_thing)
|
||||||
|
if rc then return rc end
|
||||||
|
|
||||||
|
if not minetest.check_player_privs(placer, "streetlight") then
|
||||||
|
minetest.chat_send_player(playername, "*** You don't have permission to use a streetlight spawner.")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
local node1 = minetest.get_node(pos1)
|
||||||
|
|
||||||
|
local node2, node3, node4
|
||||||
|
local def1 = minetest.registered_items[node1.name]
|
||||||
|
local def2, def3, def4
|
||||||
|
|
||||||
|
local pos2, pos3, pos4
|
||||||
|
for i = 1, 5 do
|
||||||
|
pos2 = { x=pos1.x, y = pos1.y+i, z=pos1.z }
|
||||||
|
node2 = minetest.get_node(pos2)
|
||||||
|
def2 = minetest.registered_items[node2.name]
|
||||||
|
if minetest.is_protected(pos2, player_name) or not (def2 and def2.buildable_to) then return end
|
||||||
|
end
|
||||||
|
|
||||||
|
pos3 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+5, z = pos1.z+fdir_to_right[fdir+1][2] }
|
||||||
|
node3 = minetest.get_node(pos3)
|
||||||
|
def3 = minetest.registered_items[node3.name]
|
||||||
|
if minetest.is_protected(pos3, player_name) or not (def3 and def3.buildable_to) then return end
|
||||||
|
|
||||||
|
pos4 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+4, z = pos1.z+fdir_to_right[fdir+1][2] }
|
||||||
|
node4 = minetest.get_node(pos4)
|
||||||
|
def4 = minetest.registered_items[node4.name]
|
||||||
|
|
||||||
|
local pos0 = { x = pos1.x, y = pos1.y-1, z = pos1.z }
|
||||||
|
|
||||||
|
if minetest.is_protected(pos4, player_name) or not (def3 and def4.buildable_to) then return end
|
||||||
|
|
||||||
|
if controls.sneak and minetest.is_protected(pos1, player_name) then return end
|
||||||
|
if distributor_node and minetest.is_protected(pos0, player_name) then return end
|
||||||
|
|
||||||
|
if not creative.is_enabled_for(player_name) then
|
||||||
|
local inv = placer:get_inventory()
|
||||||
|
if not inv:contains_item("main", pole.." 6") then
|
||||||
|
minetest.chat_send_player(playername, "*** You don't have enough "..pole.." in your inventory!")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if not inv:contains_item("main", light) then
|
||||||
|
minetest.chat_send_player(playername, "*** You don't have any "..light.." in your inventory!")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if needs_digiline_wire and not inv:contains_item("main", digiline_wire_node.." 6") then
|
||||||
|
minetest.chat_send_player(playername, "*** You don't have enough Digiline wires in your inventory!")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
if controls.sneak then
|
||||||
|
if not inv:contains_item("main", streetlights.concrete) then
|
||||||
|
minetest.chat_send_player(playername, "*** You don't have any concrete in your inventory!")
|
||||||
|
return
|
||||||
|
else
|
||||||
|
inv:remove_item("main", streetlights.concrete)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
if distributor_node and needs_digiline_wire then
|
||||||
|
if not inv:contains_item("main", distributor_node) then
|
||||||
|
minetest.chat_send_player(playername, "*** You don't have any "..distributor_node.." in your inventory!")
|
||||||
|
return
|
||||||
|
else
|
||||||
|
inv:remove_item("main", distributor_node)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
inv:remove_item("main", pole.." 6")
|
||||||
|
inv:remove_item("main", light)
|
||||||
|
|
||||||
|
if needs_digiline_wire then
|
||||||
|
inv:remove_item("main", digiline_wire_node.." 6")
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
if controls.sneak then
|
||||||
|
minetest.set_node(pos1, { name = streetlights.concrete })
|
||||||
|
end
|
||||||
|
|
||||||
|
local pole2 = pole
|
||||||
|
if needs_digiline_wire then
|
||||||
|
pole2 = pole.."_digilines"
|
||||||
|
end
|
||||||
|
|
||||||
|
for i = 1, 5 do
|
||||||
|
pos2 = {x=pos1.x, y = pos1.y+i, z=pos1.z}
|
||||||
|
minetest.set_node(pos2, {name = pole2 })
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.set_node(pos3, { name = pole2 })
|
||||||
|
minetest.set_node(pos4, { name = light, param2 = param2 })
|
||||||
|
|
||||||
|
if needs_digiline_wire and ilights.player_channels[playername] then
|
||||||
|
minetest.get_meta(pos4):set_string("channel", ilights.player_channels[playername])
|
||||||
|
end
|
||||||
|
|
||||||
|
if distributor_node and needs_digiline_wire then
|
||||||
|
minetest.set_node(pos0, { name = distributor_node })
|
||||||
|
digilines.update_autoconnect(pos0)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
minetest.register_privilege("streetlight", {
|
||||||
|
description = "Allows using streetlight spawners",
|
||||||
|
give_to_singleplayer = true
|
||||||
|
})
|
||||||
10
init.lua
10
init.lua
@ -8,15 +8,9 @@ streetlights.concrete = "basic_materials:concrete_block"
|
|||||||
streetlights.distributor = "streets:digiline_distributor"
|
streetlights.distributor = "streets:digiline_distributor"
|
||||||
streetlights.vert_digiline = "digistuff:vertical_bottom"
|
streetlights.vert_digiline = "digistuff:vertical_bottom"
|
||||||
|
|
||||||
function streetlights.rightclick_pointed_thing(pos, placer, itemstack, pointed_thing)
|
dofile(modpath.."/functions.lua")
|
||||||
local node = minetest.get_node_or_nil(pos)
|
|
||||||
if not node then return false end
|
|
||||||
local def = minetest.registered_nodes[node.name]
|
|
||||||
if not def or not def.on_rightclick then return false end
|
|
||||||
return def.on_rightclick(pos, node, placer, itemstack, pointed_thing) or itemstack
|
|
||||||
end
|
|
||||||
|
|
||||||
dofile(modpath.."/simple.lua")
|
dofile(modpath.."/simple.lua")
|
||||||
|
|
||||||
if minetest.get_modpath("homedecor_lighting") and minetest.get_modpath("streetspoles") then
|
if minetest.get_modpath("homedecor_lighting") and minetest.get_modpath("streetspoles") then
|
||||||
dofile(modpath.."/minedot.lua")
|
dofile(modpath.."/minedot.lua")
|
||||||
end
|
end
|
||||||
|
|||||||
163
simple.lua
163
simple.lua
@ -1,27 +1,4 @@
|
|||||||
local fdir_to_right = {
|
-- generate the simple fence-based streetlights
|
||||||
{ 1, 0 },
|
|
||||||
{ 0, -1 },
|
|
||||||
{ -1, 0 },
|
|
||||||
{ 0, 1 }
|
|
||||||
}
|
|
||||||
|
|
||||||
--digilines compatibility
|
|
||||||
|
|
||||||
local rules_alldir = {
|
|
||||||
{x = 0, y = 0, z = -1}, -- borrowed from lightstones
|
|
||||||
{x = 1, y = 0, z = 0},
|
|
||||||
{x = -1, y = 0, z = 0},
|
|
||||||
{x = 0, y = 0, z = 1},
|
|
||||||
{x = 1, y = 1, z = 0},
|
|
||||||
{x = 1, y = -1, z = 0},
|
|
||||||
{x = -1, y = 1, z = 0},
|
|
||||||
{x = -1, y = -1, z = 0},
|
|
||||||
{x = 0, y = 1, z = 1},
|
|
||||||
{x = 0, y = -1, z = 1},
|
|
||||||
{x = 0, y = 1, z = -1},
|
|
||||||
{x = 0, y = -1, z = -1},
|
|
||||||
{x = 0, y = -1, z = 0},
|
|
||||||
}
|
|
||||||
|
|
||||||
local enable_digilines = minetest.get_modpath("digilines")
|
local enable_digilines = minetest.get_modpath("digilines")
|
||||||
|
|
||||||
@ -52,138 +29,6 @@ end
|
|||||||
|
|
||||||
local digiline_wire_node = "digilines:wire_std_00000000"
|
local digiline_wire_node = "digilines:wire_std_00000000"
|
||||||
|
|
||||||
minetest.register_privilege("streetlight", {
|
|
||||||
description = "Allows using streetlight spawners",
|
|
||||||
give_to_singleplayer = true
|
|
||||||
})
|
|
||||||
|
|
||||||
local function check_and_place(itemstack, placer, pointed_thing, pole, light, param2, needs_digiline_wire, distributor_node)
|
|
||||||
local controls = placer:get_player_control()
|
|
||||||
if not placer then return end
|
|
||||||
local playername = placer:get_player_name()
|
|
||||||
|
|
||||||
local player_name = placer:get_player_name()
|
|
||||||
local fdir = minetest.dir_to_facedir(placer:get_look_dir())
|
|
||||||
|
|
||||||
local pos1 = minetest.get_pointed_thing_position(pointed_thing)
|
|
||||||
local node1 = minetest.get_node(pos1)
|
|
||||||
if not node1 or node1.name == "ignore" then return end
|
|
||||||
local def1 = minetest.registered_items[node1.name]
|
|
||||||
|
|
||||||
if (def1 and def1.buildable_to) then
|
|
||||||
pos1.y = pos1.y-1
|
|
||||||
end
|
|
||||||
|
|
||||||
local rc = streetlights.rightclick_pointed_thing(pos1, placer, itemstack, pointed_thing)
|
|
||||||
if rc then return rc end
|
|
||||||
|
|
||||||
if not minetest.check_player_privs(placer, "streetlight") then
|
|
||||||
minetest.chat_send_player(playername, "*** You don't have permission to use a streetlight spawner.")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local node1 = minetest.get_node(pos1)
|
|
||||||
|
|
||||||
local node2, node3, node4
|
|
||||||
local def1 = minetest.registered_items[node1.name]
|
|
||||||
local def2, def3, def4
|
|
||||||
|
|
||||||
local pos2, pos3, pos4
|
|
||||||
for i = 1, 5 do
|
|
||||||
pos2 = { x=pos1.x, y = pos1.y+i, z=pos1.z }
|
|
||||||
node2 = minetest.get_node(pos2)
|
|
||||||
def2 = minetest.registered_items[node2.name]
|
|
||||||
if minetest.is_protected(pos2, player_name) or not (def2 and def2.buildable_to) then return end
|
|
||||||
end
|
|
||||||
|
|
||||||
pos3 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+5, z = pos1.z+fdir_to_right[fdir+1][2] }
|
|
||||||
node3 = minetest.get_node(pos3)
|
|
||||||
def3 = minetest.registered_items[node3.name]
|
|
||||||
if minetest.is_protected(pos3, player_name) or not (def3 and def3.buildable_to) then return end
|
|
||||||
|
|
||||||
pos4 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+4, z = pos1.z+fdir_to_right[fdir+1][2] }
|
|
||||||
node4 = minetest.get_node(pos4)
|
|
||||||
def4 = minetest.registered_items[node4.name]
|
|
||||||
|
|
||||||
local pos0 = { x = pos1.x, y = pos1.y-1, z = pos1.z }
|
|
||||||
|
|
||||||
if minetest.is_protected(pos4, player_name) or not (def3 and def4.buildable_to) then return end
|
|
||||||
|
|
||||||
if controls.sneak and minetest.is_protected(pos1, player_name) then return end
|
|
||||||
if distributor_node and minetest.is_protected(pos0, player_name) then return end
|
|
||||||
|
|
||||||
if not creative.is_enabled_for(player_name) then
|
|
||||||
local inv = placer:get_inventory()
|
|
||||||
if not inv:contains_item("main", pole.." 6") then
|
|
||||||
minetest.chat_send_player(playername, "*** You don't have enough "..pole.." in your inventory!")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if not inv:contains_item("main", light) then
|
|
||||||
minetest.chat_send_player(playername, "*** You don't have any "..light.." in your inventory!")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if needs_digiline_wire and not inv:contains_item("main", digiline_wire_node.." 6") then
|
|
||||||
minetest.chat_send_player(playername, "*** You don't have enough Digiline wires in your inventory!")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
if controls.sneak then
|
|
||||||
if not inv:contains_item("main", streetlights.concrete) then
|
|
||||||
minetest.chat_send_player(playername, "*** You don't have any concrete in your inventory!")
|
|
||||||
return
|
|
||||||
else
|
|
||||||
inv:remove_item("main", streetlights.concrete)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
if distributor_node and needs_digiline_wire then
|
|
||||||
if not inv:contains_item("main", distributor_node) then
|
|
||||||
minetest.chat_send_player(playername, "*** You don't have any "..distributor_node.." in your inventory!")
|
|
||||||
return
|
|
||||||
else
|
|
||||||
inv:remove_item("main", distributor_node)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
inv:remove_item("main", pole.." 6")
|
|
||||||
inv:remove_item("main", light)
|
|
||||||
|
|
||||||
if needs_digiline_wire then
|
|
||||||
inv:remove_item("main", digiline_wire_node.." 6")
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
if controls.sneak then
|
|
||||||
minetest.set_node(pos1, { name = streetlights.concrete })
|
|
||||||
end
|
|
||||||
|
|
||||||
local pole2 = pole
|
|
||||||
if needs_digiline_wire then
|
|
||||||
pole2 = pole.."_digilines"
|
|
||||||
end
|
|
||||||
|
|
||||||
for i = 1, 5 do
|
|
||||||
pos2 = {x=pos1.x, y = pos1.y+i, z=pos1.z}
|
|
||||||
minetest.set_node(pos2, {name = pole2 })
|
|
||||||
end
|
|
||||||
|
|
||||||
minetest.set_node(pos3, { name = pole2 })
|
|
||||||
minetest.set_node(pos4, { name = light, param2 = param2 })
|
|
||||||
|
|
||||||
if needs_digiline_wire and ilights.player_channels[playername] then
|
|
||||||
minetest.get_meta(pos4):set_string("channel", ilights.player_channels[playername])
|
|
||||||
end
|
|
||||||
|
|
||||||
if distributor_node and needs_digiline_wire then
|
|
||||||
minetest.set_node(pos0, { name = distributor_node })
|
|
||||||
digilines.update_autoconnect(pos0)
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
local poles_tab = {
|
local poles_tab = {
|
||||||
-- material name, mod name, node name
|
-- material name, mod name, node name
|
||||||
{ "wood", "default", "default:fence_wood" },
|
{ "wood", "default", "default:fence_wood" },
|
||||||
@ -269,7 +114,7 @@ for _, pole in ipairs(poles_tab) do
|
|||||||
use_texture_alpha = true,
|
use_texture_alpha = true,
|
||||||
tool_capabilities = { full_punch_interval=0.1 },
|
tool_capabilities = { full_punch_interval=0.1 },
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
on_place = function(itemstack, placer, pointed_thing)
|
||||||
check_and_place(itemstack, placer, pointed_thing, matnode, lightnode, lightparam2)
|
streetlights.check_and_place(itemstack, placer, pointed_thing, matnode, lightnode, lightparam2)
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -297,7 +142,7 @@ for _, pole in ipairs(poles_tab) do
|
|||||||
use_texture_alpha = true,
|
use_texture_alpha = true,
|
||||||
tool_capabilities = { full_punch_interval=0.1 },
|
tool_capabilities = { full_punch_interval=0.1 },
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
on_place = function(itemstack, placer, pointed_thing)
|
||||||
check_and_place(itemstack, placer, pointed_thing, matnode, lightnode, lightparam2, true)
|
streetlights.check_and_place(itemstack, placer, pointed_thing, matnode, lightnode, lightparam2, true)
|
||||||
end,
|
end,
|
||||||
on_use = ilights.digiline_on_use
|
on_use = ilights.digiline_on_use
|
||||||
})
|
})
|
||||||
@ -347,7 +192,7 @@ for _, pole in ipairs(poles_tab) do
|
|||||||
use_texture_alpha = true,
|
use_texture_alpha = true,
|
||||||
tool_capabilities = { full_punch_interval=0.1 },
|
tool_capabilities = { full_punch_interval=0.1 },
|
||||||
on_place = function(itemstack, placer, pointed_thing)
|
on_place = function(itemstack, placer, pointed_thing)
|
||||||
check_and_place(itemstack, placer, pointed_thing, matnode, lightnode, lightparam2, true, distributor)
|
streetlights.check_and_place(itemstack, placer, pointed_thing, matnode, lightnode, lightparam2, true, distributor)
|
||||||
end,
|
end,
|
||||||
on_use = ilights.digiline_on_use
|
on_use = ilights.digiline_on_use
|
||||||
})
|
})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user