rename most wood, metal, etc textures

to bring them all together into one "category" instead of being scattered across the directory
also combine a couple dupes.
This commit is contained in:
Vanessa Ezekowitz 2015-04-27 23:48:02 -04:00
parent f8fc0bbad6
commit a35b57d713
37 changed files with 78 additions and 76 deletions

View File

@ -12,7 +12,7 @@ homedecor.register("toilet", {
"homedecor_marble_light.png", "homedecor_marble_light.png",
"homedecor_marble_light.png", "homedecor_marble_light.png",
"homedecor_marble_light.png", "homedecor_marble_light.png",
"forniture_metal.png" "homedecor_generic_metal_neutral.png"
}, },
selection_box = toilet_cbox, selection_box = toilet_cbox,
collision_box = toilet_cbox, collision_box = toilet_cbox,
@ -31,7 +31,7 @@ homedecor.register("toilet_open", {
"homedecor_marble_light.png", "homedecor_marble_light.png",
"homedecor_marble_light.png", "homedecor_marble_light.png",
"default_water.png", "default_water.png",
"forniture_metal.png" "homedecor_generic_metal_neutral.png"
}, },
selection_box = toilet_cbox, selection_box = toilet_cbox,
collision_box = toilet_cbox, collision_box = toilet_cbox,
@ -99,10 +99,10 @@ homedecor.register("taps", {
description = S("Bathroom taps/faucet"), description = S("Bathroom taps/faucet"),
mesh = "homedecor_bathroom_faucet.obj", mesh = "homedecor_bathroom_faucet.obj",
tiles = { tiles = {
"forniture_metal.png", "homedecor_generic_metal_neutral.png",
"homedecor_bright_metal.png", "homedecor_generic_metal_bright.png",
"homedecor_white_metal.png", "homedecor_generic_metal_white.png",
"homedecor_bright_metal.png" "homedecor_generic_metal_bright.png"
}, },
inventory_image = "3dforniture_taps_inv.png", inventory_image = "3dforniture_taps_inv.png",
wield_image = "3dforniture_taps_inv.png", wield_image = "3dforniture_taps_inv.png",
@ -120,10 +120,10 @@ homedecor.register("taps_brass", {
description = S("Bathroom taps/faucet (brass)"), description = S("Bathroom taps/faucet (brass)"),
mesh = "homedecor_bathroom_faucet.obj", mesh = "homedecor_bathroom_faucet.obj",
tiles = { tiles = {
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
"homedecor_white_metal.png", "homedecor_generic_metal_white.png",
"homedecor_tile_brass.png" "homedecor_generic_metal_brass.png"
}, },
inventory_image = "3dforniture_taps_brass_inv.png", inventory_image = "3dforniture_taps_brass_inv.png",
wield_image = "3dforniture_taps_brass_inv.png", wield_image = "3dforniture_taps_brass_inv.png",

View File

@ -161,7 +161,7 @@ local r_cbox = {
homedecor.register("radiator", { homedecor.register("radiator", {
mesh = "homedecor_radiator.obj", mesh = "homedecor_radiator.obj",
tiles = { tiles = {
"homedecor_white_metal.png", "homedecor_generic_metal_white.png",
"homedecor_radiator_controls.png" "homedecor_radiator_controls.png"
}, },
inventory_image = "homedecor_radiator_inv.png", inventory_image = "homedecor_radiator_inv.png",

View File

@ -79,9 +79,9 @@ homedecor.register("grandfather_clock", {
tiles = { tiles = {
"default_glass.png", "default_glass.png",
"homedecor_grandfather_clock_face.png", "homedecor_grandfather_clock_face.png",
"homedecor_grandfather_clock_wood.png", "homedecor_generic_wood_luxury_brown1.png",
"homedecor_grandfather_clock_face_edge.png", "homedecor_grandfather_clock_face_edge.png",
"homedecor_tile_brass.png" "homedecor_generic_metal_brass.png"
}, },
inventory_image = "homedecor_grandfather_clock_inv.png", inventory_image = "homedecor_grandfather_clock_inv.png",
groups = { snappy = 3 }, groups = { snappy = 3 },

View File

@ -497,7 +497,7 @@ minetest.register_node("homedecor:japanese_wall_top", {
drawtype = "mesh", drawtype = "mesh",
mesh = "homedecor_wall_japanese_top.obj", mesh = "homedecor_wall_japanese_top.obj",
tiles = { tiles = {
"homedecor_japanese_wood.png", "homedecor_generic_wood_luxury_brown2.png",
"homedecor_japanese_paper.png" "homedecor_japanese_paper.png"
}, },
paramtype = "light", paramtype = "light",
@ -512,7 +512,7 @@ minetest.register_node("homedecor:japanese_wall_middle", {
drawtype = "mesh", drawtype = "mesh",
mesh = "homedecor_wall_japanese_middle.obj", mesh = "homedecor_wall_japanese_middle.obj",
tiles = { tiles = {
"homedecor_japanese_wood.png", "homedecor_generic_wood_luxury_brown2.png",
"homedecor_japanese_paper.png" "homedecor_japanese_paper.png"
}, },
paramtype = "light", paramtype = "light",
@ -527,7 +527,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", {
drawtype = "mesh", drawtype = "mesh",
mesh = "homedecor_wall_japanese_bottom.obj", mesh = "homedecor_wall_japanese_bottom.obj",
tiles = { tiles = {
"homedecor_japanese_wood.png", "homedecor_generic_wood_luxury_brown2.png",
"homedecor_japanese_paper.png" "homedecor_japanese_paper.png"
}, },
paramtype = "light", paramtype = "light",
@ -562,7 +562,7 @@ homedecor.register("door_japanese_closed", {
description = "Japanese-style door", description = "Japanese-style door",
inventory_image = "homedecor_door_japanese_inv.png", inventory_image = "homedecor_door_japanese_inv.png",
tiles = { tiles = {
"homedecor_japanese_wood.png", "homedecor_generic_wood_luxury_brown2.png",
"homedecor_japanese_paper.png" "homedecor_japanese_paper.png"
}, },
mesh = "homedecor_door_japanese_closed.obj", mesh = "homedecor_door_japanese_closed.obj",
@ -583,7 +583,7 @@ homedecor.register("door_japanese_closed", {
minetest.register_node("homedecor:door_japanese_open", { minetest.register_node("homedecor:door_japanese_open", {
tiles = { tiles = {
"homedecor_japanese_wood.png", "homedecor_generic_wood_luxury_brown2.png",
"homedecor_japanese_paper.png" "homedecor_japanese_paper.png"
}, },
drawtype = "mesh", drawtype = "mesh",

View File

@ -23,7 +23,7 @@ homedecor.register("speaker_open", {
"homedecor_speaker_sides.png", "homedecor_speaker_sides.png",
"homedecor_speaker_driver.png", "homedecor_speaker_driver.png",
"homedecor_speaker_open_front.png", "homedecor_speaker_open_front.png",
"forniture_black_metal.png" "homedecor_generic_metal_black.png"
}, },
groups = { snappy = 3 }, groups = { snappy = 3 },
sounds = default.node_sound_leaves_defaults(), sounds = default.node_sound_leaves_defaults(),

View File

@ -10,7 +10,7 @@ homedecor.register("barbecue", {
description = "Barbecue", description = "Barbecue",
mesh = "homedecor_barbecue.obj", mesh = "homedecor_barbecue.obj",
tiles = { tiles = {
"forniture_black_metal.png", "homedecor_generic_metal_black.png",
{ name="homedecor_embers.png", { name="homedecor_embers.png",
animation={ animation={
type="vertical_frames", type="vertical_frames",
@ -38,8 +38,8 @@ local bl1_cbox = {
homedecor.register("bench_large_1", { homedecor.register("bench_large_1", {
mesh = "homedecor_bench_large_1.obj", mesh = "homedecor_bench_large_1.obj",
tiles = { tiles = {
"homedecor_generic_wood.png", "homedecor_generic_wood_neutral.png",
"homedecor_tile_wrought_iron.png" "homedecor_generic_metal_wrought_iron.png"
}, },
description = "Garden Bench (style 1)", description = "Garden Bench (style 1)",
inventory_image = "homedecor_bench_large_1_inv.png", inventory_image = "homedecor_bench_large_1_inv.png",
@ -61,7 +61,7 @@ local bl2_cbox = {
homedecor.register("bench_large_2", { homedecor.register("bench_large_2", {
description = "Garden Bench (style 2)", description = "Garden Bench (style 2)",
mesh = "homedecor_bench_large_2.obj", mesh = "homedecor_bench_large_2.obj",
tiles = { "homedecor_generic_wood.png" }, tiles = { "homedecor_generic_wood_neutral.png" },
inventory_image = "homedecor_bench_large_2_inv.png", inventory_image = "homedecor_bench_large_2_inv.png",
groups = {snappy=3}, groups = {snappy=3},
selection_box = bl2_cbox, selection_box = bl2_cbox,
@ -127,7 +127,7 @@ minetest.register_alias("homedecor:doghouse_roof", "air")
minetest.register_alias("homedecor:doghouse_base", "homedecor:doghouse") minetest.register_alias("homedecor:doghouse_base", "homedecor:doghouse")
homedecor.register("simple_bench", { homedecor.register("simple_bench", {
tiles = { "homedecor_generic_wood.png" }, tiles = { "homedecor_generic_wood_neutral.png" },
description = "Simple Bench", description = "Simple Bench",
groups = {snappy=3}, groups = {snappy=3},
node_box = { node_box = {
@ -263,7 +263,7 @@ homedecor.register("well", {
mesh = "homedecor_well.obj", mesh = "homedecor_well.obj",
tiles = { tiles = {
"homedecor_rope_texture.png", "homedecor_rope_texture.png",
"forniture_metal.png", "homedecor_generic_metal_neutral.png",
"default_water.png", "default_water.png",
"default_cobble.png", "default_cobble.png",
"default_wood.png", "default_wood.png",

View File

@ -22,7 +22,7 @@ for _, m in ipairs(materials) do
homedecor.register("fence_"..m, { homedecor.register("fence_"..m, {
description = S("Fence/railing ("..m..")"), description = S("Fence/railing ("..m..")"),
drawtype = "fencelike", drawtype = "fencelike",
tiles = {"homedecor_tile_"..m..".png"}, tiles = {"homedecor_generic_metal_"..m..".png"},
inventory_image = "homedecor_fence_"..m..".png", inventory_image = "homedecor_fence_"..m..".png",
selection_box = homedecor.nodebox.bar_y(1/7), selection_box = homedecor.nodebox.bar_y(1/7),
groups = {snappy=3}, groups = {snappy=3},

View File

@ -48,16 +48,18 @@ local table_colors = { "", "mahogany", "white" }
for _, i in ipairs(table_colors) do for _, i in ipairs(table_colors) do
local color = "_"..i local color = "_"..i
local color2 = "_"..i
local desc = S("Table ("..i..")") local desc = S("Table ("..i..")")
if i == "" then if i == "" then
color = "" color = ""
color2 = "_beech"
desc = S("Table") desc = S("Table")
end end
homedecor.register("table"..color, { homedecor.register("table"..color, {
description = desc, description = desc,
tiles = { "forniture_wood"..color..".png" }, tiles = { "homedecor_generic_wood"..color2..".png" },
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -97,15 +99,15 @@ for i in ipairs(chaircolors) do
local color2 = chaircolors[i][1] local color2 = chaircolors[i][1]
local name = S(chaircolors[i][2]) local name = S(chaircolors[i][2])
local chairtiles = { local chairtiles = {
"forniture_wood.png", "homedecor_generic_wood_beech.png",
"wool"..color..".png", "wool"..color..".png",
} }
if chaircolors[i][1] == "" then if chaircolors[i][1] == "" then
color = "" color = ""
chairtiles = { chairtiles = {
"forniture_wood.png", "homedecor_generic_wood_beech.png",
"forniture_wood.png" "homedecor_generic_wood_beech.png"
} }
end end
@ -320,7 +322,7 @@ local wd_cbox = {
homedecor.register("wardrobe_bottom", { homedecor.register("wardrobe_bottom", {
mesh = "homedecor_bedroom_wardrobe.obj", mesh = "homedecor_bedroom_wardrobe.obj",
tiles = { tiles = {
"forniture_wood.png", "homedecor_generic_wood_beech.png",
"homedecor_wardrobe_drawers.png", "homedecor_wardrobe_drawers.png",
"homedecor_wardrobe_doors.png" "homedecor_wardrobe_doors.png"
}, },

View File

@ -3,7 +3,7 @@ local S = homedecor.gettext
homedecor.register("bars", { homedecor.register("bars", {
description = S("Bars"), description = S("Bars"),
tiles = { "forniture_black_metal.png" }, tiles = { "homedecor_generic_metal_black.png" },
sunlight_propagates = true, sunlight_propagates = true,
node_box = { node_box = {
type = "fixed", type = "fixed",
@ -25,7 +25,7 @@ homedecor.register("bars", {
--L Binding Bars --L Binding Bars
homedecor.register("L_binding_bars", { homedecor.register("L_binding_bars", {
description = S("Binding Bars"), description = S("Binding Bars"),
tiles = { "forniture_black_metal.png" }, tiles = { "homedecor_generic_metal_black.png" },
sunlight_propagates = true, sunlight_propagates = true,
node_box = { node_box = {
type = "fixed", type = "fixed",
@ -50,7 +50,7 @@ local chain_cbox = {
homedecor.register("chains", { homedecor.register("chains", {
description = S("Chains"), description = S("Chains"),
mesh = "forniture_chains.obj", mesh = "forniture_chains.obj",
tiles = { "forniture_black_metal.png" }, tiles = { "homedecor_generic_metal_black.png" },
inventory_image="forniture_chains_inv.png", inventory_image="forniture_chains_inv.png",
sunlight_propagates = true, sunlight_propagates = true,
selection_box = chain_cbox, selection_box = chain_cbox,
@ -71,8 +71,8 @@ homedecor.register("torch_wall", {
length=1.0, length=1.0,
}, },
}, },
"forniture_black_metal.png", "homedecor_generic_metal_black.png",
"forniture_metal.png", "homedecor_generic_metal_neutral.png",
"forniture_coal.png", "forniture_coal.png",
}, },
inventory_image="forniture_torch_inv.png", inventory_image="forniture_torch_inv.png",

View File

@ -90,7 +90,7 @@ local kf_cbox = {
homedecor.register("kitchen_faucet", { homedecor.register("kitchen_faucet", {
mesh = "homedecor_kitchen_faucet.obj", mesh = "homedecor_kitchen_faucet.obj",
tiles = { "homedecor_bright_metal.png" }, tiles = { "homedecor_generic_metal_bright.png" },
inventory_image = "homedecor_kitchen_faucet_inv.png", inventory_image = "homedecor_kitchen_faucet_inv.png",
description = "Kitchen Faucet", description = "Kitchen Faucet",
groups = {snappy=3}, groups = {snappy=3},

View File

@ -205,7 +205,7 @@ homedecor.register("candlestick_wrought_iron", {
tiles = { tiles = {
"homedecor_candle_sides.png", "homedecor_candle_sides.png",
{name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}},
"homedecor_tile_wrought_iron.png", "homedecor_generic_metal_wrought_iron.png",
}, },
inventory_image = "homedecor_candlestick_wrought_iron_inv.png", inventory_image = "homedecor_candlestick_wrought_iron_inv.png",
selection_box = cs_cbox, selection_box = cs_cbox,
@ -222,7 +222,7 @@ homedecor.register("candlestick_brass", {
tiles = { tiles = {
"homedecor_candle_sides.png", "homedecor_candle_sides.png",
{name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}},
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
}, },
inventory_image = "homedecor_candlestick_brass_inv.png", inventory_image = "homedecor_candlestick_brass_inv.png",
selection_box = cs_cbox, selection_box = cs_cbox,
@ -240,7 +240,7 @@ homedecor.register("wall_sconce", {
'homedecor_candle_sides.png', 'homedecor_candle_sides.png',
{name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}},
'homedecor_wall_sconce_back.png', 'homedecor_wall_sconce_back.png',
'homedecor_tile_wrought_iron.png', 'homedecor_generic_metal_wrought_iron.png',
}, },
inventory_image = "homedecor_wall_sconce_inv.png", inventory_image = "homedecor_wall_sconce_inv.png",
selection_box = { selection_box = {
@ -266,7 +266,7 @@ homedecor.register("oil_lamp", {
tiles = { tiles = {
"homedecor_oil_lamp_handles.png", "homedecor_oil_lamp_handles.png",
"homedecor_oil_lamp_glass.png", "homedecor_oil_lamp_glass.png",
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
"homedecor_oil_lamp_base.png", "homedecor_oil_lamp_base.png",
"homedecor_oil_lamp_top.png", "homedecor_oil_lamp_top.png",
}, },
@ -403,8 +403,8 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
tiles = { tiles = {
"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
"homedecor_table_standing_lamp_wood.png", "homedecor_generic_wood_red.png",
"forniture_metal.png", "homedecor_generic_metal_neutral.png",
}, },
inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png", inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png",
walkable = false, walkable = false,
@ -429,8 +429,8 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
tiles = { tiles = {
"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
"homedecor_table_standing_lamp_wood.png", "homedecor_generic_wood_red.png",
"forniture_metal.png", "homedecor_generic_metal_neutral.png",
}, },
inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png", inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png",
walkable = false, walkable = false,
@ -488,10 +488,10 @@ homedecor.register("ceiling_lamp", {
description = S("Ceiling Lamp"), description = S("Ceiling Lamp"),
mesh = "homedecor_ceiling_lamp.obj", mesh = "homedecor_ceiling_lamp.obj",
tiles = { tiles = {
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
"homedecor_ceiling_lamp_glass.png", "homedecor_ceiling_lamp_glass.png",
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200", "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200",
"homedecor_generic_brown_plastic.png", "homedecor_generic_plastic_brown.png",
}, },
inventory_image = "homedecor_ceiling_lamp_inv.png", inventory_image = "homedecor_ceiling_lamp_inv.png",
light_source = LIGHT_MAX, light_source = LIGHT_MAX,
@ -505,10 +505,10 @@ homedecor.register("ceiling_lamp_off", {
description = S("Ceiling Lamp (off)"), description = S("Ceiling Lamp (off)"),
mesh = "homedecor_ceiling_lamp.obj", mesh = "homedecor_ceiling_lamp.obj",
tiles = { tiles = {
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
"homedecor_ceiling_lamp_glass.png", "homedecor_ceiling_lamp_glass.png",
"homedecor_table_standing_lamp_lightbulb.png", "homedecor_table_standing_lamp_lightbulb.png",
"homedecor_generic_brown_plastic.png", "homedecor_generic_plastic_brown.png",
}, },
groups = {snappy=3, not_in_creative_inventory=1}, groups = {snappy=3, not_in_creative_inventory=1},
on_punch = function(pos, node, puncher) on_punch = function(pos, node, puncher)

View File

@ -62,7 +62,7 @@ end
homedecor.register("pole_brass", { homedecor.register("pole_brass", {
description = S("Brass Pole"), description = S("Brass Pole"),
mesh = "homedecor_round_pole.obj", mesh = "homedecor_round_pole.obj",
tiles = {"homedecor_tile_brass.png^homedecor_tile_horizlines_overlay.png",}, tiles = {"homedecor_generic_metal_brass.png^homedecor_generic_metal_lines_overlay.png",},
inventory_image = "homedecor_pole_brass_inv.png", inventory_image = "homedecor_pole_brass_inv.png",
wield_image = "homedecor_pole_brass_inv.png", wield_image = "homedecor_pole_brass_inv.png",
selection_box = { selection_box = {
@ -79,7 +79,7 @@ homedecor.register("pole_brass", {
homedecor.register("pole_wrought_iron", { homedecor.register("pole_wrought_iron", {
description = S("Wrought Iron Pole"), description = S("Wrought Iron Pole"),
tiles = { "homedecor_tile_wrought_iron.png^homedecor_tile_horizlines_overlay.png" }, tiles = { "homedecor_generic_metal_wrought_iron.png^homedecor_generic_metal_lines_overlay.png" },
inventory_image = "homedecor_pole_wrought_iron_inv.png", inventory_image = "homedecor_pole_wrought_iron_inv.png",
wield_image = "homedecor_pole_wrought_iron_inv.png", wield_image = "homedecor_pole_wrought_iron_inv.png",
selection_box = { selection_box = {
@ -251,7 +251,7 @@ homedecor.register("filing_cabinet", {
description = S("Filing Cabinet"), description = S("Filing Cabinet"),
mesh = "homedecor_filing_cabinet.obj", mesh = "homedecor_filing_cabinet.obj",
tiles = { tiles = {
"forniture_wood.png", "homedecor_generic_wood_beech.png",
"homedecor_filing_cabinet_front.png", "homedecor_filing_cabinet_front.png",
"homedecor_filing_cabinet_bottom.png" "homedecor_filing_cabinet_bottom.png"
}, },
@ -275,7 +275,7 @@ homedecor.register("pool_table", {
"homedecor_pool_table_baize.png", "homedecor_pool_table_baize.png",
"homedecor_pool_table_pockets.png", "homedecor_pool_table_pockets.png",
"homedecor_pool_table_balls.png", "homedecor_pool_table_balls.png",
"homedecor_pool_table_wood.png" "homedecor_generic_wood_luxury_brown3.png"
}, },
description = "Pool Table", description = "Pool Table",
inventory_image = "homedecor_pool_table_inv.png", inventory_image = "homedecor_pool_table_inv.png",
@ -288,7 +288,7 @@ homedecor.register("pool_table", {
minetest.register_alias("homedecor:pool_table_2", "air") minetest.register_alias("homedecor:pool_table_2", "air")
homedecor.register("coatrack_wallmount", { homedecor.register("coatrack_wallmount", {
tiles = { "forniture_wood.png" }, tiles = { "homedecor_generic_wood_beech.png" },
inventory_image = "homedecor_coatrack_wallmount_inv.png", inventory_image = "homedecor_coatrack_wallmount_inv.png",
description = "Coatrack (wallmounted)", description = "Coatrack (wallmounted)",
groups = {snappy=3}, groups = {snappy=3},
@ -311,8 +311,8 @@ homedecor.register("coatrack_wallmount", {
homedecor.register("coat_tree", { homedecor.register("coat_tree", {
mesh = "homedecor_coatrack.obj", mesh = "homedecor_coatrack.obj",
tiles = { tiles = {
"forniture_wood.png", "homedecor_generic_wood_beech.png",
"homedecor_generic_wood.png" "homedecor_generic_wood_neutral.png"
}, },
inventory_image = "homedecor_coatrack_inv.png", inventory_image = "homedecor_coatrack_inv.png",
description = "Coat tree", description = "Coat tree",
@ -437,8 +437,8 @@ homedecor.register("piano", {
mesh = "homedecor_piano.obj", mesh = "homedecor_piano.obj",
tiles = { tiles = {
"homedecor_piano_keys.png", "homedecor_piano_keys.png",
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
"homedecor_piano_wood.png" "homedecor_generic_wood_luxury_black.png"
}, },
inventory_image = "homedecor_piano_inv.png", inventory_image = "homedecor_piano_inv.png",
description = "Piano", description = "Piano",
@ -461,7 +461,7 @@ homedecor.register("trophy", {
mesh = "homedecor_trophy.obj", mesh = "homedecor_trophy.obj",
tiles = { tiles = {
"default_wood.png", "default_wood.png",
"homedecor_tile_gold.png" "homedecor_generic_metal_gold.png"
}, },
inventory_image = "homedecor_trophy_inv.png", inventory_image = "homedecor_trophy_inv.png",
groups = { snappy=3 }, groups = { snappy=3 },
@ -478,9 +478,9 @@ homedecor.register("sportbench", {
description = "Sport bench", description = "Sport bench",
mesh = "homedecor_sport_bench.obj", mesh = "homedecor_sport_bench.obj",
tiles = { tiles = {
"homedecor_tile_wrought_iron.png", "homedecor_generic_metal_wrought_iron.png",
"homedecor_bright_metal.png", "homedecor_generic_metal_bright.png",
"forniture_black_metal.png", "homedecor_generic_metal_black.png",
"wool_black.png" "wool_black.png"
}, },
inventory_image = "homedecor_sport_bench_inv.png", inventory_image = "homedecor_sport_bench_inv.png",
@ -576,11 +576,11 @@ homedecor.register("tool_cabinet", {
description = "Metal tool cabinet and work table", description = "Metal tool cabinet and work table",
mesh = "homedecor_tool_cabinet.obj", mesh = "homedecor_tool_cabinet.obj",
tiles = { tiles = {
"homedecor_red_metal.png", "homedecor_generic_metal_red.png",
"homedecor_tool_cabinet_drawers.png", "homedecor_tool_cabinet_drawers.png",
"homedecor_green_metal.png", "homedecor_generic_metal_green.png",
"forniture_metal.png", "homedecor_generic_metal_neutral.png",
"homedecor_bright_metal.png", "homedecor_generic_metal_bright.png",
"homedecor_tool_cabinet_misc.png", "homedecor_tool_cabinet_misc.png",
}, },
inventory_image = "homedecor_tool_cabinet_inv.png", inventory_image = "homedecor_tool_cabinet_inv.png",
@ -684,8 +684,8 @@ homedecor.banister_materials = {
}, },
{ "white_dark", { "white_dark",
"dark topped", "dark topped",
"homedecor_white_wood.png", "homedecor_generic_wood_white.png",
"homedecor_dark_wood.png", "homedecor_generic_wood_dark.png",
"group:wood", "group:wood",
"group:stick", "group:stick",
"dye:brown", "dye:brown",
@ -693,8 +693,8 @@ homedecor.banister_materials = {
}, },
{ "brass", { "brass",
"brass", "brass",
"homedecor_white_wood.png", "homedecor_generic_wood_white.png",
"homedecor_tile_brass.png", "homedecor_generic_metal_brass.png",
"technic:brass_ingot", "technic:brass_ingot",
"group:stick", "group:stick",
"", "",
@ -702,8 +702,8 @@ homedecor.banister_materials = {
}, },
{ "wrought_iron", { "wrought_iron",
"wrought iron", "wrought iron",
"homedecor_tile_wrought_iron.png", "homedecor_generic_metal_wrought_iron.png",
"homedecor_tile_wrought_iron.png", "homedecor_generic_metal_wrought_iron.png",
"homedecor:pole_wrought_iron", "homedecor:pole_wrought_iron",
"homedecor:pole_wrought_iron", "homedecor:pole_wrought_iron",
"", "",

View File

@ -201,9 +201,9 @@ homedecor.register("desk", {
description = "Desk", description = "Desk",
mesh = "homedecor_desk.obj", mesh = "homedecor_desk.obj",
tiles = { tiles = {
"forniture_wood.png", "homedecor_generic_wood_beech.png",
"homedecor_desk_drawers.png", "homedecor_desk_drawers.png",
"forniture_black_metal.png", "homedecor_generic_metal_black.png",
}, },
inventory_image = "homedecor_desk_inv.png", inventory_image = "homedecor_desk_inv.png",
selection_box = desk_cbox, selection_box = desk_cbox,

View File

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 152 B

View File

Before

Width:  |  Height:  |  Size: 356 B

After

Width:  |  Height:  |  Size: 356 B

View File

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 186 B

View File

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 381 B

View File

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 303 B

View File

Before

Width:  |  Height:  |  Size: 86 B

After

Width:  |  Height:  |  Size: 86 B

View File

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 189 B

View File

Before

Width:  |  Height:  |  Size: 471 B

After

Width:  |  Height:  |  Size: 471 B

View File

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 156 B

View File

Before

Width:  |  Height:  |  Size: 382 B

After

Width:  |  Height:  |  Size: 382 B

View File

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 369 B

View File

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 640 B

View File

Before

Width:  |  Height:  |  Size: 251 B

After

Width:  |  Height:  |  Size: 251 B

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

Before

Width:  |  Height:  |  Size: 492 B

After

Width:  |  Height:  |  Size: 492 B

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 588 B

After

Width:  |  Height:  |  Size: 588 B

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 692 B

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 858 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

View File

@ -171,8 +171,8 @@ for c in ipairs(curtaincolors) do
end end
local mats = { local mats = {
{ "brass", "Brass", "homedecor_tile_brass.png" }, { "brass", "Brass", "homedecor_generic_metal_brass.png" },
{ "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron.png" }, { "wrought_iron", "Wrought iron", "homedecor_generic_metal_wrought_iron.png" },
{ "wood", "Wooden", "default_wood.png" } { "wood", "Wooden", "default_wood.png" }
} }