phase out generic dark, mahogany, and white wood

and rename the base wood to _plain instead of beech
This commit is contained in:
Vanessa Ezekowitz 2015-05-03 21:18:35 -04:00
parent 5041ae2cdd
commit 3996b55c03
13 changed files with 261 additions and 249 deletions

View File

@ -1,21 +1,21 @@
local S = homedecor.gettext local S = homedecor.gettext
local table_colors = { "", "mahogany", "white" } local table_colors = {
{ "", homedecor.plain_wood },
{ "_mahogany", homedecor.mahogany_wood },
{ "_white", homedecor.white_wood }
}
for _, i in ipairs(table_colors) do for i in ipairs(table_colors) do
local color = "_"..i
local color2 = "_"..i
local desc = S("Table ("..i..")") local desc = S("Table ("..i..")")
if i == "" then if i == 1 then
color = ""
color2 = "_beech"
desc = S("Table") desc = S("Table")
end end
homedecor.register("table"..color, { homedecor.register("table"..table_colors[i][1], {
description = desc, description = desc,
tiles = { "homedecor_generic_wood"..color2..".png" }, tiles = { table_colors[i][2] },
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -64,15 +64,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 = {
"homedecor_generic_wood_beech.png", homedecor.plain_wood,
"wool"..color..".png", "wool"..color..".png",
} }
if chaircolors[i][1] == "" then if chaircolors[i][1] == "" then
color = "" color = ""
chairtiles = { chairtiles = {
"homedecor_generic_wood_beech.png", homedecor.plain_wood,
"homedecor_generic_wood_beech.png" homedecor.plain_wood
} }
end end

View File

@ -99,6 +99,18 @@ function homedecor.find_ceiling(itemstack, placer, pointed_thing)
return isceiling, pos return isceiling, pos
end end
homedecor.plain_wood = "homedecor_generic_wood_plain.png^"..
"(homedecor_generic_wood_boards_overlay.png^[colorize:#a7682020:100)"
homedecor.mahogany_wood = "(homedecor_generic_wood_plain.png^[colorize:#401010:125)^"..
"(homedecor_generic_wood_boards_overlay.png^[colorize:#66493880:200)"
homedecor.white_wood = "(homedecor_generic_wood_plain.png^[colorize:#e0f0ff:200)^"..
"(homedecor_generic_wood_boards_overlay.png^[colorize:#ffffff:200)"
homedecor.dark_wood = "(homedecor_generic_wood_plain.png^[colorize:#140900:200)^"..
"(homedecor_generic_wood_boards_overlay.png^[colorize:#21110180:180)"
-- nodebox arithmetics and helpers -- nodebox arithmetics and helpers
-- (please keep non-generic nodeboxes with their node definition) -- (please keep non-generic nodeboxes with their node definition)
dofile(homedecor.modpath.."/handlers/nodeboxes.lua") dofile(homedecor.modpath.."/handlers/nodeboxes.lua")

View File

@ -244,7 +244,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 = {
"homedecor_generic_wood_beech.png", homedecor.plain_wood,
"homedecor_filing_cabinet_front.png", "homedecor_filing_cabinet_front.png",
"homedecor_filing_cabinet_bottom.png" "homedecor_filing_cabinet_bottom.png"
}, },
@ -282,7 +282,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 = { "homedecor_generic_wood_beech.png" }, tiles = { homedecor.plain_wood },
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},
@ -306,7 +306,7 @@ homedecor.register("coatrack_wallmount", {
homedecor.register("coat_tree", { homedecor.register("coat_tree", {
mesh = "homedecor_coatrack.obj", mesh = "homedecor_coatrack.obj",
tiles = { tiles = {
"homedecor_generic_wood_beech.png", homedecor.plain_wood,
"homedecor_generic_wood_neutral.png" "homedecor_generic_wood_neutral.png"
}, },
inventory_image = "homedecor_coatrack_inv.png", inventory_image = "homedecor_coatrack_inv.png",
@ -717,8 +717,8 @@ homedecor.banister_materials = {
}, },
{ "white_dark", { "white_dark",
"dark topped", "dark topped",
"homedecor_generic_wood_white.png", homedecor.white_wood,
"homedecor_generic_wood_dark.png", homedecor.dark_wood,
"group:wood", "group:wood",
"group:stick", "group:stick",
"dye:brown", "dye:brown",
@ -726,7 +726,7 @@ homedecor.banister_materials = {
}, },
{ "brass", { "brass",
"brass", "brass",
"homedecor_generic_wood_white.png", homedecor.white_wood,
"homedecor_generic_metal_brass.png", "homedecor_generic_metal_brass.png",
"technic:brass_ingot", "technic:brass_ingot",
"group:stick", "group:stick",

View File

@ -38,82 +38,82 @@ v 0.265203 0.312500 0.499999
v -0.297297 -0.125000 0.499999 v -0.297297 -0.125000 0.499999
v 0.202703 0.312500 0.499999 v 0.202703 0.312500 0.499999
v -0.234797 -0.125000 0.499999 v -0.234797 -0.125000 0.499999
vt 0.062500 0.812500 vt -0.312500 0.500000
vt 0.062500 0.750000 vt -0.312500 0.437500
vt 1.000000 0.750000 vt 0.625000 0.437500
vt 0.937500 0.812500 vt 0.562500 0.500000
vt 0.062500 0.937500 vt 0.125000 0.687500
vt 0.937500 0.937500 vt 1.000000 0.687500
vt 1.000000 1.000000 vt 1.062500 0.750000
vt 0.062500 1.000000 vt 0.125000 0.750000
vt 0.625000 0.375000
vt 0.625000 0.312500
vt 0.750000 0.312500
vt 0.750000 0.375000
vt 0.062500 0.875000
vt 1.000000 0.812500
vt 0.937500 0.875000
vt 1.000000 0.937500
vt 0.812500 0.375000
vt 0.812500 0.312500
vt 0.937500 0.312500
vt 0.937500 0.375000
vt 1.000000 0.062500
vt 0.062500 0.062500
vt 0.062500 0.000000
vt 1.000000 0.000000
vt 0.062500 0.625000
vt 0.937500 0.625000
vt 0.937500 0.687500
vt 0.062500 0.687500
vt 1.000000 0.250000
vt 0.062500 0.250000
vt 0.062500 0.187500
vt 1.000000 0.187500
vt 0.062500 0.437500
vt 0.937500 0.437500
vt 0.937500 0.500000
vt 0.062500 0.500000
vt 0.062500 0.375000
vt 0.125000 0.375000
vt 0.125000 0.437500
vt 0.125000 0.250000
vt 0.125000 0.312500
vt 0.062500 0.312500
vt 0.437500 0.375000
vt 0.375000 0.375000
vt 0.375000 0.312500
vt 0.437500 0.312500
vt 0.562500 0.375000
vt 0.500000 0.375000
vt 0.500000 0.312500
vt 0.562500 0.312500
vt 0.125000 0.062500
vt 0.125000 0.125000
vt 0.062500 0.125000
vt 0.062500 0.562500
vt 0.125000 0.562500
vt 0.125000 0.625000
vt 1.000000 0.125000 vt 1.000000 0.125000
vt 0.000000 0.125000 vt 1.000000 0.062500
vt 0.000000 0.062500 vt 1.125000 0.062500
vt 0.000000 0.250000 vt 1.125000 0.125000
vt 0.000000 0.187500 vt 0.125000 0.625000
vt 0.187500 0.875000 vt 0.125000 0.562500
vt 0.000000 0.875000 vt 1.062500 0.562500
vt 0.000000 0.812500 vt 1.000000 0.625000
vt 0.187500 0.812500 vt 1.062500 0.687500
vt 0.250000 0.875000 vt 1.187500 0.125000
vt 0.250000 0.812500 vt 1.187500 0.062500
vt 0.437500 0.812500 vt 1.312500 0.062500
vt 0.437500 0.875000 vt 1.312500 0.125000
vt 1.000000 0.500000 vt 0.875000 0.875000
vt 0.000000 0.500000 vt -0.062500 0.875000
vt 0.000000 0.312500 vt -0.062500 0.812500
vt 1.000000 0.312500 vt 0.875000 0.812500
vt 0.000000 0.562500 vt -0.312500 0.375000
vt 1.000000 0.562500 vt 0.562500 0.375000
vt 0.000000 0.750000 vt 0.562500 0.437500
vt 0.875000 1.000000
vt -0.062500 1.000000
vt -0.062500 0.937500
vt 0.875000 0.937500
vt 0.437500 0.187500
vt 1.312500 0.187500
vt 1.312500 0.250000
vt 0.437500 0.250000
vt 0.437500 0.125000
vt 0.500000 0.125000
vt 0.500000 0.187500
vt -0.375000 0.812500
vt -0.312500 0.812500
vt -0.312500 0.875000
vt -0.375000 0.875000
vt 0.812500 0.125000
vt 0.750000 0.125000
vt 0.750000 0.062500
vt 0.812500 0.062500
vt 0.937500 0.125000
vt 0.875000 0.125000
vt 0.875000 0.062500
vt 0.937500 0.062500
vt -0.250000 0.875000
vt -0.250000 0.937500
vt -0.312500 0.937500
vt -0.312500 0.312500
vt -0.250000 0.312500
vt -0.250000 0.375000
vt -0.125000 0.937500
vt -0.125000 0.875000
vt -0.125000 1.000000
vt -0.187500 0.625000
vt -0.375000 0.625000
vt -0.375000 0.562500
vt -0.187500 0.562500
vt -0.125000 0.625000
vt -0.125000 0.562500
vt 0.062500 0.562500
vt 0.062500 0.625000
vt 1.375000 0.250000
vt 0.375000 0.250000
vt 0.375000 0.062500
vt 1.375000 0.062500
vt -0.375000 0.312500
vt 0.625000 0.312500
vt 0.625000 0.500000
vt -0.375000 0.500000
vn -0.000000 0.000000 1.000000 vn -0.000000 0.000000 1.000000
vn 0.000000 0.000000 -1.000000 vn 0.000000 0.000000 -1.000000
vn 0.000000 -1.000000 0.000000 vn 0.000000 -1.000000 0.000000
@ -129,25 +129,25 @@ s off
f 6/1/1 1/2/1 3/3/1 2/4/1 f 6/1/1 1/2/1 3/3/1 2/4/1
f 17/5/2 13/6/2 14/7/2 12/8/2 f 17/5/2 13/6/2 14/7/2 12/8/2
f 17/9/3 12/10/3 26/11/3 28/12/3 f 17/9/3 12/10/3 26/11/3 28/12/3
f 4/13/1 16/1/1 5/14/1 15/15/1 f 4/13/1 16/14/1 5/15/1 15/16/1
f 25/13/2 23/15/2 24/16/2 22/5/2 f 25/13/2 23/16/2 24/17/2 22/5/2
f 25/17/3 22/18/3 29/19/3 27/20/3 f 25/18/3 22/19/3 29/20/3 27/21/3
f 3/21/4 1/22/4 12/23/4 14/24/4 f 3/22/4 1/23/4 12/24/4 14/25/4
f 6/25/5 2/26/5 13/27/5 17/28/5 f 6/26/5 2/27/5 13/28/5 17/2/5
f 5/29/4 16/30/4 22/31/4 24/32/4 f 5/29/4 16/30/4 22/31/4 24/32/4
f 4/33/5 15/34/5 23/35/5 25/36/5 f 4/33/5 15/34/5 23/35/5 25/36/5
f 27/37/5 35/38/5 31/39/5 4/33/5 f 27/37/5 35/38/5 31/39/5 4/33/5
f 16/30/4 33/40/4 37/41/4 29/42/4 f 16/40/4 33/41/4 37/42/4 29/43/4
f 32/43/6 36/44/6 34/45/6 30/46/6 f 32/44/6 36/45/6 34/46/6 30/47/6
f 31/47/6 35/48/6 37/49/6 33/50/6 f 31/48/6 35/49/6 37/50/6 33/51/6
f 1/22/4 30/51/4 34/52/4 26/53/4 f 1/42/4 30/52/4 34/53/4 26/54/4
f 28/54/5 36/55/5 32/56/5 6/25/5 f 28/55/5 36/56/5 32/57/5 6/26/5
f 26/22/1 34/51/1 36/52/1 28/53/1 f 26/42/1 34/52/1 36/53/1 28/54/1
f 29/30/1 37/40/1 35/41/1 27/42/1 f 29/40/1 37/41/1 35/42/1 27/43/1
g Cylinder_Cylinder_top g Cylinder_Cylinder_top
f 10/57/1 9/58/1 11/59/1 8/21/1 f 10/32/1 9/58/1 11/59/1 8/22/1
f 20/32/2 18/29/2 21/60/2 19/61/2 f 20/32/2 18/29/2 21/60/2 19/58/2
f 10/62/7 8/63/7 18/64/7 20/65/7 f 10/61/7 8/62/7 18/63/7 20/64/7
f 9/66/8 19/67/8 21/68/8 11/69/8 f 9/65/8 19/66/8 21/67/8 11/68/8
f 8/70/9 11/71/9 21/72/9 18/73/9 f 8/69/9 11/70/9 21/71/9 18/72/9
f 9/74/10 10/75/10 20/3/10 19/76/10 f 9/73/10 10/74/10 20/75/10 19/76/10

View File

@ -1,153 +1,153 @@
# Blender v2.73 (sub 0) OBJ File: 'bannister_right.blend' # Blender v2.73 (sub 0) OBJ File: 'bannister.blend'
# www.blender.org # www.blender.org
o Cylinder o Cylinder
v -0.265203 0.250000 0.437499 v 0.265203 0.250000 -0.437499
v -0.202703 1.187500 0.437499 v 0.202703 1.187500 -0.437499
v -0.265203 1.250000 0.437499 v 0.265203 1.250000 -0.437499
v 0.297297 -0.187500 0.437499 v -0.297297 -0.187500 -0.437499
v 0.234797 0.812500 0.437499 v -0.234797 0.812500 -0.437499
v -0.202703 0.250000 0.437499 v 0.202703 0.250000 -0.437499
v 0.047297 1.000000 0.499999 v -0.047297 1.000000 -0.499999
v -0.483953 1.468750 0.499999 v 0.483953 1.468750 -0.499999
v 0.578547 0.531250 0.499999 v -0.578547 0.531250 -0.499999
v -0.421453 1.531250 0.499999 v 0.421453 1.531250 -0.499999
v 0.516047 0.468750 0.499999 v -0.516047 0.468750 -0.499999
v -0.265203 0.250000 0.374999 v 0.265203 0.250000 -0.374999
v -0.202703 1.187500 0.374999 v 0.202703 1.187500 -0.374999
v -0.265203 1.250000 0.374999 v 0.265203 1.250000 -0.374999
v 0.297297 0.750000 0.437499 v -0.297297 0.750000 -0.437499
v 0.234797 -0.187500 0.437499 v -0.234797 -0.187500 -0.437499
v -0.202703 0.250000 0.374999 v 0.202703 0.250000 -0.374999
v -0.483953 1.468750 0.312499 v 0.483953 1.468750 -0.312499
v 0.578547 0.531250 0.312499 v -0.578547 0.531250 -0.312499
v -0.421453 1.531250 0.312499 v 0.421453 1.531250 -0.312499
v 0.516047 0.468750 0.312499 v -0.516047 0.468750 -0.312499
v 0.234797 -0.187500 0.374999 v -0.234797 -0.187500 -0.374999
v 0.297297 0.750000 0.374999 v -0.297297 0.750000 -0.374999
v 0.234797 0.812500 0.374999 v -0.234797 0.812500 -0.374999
v 0.297297 -0.187500 0.374999 v -0.297297 -0.187500 -0.374999
v -0.265203 0.250000 0.499999 v 0.265203 0.250000 -0.499999
v 0.297297 -0.187500 0.499999 v -0.297297 -0.187500 -0.499999
v -0.202703 0.250000 0.499999 v 0.202703 0.250000 -0.499999
v 0.234797 -0.187500 0.499999 v -0.234797 -0.187500 -0.499999
v -0.265203 0.312500 0.437499 v 0.265203 0.312500 -0.437499
v 0.297297 -0.125000 0.437499 v -0.297297 -0.125000 -0.437499
v -0.202703 0.312500 0.437499 v 0.202703 0.312500 -0.437499
v 0.234797 -0.125000 0.437499 v -0.234797 -0.125000 -0.437499
v -0.265203 0.312500 0.499999 v 0.265203 0.312500 -0.499999
v 0.297297 -0.125000 0.499999 v -0.297297 -0.125000 -0.499999
v -0.202703 0.312500 0.499999 v 0.202703 0.312500 -0.499999
v 0.234797 -0.125000 0.499999 v -0.234797 -0.125000 -0.499999
vt 0.062500 0.812500 vt -0.312500 0.500000
vt 0.937500 0.812500 vt 0.562500 0.500000
vt 1.000000 0.750000 vt 0.625000 0.437500
vt 0.062500 0.750000 vt -0.312500 0.437500
vt 0.062500 0.937500 vt 0.125000 0.687500
vt 0.062500 1.000000 vt 0.125000 0.750000
vt 1.000000 1.000000 vt 1.062500 0.750000
vt 0.937500 0.937500 vt 1.000000 0.687500
vt 0.625000 0.375000
vt 0.750000 0.375000
vt 0.750000 0.312500
vt 0.625000 0.312500
vt 0.062500 0.875000
vt 0.937500 0.875000
vt 1.000000 0.812500
vt 1.000000 0.937500
vt 0.812500 0.375000
vt 0.937500 0.375000
vt 0.937500 0.312500
vt 0.812500 0.312500
vt 1.000000 0.062500
vt 1.000000 0.000000
vt 0.062500 0.000000
vt 0.062500 0.062500
vt 0.062500 0.625000
vt 0.062500 0.687500
vt 0.937500 0.687500
vt 0.937500 0.625000
vt 1.000000 0.250000
vt 1.000000 0.187500
vt 0.062500 0.187500
vt 0.062500 0.250000
vt 0.062500 0.437500
vt 0.062500 0.500000
vt 0.937500 0.500000
vt 0.937500 0.437500
vt 0.062500 0.375000
vt 0.125000 0.437500
vt 0.125000 0.375000
vt 0.062500 0.312500
vt 0.125000 0.312500
vt 0.125000 0.250000
vt 0.437500 0.375000
vt 0.437500 0.312500
vt 0.375000 0.312500
vt 0.375000 0.375000
vt 0.562500 0.375000
vt 0.562500 0.312500
vt 0.500000 0.312500
vt 0.500000 0.375000
vt 0.062500 0.125000
vt 0.125000 0.125000
vt 0.125000 0.062500
vt 0.062500 0.562500
vt 0.125000 0.625000
vt 0.125000 0.562500
vt 1.000000 0.125000 vt 1.000000 0.125000
vt 0.000000 0.062500 vt 1.125000 0.125000
vt 0.000000 0.125000 vt 1.125000 0.062500
vt 0.000000 0.187500 vt 1.000000 0.062500
vt 0.000000 0.250000 vt 0.125000 0.625000
vt 0.187500 0.875000 vt 1.000000 0.625000
vt 0.187500 0.812500 vt 1.062500 0.562500
vt 0.000000 0.812500 vt 0.125000 0.562500
vt 0.000000 0.875000 vt 1.062500 0.687500
vt 0.250000 0.875000 vt 1.187500 0.125000
vt 0.437500 0.875000 vt 1.312500 0.125000
vt 0.437500 0.812500 vt 1.312500 0.062500
vt 0.250000 0.812500 vt 1.187500 0.062500
vt 1.000000 0.500000 vt 0.875000 0.875000
vt 1.000000 0.312500 vt 0.875000 0.812500
vt 0.000000 0.312500 vt -0.062500 0.812500
vt 0.000000 0.500000 vt -0.062500 0.875000
vt 0.000000 0.562500 vt -0.312500 0.375000
vt 0.000000 0.750000 vt 0.562500 0.437500
vt 1.000000 0.562500 vt 0.562500 0.375000
vt 0.875000 1.000000
vt 0.875000 0.937500
vt -0.062500 0.937500
vt -0.062500 1.000000
vt 0.437500 0.187500
vt 0.437500 0.250000
vt 1.312500 0.250000
vt 1.312500 0.187500
vt 0.437500 0.125000
vt 0.500000 0.187500
vt 0.500000 0.125000
vt -0.375000 0.812500
vt -0.375000 0.875000
vt -0.312500 0.875000
vt -0.312500 0.812500
vt 0.812500 0.125000
vt 0.812500 0.062500
vt 0.750000 0.062500
vt 0.750000 0.125000
vt 0.937500 0.125000
vt 0.937500 0.062500
vt 0.875000 0.062500
vt 0.875000 0.125000
vt -0.312500 0.937500
vt -0.250000 0.937500
vt -0.250000 0.875000
vt -0.312500 0.312500
vt -0.250000 0.375000
vt -0.250000 0.312500
vt -0.125000 0.875000
vt -0.125000 0.937500
vt -0.125000 1.000000
vt -0.187500 0.625000
vt -0.187500 0.562500
vt -0.375000 0.562500
vt -0.375000 0.625000
vt -0.125000 0.625000
vt 0.062500 0.625000
vt 0.062500 0.562500
vt -0.125000 0.562500
vt 1.375000 0.250000
vt 1.375000 0.062500
vt 0.375000 0.062500
vt 0.375000 0.250000
vt -0.375000 0.312500
vt -0.375000 0.500000
vt 0.625000 0.500000
vt 0.625000 0.312500
vn 0.000000 0.000000 -1.000000
vn 0.000000 0.000000 1.000000 vn 0.000000 0.000000 1.000000
vn -0.000000 0.000000 -1.000000
vn 0.000000 -1.000000 0.000000 vn 0.000000 -1.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 1.000000 0.000000 0.000000 vn 1.000000 0.000000 0.000000
vn -1.000000 0.000000 0.000000
vn 0.000000 1.000000 0.000000 vn 0.000000 1.000000 0.000000
vn -0.707100 0.707100 0.000000
vn 0.707100 -0.707100 0.000000
vn -0.707100 -0.707100 0.000000
vn 0.707100 0.707100 0.000000 vn 0.707100 0.707100 0.000000
vn -0.707100 -0.707100 0.000000
vn 0.707100 -0.707100 0.000000
vn -0.707100 0.707100 0.000000
g Cylinder_Cylinder_verticals g Cylinder_Cylinder_verticals
s off s off
f 6/1/1 2/2/1 3/3/1 1/4/1 f 6/1/1 2/2/1 3/3/1 1/4/1
f 17/5/2 12/6/2 14/7/2 13/8/2 f 17/5/2 12/6/2 14/7/2 13/8/2
f 17/9/3 28/10/3 26/11/3 12/12/3 f 17/9/3 28/10/3 26/11/3 12/12/3
f 4/13/1 15/14/1 5/15/1 16/1/1 f 4/13/1 15/14/1 5/15/1 16/16/1
f 25/13/2 22/5/2 24/16/2 23/14/2 f 25/13/2 22/5/2 24/17/2 23/14/2
f 25/17/3 27/18/3 29/19/3 22/20/3 f 25/18/3 27/19/3 29/20/3 22/21/3
f 3/21/4 14/22/4 12/23/4 1/24/4 f 3/22/4 14/23/4 12/24/4 1/25/4
f 6/25/5 17/26/5 13/27/5 2/28/5 f 6/26/5 17/4/5 13/27/5 2/28/5
f 5/29/4 24/30/4 22/31/4 16/32/4 f 5/29/4 24/30/4 22/31/4 16/32/4
f 4/33/5 25/34/5 23/35/5 15/36/5 f 4/33/5 25/34/5 23/35/5 15/36/5
f 27/37/5 4/33/5 31/38/5 35/39/5 f 27/37/5 4/33/5 31/38/5 35/39/5
f 16/32/4 29/40/4 37/41/4 33/42/4 f 16/40/4 29/41/4 37/42/4 33/43/4
f 32/43/6 30/44/6 34/45/6 36/46/6 f 32/44/6 30/45/6 34/46/6 36/47/6
f 31/47/6 33/48/6 37/49/6 35/50/6 f 31/48/6 33/49/6 37/50/6 35/51/6
f 1/24/4 26/51/4 34/52/4 30/53/4 f 1/42/4 26/52/4 34/53/4 30/54/4
f 28/54/5 6/25/5 32/55/5 36/56/5 f 28/55/5 6/26/5 32/56/5 36/57/5
f 26/24/1 28/51/1 36/52/1 34/53/1 f 26/42/1 28/52/1 36/53/1 34/54/1
f 29/32/1 27/40/1 35/41/1 37/42/1 f 29/40/1 27/41/1 35/42/1 37/43/1
g Cylinder_Cylinder_top g Cylinder_Cylinder_top
f 10/57/1 8/21/1 11/58/1 9/59/1 f 10/30/1 8/22/1 11/58/1 9/59/1
f 20/30/2 19/60/2 21/61/2 18/29/2 f 20/30/2 19/59/2 21/60/2 18/29/2
f 10/62/7 20/63/7 18/64/7 8/65/7 f 10/61/7 20/62/7 18/63/7 8/64/7
f 9/66/8 11/67/8 21/68/8 19/69/8 f 9/65/8 11/66/8 21/67/8 19/68/8
f 8/70/9 18/71/9 21/72/9 11/73/9 f 8/69/9 18/70/9 21/71/9 11/72/9
f 9/74/10 19/75/10 20/3/10 10/76/10 f 9/73/10 19/74/10 20/75/10 10/76/10

View File

@ -197,7 +197,7 @@ homedecor.register("desk", {
description = "Desk", description = "Desk",
mesh = "homedecor_desk.obj", mesh = "homedecor_desk.obj",
tiles = { tiles = {
"homedecor_generic_wood_beech.png", homedecor.plain_wood,
"homedecor_desk_drawers.png", "homedecor_desk_drawers.png",
"homedecor_generic_metal_black.png", "homedecor_generic_metal_black.png",
}, },

Binary file not shown.

Before

Width:  |  Height:  |  Size: 640 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 605 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

View File

@ -8,7 +8,7 @@ local wd_cbox = {
homedecor.register("wardrobe", { homedecor.register("wardrobe", {
mesh = "homedecor_bedroom_wardrobe.obj", mesh = "homedecor_bedroom_wardrobe.obj",
tiles = { tiles = {
"homedecor_generic_wood_beech.png", homedecor.plain_wood,
"homedecor_wardrobe_drawers.png", "homedecor_wardrobe_drawers.png",
"homedecor_wardrobe_doors.png" "homedecor_wardrobe_doors.png"
}, },