From 65fce91b5c5cd26c945bec2b4073df8664b9a8e4 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Mon, 27 May 2019 15:07:25 -0400 Subject: update digistuff, farming, homedecor, signs_lib, simple streetlights --- homedecor_tables/init.lua | 373 +--------------------------------------------- 1 file changed, 4 insertions(+), 369 deletions(-) (limited to 'homedecor_tables/init.lua') diff --git a/homedecor_tables/init.lua b/homedecor_tables/init.lua index d32b51d..56ae778 100644 --- a/homedecor_tables/init.lua +++ b/homedecor_tables/init.lua @@ -1,371 +1,6 @@ +local modpath = minetest.get_modpath("homedecor_tables") -local S = homedecor.gettext +dofile(modpath.."/misc.lua") +dofile(modpath.."/endtable.lua") +dofile(modpath.."/coffeetable.lua") --- Various kinds of tables - -local materials = { - { "glass", - S("Small square glass table"), - S("Small round glass table"), - S("Large glass table piece"), - }, - { "wood", - S("Small square wooden table"), - S("Small round wooden table"), - S("Large wooden table piece"), - } -} - -local tables_cbox = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, -} - -for i, mat in ipairs(materials) do - local m, small_s, small_r, large = unpack(mat) - local s - - if m == "glass" then - s = default.node_sound_glass_defaults() - else - s = default.node_sound_wood_defaults() - end - --- small square tables - - homedecor.register(m.."_table_small_square", { - description = small_s, - mesh = "homedecor_table_small_square.obj", - tiles = { 'homedecor_'..m..'_table_small_square.png' }, - wield_image = 'homedecor_'..m..'_table_small_square_inv.png', - inventory_image = 'homedecor_'..m..'_table_small_square_inv.png', - groups = { snappy = 3 }, - sounds = s, - selection_box = tables_cbox, - collision_box = tables_cbox, - on_place = minetest.rotate_node - }) - --- small round tables - - homedecor.register(m..'_table_small_round', { - description = small_r, - mesh = "homedecor_table_small_round.obj", - tiles = { "homedecor_"..m.."_table_small_round.png" }, - wield_image = 'homedecor_'..m..'_table_small_round_inv.png', - inventory_image = 'homedecor_'..m..'_table_small_round_inv.png', - groups = { snappy = 3 }, - sounds = s, - selection_box = tables_cbox, - collision_box = tables_cbox, - on_place = minetest.rotate_node - }) - --- Large square table pieces - - homedecor.register(m..'_table_large', { - description = large, - tiles = { - 'homedecor_'..m..'_table_large_tb.png', - 'homedecor_'..m..'_table_large_tb.png', - 'homedecor_'..m..'_table_large_edges.png', - 'homedecor_'..m..'_table_large_edges.png', - 'homedecor_'..m..'_table_large_edges.png', - 'homedecor_'..m..'_table_large_edges.png' - }, - wield_image = 'homedecor_'..m..'_table_large_inv.png', - inventory_image = 'homedecor_'..m..'_table_large_inv.png', - groups = { snappy = 3 }, - sounds = s, - node_box = { - type = "fixed", - fixed = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, - }, - selection_box = tables_cbox, - on_place = minetest.rotate_node - }) - - minetest.register_alias('homedecor:'..m..'_table_large_b', 'homedecor:'..m..'_table_large') - minetest.register_alias('homedecor:'..m..'_table_small_square_b', 'homedecor:'..m..'_table_small_square') - minetest.register_alias('homedecor:'..m..'_table_small_round_b', 'homedecor:'..m..'_table_small_round') - -end - --- conversion routines for old non-6dfacedir tables - -local tlist_s = {} -local tlist_t = {} -local dirs2 = { 9, 18, 7, 12 } - -for i in ipairs(materials) do - local m = materials[i][1] - table.insert(tlist_s, "homedecor:"..m.."_table_large_s") - table.insert(tlist_s, "homedecor:"..m.."_table_small_square_s") - table.insert(tlist_s, "homedecor:"..m.."_table_small_round_s") - - table.insert(tlist_t, "homedecor:"..m.."_table_large_t") - table.insert(tlist_t, "homedecor:"..m.."_table_small_square_t") - table.insert(tlist_t, "homedecor:"..m.."_table_small_round_t") -end - -minetest.register_abm({ - nodenames = tlist_s, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local newnode = string.sub(node.name, 1, -3) -- strip the "_s" from the name - local fdir = node.param2 or 0 - minetest.set_node(pos, {name = newnode, param2 = dirs2[fdir+1]}) - end -}) - -minetest.register_abm({ - nodenames = tlist_t, - interval = 1, - chance = 1, - action = function(pos, node, active_object_count, active_object_count_wider) - local newnode = string.sub(node.name, 1, -3) -- strip the "_t" from the name - minetest.set_node(pos, { name = newnode, param2 = 20 }) - end -}) - --- other tables - -homedecor.register("utility_table_top", { - description = S("Utility Table"), - tiles = { - 'homedecor_utility_table_tb.png', - 'homedecor_utility_table_tb.png', - 'homedecor_utility_table_edges.png', - 'homedecor_utility_table_edges.png', - 'homedecor_utility_table_edges.png', - 'homedecor_utility_table_edges.png' - }, - wield_image = 'homedecor_utility_table_tb.png', - inventory_image = 'homedecor_utility_table_tb.png', - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - paramtype2 = "wallmounted", - node_box = { - type = "wallmounted", - wall_bottom = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, - wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, - wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 }, - }, - selection_box = { - type = "wallmounted", - wall_bottom = { -0.5, -0.5, -0.5, 0.5, -0.4375, 0.5 }, - wall_top = { -0.5, 0.4375, -0.5, 0.5, 0.5, 0.5 }, - wall_side = { -0.5, -0.5, -0.5, -0.4375, 0.5, 0.5 }, - }, -}) - --- Various kinds of table legs - --- local above -materials = { - { "brass", S("brass") }, - { "wrought_iron", S("wrought iron") }, -} - -for _, t in ipairs(materials) do -local name, desc = unpack(t) -homedecor.register("table_legs_"..name, { - description = S("Table Legs (@1)", desc), - drawtype = "plantlike", - tiles = {"homedecor_table_legs_"..name..".png"}, - inventory_image = "homedecor_table_legs_"..name..".png", - wield_image = "homedecor_table_legs_"..name..".png", - walkable = false, - groups = {snappy=3}, - sounds = default.node_sound_wood_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 } - }, -}) -end - -homedecor.register("utility_table_legs", { - description = S("Legs for Utility Table"), - drawtype = "plantlike", - tiles = { 'homedecor_utility_table_legs.png' }, - inventory_image = 'homedecor_utility_table_legs_inv.png', - wield_image = 'homedecor_utility_table_legs.png', - walkable = false, - groups = { snappy = 3 }, - sounds = default.node_sound_wood_defaults(), - selection_box = { - type = "fixed", - fixed = { -0.37, -0.5, -0.37, 0.37, 0.5, 0.37 } - }, -}) - --- crafting - - -minetest.register_craft( { - output = "homedecor:glass_table_small_round_b 15", - recipe = { - { "", "default:glass", "" }, - { "default:glass", "default:glass", "default:glass" }, - { "", "default:glass", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:glass_table_small_square_b 2", - recipe = { - {"homedecor:glass_table_small_round", "homedecor:glass_table_small_round" }, - } -}) - -minetest.register_craft( { - output = "homedecor:glass_table_large_b 2", - recipe = { - { "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }, - } -}) - --- - -minetest.register_craft( { - output = "homedecor:wood_table_small_round_b 15", - recipe = { - { "", "group:wood", "" }, - { "group:wood", "group:wood", "group:wood" }, - { "", "group:wood", "" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:wood_table_small_square_b 2", - recipe = { - { "homedecor:wood_table_small_round","homedecor:wood_table_small_round" }, - } -}) - -minetest.register_craft( { - output = "homedecor:wood_table_large_b 2", - recipe = { - { "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }, - } -}) - --- - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:wood_table_small_round_b", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:wood_table_small_square_b", - burntime = 30, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:wood_table_large_b", - burntime = 30, -}) - - -minetest.register_craft( { - output = "homedecor:table_legs_wrought_iron 3", - recipe = { - { "", "default:iron_lump", "" }, - { "", "default:iron_lump", "" }, - { "default:iron_lump", "default:iron_lump", "default:iron_lump" }, - }, -}) - -minetest.register_craft( { - output = "homedecor:table_legs_brass 3", - recipe = { - { "", "basic_materials:brass_ingot", "" }, - { "", "basic_materials:brass_ingot", "" }, - { "basic_materials:brass_ingot", "basic_materials:brass_ingot", "basic_materials:brass_ingot" } - }, -}) - -minetest.register_craft( { - output = "homedecor:utility_table_legs", - recipe = { - { "group:stick", "group:stick", "group:stick" }, - { "group:stick", "", "group:stick" }, - { "group:stick", "", "group:stick" }, - }, -}) - -minetest.register_craft({ - type = "fuel", - recipe = "homedecor:utility_table_legs", - burntime = 30, -}) - - - --- recycling - -minetest.register_craft({ - type = "shapeless", - output = "vessels:glass_fragments", - recipe = { - "homedecor:glass_table_small_round", - "homedecor:glass_table_small_round", - "homedecor:glass_table_small_round" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "vessels:glass_fragments", - recipe = { - "homedecor:glass_table_small_square", - "homedecor:glass_table_small_square", - "homedecor:glass_table_small_square" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "vessels:glass_fragments", - recipe = { - "homedecor:glass_table_large", - "homedecor:glass_table_large", - "homedecor:glass_table_large" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "default:stick 4", - recipe = { - "homedecor:wood_table_small_round", - "homedecor:wood_table_small_round", - "homedecor:wood_table_small_round" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "default:stick 4", - recipe = { - "homedecor:wood_table_small_square", - "homedecor:wood_table_small_square", - "homedecor:wood_table_small_square" - } -}) - -minetest.register_craft({ - type = "shapeless", - output = "default:stick 4", - recipe = { - "homedecor:wood_table_large", - "homedecor:wood_table_large", - "homedecor:wood_table_large" - } -}) -- cgit v1.2.3