minetest
/
minetest_game
mirror of https://github.com/minetest/minetest_game.git
1
0
Fork 2
Code Issues Releases Wiki Activity

Allow buckets to pick up partially full liquid nodes when liquid_finite is enabled. 

Also give water and lava buckets a description.
This commit is contained in:
ShadowNinja 2013-03-18 17:25:09 -04:00
parent a4426e4bd4
commit 3a6a9ebb8d
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
mods/bucket/init.lua
View File

@ -1,6 +1,8 @@
-- Minetest 0.4 mod: bucket
-- See README.txt for licensing and other information.
local liquid_max = 8 --The number of water levels when liquid_finite is enabled
minetest.register_alias("bucket", "bucket:bucket_empty")
minetest.register_alias("bucket_water", "bucket:bucket_water")
minetest.register_alias("bucket_lava", "bucket:bucket_lava")
@ -22,7 +24,7 @@ bucket.liquids = {}
-- itemname = name of the new bucket item (or nil if liquid is not takeable)
-- inventory_image = texture of the new bucket item (ignored if itemname == nil)
-- This function can be called from any mod (that depends on bucket).
function bucket.register_liquid(source, flowing, itemname, inventory_image)
function bucket.register_liquid(source, flowing, itemname, inventory_image, name)
bucket.liquids[source] = {
source = source,
flowing = flowing,
@ -32,6 +34,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image)
if itemname ~= nil then
minetest.register_craftitem(itemname, {
description = name,
inventory_image = inventory_image,
stack_max = 1,
liquids_pointable = true,
@ -40,17 +43,37 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image)
if pointed_thing.type ~= "node" then
return
end
local place_liquid = function(pos, node, source, flowing, fullness)
if math.floor(fullness/128) == 1 or (not minetest.setting_getbool("liquid_finite")) then
minetest.env:add_node(pos, {name=source, param2=fullness})
return
elseif node.name == flowing then
fullness = fullness + node.param2
elseif node.name == source then
fullness = liquid_max
end
if fullness >= liquid_max then
minetest.env:add_node(pos, {name=source, param2=liquid_max})
else
minetest.env:add_node(pos, {name=flowing, param2=fullness})
end
end
-- Check if pointing to a buildable node
n = minetest.env:get_node(pointed_thing.under)
if minetest.registered_nodes[n.name].buildable_to then
local node = minetest.env:get_node(pointed_thing.under)
local fullness = tonumber(itemstack:get_metadata())
if minetest.registered_nodes[node.name].buildable_to then
-- buildable; replace the node
minetest.env:add_node(pointed_thing.under, {name=source})
place_liquid(pointed_thing.under, node, source, flowing, fullness)
else
-- not buildable to; place the liquid above
-- check if the node above can be replaced
n = minetest.env:get_node(pointed_thing.above)
if minetest.registered_nodes[n.name].buildable_to then
minetest.env:add_node(pointed_thing.above,{name=source})
local node = minetest.env:get_node(pointed_thing.above)
if minetest.registered_nodes[node.name].buildable_to then
place_liquid(pointed_thing.above, node, source, flowing, fullness)
else
-- do not remove the bucket with the liquid
return
@ -73,11 +96,15 @@ minetest.register_craftitem("bucket:bucket_empty", {
return
end
-- Check if pointing to a liquid source
n = minetest.env:get_node(pointed_thing.under)
liquiddef = bucket.liquids[n.name]
if liquiddef ~= nil and liquiddef.source == n.name and liquiddef.itemname ~= nil then
node = minetest.env:get_node(pointed_thing.under)
liquiddef = bucket.liquids[node.name]
if liquiddef ~= nil and liquiddef.itemname ~= nil and (node.name == liquiddef.source or
(node.name == liquiddef.flowing and minetest.setting_getbool("liquid_finite"))) then
minetest.env:add_node(pointed_thing.under, {name="air"})
return {name=liquiddef.itemname}
if node.name == liquiddef.source then node.param2 = liquid_max end
return ItemStack({name = liquiddef.itemname, metadata = tostring(node.param2)})
end
end,
})
@ -86,14 +113,16 @@ bucket.register_liquid(
"default:water_source",
"default:water_flowing",
"bucket:bucket_water",
"bucket_water.png"
"bucket_water.png",
"Water bucket"
)
bucket.register_liquid(
"default:lava_source",
"default:lava_flowing",
"bucket:bucket_lava",
"bucket_lava.png"
"bucket_lava.png",
"Lava bucket"
)
minetest.register_craft({