MTSR/xdecor-libre
4
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Cooking : fix cauldron water filling with empty bucket + don't replace stack of empty buckets by a single filled bucket

Browse Source
This commit is contained in:
Jean-Patrick Guerrero 2016-03-06 00:18:35 +01:00
parent 21cf911db0
commit 87f99c9599
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cooking.lua
View File

@ -28,16 +28,30 @@ function cauldron.boiling_construct(pos)
end end
function cauldron.filling(pos, node, clicker, itemstack) function cauldron.filling(pos, node, clicker, itemstack)
local inv = clicker:get_inventory()
local wield_item = clicker:get_wielded_item():get_name() local wield_item = clicker:get_wielded_item():get_name()
if wield_item:sub(1,7) == "bucket:" then if wield_item:sub(1,7) == "bucket:" then
if wield_item:sub(-6) == "_empty" then if wield_item:sub(-6) == "_empty" and not (node.name:sub(-6) == "_empty") then
if itemstack:get_count() > 1 then
if inv:room_for_item("main", "bucket:bucket_water 1") then
itemstack:take_item()
inv:add_item("main", "bucket:bucket_water 1")
else
minetest.chat_send_player(clicker:get_player_name(),
"No room in your inventory to add a bucket of water.")
return
end
else
itemstack:replace("bucket:bucket_water")
end
minetest.set_node(pos, {name="xdecor:cauldron_empty", param2=node.param2}) minetest.set_node(pos, {name="xdecor:cauldron_empty", param2=node.param2})
itemstack:replace("bucket:bucket_water") elseif wield_item:sub(-6) == "_water" and node.name:sub(-6) == "_empty" then
elseif wield_item:sub(-6) == "_water" then
minetest.set_node(pos, {name="xdecor:cauldron_idle", param2=node.param2}) minetest.set_node(pos, {name="xdecor:cauldron_idle", param2=node.param2})
itemstack:replace("bucket:bucket_empty") itemstack:replace("bucket:bucket_empty")
end end
end return itemstack
end
end end
function cauldron.idle_timer(pos) function cauldron.idle_timer(pos)
@ -47,7 +61,7 @@ function cauldron.idle_timer(pos)
end end
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
minetest.set_node(pos, {name="xdecor:cauldron_boiling_water", param2=node.param2}) minetest.set_node(pos, {name="xdecor:cauldron_boiling", param2=node.param2})
return true return true
end end
@ -101,7 +115,7 @@ function cauldron.take_soup(pos, node, clicker, itemstack)
inv:add_item("main", "xdecor:bowl_soup 1") inv:add_item("main", "xdecor:bowl_soup 1")
else else
minetest.chat_send_player(clicker:get_player_name(), minetest.chat_send_player(clicker:get_player_name(),
"No room in your inventory to add a bowl of soup!") "No room in your inventory to add a bowl of soup.")
return return
end end
else else
@ -135,7 +149,7 @@ xdecor.register("cauldron_idle", {
on_timer = cauldron.idle_timer on_timer = cauldron.idle_timer
}) })
xdecor.register("cauldron_boiling_water", { xdecor.register("cauldron_boiling", {
groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1}, groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
on_rotate = screwdriver.rotate_simple, on_rotate = screwdriver.rotate_simple,
drop = "xdecor:cauldron_empty", drop = "xdecor:cauldron_empty",
@ -149,6 +163,7 @@ xdecor.register("cauldron_boiling_water", {
on_construct = cauldron.boiling_construct, on_construct = cauldron.boiling_construct,
on_timer = cauldron.boiling_timer on_timer = cauldron.boiling_timer
}) })
minetest.register_alias("xdecor:cauldron_boiling_water", "xdecor:cauldron_boiling")
xdecor.register("cauldron_soup", { xdecor.register("cauldron_soup", {
groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1}, groups = {cracky=2, oddly_breakable_by_hand=1, not_in_creative_inventory=1},

2
mechanisms.lua
View File

@ -23,7 +23,7 @@ end
function plate.construct(pos) function plate.construct(pos)
local timer = minetest.get_node_timer(pos) local timer = minetest.get_node_timer(pos)
timer:start(0.5) timer:start(0.1)
end end
function plate.timer(pos) function plate.timer(pos)