crabman77/homedecor_modpack
1
0
Fork 0
forked from nalc/homedecor_modpack
Code Issues Pull Requests Projects Releases Wiki Activity

More colors for the bed

Browse Source 
red, (dark) green, violet
This commit is contained in:
kilbith
2014-08-20 16:11:08 +02:00
committed by Vanessa Ezekowitz
parent 482127af2d
commit 2609e68d9d
29 changed files with 137 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
homedecor/crafts.lua
View File

@@ -2372,15 +2372,6 @@ minetest.register_craft( {
}, },
}) })
minetest.register_craft( {
output = "homedecor:bed_blue_foot",
recipe = {
{ "group:stick", "", "group:stick" },
{ "wool:white", "wool:blue", "wool:blue" },
{ "group:wood", "", "group:wood" },
},
})
minetest.register_craft( { minetest.register_craft( {
output = "homedecor:pool_table", output = "homedecor:pool_table",
recipe = { recipe = {
@@ -2517,3 +2508,25 @@ minetest.register_craft( {
{ "moreblocks:slab_wood", "", "moreblocks:slab_wood" } { "moreblocks:slab_wood", "", "moreblocks:slab_wood" }
}, },
}) })
local bedcolors = {
{ "red", "red"},
{ "green", "dark_green"},
{ "blue", "blue"},
{ "violet", "violet"}
}
for c in ipairs(bedcolors) do
local color = bedcolors[c][1]
local woolcolor = bedcolors[c][2]
minetest.register_craft( {
output = "homedecor:bed_"..color.."_foot",
recipe = {
{ "group:stick", "", "group:stick" },
{ "wool:white", "wool:"..woolcolor, "wool:"..woolcolor },
{ "group:wood", "", "group:wood" },
},
})
end

221
homedecor/furniture.lua
View File

@@ -240,45 +240,12 @@ minetest.register_node(":homedecor:openframe_bookshelf", {
} }
}) })
-- decorative bed and wardrobe, models by jp local bedcolors = {
"red",
minetest.register_node("homedecor:bed_blue_head", { "green",
tiles = { "blue",
"homedecor_bed_blue_top1.png", "violet",
"homedecor_bed_bottom1.png", }
"homedecor_bed_blue_side1.png",
"homedecor_bed_blue_side1.png^[transformFX",
"homedecor_bed_blue_head1.png",
"homedecor_bed_blue_head2.png"
},
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3, not_in_creative_inventory=1},
node_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, 0.4375, -0.375, 0.5, 0.5}, -- NodeBox1
{0.375, -0.5, 0.4375, 0.5, 0.5, 0.5}, -- NodeBox2
{-0.5, 0.25, 0.4375, 0.5, 0.4375, 0.5}, -- NodeBox3
{-0.5, 0, 0.4375, 0.5, 0.1875, 0.5}, -- NodeBox4
{-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5}, -- NodeBox5
{-0.4375, -0.375, -0.5, -0.375, -0.125, 0.5}, -- NodeBox6
{0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox7
{-0.375, -0.375, 0.25, 0.375, -0.3125, 0.375}, -- NodeBox8
{-0.375, -0.375, 0.0625, 0.375, -0.3125, 0.1875}, -- NodeBox9
{-0.375, -0.375, -0.125, 0.375, -0.3125, 0}, -- NodeBox10
{-0.375, -0.375, -0.3125, 0.375, -0.3125, -0.1875}, -- NodeBox11
{-0.375, -0.375, -0.5, 0.375, -0.3125, -0.375}, -- NodeBox12
{-0.375, -0.3125, -0.5, 0.375, -0.0625, 0.4375}, -- NodeBox13
{-0.3125, -0.125, 0.0625, 0.3125, 0.0625, 0.4375}, -- NodeBox14
}
},
selection_box = {
type = "fixed",
fixed = { 0, 0, 0, 0, 0, 0 }
}
})
local fdir_to_fwd = { local fdir_to_fwd = {
{ 0, 1 }, { 0, 1 },
@@ -287,78 +254,120 @@ local fdir_to_fwd = {
{ -1, 0 }, { -1, 0 },
} }
minetest.register_node("homedecor:bed_blue_foot", { for _, color in ipairs(bedcolors) do
tiles = {
"homedecor_bed_blue_top2.png", minetest.register_node("homedecor:bed_"..color.."_head", {
"homedecor_bed_bottom2.png", tiles = {
"homedecor_bed_blue_side2.png", "homedecor_bed_"..color.."_top1.png",
"homedecor_bed_blue_side2.png^[transformFX", "homedecor_bed_bottom1.png",
"homedecor_bed_blue_foot2.png", "homedecor_bed_"..color.."_side1.png",
"homedecor_bed_blue_foot1.png" "homedecor_bed_"..color.."_side1.png^[transformFX",
}, "homedecor_bed_"..color.."_head1.png",
inventory_image = "homedecor_bed_blue_inv.png", "homedecor_bed_"..color.."_head2.png"
description = "Bed", },
drawtype = "nodebox", drawtype = "nodebox",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3}, groups = {snappy=3, not_in_creative_inventory=1},
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
{-0.5, -0.5, -0.5, -0.375, 0.1875, -0.4375}, -- NodeBox1 {-0.5, -0.5, 0.4375, -0.375, 0.5, 0.5}, -- NodeBox1
{0.375, -0.5, -0.5, 0.5, 0.1875, -0.4375}, -- NodeBox2 {0.375, -0.5, 0.4375, 0.5, 0.5, 0.5}, -- NodeBox2
{-0.5, 0, -0.5, 0.5, 0.125, -0.4375}, -- NodeBox3 {-0.5, 0.25, 0.4375, 0.5, 0.4375, 0.5}, -- NodeBox3
{-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375}, -- NodeBox4 {-0.5, 0, 0.4375, 0.5, 0.1875, 0.5}, -- NodeBox4
{-0.4375, -0.375, -0.5, -0.375, -0.125, 0.5}, -- NodeBox5 {-0.5, -0.375, 0.4375, 0.5, -0.125, 0.5}, -- NodeBox5
{0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox6 {-0.4375, -0.375, -0.5, -0.375, -0.125, 0.5}, -- NodeBox6
{-0.375, -0.375, 0.3125, 0.375, -0.3125, 0.4375}, -- NodeBox7 {0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox7
{-0.375, -0.375, 0.125, 0.375, -0.3125, 0.25}, -- NodeBox8 {-0.375, -0.375, 0.25, 0.375, -0.3125, 0.375}, -- NodeBox8
{-0.375, -0.375, -0.0625, 0.375, -0.3125, 0.0625}, -- NodeBox9 {-0.375, -0.375, 0.0625, 0.375, -0.3125, 0.1875}, -- NodeBox9
{-0.375, -0.375, -0.25, 0.375, -0.3125, -0.125}, -- NodeBox10 {-0.375, -0.375, -0.125, 0.375, -0.3125, 0}, -- NodeBox10
{-0.375, -0.375, -0.4375, 0.375, -0.3125, -0.3125}, -- NodeBox11 {-0.375, -0.375, -0.3125, 0.375, -0.3125, -0.1875}, -- NodeBox11
{-0.375, -0.3125, -0.4375, 0.375, -0.0625, 0.5}, -- NodeBox12 {-0.375, -0.375, -0.5, 0.375, -0.3125, -0.375}, -- NodeBox12
{-0.375, -0.3125, -0.5, 0.375, -0.0625, 0.4375}, -- NodeBox13
{-0.3125, -0.125, 0.0625, 0.3125, 0.0625, 0.4375}, -- NodeBox14
}
},
selection_box = {
type = "fixed",
fixed = { 0, 0, 0, 0, 0, 0 }
} }
}, })
selection_box = {
type = "fixed",
fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 }
},
on_place = function(itemstack, placer, pointed_thing)
local pos = pointed_thing.under
local pnode = minetest.get_node(pointed_thing.under)
local rnodedef = minetest.registered_nodes[pnode.name]
if not rnodedef["buildable_to"] then minetest.register_node("homedecor:bed_"..color.."_foot", {
pos = pointed_thing.above tiles = {
end "homedecor_bed_"..color.."_top2.png",
"homedecor_bed_bottom2.png",
"homedecor_bed_"..color.."_side2.png",
"homedecor_bed_"..color.."_side2.png^[transformFX",
"homedecor_bed_"..color.."_foot2.png",
"homedecor_bed_"..color.."_foot1.png"
},
inventory_image = "homedecor_bed_"..color.."_inv.png",
description = S("Bed (%s)"):format(color),
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3},
node_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, -0.375, 0.1875, -0.4375}, -- NodeBox1
{0.375, -0.5, -0.5, 0.5, 0.1875, -0.4375}, -- NodeBox2
{-0.5, 0, -0.5, 0.5, 0.125, -0.4375}, -- NodeBox3
{-0.5, -0.375, -0.5, 0.5, -0.125, -0.4375}, -- NodeBox4
{-0.4375, -0.375, -0.5, -0.375, -0.125, 0.5}, -- NodeBox5
{0.375, -0.375, -0.5, 0.4375, -0.125, 0.5}, -- NodeBox6
{-0.375, -0.375, 0.3125, 0.375, -0.3125, 0.4375}, -- NodeBox7
{-0.375, -0.375, 0.125, 0.375, -0.3125, 0.25}, -- NodeBox8
{-0.375, -0.375, -0.0625, 0.375, -0.3125, 0.0625}, -- NodeBox9
{-0.375, -0.375, -0.25, 0.375, -0.3125, -0.125}, -- NodeBox10
{-0.375, -0.375, -0.4375, 0.375, -0.3125, -0.3125}, -- NodeBox11
{-0.375, -0.3125, -0.4375, 0.375, -0.0625, 0.5}, -- NodeBox12
}
},
selection_box = {
type = "fixed",
fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 1.5 }
},
on_place = function(itemstack, placer, pointed_thing)
local pos = pointed_thing.under
local pnode = minetest.get_node(pointed_thing.under)
local rnodedef = minetest.registered_nodes[pnode.name]
local fdir = minetest.dir_to_facedir(placer:get_look_dir()) if not rnodedef["buildable_to"] then
local pos2 = { x = pos.x + fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + fdir_to_fwd[fdir+1][2] } pos = pointed_thing.above
end
local tnode = minetest.get_node(pos) local fdir = minetest.dir_to_facedir(placer:get_look_dir())
local tnode2 = minetest.get_node(pos2) local pos2 = { x = pos.x + fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + fdir_to_fwd[fdir+1][2] }
if homedecor.get_nodedef_field(tnode.name, "buildable_to") local tnode = minetest.get_node(pos)
and homedecor.get_nodedef_field(tnode2.name, "buildable_to") local tnode2 = minetest.get_node(pos2)
and not minetest.is_protected(pos, placer:get_player_name())
and not minetest.is_protected(pos2, placer:get_player_name()) then if homedecor.get_nodedef_field(tnode.name, "buildable_to")
minetest.add_node(pos, { name = "homedecor:bed_blue_foot", param2 = fdir }) and homedecor.get_nodedef_field(tnode2.name, "buildable_to")
minetest.add_node(pos2, { name = "homedecor:bed_blue_head", param2 = fdir }) and not minetest.is_protected(pos, placer:get_player_name())
if not homedecor.expect_infinite_stacks then and not minetest.is_protected(pos2, placer:get_player_name()) then
itemstack:take_item() minetest.add_node(pos, { name = "homedecor:bed_"..color.."_foot", param2 = fdir })
return itemstack minetest.add_node(pos2, { name = "homedecor:bed_"..color.."_head", param2 = fdir })
if not homedecor.expect_infinite_stacks then
itemstack:take_item()
return itemstack
end
end
end,
after_dig_node = function(pos, oldnode, oldmetadata, digger)
local fdir = oldnode.param2
if not fdir or fdir > 3 then return end
local pos2 = { x = pos.x + fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + fdir_to_fwd[fdir+1][2] }
if minetest.get_node(pos2).name == "homedecor:bed_"..color.."_head" then
minetest.remove_node(pos2)
end end
end end
end, })
after_dig_node = function(pos, oldnode, oldmetadata, digger)
local fdir = oldnode.param2 end
if not fdir or fdir > 3 then return end
local pos2 = { x = pos.x + fdir_to_fwd[fdir+1][1], y=pos.y, z = pos.z + fdir_to_fwd[fdir+1][2] }
if minetest.get_node(pos2).name == "homedecor:bed_blue_head" then
minetest.remove_node(pos2)
end
end
})
minetest.register_node("homedecor:wardrobe_top", { minetest.register_node("homedecor:wardrobe_top", {
tiles = { tiles = {
@@ -371,8 +380,8 @@ minetest.register_node("homedecor:wardrobe_top", {
}, },
drawtype = "nodebox", drawtype = "nodebox",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3, not_in_creative_inventory=1}, groups = {snappy=3, not_in_creative_inventory=1},
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {

BIN
homedecor/textures/homedecor_bed_green_foot1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 379 B

BIN
homedecor/textures/homedecor_bed_green_foot2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B

BIN
homedecor/textures/homedecor_bed_green_head1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 497 B

BIN
homedecor/textures/homedecor_bed_green_head2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 433 B

BIN
homedecor/textures/homedecor_bed_green_inv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
homedecor/textures/homedecor_bed_green_side1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 378 B

BIN
homedecor/textures/homedecor_bed_green_side2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 334 B

BIN
homedecor/textures/homedecor_bed_green_top1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 674 B

BIN
homedecor/textures/homedecor_bed_green_top2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 630 B

BIN
homedecor/textures/homedecor_bed_red_foot1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 374 B

BIN
homedecor/textures/homedecor_bed_red_foot2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B

BIN
homedecor/textures/homedecor_bed_red_head1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 495 B

BIN
homedecor/textures/homedecor_bed_red_head2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 434 B

BIN
homedecor/textures/homedecor_bed_red_inv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
homedecor/textures/homedecor_bed_red_side1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 372 B

BIN
homedecor/textures/homedecor_bed_red_side2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 322 B

BIN
homedecor/textures/homedecor_bed_red_top1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 607 B

BIN
homedecor/textures/homedecor_bed_red_top2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 472 B

BIN
homedecor/textures/homedecor_bed_violet_foot1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 378 B

BIN
homedecor/textures/homedecor_bed_violet_foot2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B

BIN
homedecor/textures/homedecor_bed_violet_head1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 499 B

BIN
homedecor/textures/homedecor_bed_violet_head2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 433 B

BIN
homedecor/textures/homedecor_bed_violet_inv.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
homedecor/textures/homedecor_bed_violet_side1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 374 B

BIN
homedecor/textures/homedecor_bed_violet_side2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 337 B

BIN
homedecor/textures/homedecor_bed_violet_top1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 665 B

BIN
homedecor/textures/homedecor_bed_violet_top2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 602 B