Can place kelp also in downwards-flowing water

This commit is contained in:
Wuzzy 2020-12-03 14:01:27 +01:00
parent 51fea93905
commit 257d7803a4
1 changed files with 33 additions and 9 deletions

View File

@ -41,6 +41,30 @@ local function grow_param2_step(param2, snap_into_grid)
return param2, param2 ~= old_param2 return param2, param2 ~= old_param2
end end
local function kelp_check_place(pos_above, node_above, def_above)
if minetest.get_item_group(node_above.name, "water") == 0 then
return false
end
local can_place = false
if (def_above.liquidtype == "source") then
can_place = true
elseif (def_above.liquidtype == "flowing") then
-- Check if bit 3 (downwards flowing) is set
can_place = (math.floor(node_above.param2 / 8) % 2) == 1
if not can_place then
-- If not, also check node above (this is needed due a weird quirk in the definition of
-- "downwards flowing" liquids in Minetest)
local node_above_above = minetest.get_node({x=pos_above.x,y=pos_above.y+1,z=pos_above.z})
local naa_def = minetest.registered_nodes[node_above_above.name]
can_place = naa_def.liquidtype == "source"
if not can_place then
can_place = (naa_def.liquidtype == "flowing") and ((math.floor(node_above_above.param2 / 8) % 2) == 1)
end
end
end
return can_place
end
local function kelp_on_place(itemstack, placer, pointed_thing) local function kelp_on_place(itemstack, placer, pointed_thing)
if pointed_thing.type ~= "node" or not placer then if pointed_thing.type ~= "node" or not placer then
return itemstack return itemstack
@ -96,11 +120,12 @@ local function kelp_on_place(itemstack, placer, pointed_thing)
-- Placed on side or below node, abort -- Placed on side or below node, abort
return itemstack return itemstack
end end
-- New kelp top must also be submerged in water source -- New kelp top must also be submerged in water
local _, top_node = get_kelp_top(pos_under, node_under) local top_pos, top_node = get_kelp_top(pos_under, node_under)
submerged = get_submerged(top_node) local top_def = minetest.registered_nodes[top_node.name]
if submerged ~= "source" then submerged = kelp_check_place(top_pos, top_node, top_def)
-- Not submerged in water source, abort if not submerged then
-- Not submerged in water, abort
return itemstack return itemstack
end end
else else
@ -109,11 +134,10 @@ local function kelp_on_place(itemstack, placer, pointed_thing)
-- Placed on side or below node, abort -- Placed on side or below node, abort
return itemstack return itemstack
end end
-- Kelp can be placed inside a water source on top of a surface node -- Kelp can be placed inside a water source or water flowing downwards on top of a surface node
local g_above_water = minetest.get_item_group(node_above.name, "water") local can_place = kelp_check_place(pos_above, node_above, def_above)
if not (g_above_water ~= 0 and def_above.liquidtype == "source") then if not can_place then
return itemstack return itemstack
-- TODO: Also allow placement into downwards flowing liquid
end end
node_under.param2 = minetest.registered_items[node_under.name].place_param2 or 16 node_under.param2 = minetest.registered_items[node_under.name].place_param2 or 16
end end