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

Put back collision boxes on cauldrons

Browse Source
This commit is contained in:
jp 2015-12-03 22:47:59 +01:00
parent d08db7dda3
commit 2d455515a3
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cooking.lua
View File

@ -1,11 +1,22 @@
minetest.register_alias("xdecor:cauldron", "xdecor:cauldron_empty") minetest.register_alias("xdecor:cauldron", "xdecor:cauldron_empty")
local cauldron_cbox = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5},
{-0.5, -0.5, 0.5, 0.5, 0.5, 0.5},
{-0.5, -0.5, -0.5, -0.5, 0.5, 0.5},
{0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
{-0.5, -0.5, -0.5, 0.5, 0, 0.5}
}
}
xdecor.register("cauldron_empty", { xdecor.register("cauldron_empty", {
description = "Cauldron", description = "Cauldron",
groups = {cracky=2, oddly_breakable_by_hand=1}, groups = {cracky=2, oddly_breakable_by_hand=1},
on_rotate = screwdriver.rotate_simple, on_rotate = screwdriver.rotate_simple,
tiles = {"xdecor_cauldron_top_empty.png", "xdecor_cauldron_sides.png"}, tiles = {"xdecor_cauldron_top_empty.png", "xdecor_cauldron_sides.png"},
infotext = "Empty Cauldron", infotext = "Cauldron (empty)",
on_rightclick = function(pos, node, clicker, itemstack, _) on_rightclick = function(pos, node, clicker, itemstack, _)
local wield_item = clicker:get_wielded_item():get_name() local wield_item = clicker:get_wielded_item():get_name()
if wield_item == "bucket:bucket_water" or if wield_item == "bucket:bucket_water" or
@ -13,7 +24,8 @@ xdecor.register("cauldron_empty", {
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 end,
collision_box = cauldron_cbox
}) })
xdecor.register("cauldron_idle", { xdecor.register("cauldron_idle", {
@ -22,42 +34,35 @@ xdecor.register("cauldron_idle", {
tiles = {"xdecor_cauldron_top_idle.png", "xdecor_cauldron_sides.png"}, tiles = {"xdecor_cauldron_top_idle.png", "xdecor_cauldron_sides.png"},
drop = "xdecor:cauldron_empty", drop = "xdecor:cauldron_empty",
infotext = "Cauldron (idle)", infotext = "Cauldron (idle)",
collision_box = cauldron_cbox
}) })
xdecor.register("cauldron_boiling_water", { xdecor.register("cauldron_boiling_water", {
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",
infotext = "Drop foods inside to make a soup", infotext = "Cauldron (active) - Drop foods inside to make a soup",
damage_per_second = 2, damage_per_second = 2,
tiles = { tiles = {
{ name = "xdecor_cauldron_top_anim_boiling_water.png", { name = "xdecor_cauldron_top_anim_boiling_water.png",
animation = {type="vertical_frames", length=3.0} }, animation = {type="vertical_frames", length=3.0} },
"xdecor_cauldron_sides.png" "xdecor_cauldron_sides.png"
}, },
collision_box = { collision_box = cauldron_cbox
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0.5, -0.5},
{-0.5, -0.5, 0.5, 0.5, 0.5, 0.5},
{-0.5, -0.5, -0.5, -0.5, 0.5, 0.5},
{0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
{-0.5, -0.5, -0.5, 0.5, 0, 0.5}
}
}
}) })
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},
on_rotate = screwdriver.rotate_simple, on_rotate = screwdriver.rotate_simple,
drop = "xdecor:cauldron_empty", drop = "xdecor:cauldron_empty",
infotext = "The soup is ready, use a bowl to eat it", infotext = "Cauldron (active) - Use a bowl to eat the soup",
damage_per_second = 2, damage_per_second = 2,
tiles = { tiles = {
{ name = "xdecor_cauldron_top_anim_soup.png", { name = "xdecor_cauldron_top_anim_soup.png",
animation = {type="vertical_frames", length=3.0} }, animation = {type="vertical_frames", length=3.0} },
"xdecor_cauldron_sides.png" "xdecor_cauldron_sides.png"
}, },
collision_box = cauldron_cbox,
on_rightclick = function(pos, node, clicker, itemstack, _) on_rightclick = function(pos, node, clicker, itemstack, _)
local inv = clicker:get_inventory() local inv = clicker:get_inventory()
if clicker:get_wielded_item():get_name() == "xdecor:bowl" then if clicker:get_wielded_item():get_name() == "xdecor:bowl" then
@ -91,7 +96,7 @@ minetest.register_abm({
action = function(pos, node, _, _) action = function(pos, node, _, _)
local objs = nil local objs = nil
local ingredients = {} local ingredients = {}
objs = minetest.get_objects_inside_radius(pos, .5) objs = minetest.get_objects_inside_radius(pos, 0.5)
if not objs then return end if not objs then return end
for _, obj in pairs(objs) do for _, obj in pairs(objs) do

2
itemframe.lua
View File

@ -35,7 +35,7 @@ minetest.register_entity("xdecor:f_item", {
local remove_item = function(pos, node) local remove_item = function(pos, node)
local objs = nil local objs = nil
objs = minetest.get_objects_inside_radius(pos, .5) objs = minetest.get_objects_inside_radius(pos, 0.5)
if not objs then return end if not objs then return end
for _, obj in pairs(objs) do for _, obj in pairs(objs) do