From 7d5287cc04385394141a6d85413a65724f734984 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 8 Sep 2015 09:50:02 +0200 Subject: [PATCH] placeholder usage for decor, where useable --- homedecor/clocks.lua | 2 +- homedecor/exterior.lua | 13 +++++++------ homedecor/foyer.lua | 2 +- homedecor/gastronomy.lua | 2 +- homedecor/kitchen_appliances.lua | 4 ++-- homedecor/laundry.lua | 2 +- homedecor/lighting.lua | 2 +- homedecor/misc-nodes.lua | 6 +++--- homedecor/office.lua | 4 ++-- homedecor/wardrobe.lua | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua index 1fc6a6c..0a00934 100644 --- a/homedecor/clocks.lua +++ b/homedecor/clocks.lua @@ -91,7 +91,7 @@ homedecor.register("grandfather_clock", { selection_box = gf_cbox, collision_box = gf_cbox, sounds = default.node_sound_wood_defaults(), - expand = { top="air" }, + expand = { top="placeholder" }, on_rotate = screwdriver.rotate_simple }) diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 0a96ab3..97307dc 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -25,6 +25,7 @@ homedecor.register("barbecue", { selection_box = bbq_cbox, collision_box = bbq_cbox, sounds = default.node_sound_stone_defaults(), + -- no need for placeholder it appears expand = { top="air" }, }) @@ -52,7 +53,7 @@ homedecor.register("bench_large_1", { description = "Garden Bench (style 1)", inventory_image = "homedecor_bench_large_1_inv.png", groups = { snappy = 3 }, - expand = { right="air" }, + expand = { right="placeholder" }, sounds = default.node_sound_wood_defaults(), selection_box = bl1_sbox, node_box = bl1_cbox, @@ -83,7 +84,7 @@ homedecor.register("bench_large_2", { groups = {snappy=3}, selection_box = bl2_sbox, node_box = bl2_cbox, - expand = { right="air" }, + expand = { right="placeholder" }, sounds = default.node_sound_wood_defaults(), on_rotate = screwdriver.disallow }) @@ -101,7 +102,7 @@ homedecor.register("deckchair", { tiles = {"homedecor_deckchair.png"}, description = "Deck Chair", groups = { snappy = 3 }, - expand = { forward="air" }, + expand = { forward="placeholder" }, sounds = default.node_sound_wood_defaults(), selection_box = dc_cbox, collision_box = dc_cbox, @@ -116,7 +117,7 @@ homedecor.register("deckchair_striped_blue", { tiles = {"homedecor_deckchair_striped_blue.png"}, description = "Deck Chair", groups = { snappy = 3 }, - expand = { forward="air" }, + expand = { forward="placeholder" }, sounds = default.node_sound_wood_defaults(), selection_box = dc_cbox, collision_box = dc_cbox, @@ -135,7 +136,7 @@ homedecor.register("doghouse", { selection_box = homedecor.nodebox.slab_y(1.5), collision_box = homedecor.nodebox.slab_y(1.5), groups = {snappy=3}, - expand = { top="air" }, + expand = { top="placeholder" }, sounds = default.node_sound_wood_defaults(), on_rotate = screwdriver.rotate_simple }) @@ -323,7 +324,7 @@ homedecor.register("well", { groups = { snappy = 3 }, selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), - expand = { top="air" }, + expand = { top="placeholder" }, sounds = default.node_sound_stone_defaults(), on_rotate = screwdriver.rotate_simple }) diff --git a/homedecor/foyer.lua b/homedecor/foyer.lua index b218c1e..6d9afa7 100644 --- a/homedecor/foyer.lua +++ b/homedecor/foyer.lua @@ -32,7 +32,7 @@ homedecor.register("coat_tree", { description = "Coat tree", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), - expand = { top="air" }, + expand = { top="placeholder" }, walkable = false, selection_box = { type = "fixed", diff --git a/homedecor/gastronomy.lua b/homedecor/gastronomy.lua index 3cbf2db..d4bc611 100644 --- a/homedecor/gastronomy.lua +++ b/homedecor/gastronomy.lua @@ -185,7 +185,7 @@ homedecor.register("soda_machine", { groups = {snappy=3}, selection_box = svm_cbox, collision_box = svm_cbox, - expand = { top="air" }, + expand = { top="placeholder" }, sounds = default.node_sound_wood_defaults(), on_rotate = screwdriver.rotate_simple, on_punch = function(pos, node, puncher, pointed_thing) diff --git a/homedecor/kitchen_appliances.lua b/homedecor/kitchen_appliances.lua index 68570e0..ae59a40 100644 --- a/homedecor/kitchen_appliances.lua +++ b/homedecor/kitchen_appliances.lua @@ -12,7 +12,7 @@ homedecor.register("refrigerator_steel", { sounds = default.node_sound_stone_defaults(), selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), - expand = { top="air" }, + expand = { top="placeholder" }, infotext=S("Refrigerator"), inventory = { size=50, @@ -31,7 +31,7 @@ homedecor.register("refrigerator_white", { selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), sounds = default.node_sound_stone_defaults(), - expand = { top="air" }, + expand = { top="placeholder" }, infotext=S("Refrigerator"), inventory = { size=50, diff --git a/homedecor/laundry.lua b/homedecor/laundry.lua index 01a448f..e2ef721 100644 --- a/homedecor/laundry.lua +++ b/homedecor/laundry.lua @@ -54,7 +54,7 @@ homedecor.register("ironing_board", { "wool_grey.png", "homedecor_generic_metal_black.png^[brighten" }, - expand = {right = "air"}, + expand = {right = "placeholder"}, groups = { snappy = 3 }, selection_box = ib_cbox, collision_box = ib_cbox diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index f0c3b9d..8351b64 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -477,7 +477,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) node.name = "homedecor:standing_lamp"..lampcolor.."_"..repl[suffix] minetest.set_node(pos, node) end, - expand = { top="air" }, + expand = { top="placeholder" }, }) minetest.register_alias("homedecor:standing_lamp_bottom"..lampcolor.."_"..suffix, "homedecor:standing_lamp"..lampcolor.."_"..suffix) diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 333961e..5d80729 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -273,7 +273,7 @@ homedecor.register("pool_table", { groups = {snappy=3}, selection_box = pooltable_cbox, collision_box = pooltable_cbox, - expand = { forward="air" }, + expand = { forward="placeholder" }, sounds = default.node_sound_wood_defaults(), on_rotate = screwdriver.disallow }) @@ -297,7 +297,7 @@ homedecor.register("piano", { groups = { snappy = 3 }, selection_box = piano_cbox, collision_box = piano_cbox, - expand = { right="air" }, + expand = { right="placeholder" }, sounds = default.node_sound_wood_defaults(), on_rotate = screwdriver.disallow }) @@ -377,7 +377,7 @@ homedecor.register("tool_cabinet", { on_rotate = screwdriver.rotate_simple, groups = { snappy=3 }, selection_box = homedecor.nodebox.slab_y(2), - expand = { top="air" }, + expand = { top="placeholder" }, inventory = { size=24, } diff --git a/homedecor/office.lua b/homedecor/office.lua index 53533e7..1da21dc 100644 --- a/homedecor/office.lua +++ b/homedecor/office.lua @@ -34,7 +34,7 @@ homedecor.register("desk", { collision_box = desk_cbox, sounds = default.node_sound_wood_defaults(), groups = { snappy = 3 }, - expand = { right="air" }, + expand = { right="placeholder" }, inventory = { size=24, lockable=true, @@ -112,7 +112,7 @@ for _, c in pairs({"basic", "upscale"}) do sounds = default.node_sound_wood_defaults(), selection_box = ofchairs_sbox, collision_box = ofchairs_cbox, - expand = { top = "air" }, + expand = { top = "placeholder" }, on_rotate = screwdriver.rotate_simple }) end diff --git a/homedecor/wardrobe.lua b/homedecor/wardrobe.lua index 4f56acb..86b29ef 100644 --- a/homedecor/wardrobe.lua +++ b/homedecor/wardrobe.lua @@ -18,7 +18,7 @@ homedecor.register("wardrobe", { selection_box = wd_cbox, collision_box = wd_cbox, sounds = default.node_sound_wood_defaults(), - expand = { top="air" }, + expand = { top="placeholder" }, on_rotate = screwdriver.rotate_simple, infotext = "Wardrobe", inventory = {