move most other homedecor nodes to the new registration function, remove any unnecessary fields due to minetest or homedecor defaults

This commit is contained in:
Tim
2015-01-24 00:34:02 +01:00
parent be9d1e0b7e
commit 78045a752f
21 changed files with 131 additions and 583 deletions

View File

@ -2,14 +2,13 @@
local S = homedecor.gettext
minetest.register_node('homedecor:ceiling_paint', {
homedecor.register("ceiling_paint", {
description = S("Textured Ceiling Paint"),
drawtype = 'signlike',
tiles = { 'homedecor_ceiling_paint.png' },
inventory_image = 'homedecor_ceiling_paint_roller.png',
wield_image = 'homedecor_ceiling_paint_roller.png',
sunlight_propagates = true,
paramtype = 'light',
walkable = false,
groups = { snappy = 3 },
sounds = default.node_sound_leaves_defaults(),
@ -21,14 +20,13 @@ minetest.register_node('homedecor:ceiling_paint', {
},
})
minetest.register_node('homedecor:ceiling_tile', {
homedecor.register("ceiling_tile", {
description = S("Drop-Ceiling Tile"),
drawtype = 'signlike',
tiles = { 'homedecor_ceiling_tile.png' },
wield_image = 'homedecor_ceiling_tile.png',
inventory_image = 'homedecor_ceiling_tile.png',
sunlight_propagates = true,
paramtype = 'light',
walkable = false,
groups = { snappy = 3 },
sounds = default.node_sound_leaves_defaults(),
@ -40,16 +38,14 @@ minetest.register_node('homedecor:ceiling_tile', {
},
})
minetest.register_node('homedecor:rug_small', {
homedecor.register("rug_small", {
description = S("Small Throw Rug"),
drawtype = 'signlike',
tiles = { 'homedecor_rug_small.png' },
wield_image = 'homedecor_rug_small.png',
inventory_image = 'homedecor_rug_small.png',
sunlight_propagates = true,
paramtype = 'light',
paramtype2 = "wallmounted",
is_ground_content = true,
walkable = false,
groups = { snappy = 3 },
sounds = default.node_sound_leaves_defaults(),
@ -61,16 +57,14 @@ minetest.register_node('homedecor:rug_small', {
},
})
minetest.register_node('homedecor:rug_large', {
homedecor.register("rug_large", {
description = S("Large Area Rug"),
drawtype = 'signlike',
tiles = { 'homedecor_rug_large.png' },
wield_image = 'homedecor_rug_large.png',
inventory_image = 'homedecor_rug_large.png',
sunlight_propagates = true,
paramtype = 'light',
paramtype2 = "wallmounted",
is_ground_content = true,
walkable = false,
groups = { snappy = 3 },
sounds = default.node_sound_leaves_defaults(),
@ -82,55 +76,36 @@ minetest.register_node('homedecor:rug_large', {
},
})
minetest.register_node('homedecor:flower_pot_terracotta', {
homedecor.register("flower_pot_terracotta", {
description = S("Terracotta Flower Pot"),
drawtype = "mesh",
mesh = "homedecor_flowerpot.obj",
tiles = { "homedecor_flower_pot_terracotta.png" },
sunlight_propagates = false,
paramtype = "light",
paramtype2 = "facedir",
walkable = true,
groups = { snappy = 3, potting_soil=1},
sounds = default.node_sound_leaves_defaults(),
})
minetest.register_node('homedecor:flower_pot_black', {
homedecor.register("flower_pot_black", {
description = S("Black Plastic Flower Pot"),
drawtype = "mesh",
mesh = "homedecor_flowerpot.obj",
tiles = { "homedecor_flower_pot_black.png" },
sunlight_propagates = false,
paramtype = "light",
paramtype2 = "facedir",
walkable = true,
groups = { snappy = 3, potting_soil=1 },
sounds = default.node_sound_leaves_defaults(),
})
minetest.register_node('homedecor:flower_pot_green', {
homedecor.register("flower_pot_green", {
description = S("Green Plastic Flower Pot"),
drawtype = "mesh",
mesh = "homedecor_flowerpot.obj",
tiles = { "homedecor_flower_pot_green.png" },
sunlight_propagates = false,
paramtype = "light",
paramtype2 = "facedir",
walkable = true,
groups = { snappy = 3, potting_soil=1 },
sounds = default.node_sound_leaves_defaults(),
})
minetest.register_node("homedecor:pole_brass", {
homedecor.register("pole_brass", {
description = S("Brass Pole"),
drawtype = "mesh",
mesh = "homedecor_round_pole.obj",
tiles = {"homedecor_tile_brass2.png"},
inventory_image = "homedecor_pole_brass_inv.png",
wield_image = "homedecor_pole_brass_inv.png",
paramtype = "light",
paramtype2 = "facedir",
is_ground_content = true,
selection_box = {
type = "fixed",
fixed = { -0.125, -0.5, -0.125, 0.125, 0.5, 0.125 },
@ -141,18 +116,13 @@ minetest.register_node("homedecor:pole_brass", {
},
groups = {snappy=3},
sounds = default.node_sound_wood_defaults(),
walkable = true,
})
minetest.register_node("homedecor:pole_wrought_iron", {
homedecor.register("pole_wrought_iron", {
description = S("Wrought Iron Pole"),
drawtype = "nodebox",
tiles = {"homedecor_tile_wrought_iron2.png"},
inventory_image = "homedecor_pole_wrought_iron_inv.png",
wield_image = "homedecor_pole_wrought_iron_inv.png",
paramtype = "light",
paramtype2 = "facedir",
is_ground_content = true,
selection_box = {
type = "fixed",
fixed = {-0.0625, -0.5, -0.0625, 0.0625, 0.5, 0.0625}
@ -163,17 +133,13 @@ minetest.register_node("homedecor:pole_wrought_iron", {
},
groups = {snappy=3},
sounds = default.node_sound_wood_defaults(),
walkable = true,
})
local welcome_mat_colors = { "green", "brown", "grey" }
for _, color in ipairs(welcome_mat_colors) do
minetest.register_node("homedecor:welcome_mat_"..color, {
homedecor.register("welcome_mat_"..color, {
description = "Welcome Mat ("..color..")",
paramtype = "light",
paramtype2 = "facedir",
drawtype = "nodebox",
tiles = {
"homedecor_welcome_mat_"..color..".png",
"homedecor_welcome_mat_bottom.png",
@ -190,9 +156,7 @@ for _, color in ipairs(welcome_mat_colors) do
})
end
minetest.register_node("homedecor:chimney", {
drawtype = "nodebox",
paramtype = "light",
homedecor.register("chimney", {
description = "Chimney",
tiles = {
"homedecor_chimney_top.png",
@ -213,8 +177,7 @@ minetest.register_node("homedecor:chimney", {
sounds = default.node_sound_stone_defaults()
})
minetest.register_node("homedecor:fishtank", {
drawtype = "nodebox",
homedecor.register("fishtank", {
description = "Fishtank",
tiles = {
"homedecor_fishtank_top.png",
@ -224,8 +187,6 @@ minetest.register_node("homedecor:fishtank", {
"homedecor_fishtank_back.png",
"homedecor_fishtank_front.png"
},
paramtype = "light",
paramtype2 = "facedir",
node_box = {
type = "fixed",
fixed = {
@ -251,8 +212,7 @@ minetest.register_node("homedecor:fishtank", {
end
})
minetest.register_node("homedecor:fishtank_lighted", {
drawtype = "nodebox",
homedecor.register("fishtank_lighted", {
description = "Fishtank",
tiles = {
"homedecor_fishtank_top.png",
@ -262,9 +222,7 @@ minetest.register_node("homedecor:fishtank_lighted", {
"homedecor_fishtank_back_lighted.png",
"homedecor_fishtank_front_lighted.png"
},
paramtype = "light",
light_source = LIGHT_MAX-4,
paramtype2 = "facedir",
node_box = {
type = "fixed",
fixed = {
@ -291,14 +249,12 @@ minetest.register_node("homedecor:fishtank_lighted", {
})
homedecor.register("cardboard_box_big", {
drawtype = "normal",
description = S("Cardboard box (big)"),
tiles = {
'homedecor_cardbox_big_tb.png',
'homedecor_cardbox_big_tb.png',
'homedecor_cardbox_big_sides.png',
},
sunlight_propagates = false,
groups = { snappy = 3 },
sounds = default.node_sound_wood_defaults(),
infotext=S("Cardboard box"),
@ -308,7 +264,6 @@ homedecor.register("cardboard_box_big", {
})
homedecor.register("cardboard_box", {
drawtype = "nodebox",
description = S("Cardboard box"),
tiles = {
'homedecor_cardbox_tb.png',
@ -321,7 +276,6 @@ homedecor.register("cardboard_box", {
{-0.3125, -0.5, -0.3125, 0.3125, 0, 0.3125},
}
},
sunlight_propagates = false,
groups = { snappy = 3 },
sounds = default.node_sound_wood_defaults(),
infotext=S("Cardboard box"),
@ -330,11 +284,8 @@ homedecor.register("cardboard_box", {
},
})
minetest.register_node("homedecor:dvd_cd_cabinet", {
homedecor.register("dvd_cd_cabinet", {
description = "DVD/CD cabinet",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
tiles = {
"homedecor_dvdcd_cabinet_top.png",
"homedecor_dvdcd_cabinet_top.png",
@ -371,8 +322,6 @@ homedecor.register("filing_cabinet", {
'forniture_wood.png',
'homedecor_filing_cabinet_front.png'
},
sunlight_propagates = false,
walkable = true,
selection_box = { type = "regular" },
node_box = {
type = "fixed",
@ -549,7 +498,7 @@ homedecor.register("pool_table_2", {
selection_box = homedecor.nodebox.null,
})
minetest.register_node("homedecor:trash_can", {
homedecor.register("trash_can", {
tiles = {
"homedecor_trashcan_tb.png",
"homedecor_trashcan_tb.png",
@ -560,9 +509,6 @@ minetest.register_node("homedecor:trash_can", {
},
inventory_image = "homedecor_trashcan_inv.png",
description = "Trash Can",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3},
node_box = {
type = "fixed",
@ -679,13 +625,10 @@ homedecor.register("well_top", {
selection_box = homedecor.nodebox.null,
})
minetest.register_node("homedecor:coatrack_wallmount", {
homedecor.register("coatrack_wallmount", {
tiles = { "forniture_wood.png" },
inventory_image = "homedecor_coatrack_wallmount_inv.png",
description = "Coatrack (wallmounted)",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3},
node_box = {
type = "fixed",
@ -703,13 +646,10 @@ minetest.register_node("homedecor:coatrack_wallmount", {
},
})
minetest.register_node("homedecor:coat_tree", {
homedecor.register("coat_tree", {
tiles = { "forniture_wood.png" },
inventory_image = "homedecor_coatrack_inv.png",
description = "Coat tree",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3},
node_box = {
type = "fixed",
@ -727,7 +667,7 @@ minetest.register_node("homedecor:coat_tree", {
},
})
minetest.register_node("homedecor:cutlery_set", {
homedecor.register("cutlery_set", {
tiles = {
"homedecor_cutlery_set_top.png",
"homedecor_cutlery_set_sides.png",
@ -735,9 +675,6 @@ minetest.register_node("homedecor:cutlery_set", {
},
inventory_image = "homedecor_cutlery_set_inv.png",
description = "Cutlery set",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = {snappy=3},
node_box = {
type = "fixed",
@ -780,28 +717,22 @@ local bottle_cbox = {
}
}
minetest.register_node("homedecor:bottle_brown", {
homedecor.register("bottle_brown", {
tiles = { "homedecor_bottle_brown.png" },
inventory_image = "homedecor_bottle_brown_inv.png",
description = "Brown bottle",
drawtype = "mesh",
mesh = "homedecor_bottle.obj",
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
groups = {snappy=3},
collision_box = bottle_cbox,
selection_box = bottle_cbox
})
minetest.register_node("homedecor:bottle_green", {
homedecor.register("bottle_green", {
tiles = { "homedecor_bottle_green.png" },
inventory_image = "homedecor_bottle_green_inv.png",
description = "Green bottle",
drawtype = "mesh",
mesh = "homedecor_bottle.obj",
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
groups = {snappy=3},
collision_box = bottle_cbox,
@ -817,56 +748,45 @@ local fbottle_cbox = {
}
}
minetest.register_node("homedecor:4_bottles_brown", {
homedecor.register("4_bottles_brown", {
tiles = { "homedecor_bottle_brown.png" },
inventory_image = "homedecor_4_bottles_brown_inv.png",
description = "Four brown bottles",
drawtype = "mesh",
mesh = "homedecor_4_bottles.obj",
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
groups = {snappy=3},
collision_box = fbottle_cbox,
selection_box = fbottle_cbox
})
minetest.register_node("homedecor:4_bottles_green", {
homedecor.register("4_bottles_green", {
tiles = { "homedecor_bottle_green.png" },
inventory_image = "homedecor_4_bottles_green_inv.png",
description = "Four green bottles",
drawtype = "mesh",
mesh = "homedecor_4_bottles.obj",
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
groups = {snappy=3},
collision_box = fbottle_cbox,
selection_box = fbottle_cbox
})
minetest.register_node("homedecor:4_bottles_multi", {
homedecor.register("4_bottles_multi", {
tiles = { "homedecor_4_bottles_multi.png" },
inventory_image = "homedecor_4_bottles_multi_inv.png",
description = "Four misc brown/green bottles",
drawtype = "mesh",
mesh = "homedecor_4_bottles_multi.obj",
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
groups = {snappy=3},
collision_box = fbottle_cbox,
selection_box = fbottle_cbox
})
minetest.register_node("homedecor:dartboard", {
homedecor.register("dartboard", {
description = "Dartboard",
drawtype = "mesh",
mesh = "homedecor_dartboard.obj",
tiles = { "homedecor_dartboard.png" },
inventory_image = "homedecor_dartboard_inv.png",
wield_image = "homedecor_dartboard_inv.png",
paramtype = "light",
paramtype2 = "wallmounted",
sunlight_propagates = true,
walkable = false,
@ -950,15 +870,12 @@ minetest.register_abm({
end
})
minetest.register_node("homedecor:trophy", {
homedecor.register("trophy", {
description = "Trophy",
tiles = {
"default_gold_block.png"
},
inventory_image = "homedecor_trophy_inv.png",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3 },
node_box = {
type = "fixed",
@ -986,7 +903,7 @@ minetest.register_node("homedecor:trophy", {
}
})
minetest.register_node("homedecor:sportbench", {
homedecor.register("sportbench", {
description = "Sport bench",
tiles = {
"homedecor_sportbench_top.png",
@ -996,9 +913,6 @@ minetest.register_node("homedecor:sportbench", {
"homedecor_sportbench_bottom.png",
"homedecor_sportbench_front.png"
},
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3 },
node_box = {
type = "fixed",
@ -1022,7 +936,7 @@ minetest.register_node("homedecor:sportbench", {
}
})
minetest.register_node("homedecor:skateboard", {
homedecor.register("skateboard", {
description = "Skateboard",
tiles = {
"homedecor_skateboard_top.png",
@ -1030,9 +944,6 @@ minetest.register_node("homedecor:skateboard", {
"homedecor_skateboard_sides.png"
},
inventory_image = "homedecor_skateboard_inv.png",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3 },
node_box = {
type = "fixed",
@ -1053,15 +964,12 @@ minetest.register_node("homedecor:skateboard", {
on_place = minetest.rotate_node
})
minetest.register_node("homedecor:stonepath", {
homedecor.register("stonepath", {
description = "Garden stone path",
tiles = {
"default_stone.png"
},
inventory_image = "homedecor_stonepath_inv.png",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3 },
node_box = {
type = "fixed",
@ -1134,7 +1042,7 @@ homedecor.register("barbecue_meat", {
selection_box = homedecor.nodebox.null
})
minetest.register_node("homedecor:beer_tap", {
homedecor.register("beer_tap", {
description = "Beer tap",
tiles = {
"homedecor_beertap_front.png",
@ -1145,9 +1053,6 @@ minetest.register_node("homedecor:beer_tap", {
"homedecor_beertap_front.png"
},
inventory_image = "homedecor_beertap_inv.png",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3 },
node_box = {
type = "fixed",
@ -1185,7 +1090,7 @@ minetest.register_node("homedecor:beer_tap", {
end
})
minetest.register_node("homedecor:beer_mug", {
homedecor.register("beer_mug", {
description = "Beer mug",
tiles = {
"homedecor_beer_top.png",
@ -1197,9 +1102,6 @@ minetest.register_node("homedecor:beer_mug", {
},
inventory_image = "homedecor_beer_inv.png",
use_texture_alpha = true,
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3, oddly_breakable_by_hand=3 },
sounds = default.node_sound_glass_defaults(),
node_box = {
@ -1276,7 +1178,7 @@ homedecor.register("tool_cabinet_top", {
selection_box = homedecor.nodebox.null
})
minetest.register_node("homedecor:swing", {
homedecor.register("swing", {
description = "Tree's swing",
tiles = {
"homedecor_swing_top.png",
@ -1284,9 +1186,6 @@ minetest.register_node("homedecor:swing", {
"homedecor_swing_top.png"
},
inventory_image = "homedecor_swing_inv.png",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3, oddly_breakable_by_hand=3 },
node_box = {
type = "fixed",
@ -1351,13 +1250,10 @@ minetest.register_node("homedecor:swing", {
end
})
minetest.register_node("homedecor:swing_rope", {
homedecor.register("swing_rope", {
tiles = {
"homedecor_swingrope_sides.png"
},
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { not_in_creative_inventory=1 },
node_box = {
type = "fixed",
@ -1398,7 +1294,7 @@ for c in ipairs(bookcolors) do
minetest.remove_node(pos)
end
minetest.register_node("homedecor:book_"..color, {
homedecor.register("book_"..color, {
description = S("Book (%s)"):format(color_d),
tiles = {
"homedecor_book_"..color.."_top.png",
@ -1410,9 +1306,6 @@ minetest.register_node("homedecor:book_"..color, {
},
inventory_image = "homedecor_book_"..color.."_inv.png",
wield_image = "homedecor_book_"..color.."_inv.png",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3, oddly_breakable_by_hand=3, book=1 },
stack_max = 1,
node_box = {
@ -1481,7 +1374,7 @@ minetest.register_node("homedecor:book_"..color, {
end,
})
minetest.register_node("homedecor:book_open_"..color, {
homedecor.register("book_open_"..color, {
tiles = {
"homedecor_book_open_top.png",
"homedecor_book_open_"..color.."_bottom.png",
@ -1490,9 +1383,6 @@ minetest.register_node("homedecor:book_open_"..color, {
"homedecor_book_open_sides.png",
"homedecor_book_open_sides.png"
},
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
groups = { snappy=3, oddly_breakable_by_hand=3, not_in_creative_inventory=1 },
node_box = {
type = "fixed",
@ -1525,13 +1415,12 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
player:set_wielded_item(stack)
end)
minetest.register_node("homedecor:calendar", {
homedecor.register("calendar", {
description = "Calendar",
drawtype = "signlike",
tiles = {"homedecor_calendar.png"},
inventory_image = "homedecor_calendar.png",
wield_image = "homedecor_calendar.png",
paramtype = "light",
paramtype2 = "wallmounted",
sunlight_propagates = true,
walkable = false,
@ -1548,14 +1437,11 @@ local globe_cbox = {
fixed = { -0.4, -0.5, -0.3, 0.3, 0.3, 0.3 }
}
minetest.register_node("homedecor:desk_globe", {
homedecor.register("desk_globe", {
description = "Desk globe",
drawtype = "mesh",
mesh = "homedecor_desk_globe.obj",
tiles = {"homedecor_desk_globe.png"},
inventory_image = "homedecor_desk_globe_inv.png",
paramtype = "light",
paramtype2 = "facedir",
selection_box = globe_cbox,
collision_box = globe_cbox,
groups = {choppy=2},
@ -1563,14 +1449,11 @@ minetest.register_node("homedecor:desk_globe", {
})
local wine_cbox = homedecor.nodebox.slab_z(0.25)
minetest.register_node("homedecor:wine_rack", {
homedecor.register("wine_rack", {
description = "Wine Rack",
drawtype = "mesh",
mesh = "homedecor_wine_rack.obj",
tiles = {"homedecor_wine_rack.png"},
inventory_image = "homedecor_wine_rack_inv.png",
paramtype = "light",
paramtype2 = "facedir",
groups = {choppy=2},
selection_box = wine_cbox,
collision_box = wine_cbox,