allow specifying the height of the lamppost
and whether it has a top section over the bulb (the top is included in the height, defaults to 5m, with top)
This commit is contained in:
parent
6c4bfd6205
commit
42f775f716
@ -36,6 +36,8 @@ function streetlights.check_and_place(itemstack, placer, pointed_thing, def)
|
|||||||
local pole = def.pole
|
local pole = def.pole
|
||||||
local light = def.light
|
local light = def.light
|
||||||
local param2 = def.param2
|
local param2 = def.param2
|
||||||
|
local height = def.height or 5
|
||||||
|
local has_top = (def.has_top ~= false)
|
||||||
local needs_digiline_wire = def.needs_digiline_wire
|
local needs_digiline_wire = def.needs_digiline_wire
|
||||||
local distributor_node = def.distributor_node
|
local distributor_node = def.distributor_node
|
||||||
|
|
||||||
@ -70,26 +72,27 @@ function streetlights.check_and_place(itemstack, placer, pointed_thing, def)
|
|||||||
local def2, def3, def4
|
local def2, def3, def4
|
||||||
|
|
||||||
local pos2, pos3, pos4
|
local pos2, pos3, pos4
|
||||||
for i = 1, 5 do
|
for i = 1, height do
|
||||||
pos2 = { x=pos1.x, y = pos1.y+i, z=pos1.z }
|
pos2 = { x=pos1.x, y = pos1.y+i, z=pos1.z }
|
||||||
node2 = minetest.get_node(pos2)
|
node2 = minetest.get_node(pos2)
|
||||||
def2 = minetest.registered_items[node2.name]
|
def2 = minetest.registered_items[node2.name]
|
||||||
if minetest.is_protected(pos2, player_name) or not (def2 and def2.buildable_to) then return end
|
if minetest.is_protected(pos2, player_name) or not (def2 and def2.buildable_to) then return end
|
||||||
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] }
|
pos3 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+height, z = pos1.z+fdir_to_right[fdir+1][2] }
|
||||||
node3 = minetest.get_node(pos3)
|
node3 = minetest.get_node(pos3)
|
||||||
def3 = minetest.registered_items[node3.name]
|
def3 = minetest.registered_items[node3.name]
|
||||||
if minetest.is_protected(pos3, player_name) or not (def3 and def3.buildable_to) then return end
|
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] }
|
if has_top then
|
||||||
|
pos4 = { x = pos1.x+fdir_to_right[fdir+1][1], y = pos1.y+height-1, z = pos1.z+fdir_to_right[fdir+1][2] }
|
||||||
node4 = minetest.get_node(pos4)
|
node4 = minetest.get_node(pos4)
|
||||||
def4 = minetest.registered_items[node4.name]
|
def4 = minetest.registered_items[node4.name]
|
||||||
|
if minetest.is_protected(pos4, player_name) or not (def4 and def4.buildable_to) then return end
|
||||||
|
end
|
||||||
|
|
||||||
local pos0 = { x = pos1.x, y = pos1.y-1, z = pos1.z }
|
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 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 distributor_node and minetest.is_protected(pos0, player_name) then return end
|
||||||
|
|
||||||
@ -146,13 +149,17 @@ function streetlights.check_and_place(itemstack, placer, pointed_thing, def)
|
|||||||
pole2 = pole.."_digilines"
|
pole2 = pole.."_digilines"
|
||||||
end
|
end
|
||||||
|
|
||||||
for i = 1, 5 do
|
for i = 1, height do
|
||||||
pos2 = {x=pos1.x, y = pos1.y+i, z=pos1.z}
|
pos2 = {x=pos1.x, y = pos1.y+i, z=pos1.z}
|
||||||
minetest.set_node(pos2, {name = pole2 })
|
minetest.set_node(pos2, {name = pole2 })
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if has_top then
|
||||||
minetest.set_node(pos3, { name = pole2 })
|
minetest.set_node(pos3, { name = pole2 })
|
||||||
minetest.set_node(pos4, { name = light, param2 = param2 })
|
minetest.set_node(pos4, { name = light, param2 = param2 })
|
||||||
|
else
|
||||||
|
minetest.set_node(pos3, { name = light, param2 = param2 })
|
||||||
|
end
|
||||||
|
|
||||||
if needs_digiline_wire and ilights.player_channels[playername] then
|
if needs_digiline_wire and ilights.player_channels[playername] then
|
||||||
minetest.get_meta(pos4):set_string("channel", ilights.player_channels[playername])
|
minetest.get_meta(pos4):set_string("channel", ilights.player_channels[playername])
|
||||||
@ -162,6 +169,7 @@ function streetlights.check_and_place(itemstack, placer, pointed_thing, def)
|
|||||||
minetest.set_node(pos0, { name = distributor_node })
|
minetest.set_node(pos0, { name = distributor_node })
|
||||||
digilines.update_autoconnect(pos0)
|
digilines.update_autoconnect(pos0)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
minetest.register_privilege("streetlight", {
|
minetest.register_privilege("streetlight", {
|
||||||
|
14
simple.lua
14
simple.lua
@ -30,10 +30,10 @@ end
|
|||||||
local digiline_wire_node = "digilines:wire_std_00000000"
|
local digiline_wire_node = "digilines:wire_std_00000000"
|
||||||
|
|
||||||
local poles_tab = {
|
local poles_tab = {
|
||||||
-- material name, mod name, node name
|
-- material name, mod name, node name, optional height, has top section
|
||||||
{ "wood", "default", "default:fence_wood" },
|
{ "wood", "default", "default:fence_wood" },
|
||||||
{ "junglewood", "default", "default:fence_junglewood" },
|
{ "junglewood", "default", "default:fence_junglewood" },
|
||||||
{ "brass", "homedecor_fences", "homedecor:fence_brass" },
|
{ "brass", "homedecor_fences", "homedecor:fence_brass"},
|
||||||
{ "wrought_iron", "homedecor_fences", "homedecor:fence_wrought_iron" },
|
{ "wrought_iron", "homedecor_fences", "homedecor:fence_wrought_iron" },
|
||||||
{ "steel", "gloopblocks", "gloopblocks:fence_steel" }
|
{ "steel", "gloopblocks", "gloopblocks:fence_steel" }
|
||||||
}
|
}
|
||||||
@ -49,6 +49,8 @@ for _, pole in ipairs(poles_tab) do
|
|||||||
local matname = pole[1]
|
local matname = pole[1]
|
||||||
local matmod = pole[2]
|
local matmod = pole[2]
|
||||||
local matnode = pole[3]
|
local matnode = pole[3]
|
||||||
|
local height = pole[4] or 5
|
||||||
|
local has_top = (pole[5] ~= false)
|
||||||
|
|
||||||
if minetest.get_modpath(matmod) then
|
if minetest.get_modpath(matmod) then
|
||||||
|
|
||||||
@ -117,7 +119,9 @@ for _, pole in ipairs(poles_tab) do
|
|||||||
streetlights.check_and_place(itemstack, placer, pointed_thing, {
|
streetlights.check_and_place(itemstack, placer, pointed_thing, {
|
||||||
pole=matnode,
|
pole=matnode,
|
||||||
light=lightnode,
|
light=lightnode,
|
||||||
param2=lightparam2
|
param2=lightparam2,
|
||||||
|
has_top = has_top,
|
||||||
|
height = height
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
})
|
})
|
||||||
@ -150,6 +154,8 @@ for _, pole in ipairs(poles_tab) do
|
|||||||
pole=matnode,
|
pole=matnode,
|
||||||
light=lightnode,
|
light=lightnode,
|
||||||
param2=lightparam2,
|
param2=lightparam2,
|
||||||
|
has_top = has_top,
|
||||||
|
height = height,
|
||||||
needs_digiline_wire=true
|
needs_digiline_wire=true
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
@ -205,6 +211,8 @@ for _, pole in ipairs(poles_tab) do
|
|||||||
pole=matnode,
|
pole=matnode,
|
||||||
light=lightnode,
|
light=lightnode,
|
||||||
param2=lightparam2,
|
param2=lightparam2,
|
||||||
|
has_top = has_top,
|
||||||
|
height = height,
|
||||||
needs_digiline_wire=true,
|
needs_digiline_wire=true,
|
||||||
distributor_node=distributor
|
distributor_node=distributor
|
||||||
})
|
})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user