diff --git a/furniture.lua b/furniture.lua index 60b6edb8..4272f774 100644 --- a/furniture.lua +++ b/furniture.lua @@ -28,6 +28,7 @@ minetest.register_node("homedecor:table", { }, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, }) + minetest.register_node("homedecor:chair", { description = "Chair", tiles = { @@ -59,43 +60,66 @@ minetest.register_node("homedecor:chair", { groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, }) -minetest.register_node("homedecor:armchair", { - description = "Armchair", - tiles = { - "forniture_armchair_top.png", - "forniture_armchair_top.png", - "forniture_armchair_lat1.png", - "forniture_armchair_lat1.png", - "forniture_armchair_lat2.png", - "forniture_armchair_lat2.png", - }, - drawtype = "nodebox", - sunlight_propagates = true, - paramtype = "light", - paramtype2 = "facedir", - node_box = { - type = "fixed", - fixed = { - { -0.50, -0.50, -0.45, -0.30, 0.05, 0.30 }, - { -0.45, -0.50, -0.50, -0.35, 0.05, -0.45 }, - { -0.45, 0.05, -0.45, -0.35, 0.10, 0.15 }, - { 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 }, - { -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}, -}) +local chaircolors = { + { "black", "Black" }, + { "red", "Red" }, + { "pink", "Pink" }, + { "violet", "Violet" }, + { "blue", "Blue" }, + { "dark_green", "Dark Green" }, +} + +for i in ipairs(chaircolors) do + color = chaircolors[i][1] + name = chaircolors[i][2] + minetest.register_node("homedecor:armchair_"..color, { + description = "Armchair ("..name..")", + tiles = { + "forniture_armchair_top_"..color..".png", + "forniture_armchair_top_"..color..".png", + "forniture_armchair_lat1_"..color..".png", + "forniture_armchair_lat1_"..color..".png", + "forniture_armchair_lat2_"..color..".png", + "forniture_armchair_lat2_"..color..".png", + }, + drawtype = "nodebox", + sunlight_propagates = true, + paramtype = "light", + paramtype2 = "facedir", + node_box = { + type = "fixed", + fixed = { + { -0.50, -0.50, -0.45, -0.30, 0.05, 0.30 }, + { -0.45, -0.50, -0.50, -0.35, 0.05, -0.45 }, + { -0.45, 0.05, -0.45, -0.35, 0.10, 0.15 }, + { 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 }, + { -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) @@ -159,7 +183,8 @@ reg_lamp("max", "off", nil, "x", 14) -- Aliases for 3dforniture mod. minetest.register_alias("3dforniture:table", "homedecor:table") 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('chair', 'homedecor:chair') diff --git a/furniture_recipes.lua b/furniture_recipes.lua index 013dd3b5..3a1098c7 100644 --- a/furniture_recipes.lua +++ b/furniture_recipes.lua @@ -28,15 +28,6 @@ minetest.register_craft({ burntime = 15, }) -minetest.register_craft({ - output = "homedecor:armchair 2", - recipe = { - { "wool:black",""}, - { "default:wood","default:wood" }, - { "wool:black","wool:black" }, - }, -}) - minetest.register_craft({ type = "fuel", recipe = "homedecor:armchair", diff --git a/shutters.lua b/shutters.lua index 8deff28b..f6b2da1d 100644 --- a/shutters.lua +++ b/shutters.lua @@ -142,11 +142,11 @@ minetest.register_node('homedecor:shutter_light_blue', { }, }) -minetest.register_node('homedecor:shutter_purple', { - description = S("Wooden Shutter (Purple)"), - tiles = { 'homedecor_window_shutter_purple.png' }, - inventory_image = 'homedecor_window_shutter_purple.png', - wield_image = 'homedecor_window_shutter_purple.png', +minetest.register_node('homedecor:shutter_violet', { + description = S("Wooden Shutter (Violet)"), + tiles = { 'homedecor_window_shutter_violet.png' }, + inventory_image = 'homedecor_window_shutter_violet.png', + wield_image = 'homedecor_window_shutter_violet.png', drawtype = 'signlike', sunlight_propagates = false, paramtype = "light", @@ -217,3 +217,5 @@ minetest.register_node('homedecor:shutter_yellow', { --wall_side = = }, }) + +minetest.register_alias("homedecor:shutter_purple", "homedecor:shutter_violet") diff --git a/textures/forniture_armchair_lat1.png b/textures/forniture_armchair_lat1.png deleted file mode 100644 index 166ee46a..00000000 Binary files a/textures/forniture_armchair_lat1.png and /dev/null differ diff --git a/textures/forniture_armchair_lat1_black.png b/textures/forniture_armchair_lat1_black.png new file mode 100644 index 00000000..3854e37b Binary files /dev/null and b/textures/forniture_armchair_lat1_black.png differ diff --git a/textures/forniture_armchair_lat1_blue.png b/textures/forniture_armchair_lat1_blue.png new file mode 100644 index 00000000..27199299 Binary files /dev/null and b/textures/forniture_armchair_lat1_blue.png differ diff --git a/textures/forniture_armchair_lat1_dark_green.png b/textures/forniture_armchair_lat1_dark_green.png new file mode 100644 index 00000000..1a0ab2f9 Binary files /dev/null and b/textures/forniture_armchair_lat1_dark_green.png differ diff --git a/textures/forniture_armchair_lat1_pink.png b/textures/forniture_armchair_lat1_pink.png new file mode 100644 index 00000000..fbe4c860 Binary files /dev/null and b/textures/forniture_armchair_lat1_pink.png differ diff --git a/textures/forniture_armchair_lat1_red.png b/textures/forniture_armchair_lat1_red.png new file mode 100644 index 00000000..1537f5b8 Binary files /dev/null and b/textures/forniture_armchair_lat1_red.png differ diff --git a/textures/forniture_armchair_lat1_violet.png b/textures/forniture_armchair_lat1_violet.png new file mode 100644 index 00000000..8a82dbe7 Binary files /dev/null and b/textures/forniture_armchair_lat1_violet.png differ diff --git a/textures/forniture_armchair_lat2.png b/textures/forniture_armchair_lat2.png deleted file mode 100644 index f0853ffa..00000000 Binary files a/textures/forniture_armchair_lat2.png and /dev/null differ diff --git a/textures/forniture_armchair_lat2_black.png b/textures/forniture_armchair_lat2_black.png new file mode 100644 index 00000000..9dae62d8 Binary files /dev/null and b/textures/forniture_armchair_lat2_black.png differ diff --git a/textures/forniture_armchair_lat2_blue.png b/textures/forniture_armchair_lat2_blue.png new file mode 100644 index 00000000..c0e3b58e Binary files /dev/null and b/textures/forniture_armchair_lat2_blue.png differ diff --git a/textures/forniture_armchair_lat2_dark_green.png b/textures/forniture_armchair_lat2_dark_green.png new file mode 100644 index 00000000..68e424c5 Binary files /dev/null and b/textures/forniture_armchair_lat2_dark_green.png differ diff --git a/textures/forniture_armchair_lat2_pink.png b/textures/forniture_armchair_lat2_pink.png new file mode 100644 index 00000000..eacdf609 Binary files /dev/null and b/textures/forniture_armchair_lat2_pink.png differ diff --git a/textures/forniture_armchair_lat2_red.png b/textures/forniture_armchair_lat2_red.png new file mode 100644 index 00000000..becf8732 Binary files /dev/null and b/textures/forniture_armchair_lat2_red.png differ diff --git a/textures/forniture_armchair_lat2_violet.png b/textures/forniture_armchair_lat2_violet.png new file mode 100644 index 00000000..89c6c138 Binary files /dev/null and b/textures/forniture_armchair_lat2_violet.png differ diff --git a/textures/forniture_armchair_top.png b/textures/forniture_armchair_top.png deleted file mode 100644 index 350cf577..00000000 Binary files a/textures/forniture_armchair_top.png and /dev/null differ diff --git a/textures/forniture_armchair_top_black.png b/textures/forniture_armchair_top_black.png new file mode 100644 index 00000000..393d2455 Binary files /dev/null and b/textures/forniture_armchair_top_black.png differ diff --git a/textures/forniture_armchair_top_blue.png b/textures/forniture_armchair_top_blue.png new file mode 100644 index 00000000..5074e209 Binary files /dev/null and b/textures/forniture_armchair_top_blue.png differ diff --git a/textures/forniture_armchair_top_dark_green.png b/textures/forniture_armchair_top_dark_green.png new file mode 100644 index 00000000..ce2e6770 Binary files /dev/null and b/textures/forniture_armchair_top_dark_green.png differ diff --git a/textures/forniture_armchair_top_pink.png b/textures/forniture_armchair_top_pink.png new file mode 100644 index 00000000..6426cef7 Binary files /dev/null and b/textures/forniture_armchair_top_pink.png differ diff --git a/textures/forniture_armchair_top_red.png b/textures/forniture_armchair_top_red.png new file mode 100644 index 00000000..b09ce132 Binary files /dev/null and b/textures/forniture_armchair_top_red.png differ diff --git a/textures/forniture_armchair_top_violet.png b/textures/forniture_armchair_top_violet.png new file mode 100644 index 00000000..1e678cf5 Binary files /dev/null and b/textures/forniture_armchair_top_violet.png differ diff --git a/textures/forniture_wood.png b/textures/forniture_wood.png index a9a9937c..288f1c12 100644 Binary files a/textures/forniture_wood.png and b/textures/forniture_wood.png differ diff --git a/textures/forniture_wood_s1.png b/textures/forniture_wood_s1.png index 5c5be5db..fab2a5b3 100644 Binary files a/textures/forniture_wood_s1.png and b/textures/forniture_wood_s1.png differ diff --git a/textures/forniture_wood_s2.png b/textures/forniture_wood_s2.png index 491026af..206d3dee 100644 Binary files a/textures/forniture_wood_s2.png and b/textures/forniture_wood_s2.png differ diff --git a/textures/homedecor_window_shutter_purple.png b/textures/homedecor_window_shutter_violet.png similarity index 100% rename from textures/homedecor_window_shutter_purple.png rename to textures/homedecor_window_shutter_violet.png