X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=nodes.lua;h=aa3cc4b0b52ea2a984782c360474f926c94f46e0;hb=522dc7ef39feeff51057226dc184a5c04c6ecf96;hp=7d2ece541f4f37d451522c1fe8ebf4a2a9be373c;hpb=7b349767da976cb95a00d4362c2b717b04154bc3;p=xdecor.git diff --git a/nodes.lua b/nodes.lua index 7d2ece5..aa3cc4b 100644 --- a/nodes.lua +++ b/nodes.lua @@ -1,3 +1,5 @@ +screwdriver = screwdriver or {} + xpanes.register_pane("bamboo_frame", { description = "Bamboo Frame", tiles = {"xdecor_bamboo_frame.png"}, @@ -6,7 +8,7 @@ xpanes.register_pane("bamboo_frame", { textures = {"xdecor_bamboo_frame.png", "xdecor_bamboo_frame.png", "xpanes_space.png"}, inventory_image = "xdecor_bamboo_frame.png", wield_image = "xdecor_bamboo_frame.png", - groups = {snappy=3, pane=1, flammable=2}, + 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"}, @@ -20,7 +22,7 @@ xdecor.register("baricade", { walkable = false, inventory_image = "xdecor_baricade.png", tiles = {"xdecor_baricade.png"}, - groups = {snappy=3, flammable=3}, + groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, damage_per_second = 4, selection_box = xdecor.nodebox.slab_y(0.3) }) @@ -30,7 +32,7 @@ xdecor.register("barrel", { inventory = {size=24}, infotext = "Barrel", tiles = {"xdecor_barrel_top.png", "xdecor_barrel_sides.png"}, - groups = {choppy=3, flammable=3}, + groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, sounds = default.node_sound_wood_defaults() }) @@ -38,8 +40,9 @@ xdecor.register("cabinet", { description = "Wood Cabinet", inventory = {size=24}, infotext = "Wood Cabinet", - groups = {choppy=3, flammable=3}, + groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.rotate_simple, tiles = { "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", "xdecor_cabinet_sides.png", @@ -51,7 +54,7 @@ xdecor.register("cabinet_half", { description = "Half Wood Cabinet", inventory = {size=8}, infotext = "Half Wood Cabinet", - groups = {choppy=3, flammable=3}, + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, sounds = default.node_sound_wood_defaults(), node_box = xdecor.nodebox.slab_y(0.5, 0.5), tiles = { @@ -74,61 +77,19 @@ xdecor.register("candle", { 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} } }, selection_box = { type = "wallmounted", + wall_top = {-0.3, -0.4, -0.3, 0.3, 0.5, 0.3}, 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} } }) -xdecor.register("cardboard_box", { - description = "Cardboard Box", - inventory = {size=8}, - infotext = "Cardboard Box", - groups = {snappy=3, flammable=3}, - tiles = {"xdecor_cardbox_top.png", "xdecor_cardbox_top.png", - "xdecor_cardbox_sides.png"}, - node_box = { - type = "fixed", fixed = {{-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125}} - } -}) - -xdecor.register("cauldron", { - description = "Cauldron", - groups = {cracky=2}, - tiles = { - { name = "xdecor_cauldron_top_anim.png", - animation = {type="vertical_frames", length=3.0} }, - "xdecor_cauldron_sides.png" - } -}) - -if minetest.get_modpath("bucket") then - local original_bucket_on_use = minetest.registered_items["bucket:bucket_empty"].on_use - minetest.override_item("bucket:bucket_empty", { - on_use = function(itemstack, user, pointed_thing) - local inv = user:get_inventory() - local player = user:get_player_name() - - if minetest.get_node(pointed_thing.under).name == "xdecor:cauldron" then - if inv:room_for_item("main", "bucket:bucket_water 1") then - itemstack:take_item() - inv:add_item("main", "bucket:bucket_water 1") - else - minetest.chat_send_player(player, "No enough room in your inventory.") - end - return itemstack - else if original_bucket_on_use then - return original_bucket_on_use(itemstack, user, pointed_thing) - else return end - end - end - }) -end - xpanes.register_pane("chainlink", { description = "Chain Link", tiles = {"xdecor_chainlink.png"}, @@ -137,7 +98,7 @@ xpanes.register_pane("chainlink", { textures = {"xdecor_chainlink.png", "xdecor_chainlink.png", "xpanes_space.png"}, inventory_image = "xdecor_chainlink.png", wield_image = "xdecor_chainlink.png", - groups = {snappy=3, pane=1}, + groups = {cracky=3, oddly_breakable_by_hand=2, pane=1}, recipe = { {"default:steel_ingot", "", "default:steel_ingot"}, {"", "default:steel_ingot", ""}, @@ -145,33 +106,8 @@ xpanes.register_pane("chainlink", { } }) -xdecor.register("chair", { - description = "Chair", - tiles = {"xdecor_wood.png"}, - sounds = default.node_sound_wood_defaults(), - groups = {choppy=3, flammable=3}, - 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}} - } -}) - -xdecor.register("chandelier", { - description = "Chandelier", - drawtype = "plantlike", - walkable = false, - inventory_image = "xdecor_chandelier.png", - tiles = {"xdecor_chandelier.png"}, - groups = {dig_immediate=3}, - light_source = 14, - selection_box = xdecor.nodebox.slab_y(0.5, 0.5) -}) - +-- The following nodedef is licensed under WTFPL for granting a possible re-use +-- in Minetest Game (https://github.com/minetest/minetest_game). xdecor.register("cobweb", { description = "Cobweb", drawtype = "plantlike", @@ -189,9 +125,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, @@ -202,7 +136,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 }) @@ -215,7 +149,7 @@ 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 }) @@ -229,17 +163,23 @@ for _, c in pairs(colors) do }) end -xdecor.register("cushion", { - description = "Cushion", +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_block", { 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) + groups = {snappy=3, flammable=3, fall_damage_add_percent=-75, not_in_creative_inventory=1}, + drop = "xdecor:cushion 2" }) local function door_access(door) - if door:find("prison") then return true end - return false + return door:find("prison") end local door_types = { @@ -249,9 +189,9 @@ local door_types = { 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", + description = string.gsub(" "..d[1], "%W%l", string.upper):sub(2):gsub("_", " ").." Door", inventory_image = "xdecor_"..d[1].."_door_inv.png", - groups = {choppy=3, flammable=2, door=1}, + 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]), @@ -265,8 +205,9 @@ xdecor.register("empty_shelf", { inventory = {size=24}, infotext = "Empty Shelf", tiles = {"default_wood.png", "default_wood.png^xdecor_empty_shelf.png"}, - groups = {choppy=3, flammable=3}, - sounds = default.node_sound_wood_defaults() + groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, + sounds = default.node_sound_wood_defaults(), + on_rotate = screwdriver.rotate_simple }) xdecor.register("enderchest", { @@ -276,14 +217,17 @@ xdecor.register("enderchest", { "xdecor_enderchest_side.png", "xdecor_enderchest_side.png", "xdecor_enderchest_side.png", "xdecor_enderchest_front.png" }, - groups = {cracky=2}, + groups = {cracky=1, choppy=1, oddly_breakable_by_hand=1}, sounds = default.node_sound_stone_defaults(), + on_rotate = screwdriver.rotate_simple, on_construct = function(pos) local meta = minetest.get_meta(pos) - local xbg = default.gui_bg..default.gui_bg_img..default.gui_slots - meta:set_string("formspec", "size[8,9]"..xbg.. - "list[current_player;enderchest;0,0;8,4;]".. - "list[current_player;main;0,5;8,4;]") + 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 }) @@ -302,7 +246,7 @@ xdecor.register("fire", { { name = "xdecor_fire_anim.png", animation = {type="vertical_frames", length=1.5} } }, - damage_per_second = 2, + damage_per_second = 4, drop = "", selection_box = { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, -0.3, 0.3} @@ -310,35 +254,6 @@ xdecor.register("fire", { 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 - else return 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", @@ -374,24 +289,28 @@ xdecor.register("lantern", { } }) -xdecor.register("lightbox", { - description = "Light Box", - tiles = {"xdecor_lightbox.png"}, - groups = {cracky=3}, - light_source = 13, - sounds = default.node_sound_glass_defaults() -}) +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 + +minetest.register_alias("xdecor:lightbox", "xdecor:wooden_lightbox") xdecor.register("packed_ice", { drawtype = "normal", description = "Packed Ice", tiles = {"xdecor_packed_ice.png"}, - groups = {cracky=2}, + groups = {cracky=1, puts_out_fire=1}, sounds = default.node_sound_glass_defaults() }) -local flowers = {"dandelion_white", "dandelion_yellow", "geranium", - "rose", "tulip", "viola"} +local flowers = {"dandelion_white", "dandelion_yellow", "geranium", "rose", + "tulip", "viola"} for _, f in pairs(flowers) do xdecor.register("potted_"..f, { @@ -414,43 +333,73 @@ for _, f in pairs(flowers) do }) end -xdecor.register("painting", { +xdecor.register("painting_1", { description = "Painting", - drawtype = "signlike", - tiles = {"xdecor_painting.png"}, - inventory_image = "xdecor_painting.png", + tiles = {"xdecor_painting_1.png"}, + inventory_image = "xdecor_painting_empty.png", + wield_image = "xdecor_painting_empty.png", paramtype2 = "wallmounted", legacy_wallmounted = true, - walkable = false, - wield_image = "xdecor_painting.png", - selection_box = {type="wallmounted"}, - groups = {dig_immediate=3, flammable=3, attached_node=1} + wield_image = "xdecor_painting_empty.png", + sunlight_propagates = true, + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3, attached_node=1}, + sounds = default.node_sound_wood_defaults(), + node_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} + }, + on_construct = function(pos) + local node = minetest.get_node(pos) + local random = math.random(4) + if random == 1 then return end + minetest.set_node(pos, {name="xdecor:painting_"..random, param2=node.param2}) + end }) -xdecor.register("plant_pot", { - description = "Plant Pot", - drawtype = "plantlike", - inventory_image = "xdecor_plant_pot.png", - wield_image = "xdecor_plant_pot.png", - groups = {snappy=3}, - tiles = {"xdecor_plant_pot.png"}, - sounds = default.node_sound_stone_defaults() -}) +for i = 2, 4 do + xdecor.register("painting_"..i, { + tiles = {"xdecor_painting_"..i..".png"}, + paramtype2 = "wallmounted", + legacy_wallmounted = true, + drop = "xdecor:painting_1", + sunlight_propagates = true, + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3, attached_node=1, not_in_creative_inventory=1}, + sounds = default.node_sound_wood_defaults(), + node_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} + } + }) +end -xdecor.register("moonbrick", { - drawtype = "normal", - description = "Moon Brick", - tiles = {"xdecor_moonbrick.png"}, - groups = {cracky=2}, - sounds = default.node_sound_stone_defaults(), +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(), + }) + + 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=3, flammable=3}, + groups = {choppy=2, oddly_breakable_by_hand=1, flammable=3}, sounds = default.node_sound_wood_defaults() }) @@ -462,7 +411,7 @@ xpanes.register_pane("rust_bar", { 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 = {snappy=3, pane=1}, + groups = {cracky=3, oddly_breakable_by_hand=2, pane=1}, recipe = { {"", "default:dirt", ""}, {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, @@ -470,29 +419,19 @@ xpanes.register_pane("rust_bar", { } }) -xdecor.register("stereo", { - description = "Stereo", - groups = {snappy=3}, - tiles = { - "xdecor_stereo_top.png", "xdecor_stereo_bottom.png", - "xdecor_stereo_left.png^[transformFX", "xdecor_stereo_left.png", - "xdecor_stereo_back.png", "xdecor_stereo_front.png" - } -}) - xdecor.register("stonepath", { description = "Garden Stone Path", tiles = {"default_stone.png"}, groups = {snappy=3}, + 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.pixelnodebox(16, { + {8, 0, 8, 6, 0.5, 6}, + {1, 0, 1, 6, 0.5, 6}, + {1, 0, 10, 5, 0.5, 5}, + {10, 0, 2, 4, 0.5, 4} + }), selection_box = xdecor.nodebox.slab_y(0.05) }) @@ -502,10 +441,9 @@ local stonish = {"desertstone_tile", "stone_tile", "stone_rune", 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), + description = string.gsub(" "..t, "%W%l", string.upper):sub(2):gsub("_", " "), tiles = {"xdecor_"..t..".png"}, - groups = {cracky=2}, + groups = {cracky=1}, sounds = default.node_sound_stone_defaults() }) end @@ -513,13 +451,11 @@ end xdecor.register("table", { description = "Table", tiles = {"xdecor_wood.png"}, - groups = {choppy=3, flammable=3}, + groups = {choppy=3, oddly_breakable_by_hand=2, flammable=3}, 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.pixelnodebox(16, { + {0, 14, 0, 16, 2, 16}, {5.5, 0, 5.5, 5, 14, 6} + }) }) xdecor.register("tatami", { @@ -527,15 +463,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("tv", { description = "Television", light_source = 11, groups = {snappy=3}, + on_rotate = screwdriver.rotate_simple, tiles = { "xdecor_television_left.png^[transformR270", "xdecor_television_left.png^[transformR90", @@ -546,11 +481,28 @@ xdecor.register("tv", { } }) +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"} + } +}) + xdecor.register("woodframed_glass", { description = "Wood Framed Glass", drawtype = "glasslike_framed", - tiles = {"xdecor_framed_glass.png", "xdecor_framed_glass_detail.png"}, - groups = {cracky=3}, + tiles = {"xdecor_woodframed_glass.png", "xdecor_woodframed_glass_detail.png"}, + groups = {cracky=3, oddly_breakable_by_hand=2}, sounds = default.node_sound_glass_defaults() }) @@ -558,6 +510,6 @@ xdecor.register("wood_tile", { description = "Wood Tile", tiles = {"xdecor_wood_tile.png"}, drawtype = "normal", - groups = {choppy=2, wood=1, flammable=2}, + groups = {choppy=1, oddly_breakable_by_hand=1, wood=1, flammable=2}, sounds = default.node_sound_wood_defaults() })