Add several new colors of armchairs

Renamed the plain one to include "black", aliased to original name.
Better textures for the wooden table/chair and the black armchair.

Also renamed purple shutter to violet for consistency.
This commit is contained in:
Vanessa Ezekowitz 2013-04-03 17:03:42 -04:00
parent cb993bfd4b
commit 17e47745d1
28 changed files with 70 additions and 52 deletions

View File

@ -28,6 +28,7 @@ minetest.register_node("homedecor:table", {
}, },
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
}) })
minetest.register_node("homedecor:chair", { minetest.register_node("homedecor:chair", {
description = "Chair", description = "Chair",
tiles = { tiles = {
@ -59,43 +60,66 @@ minetest.register_node("homedecor:chair", {
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
}) })
minetest.register_node("homedecor:armchair", { local chaircolors = {
description = "Armchair", { "black", "Black" },
tiles = { { "red", "Red" },
"forniture_armchair_top.png", { "pink", "Pink" },
"forniture_armchair_top.png", { "violet", "Violet" },
"forniture_armchair_lat1.png", { "blue", "Blue" },
"forniture_armchair_lat1.png", { "dark_green", "Dark Green" },
"forniture_armchair_lat2.png", }
"forniture_armchair_lat2.png",
}, for i in ipairs(chaircolors) do
drawtype = "nodebox", color = chaircolors[i][1]
sunlight_propagates = true, name = chaircolors[i][2]
paramtype = "light", minetest.register_node("homedecor:armchair_"..color, {
paramtype2 = "facedir", description = "Armchair ("..name..")",
node_box = { tiles = {
type = "fixed", "forniture_armchair_top_"..color..".png",
fixed = { "forniture_armchair_top_"..color..".png",
{ -0.50, -0.50, -0.45, -0.30, 0.05, 0.30 }, "forniture_armchair_lat1_"..color..".png",
{ -0.45, -0.50, -0.50, -0.35, 0.05, -0.45 }, "forniture_armchair_lat1_"..color..".png",
{ -0.45, 0.05, -0.45, -0.35, 0.10, 0.15 }, "forniture_armchair_lat2_"..color..".png",
{ 0.30, -0.50, -0.45, 0.50, 0.05, 0.30 }, "forniture_armchair_lat2_"..color..".png",
{ 0.35, -0.50, -0.50, 0.45, 0.05, -0.45 }, },
{ 0.35, 0.05, -0.45, 0.45, 0.10, 0.15 }, drawtype = "nodebox",
{ -0.50, -0.50, 0.30, 0.50, 0.45, 0.50 }, sunlight_propagates = true,
{ -0.45, 0.45, 0.35, 0.45, 0.50, 0.45 }, paramtype = "light",
{ -0.30, -0.45, -0.35, 0.30, -0.10, 0.30 }, paramtype2 = "facedir",
{ -0.30, -0.45, -0.40, 0.30, -0.15, -0.35 }, node_box = {
{ -0.50, 0.05, 0.15, -0.30, 0.45, 0.30 }, type = "fixed",
{ -0.45, 0.10, 0.10, -0.35, 0.45, 0.15 }, fixed = {
{ -0.45, 0.45, 0.15, -0.35, 0.50, 0.35 }, { -0.50, -0.50, -0.45, -0.30, 0.05, 0.30 },
{ 0.30, 0.05, 0.15, 0.50, 0.45, 0.30 }, { -0.45, -0.50, -0.50, -0.35, 0.05, -0.45 },
{ 0.35, 0.10, 0.10, 0.45, 0.45, 0.15 }, { -0.45, 0.05, -0.45, -0.35, 0.10, 0.15 },
{ 0.35, 0.45, 0.15, 0.45, 0.50, 0.35 }, { 0.30, -0.50, -0.45, 0.50, 0.05, 0.30 },
}, { 0.35, -0.50, -0.50, 0.45, 0.05, -0.45 },
}, { 0.35, 0.05, -0.45, 0.45, 0.10, 0.15 },
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, { -0.50, -0.50, 0.30, 0.50, 0.45, 0.50 },
}) { -0.45, 0.45, 0.35, 0.45, 0.50, 0.45 },
{ -0.30, -0.45, -0.35, 0.30, -0.10, 0.30 },
{ -0.30, -0.45, -0.40, 0.30, -0.15, -0.35 },
{ -0.50, 0.05, 0.15, -0.30, 0.45, 0.30 },
{ -0.45, 0.10, 0.10, -0.35, 0.45, 0.15 },
{ -0.45, 0.45, 0.15, -0.35, 0.50, 0.35 },
{ 0.30, 0.05, 0.15, 0.50, 0.45, 0.30 },
{ 0.35, 0.10, 0.10, 0.45, 0.45, 0.15 },
{ 0.35, 0.45, 0.15, 0.45, 0.50, 0.35 },
},
},
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
})
minetest.register_craft({
output = "homedecor:armchair_"..color.." 2",
recipe = {
{ "wool:"..color,""},
{ "default:wood","default:wood" },
{ "wool:"..color,"wool:"..color },
},
})
end
function homedecor_table_lamp_on_punch(pos, node, puncher) function homedecor_table_lamp_on_punch(pos, node, puncher)
@ -159,7 +183,8 @@ reg_lamp("max", "off", nil, "x", 14)
-- Aliases for 3dforniture mod. -- Aliases for 3dforniture mod.
minetest.register_alias("3dforniture:table", "homedecor:table") minetest.register_alias("3dforniture:table", "homedecor:table")
minetest.register_alias("3dforniture:chair", "homedecor:chair") minetest.register_alias("3dforniture:chair", "homedecor:chair")
minetest.register_alias("3dforniture:armchair", "homedecor:armchair") minetest.register_alias("3dforniture:armchair", "homedecor:armchair_black")
minetest.register_alias("homedecor:armchair", "homedecor:armchair_black")
minetest.register_alias('table', 'homedecor:table') minetest.register_alias('table', 'homedecor:table')
minetest.register_alias('chair', 'homedecor:chair') minetest.register_alias('chair', 'homedecor:chair')

View File

@ -28,15 +28,6 @@ minetest.register_craft({
burntime = 15, burntime = 15,
}) })
minetest.register_craft({
output = "homedecor:armchair 2",
recipe = {
{ "wool:black",""},
{ "default:wood","default:wood" },
{ "wool:black","wool:black" },
},
})
minetest.register_craft({ minetest.register_craft({
type = "fuel", type = "fuel",
recipe = "homedecor:armchair", recipe = "homedecor:armchair",

View File

@ -142,11 +142,11 @@ minetest.register_node('homedecor:shutter_light_blue', {
}, },
}) })
minetest.register_node('homedecor:shutter_purple', { minetest.register_node('homedecor:shutter_violet', {
description = S("Wooden Shutter (Purple)"), description = S("Wooden Shutter (Violet)"),
tiles = { 'homedecor_window_shutter_purple.png' }, tiles = { 'homedecor_window_shutter_violet.png' },
inventory_image = 'homedecor_window_shutter_purple.png', inventory_image = 'homedecor_window_shutter_violet.png',
wield_image = 'homedecor_window_shutter_purple.png', wield_image = 'homedecor_window_shutter_violet.png',
drawtype = 'signlike', drawtype = 'signlike',
sunlight_propagates = false, sunlight_propagates = false,
paramtype = "light", paramtype = "light",
@ -217,3 +217,5 @@ minetest.register_node('homedecor:shutter_yellow', {
--wall_side = = <default> --wall_side = = <default>
}, },
}) })
minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet")

Binary file not shown.

Before

Width:  |  Height:  |  Size: 354 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 685 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 685 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 692 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 720 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 717 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 699 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 672 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 616 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 610 B

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB