X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=nodes.lua;h=32e21d2d940be38cb085e8a887d6b35816b36d4b;hb=f1b7d8f107b0b52b608da4a7f827f0d147e9245c;hp=799f4ea6e26f63b8eceb4648ad1cc7d418ba11e0;hpb=d08db7dda39679e4e737b030a8423ef1c84eab01;p=xdecor.git diff --git a/nodes.lua b/nodes.lua index 799f4ea..32e21d2 100644 --- a/nodes.lua +++ b/nodes.lua @@ -1,52 +1,48 @@ screwdriver = screwdriver or {} -local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots - -local function sit(pos, node, clicker) - local player = clicker:get_player_name() - if default.player_attached[player] == true then - pos.y = pos.y - 0.5 - clicker:setpos(pos) - clicker:set_eye_offset({x=0, y=0, z=0}, {x=0, y=0, z=0}) - clicker:set_physics_override(1, 1, 1) - default.player_attached[player] = false - default.player_set_animation(clicker, "stand", 30) - elseif default.player_attached[player] ~= true and - clicker:get_player_velocity().x == 0 and - clicker:get_player_velocity().y == 0 and - clicker:get_player_velocity().z == 0 and node.param2 <= 3 then - - clicker:set_eye_offset({x=0, y=-7, z=2}, {x=0, y=0, z=0}) - clicker:set_physics_override(0, 0, 0) - clicker:setpos(pos) - default.player_attached[player] = true - default.player_set_animation(clicker, "sit", 30) - - if node.param2 == 0 then - clicker:set_look_yaw(3.15) - elseif node.param2 == 1 then - clicker:set_look_yaw(7.9) - elseif node.param2 == 2 then - clicker:set_look_yaw(6.28) - elseif node.param2 == 3 then - clicker:set_look_yaw(4.75) - end - end + +function xdecor.register_pane(name, desc, def) + xpanes.register_pane(name, { + description = desc, + tiles = {"xdecor_"..name..".png"}, + drawtype = "airlike", + paramtype = "light", + textures = {"xdecor_"..name..".png", "xdecor_"..name..".png", "xpanes_space.png"}, + inventory_image = "xdecor_"..name..".png", + wield_image = "xdecor_"..name..".png", + groups = def.groups, + sounds = def.sounds or default.node_sound_defaults(), + recipe = def.recipe + }) end -xpanes.register_pane("bamboo_frame", { - description = "Bamboo Frame", - tiles = {"xdecor_bamboo_frame.png"}, - drawtype = "airlike", - paramtype = "light", - textures = {"xdecor_bamboo_frame.png", "xdecor_bamboo_frame.png", "xpanes_space.png"}, - inventory_image = "xdecor_bamboo_frame.png", - wield_image = "xdecor_bamboo_frame.png", +xdecor.register_pane("bamboo_frame", "Bamboo Frame", { groups = {choppy=3, oddly_breakable_by_hand=2, pane=1, flammable=2}, - recipe = { - {"default:papyrus", "default:papyrus", "default:papyrus"}, - {"default:papyrus", "farming:cotton", "default:papyrus"}, - {"default:papyrus", "default:papyrus", "default:papyrus"} - } + recipe = {{"default:papyrus", "default:papyrus", "default:papyrus"}, + {"default:papyrus", "farming:cotton", "default:papyrus"}, + {"default:papyrus", "default:papyrus", "default:papyrus"}} +}) + +xdecor.register_pane("chainlink", "Chainlink", { + groups = {cracky=3, oddly_breakable_by_hand=2, pane=1}, + recipe = {{"default:steel_ingot", "", "default:steel_ingot"}, + {"", "default:steel_ingot", ""}, + {"default:steel_ingot", "", "default:steel_ingot"}} +}) + +xdecor.register_pane("rusty_bar", "Rusty Iron Bars", { + sounds = default.node_sound_stone_defaults(), + groups = {cracky=2, pane=1}, + recipe = {{"", "default:dirt", ""}, + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}} +}) + +xdecor.register_pane("wood_frame", "Wood Frame", { + sounds = default.node_sound_wood_defaults(), + groups = {choppy=2, pane=1, flammable=2}, + recipe = {{"group:wood", "group:stick", "group:wood"}, + {"group:stick", "group:stick", "group:stick"}, + {"group:wood", "group:stick", "group:wood"}} }) xdecor.register("baricade", { @@ -55,46 +51,54 @@ xdecor.register("baricade", { walkable = false, inventory_image = "xdecor_baricade.png", tiles = {"xdecor_baricade.png"}, - groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, + groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2}, damage_per_second = 4, selection_box = xdecor.nodebox.slab_y(0.3) }) -xdecor.register("barrel", { - description = "Barrel", - inventory = {size=24}, - infotext = "Barrel", +function xdecor.register_storage(name, desc, def) + xdecor.register(name, { + description = desc, + inventory = {size=def.inv_size or 24}, + infotext = desc, + tiles = def.tiles, + node_box = def.node_box, + on_rotate = def.on_rotate, + on_place = def.on_place, + groups = def.groups or {choppy=2, oddly_breakable_by_hand=1, flammable=2}, + sounds = default.node_sound_wood_defaults() + }) +end + +xdecor.register_storage("barrel", "Barrel", { tiles = {"xdecor_barrel_top.png", "xdecor_barrel_sides.png"}, - groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, - sounds = default.node_sound_wood_defaults() + on_place = minetest.rotate_node }) -xdecor.register("cabinet", { - description = "Wood Cabinet", - inventory = {size=24}, - infotext = "Wood Cabinet", - groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, - sounds = default.node_sound_wood_defaults(), +xdecor.register_storage("cabinet", "Wooden Cabinet", { on_rotate = screwdriver.rotate_simple, - tiles = { - "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", - "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", - "xdecor_cabinet_sides.png", "xdecor_cabinet_front.png" - } + tiles = {"xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", + "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", + "xdecor_cabinet_sides.png", "xdecor_cabinet_front.png"} }) -xdecor.register("cabinet_half", { - description = "Half Wood Cabinet", - inventory = {size=8}, - infotext = "Half Wood Cabinet", - groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, - sounds = default.node_sound_wood_defaults(), +xdecor.register_storage("cabinet_half", "Half Wooden Cabinet", { + inv_size = 8, node_box = xdecor.nodebox.slab_y(0.5, 0.5), - tiles = { - "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", - "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_sides.png", - "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_front.png" - } + on_rotate = screwdriver.rotate_simple, + tiles = {"xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", + "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_sides.png", + "xdecor_half_cabinet_sides.png", "xdecor_half_cabinet_front.png"} +}) + +xdecor.register_storage("empty_shelf", "Empty Shelf", { + on_rotate = screwdriver.rotate_simple, + tiles = {"default_wood.png", "default_wood.png^xdecor_empty_shelf.png"} +}) + +xdecor.register_storage("multishelf", "Multi Shelf", { + on_rotate = screwdriver.rotate_simple, + tiles = {"default_wood.png", "default_wood.png^xdecor_multishelf.png"}, }) xdecor.register("candle", { @@ -104,76 +108,38 @@ xdecor.register("candle", { inventory_image = "xdecor_candle_inv.png", wield_image = "xdecor_candle_wield.png", paramtype2 = "wallmounted", - legacy_wallmounted = true, walkable = false, groups = {dig_immediate=3, attached_node=1}, - tiles = { - { name = "xdecor_candle_floor.png", - animation = {type="vertical_frames", length=1.5} }, - { name = "xdecor_candle_ceiling.png", - animation = {type="vertical_frames", length=1.5} }, - { name = "xdecor_candle_wall.png", - animation = {type="vertical_frames", length=1.5} } + tiles = {{name = "xdecor_candle_floor.png", + animation = {type="vertical_frames", length=1.5}}, + {name = "xdecor_candle_floor.png", + animation = {type="vertical_frames", length=1.5}}, + {name = "xdecor_candle_wall.png", + animation = {type="vertical_frames", length=1.5}} }, selection_box = { type = "wallmounted", - wall_top = {-0.3, -0.4, -0.3, 0.3, 0.5, 0.3}, + wall_top = {-0.25, -0.5, -0.25, 0.25, 0.1, 0.25}, wall_bottom = {-0.25, -0.5, -0.25, 0.25, 0.1, 0.25}, wall_side = {-0.5, -0.35, -0.15, -0.15, 0.4, 0.15} } }) -xpanes.register_pane("chainlink", { - description = "Chain Link", - tiles = {"xdecor_chainlink.png"}, - drawtype = "airlike", - paramtype = "light", - textures = {"xdecor_chainlink.png", "xdecor_chainlink.png", "xpanes_space.png"}, - inventory_image = "xdecor_chainlink.png", - wield_image = "xdecor_chainlink.png", - groups = {cracky=3, oddly_breakable_by_hand=2, pane=1}, - recipe = { - {"default:steel_ingot", "", "default:steel_ingot"}, - {"", "default:steel_ingot", ""}, - {"default:steel_ingot", "", "default:steel_ingot"} - } -}) - xdecor.register("chair", { description = "Chair", tiles = {"xdecor_wood.png"}, sounds = default.node_sound_wood_defaults(), - groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2}, on_rotate = screwdriver.rotate_simple, - node_box = { - type = "fixed", - fixed = {{-0.3125, -0.5, 0.1875, -0.1875, 0.5, 0.3125}, - {0.1875, -0.5, 0.1875, 0.3125, 0.5, 0.3125}, - {-0.1875, 0.025, 0.22, 0.1875, 0.45, 0.28}, - {-0.3125, -0.5, -0.3125, -0.1875, -0.125, -0.1875}, - {0.1875, -0.5, -0.3125, 0.3125, -0.125, -0.1875}, - {-0.3125, -0.125, -0.3125, 0.3125, 0, 0.1875}} - }, - on_rightclick = function(pos, node, clicker) - local objs = minetest.get_objects_inside_radius(pos, 0.5) - for _, p in pairs(objs) do - if p:get_player_name() ~= clicker:get_player_name() then return end - end - pos.y = pos.y + 0 - sit(pos, node, clicker) - end, - can_dig = function(pos, player) - local pname = player:get_player_name() - local objs = minetest.get_objects_inside_radius(pos, 0.5) - - for _, p in pairs(objs) do - if p:get_player_name() ~= nil or - default.player_attached[pname] == true or not - player or not player:is_player() then - return false - end - end - return true + node_box = xdecor.pixelbox(16, { + {3, 0, 11, 2, 16, 2}, {11, 0, 11, 2, 16, 2}, + {5, 9, 11.5, 6, 6, 1}, {3, 0, 3, 2, 6, 2}, + {11, 0, 3, 2, 6, 2}, {3, 6, 3, 10, 2, 8} + }), + can_dig = xdecor.sit_dig, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + pos.y = pos.y + 0 -- Sitting position. + xdecor.sit(pos, node, clicker, pointed_thing) end }) @@ -194,9 +160,7 @@ xdecor.register("cobweb", { sounds = default.node_sound_leaves_defaults() }) -local colors = {"red"} -- Add more curtains colors simply here. - -for _, c in pairs(colors) do +for _, c in pairs({"red"}) do -- Add more curtains colors simply here. xdecor.register("curtain_"..c, { description = c:gsub("^%l", string.upper).." Curtain", walkable = false, @@ -207,7 +171,7 @@ for _, c in pairs(colors) do paramtype2 = "wallmounted", groups = {dig_immediate=3, flammable=3}, selection_box = {type="wallmounted"}, - on_rightclick = function(pos, node, _, _) + on_rightclick = function(pos, node) minetest.set_node(pos, {name="xdecor:curtain_open_"..c, param2=node.param2}) end }) @@ -220,107 +184,89 @@ for _, c in pairs(colors) do groups = {dig_immediate=3, flammable=3, not_in_creative_inventory=1}, selection_box = {type="wallmounted"}, drop = "xdecor:curtain_"..c, - on_rightclick = function(pos, node, _, _) + on_rightclick = function(pos, node) minetest.set_node(pos, {name="xdecor:curtain_"..c, param2=node.param2}) end }) minetest.register_craft({ output = "xdecor:curtain_"..c.." 4", - recipe = { - {"", "wool:"..c, ""}, - {"", "wool:"..c, ""} - } + recipe = { {"", "wool:"..c, ""}, + {"", "wool:"..c, ""} } }) end -xdecor.register("crate", { - description = "Crate", - inventory = {size=24}, - infotext = "Crate", - tiles = {"xdecor_crate.png"}, - groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, - sounds = default.node_sound_wood_defaults() -}) - xdecor.register("cushion", { description = "Cushion", tiles = {"xdecor_cushion.png"}, groups = {snappy=3, flammable=3, fall_damage_add_percent=-50}, on_place = minetest.rotate_node, - node_box = xdecor.nodebox.slab_y(-0.5, 0.5), - on_rightclick = function(pos, node, clicker) - local objs = minetest.get_objects_inside_radius(pos, 0.5) - for _, p in pairs(objs) do - if p:get_player_name() ~= clicker:get_player_name() then return end - end - pos.y = pos.y + 0 - sit(pos, node, clicker) - end, - can_dig = function(pos, player) - local pname = player:get_player_name() - local objs = minetest.get_objects_inside_radius(pos, 0.5) - - for _, p in pairs(objs) do - if p:get_player_name() ~= nil or - default.player_attached[pname] == true or not - player or not player:is_player() then - return false - end - end - return true - end + node_box = xdecor.nodebox.slab_y(0.5), + can_dig = xdecor.sit_dig }) -local function door_access(door) - return door:find("prison") -end +xdecor.register("cushion_block", { + description = "Cushion Block", + tiles = {"xdecor_cushion.png"}, + groups = {snappy=3, flammable=3, fall_damage_add_percent=-75, not_in_creative_inventory=1} +}) -local door_types = { - {"japanese", "brown"}, {"prison", "grey"}, {"prison_rust", "rust"}, - {"screen", "brownb"}, {"slide", "brownc"}, {"woodglass", "brown"} +local function door_access(name) return name:find("prison") end +local xdecor_doors = { + japanese = { + {"group:wood", "default:paper"}, + {"default:paper", "group:wood"}, + {"group:wood", "default:paper"} }, + prison = { + {"xpanes:bar", "xpanes:bar"}, + {"xpanes:bar", "xpanes:bar"}, + {"xpanes:bar", "xpanes:bar"} }, + rusty_prison = { + {"xpanes:rusty_bar", "xpanes:rusty_bar"}, + {"xpanes:rusty_bar", "xpanes:rusty_bar"}, + {"xpanes:rusty_bar", "xpanes:rusty_bar"} }, + screen = { + {"group:wood", "group:wood"}, + {"xpanes:chainlink", "xpanes:chainlink"}, + {"group:wood", "group:wood"} }, + slide = { + {"default:paper", "default:paper"}, + {"default:paper", "default:paper"}, + {"group:wood", "group:wood"} }, + woodglass = { + {"default:glass", "default:glass"}, + {"group:wood", "group:wood"}, + {"group:wood", "group:wood"} } } -for _, d in pairs(door_types) do - doors.register_door("xdecor:"..d[1].."_door", { - description = string.gsub(d[1]:gsub("^%l", string.upper), "_r", " R").." Door", - inventory_image = "xdecor_"..d[1].."_door_inv.png", - groups = {choppy=3, cracky=3, oddly_breakable_by_hand=1, flammable=2, door=1}, - tiles_bottom = {"xdecor_"..d[1].."_door_b.png", "xdecor_"..d[2]..".png"}, - tiles_top = {"xdecor_"..d[1].."_door_a.png", "xdecor_"..d[2]..".png"}, - only_placer_can_open = door_access(d[1]), - sounds = default.node_sound_wood_defaults(), - sunlight = false +for name, recipe in pairs(xdecor_doors) do + if not doors.register then break end + doors.register(name.."_door", { + tiles = {{name = "xdecor_"..name.."_door.png", backface_culling=true}}, + description = name:gsub("%f[%w]%l", string.upper):gsub("_", " ").." Door", + inventory_image = "xdecor_"..name.."_door_inv.png", + protected = door_access(name), + groups = {choppy=2, cracky=2, oddly_breakable_by_hand=1, door=1}, + recipe = recipe }) end -xdecor.register("empty_shelf", { - description = "Empty Shelf", - inventory = {size=24}, - infotext = "Empty Shelf", - tiles = {"default_wood.png", "default_wood.png^xdecor_empty_shelf.png"}, - groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, - sounds = default.node_sound_wood_defaults(), - on_rotate = screwdriver.rotate_simple -}) - xdecor.register("enderchest", { description = "Ender Chest", - tiles = { - "xdecor_enderchest_top.png", "xdecor_enderchest_top.png", - "xdecor_enderchest_side.png", "xdecor_enderchest_side.png", - "xdecor_enderchest_side.png", "xdecor_enderchest_front.png" - }, - groups = {cracky=1, choppy=1, oddly_breakable_by_hand=1}, + tiles = {"xdecor_enderchest_top.png", "xdecor_enderchest_top.png", + "xdecor_enderchest_side.png", "xdecor_enderchest_side.png", + "xdecor_enderchest_side.png", "xdecor_enderchest_front.png"}, + groups = {cracky=1, choppy=1}, sounds = default.node_sound_stone_defaults(), on_rotate = screwdriver.rotate_simple, on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("formspec", "size[8,9]"..xbg..default.get_hotbar_bg(0,5).. - "list[current_player;enderchest;0,0;8,4;]".. - "list[current_player;main;0,5;8,4;]".. - "listring[current_player;enderchest]".. - "listring[current_player;main]") + meta:set_string("formspec", [[ size[8,9] + list[current_player;enderchest;0,0;8,4;] + list[current_player;main;0,5;8,4;] + listring[current_player;enderchest] + listring[current_player;main] ]] + ..xbg..default.get_hotbar_bg(0,5)) meta:set_string("infotext", "Ender Chest") end }) @@ -330,52 +276,6 @@ minetest.register_on_joinplayer(function(player) inv:set_size("enderchest", 8*4) end) -xdecor.register("fire", { - description = "Fancy Fire", - drawtype = "plantlike", - light_source = 14, - walkable = false, - tiles = { - { name = "xdecor_fire_anim.png", - animation = {type="vertical_frames", length=1.5} } - }, - damage_per_second = 4, - drop = "", - selection_box = { - type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, -0.3, 0.3} - }, - groups = {dig_immediate=3, hot=3, not_in_creative_inventory=1} -}) - -minetest.register_tool("xdecor:flint_steel", { - description = "Flint & Steel", - inventory_image = "xdecor_flint_steel.png", - tool_capabilities = { - groupcaps = { igniter = {uses=10, maxlevel=1} } - }, - on_use = function(itemstack, user, pointed_thing) - local player = user:get_player_name() - if pointed_thing.type == "node" and - minetest.get_node(pointed_thing.above).name == "air" then - if not minetest.is_protected(pointed_thing.above, player) then - minetest.set_node(pointed_thing.above, {name="xdecor:fire"}) - else - minetest.chat_send_player(player, "This area is protected.") - end - end - - itemstack:add_wear(1000) - return itemstack - end -}) - -minetest.register_tool("xdecor:hammer", { - description = "Hammer", - inventory_image = "xdecor_hammer.png", - wield_image = "xdecor_hammer.png", - on_use = function(...) do return end end -}) - xdecor.register("ivy", { description = "Ivy", drawtype = "signlike", @@ -384,7 +284,6 @@ xdecor.register("ivy", { groups = {dig_immediate=3, flammable=3, plant=1}, paramtype2 = "wallmounted", selection_box = {type="wallmounted"}, - legacy_wallmounted = true, tiles = {"xdecor_ivy.png"}, inventory_image = "xdecor_ivy.png", wield_image = "xdecor_ivy.png", @@ -393,46 +292,31 @@ xdecor.register("ivy", { xdecor.register("lantern", { description = "Lantern", - light_source = 12, - drawtype = "torchlike", - inventory_image = "xdecor_lantern_floor.png", - wield_image = "xdecor_lantern_floor.png", + light_source = 13, + drawtype = "plantlike", + inventory_image = "xdecor_lantern_inv.png", + wield_image = "xdecor_lantern_inv.png", paramtype2 = "wallmounted", - legacy_wallmounted = true, walkable = false, groups = {dig_immediate=3, attached_node=1}, - tiles = {"xdecor_lantern_floor.png", "xdecor_lantern_ceiling.png", - "xdecor_lantern.png"}, - selection_box = { - type = "wallmounted", - wall_top = {-0.25, -0.4, -0.25, 0.25, 0.5, 0.25}, - wall_bottom = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}, - wall_side = {-0.5, -0.5, -0.15, 0.5, 0.5, 0.15} - } + tiles = {{name = "xdecor_lantern.png", animation = {type="vertical_frames", length=1.5}}}, + selection_box = xdecor.pixelbox(16, {{4, 0, 4, 8, 16, 8}}) }) -xdecor.register("lightbox", { - description = "Light Box", - tiles = {"xdecor_lightbox.png"}, - groups = {cracky=3, choppy=3, oddly_breakable_by_hand=2}, - light_source = 13, - sounds = default.node_sound_glass_defaults() -}) - -xdecor.register("packed_ice", { - drawtype = "normal", - description = "Packed Ice", - tiles = {"xdecor_packed_ice.png"}, - groups = {cracky=1, puts_out_fire=1}, - sounds = default.node_sound_glass_defaults() -}) - -local flowers = {"dandelion_white", "dandelion_yellow", "geranium", - "rose", "tulip", "viola"} +for _, l in pairs({"iron", "wooden"}) do + xdecor.register(l.."_lightbox", { + description = l:gsub("^%l", string.upper).." Light Box", + tiles = {"xdecor_"..l.."_lightbox.png"}, + groups = {cracky=3, choppy=3, oddly_breakable_by_hand=2}, + light_source = 13, + sounds = default.node_sound_glass_defaults() + }) +end -for _, f in pairs(flowers) do +for _, f in pairs({"dandelion_white", "dandelion_yellow", "geranium", + "rose", "tulip", "viola"}) do xdecor.register("potted_"..f, { - description = string.gsub("Potted Flowers ("..f..")", "_", " "), + description = "Potted "..f:gsub("%f[%w]%l", string.upper):gsub("_", " "), walkable = false, groups = {dig_immediate=3, flammable=3, plant=1, flower=1}, tiles = {"xdecor_"..f.."_pot.png"}, @@ -444,90 +328,49 @@ for _, f in pairs(flowers) do minetest.register_craft({ output = "xdecor:potted_"..f, - recipe = { - {"default:clay_brick", "flowers:"..f, "default:clay_brick"}, - {"", "default:clay_brick", ""} - } + recipe = { {"default:clay_brick", "flowers:"..f, "default:clay_brick"}, + {"", "default:clay_brick", ""} } }) end +local painting_box = { + type = "wallmounted", + wall_top = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125}, + wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125}, + wall_side = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375} +} + xdecor.register("painting_1", { description = "Painting", - drawtype = "signlike", tiles = {"xdecor_painting_1.png"}, - inventory_image = "xdecor_painting_1.png", + inventory_image = "xdecor_painting_empty.png", + wield_image = "xdecor_painting_empty.png", paramtype2 = "wallmounted", - legacy_wallmounted = true, - walkable = false, - on_rotate = screwdriver.rotate_simple, wield_image = "xdecor_painting_empty.png", - selection_box = {type="wallmounted"}, - groups = {dig_immediate=3, flammable=3, attached_node=1}, - after_place_node = function(pos, _, _, _) + sunlight_propagates = true, + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2, attached_node=1}, + sounds = default.node_sound_wood_defaults(), + node_box = painting_box, + on_construct = function(pos) local node = minetest.get_node(pos) - minetest.set_node(pos, {name="xdecor:painting_"..math.random(1,4), param2=node.param2}) + local random = math.random(4) + if random == 1 then return end + minetest.set_node(pos, {name="xdecor:painting_"..random, param2=node.param2}) end }) -minetest.register_alias("xdecor:painting", "xdecor:painting_1") - for i = 2, 4 do xdecor.register("painting_"..i, { - drawtype = "signlike", tiles = {"xdecor_painting_"..i..".png"}, paramtype2 = "wallmounted", - legacy_wallmounted = true, - walkable = false, - on_rotate = screwdriver.rotate_simple, drop = "xdecor:painting_1", - selection_box = {type="wallmounted"}, - groups = {dig_immediate=3, flammable=3, attached_node=1, not_in_creative_inventory=1} - }) -end - -for _, b in pairs({{"cactus", "cactus"}, {"moon", "stone"}}) do - xdecor.register(b[1].."brick", { - drawtype = "normal", - description = b[1]:gsub("^%l", string.upper).." Brick", - tiles = {"xdecor_"..b[1].."brick.png"}, - groups = {cracky=2}, - sounds = default.node_sound_stone_defaults(), + sunlight_propagates = true, + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=2, attached_node=1, not_in_creative_inventory=1}, + sounds = default.node_sound_wood_defaults(), + node_box = painting_box }) - - minetest.register_craft({ - output = "xdecor:"..b[1].."brick", - recipe = { - {"default:brick", "default:"..b[2]} - } -}) end -xdecor.register("multishelf", { - description = "Multi Shelf", - inventory = {size=24}, - infotext = "Multi Shelf", - on_rotate = screwdriver.rotate_simple, - tiles = {"default_wood.png", "default_wood.png^xdecor_multishelf.png"}, - groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, - sounds = default.node_sound_wood_defaults() -}) - -xpanes.register_pane("rust_bar", { - description = "Rust Bars", - tiles = {"xdecor_rust_bars.png"}, - drawtype = "airlike", - paramtype = "light", - textures = {"xdecor_rust_bars.png", "xdecor_rust_bars.png", "xpanes_space.png"}, - inventory_image = "xdecor_rust_bars.png", - wield_image = "xdecor_rust_bars.png", - groups = {cracky=3, oddly_breakable_by_hand=2, pane=1}, - recipe = { - {"", "default:dirt", ""}, - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"} - } -}) - xdecor.register("stonepath", { description = "Garden Stone Path", tiles = {"default_stone.png"}, @@ -535,40 +378,46 @@ xdecor.register("stonepath", { on_rotate = screwdriver.rotate_simple, sounds = default.node_sound_stone_defaults(), sunlight_propagates = true, - node_box = { - type = "fixed", - fixed = {{0, -0.5, 0, 0.375, -0.47, 0.375}, - {-0.4375, -0.5, -0.4375, -0.0625, -0.47, -0.0625}, - {-0.4375, -0.5, 0.125, -0.125, -0.47, 0.4375}, - {0.125, -0.5, -0.375, 0.375, -0.47, -0.125}} - }, + node_box = xdecor.pixelbox(16, { + {8, 0, 8, 6, .5, 6}, {1, 0, 1, 6, .5, 6}, + {1, 0, 10, 5, .5, 5}, {10, 0, 2, 4, .5, 4} + }), selection_box = xdecor.nodebox.slab_y(0.05) }) -local stonish = {"desertstone_tile", "stone_tile", "stone_rune", - "coalstone_tile", "hard_clay"} - -for _, t in pairs(stonish) do - xdecor.register(t, { - drawtype = "normal", - description = string.sub(t:gsub("^%l", string.upper), 1, -6) - .." "..t:sub(-4):gsub("^%l", string.upper), - tiles = {"xdecor_"..t..".png"}, - groups = {cracky=1}, - sounds = default.node_sound_stone_defaults() +function xdecor.register_hard_node(name, desc, def) + xdecor.register(name, { + description = desc, + tiles = {"xdecor_"..name..".png"}, + groups = def.groups or {cracky=1}, + sounds = def.sounds or default.node_sound_stone_defaults() }) end +xdecor.register_hard_node("cactusbrick", "Cactus Brick", {}) +xdecor.register_hard_node("coalstone_tile", "Coal Stone Tile", {}) +xdecor.register_hard_node("desertstone_tile", "Desert Stone Tile", {}) +xdecor.register_hard_node("hard_clay", "Hardened Clay", {}) +xdecor.register_hard_node("moonbrick", "Moon Brick", {}) +xdecor.register_hard_node("stone_tile", "Stone Tile", {}) +xdecor.register_hard_node("stone_rune", "Runestone", {}) +xdecor.register_hard_node("packed_ice", "Packed Ice", { + groups = {cracky=1, puts_out_fire=1}, + sounds = default.node_sound_glass_defaults() +}) +xdecor.register_hard_node("wood_tile", "Wooden Tile", { + groups = {choppy=1, wood=1, flammable=2}, + sounds = default.node_sound_wood_defaults() +}) + xdecor.register("table", { description = "Table", tiles = {"xdecor_wood.png"}, - groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, + groups = {choppy=2, oddly_breakable_by_hand=1, flammable=2}, sounds = default.node_sound_wood_defaults(), - node_box = { - type = "fixed", - fixed = {{-0.5, 0.4, -0.5, 0.5, 0.5, 0.5}, - {-0.15, -0.5, -0.15, 0.15, 0.4, 0.15}} - } + node_box = xdecor.pixelbox(16, { + {0, 14, 0, 16, 2, 16}, {5.5, 0, 5.5, 5, 14, 6} + }) }) xdecor.register("tatami", { @@ -576,9 +425,14 @@ xdecor.register("tatami", { tiles = {"xdecor_tatami.png"}, wield_image = "xdecor_tatami.png", groups = {snappy=3, flammable=3}, - node_box = { - type = "fixed", fixed = {{-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5}} - } + node_box = xdecor.nodebox.slab_y(0.0625) +}) + +xdecor.register("trampoline", { + description = "Trampoline", + tiles = {"xdecor_trampoline.png", "xdecor_trampoline_sides.png"}, + groups = {snappy=3, flammable=3, fall_damage_add_percent=-80, bouncy=90}, + node_box = xdecor.nodebox.slab_y(0.5) }) xdecor.register("tv", { @@ -586,45 +440,19 @@ xdecor.register("tv", { light_source = 11, groups = {snappy=3}, on_rotate = screwdriver.rotate_simple, - tiles = { - "xdecor_television_left.png^[transformR270", - "xdecor_television_left.png^[transformR90", - "xdecor_television_left.png^[transformFX", - "xdecor_television_left.png", "xdecor_television_back.png", - { name = "xdecor_television_front_animated.png", - animation = {type="vertical_frames", length=80.0} } - } -}) - -xpanes.register_pane("wood_frame", { - description = "Wood Frame", - tiles = {"xdecor_wood_frame.png"}, - drawtype = "airlike", - paramtype = "light", - textures = {"xdecor_wood_frame.png", "xdecor_wood_frame.png", "xpanes_space.png"}, - inventory_image = "xdecor_wood_frame.png", - wield_image = "xdecor_wood_frame.png", - groups = {choppy=3, oddly_breakable_by_hand=2, pane=1, flammable=3}, - sounds = default.node_sound_wood_defaults(), - recipe = { - {"group:wood", "group:stick", "group:wood"}, - {"group:stick", "group:stick", "group:stick"}, - {"group:wood", "group:stick", "group:wood"} - } + tiles = {"xdecor_television_left.png^[transformR270", + "xdecor_television_left.png^[transformR90", + "xdecor_television_left.png^[transformFX", + "xdecor_television_left.png", "xdecor_television_back.png", + {name="xdecor_television_front_animated.png", + animation = {type="vertical_frames", length=80.0}} } }) xdecor.register("woodframed_glass", { description = "Wood Framed Glass", drawtype = "glasslike_framed", tiles = {"xdecor_woodframed_glass.png", "xdecor_woodframed_glass_detail.png"}, - groups = {cracky=3, oddly_breakable_by_hand=2}, + groups = {cracky=2, oddly_breakable_by_hand=1}, sounds = default.node_sound_glass_defaults() }) -xdecor.register("wood_tile", { - description = "Wood Tile", - tiles = {"xdecor_wood_tile.png"}, - drawtype = "normal", - groups = {choppy=1, oddly_breakable_by_hand=1, wood=1, flammable=2}, - sounds = default.node_sound_wood_defaults() -})