phase out separate inv textures for beds

reduce them to just the wood+white sheet base images plus colorized blanket/pillow overlays
This commit is contained in:
Vanessa Ezekowitz 2015-05-07 13:30:49 -04:00
parent 4c6a98b593
commit a6056d69de
23 changed files with 16 additions and 13 deletions

View File

@ -1,15 +1,15 @@
local S = homedecor.gettext local S = homedecor.gettext
local bedcolors = { local bedcolors = {
"red", { "red", "#d00000:150" },
"green", { "green", "#00d000:150" },
"blue", { "blue", "#0000d0:150" },
"violet", { "violet", "#7000e0:150" },
"brown", { "brown", "#603010:175" },
"darkgrey", { "darkgrey", "#101010:150" },
"orange", { "orange", "#ff3000:150" },
"yellow", { "yellow", "#ffe000:150" },
"pink", { "pink", "#ff80b0:150" }
} }
local bed_sbox = { local bed_sbox = {
@ -40,8 +40,11 @@ local kbed_cbox = {
} }
} }
for _, color in ipairs(bedcolors) do for i in ipairs(bedcolors) do
local color = bedcolors[i][1]
local color2=color local color2=color
local hue = bedcolors[i][2]
if color == "darkgrey" then if color == "darkgrey" then
color2 = "dark_grey" color2 = "dark_grey"
end end
@ -55,7 +58,7 @@ for _, color in ipairs(bedcolors) do
"homedecor_bed_bottom.png", "homedecor_bed_bottom.png",
"wool_"..color2..".png^[brighten", -- pillow "wool_"..color2..".png^[brighten", -- pillow
}, },
inventory_image = "homedecor_bed_"..color.."_inv.png", inventory_image = "homedecor_bed_inv.png^(homedecor_bed_overlay_inv.png^[colorize:"..hue..")",
description = S("Bed (%s)"):format(color), description = S("Bed (%s)"):format(color),
groups = {snappy=3}, groups = {snappy=3},
selection_box = bed_sbox, selection_box = bed_sbox,
@ -86,7 +89,6 @@ for _, color in ipairs(bedcolors) do
"homedecor_bed_bottom.png", "homedecor_bed_bottom.png",
"wool_"..color2..".png^[brighten", "wool_"..color2..".png^[brighten",
}, },
groups = {snappy=3, not_in_creative_inventory=1},
selection_box = bed_sbox, selection_box = bed_sbox,
collision_box = bed_cbox, collision_box = bed_cbox,
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
@ -112,7 +114,8 @@ for _, color in ipairs(bedcolors) do
"homedecor_bed_bottom.png", "homedecor_bed_bottom.png",
"wool_"..color2..".png^[brighten", "wool_"..color2..".png^[brighten",
}, },
inventory_image = "homedecor_bed_kingsize_"..color.."_inv.png", inventory_image = "homedecor_bed_kingsize_inv.png^(homedecor_bed_kingsize_overlay_inv.png^[colorize:"..hue..")",
groups = {snappy=3, not_in_creative_inventory=1},
description = S("Bed (%s, king sized)"):format(color), description = S("Bed (%s, king sized)"):format(color),
groups = {snappy=3, not_in_creative_inventory=1}, groups = {snappy=3, not_in_creative_inventory=1},
selection_box = kbed_sbox, selection_box = kbed_sbox,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB