mtcontrib/homedecor_modpack
1
0
Fork 2
mirror of https://github.com/mt-mods/homedecor_modpack.git synced 2024-12-22 16:10:18 +01:00
Code Issues Releases Wiki Activity

Use texture colorization where possible

Browse Source 
Uses "color = <foo>" in the tile image def instead
of compositing with ^[colorize or ^[brighten.  Saves RAM.
This commit is contained in:
Vanessa Ezekowitz 2017-01-25 04:22:28 -05:00
parent 8e467ef6b6
commit 73545c89af
31 changed files with 133 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
homedecor/bathroom_sanitation.lua
View File

@ -17,10 +17,10 @@ homedecor.register("toilet", {
description = S("Toilet"),
mesh = "homedecor_toilet_closed.obj",
tiles = {
"homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_generic_metal_black.png^[brighten"
"homedecor_marble.png",
"homedecor_marble.png",
"homedecor_marble.png",
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey }
},
selection_box = toilet_sbox,
node_box = toilet_cbox,
@ -35,11 +35,11 @@ homedecor.register("toilet", {
homedecor.register("toilet_open", {
mesh = "homedecor_toilet_open.obj",
tiles = {
"homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_marble.png",
"homedecor_marble.png",
"homedecor_marble.png",
"default_water.png",
"homedecor_generic_metal_black.png^[brighten"
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey }
},
selection_box = toilet_sbox,
collision_box = toilet_cbox,
@ -89,7 +89,7 @@ homedecor.register("sink", {
description = S("Bathroom Sink"),
mesh = "homedecor_bathroom_sink.obj",
tiles = {
"homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_marble.png",
"homedecor_marble.png",
"default_water.png"
},
@ -137,9 +137,9 @@ homedecor.register("taps", {
description = S("Bathroom taps/faucet"),
mesh = "homedecor_bathroom_faucet.obj",
tiles = {
"homedecor_generic_metal_black.png^[brighten",
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
"homedecor_generic_metal_bright.png",
"homedecor_generic_metal_black.png^[colorize:#ffffff:200",
"homedecor_generic_metal.png",
"homedecor_generic_metal_bright.png"
},
inventory_image = "3dforniture_taps_inv.png",
@ -162,7 +162,7 @@ homedecor.register("taps_brass", {
tiles = {
"homedecor_generic_metal_brass.png",
"homedecor_generic_metal_brass.png",
"homedecor_generic_metal_black.png^[colorize:#ffffff:200",
"homedecor_generic_metal.png",
"homedecor_generic_metal_brass.png"
},
inventory_image = "3dforniture_taps_brass_inv.png",
@ -218,7 +218,7 @@ homedecor.register("shower_head", {
drawtype = "mesh",
mesh = "homedecor_shower_head.obj",
tiles = {
"homedecor_generic_metal_black.png^[brighten",
"homedecor_generic_metal.png",
"homedecor_shower_head.png"
},
inventory_image = "homedecor_shower_head_inv.png",

2
homedecor/climate-control.lua
View File

@ -132,7 +132,7 @@ local r_cbox = homedecor.nodebox.slab_z(-0.25)
homedecor.register("radiator", {
mesh = "homedecor_radiator.obj",
tiles = {
"homedecor_generic_metal_black.png^[colorize:#ffffff:200",
"homedecor_generic_metal.png",
"homedecor_radiator_controls.png"
},
inventory_image = "homedecor_radiator_inv.png",

4
homedecor/clocks.lua
View File

@ -4,7 +4,7 @@ local clock_sbox = {
}
local clock_materials = {
{ "plastic", "homedecor_generic_plastic_black.png^[colorize:#ffffff:220" },
{ "plastic", "homedecor_generic_plastic.png" },
{ "wood", "default_wood.png" }
}
@ -82,7 +82,7 @@ homedecor.register("grandfather_clock", {
tiles = {
"default_glass.png",
"homedecor_grandfather_clock_face.png",
"homedecor_generic_wood_luxury.png",
homedecor.lux_wood,
"homedecor_grandfather_clock_face_edge.png",
"homedecor_generic_metal_brass.png"
},

10
homedecor/doors_and_gates.lua
View File

@ -527,7 +527,7 @@ minetest.register_node("homedecor:japanese_wall_top", {
drawtype = "mesh",
mesh = "homedecor_wall_japanese_top.obj",
tiles = {
"homedecor_generic_wood_luxury.png",
homedecor.lux_wood,
"homedecor_japanese_paper.png"
},
paramtype = "light",
@ -543,7 +543,7 @@ minetest.register_node("homedecor:japanese_wall_middle", {
drawtype = "mesh",
mesh = "homedecor_wall_japanese_middle.obj",
tiles = {
"homedecor_generic_wood_luxury.png",
homedecor.lux_wood,
"homedecor_japanese_paper.png"
},
paramtype = "light",
@ -559,7 +559,7 @@ minetest.register_node("homedecor:japanese_wall_bottom", {
drawtype = "mesh",
mesh = "homedecor_wall_japanese_bottom.obj",
tiles = {
"homedecor_generic_wood_luxury.png",
homedecor.lux_wood,
"homedecor_japanese_paper.png"
},
paramtype = "light",
@ -595,7 +595,7 @@ homedecor.register("door_japanese_closed", {
description = S("Japanese-style door"),
inventory_image = "homedecor_door_japanese_inv.png",
tiles = {
"homedecor_generic_wood_luxury.png",
homedecor.lux_wood,
"homedecor_japanese_paper.png"
},
mesh = "homedecor_door_japanese_closed.obj",
@ -618,7 +618,7 @@ homedecor.register("door_japanese_closed", {
homedecor.register("door_japanese_open", {
tiles = {
"homedecor_generic_wood_luxury.png",
homedecor.lux_wood,
"homedecor_japanese_paper.png"
},
mesh = "homedecor_door_japanese_open.obj",

6
homedecor/exterior.lua
View File

@ -12,8 +12,8 @@ homedecor.register("barbecue", {
description = S("Barbecue"),
mesh = "homedecor_barbecue.obj",
tiles = {
"homedecor_generic_metal_black.png",
{ name="homedecor_embers.png",
{ name = "homedecor_generic_metal.png" , color = homedecor.color_black },
{ name = "homedecor_embers.png",
animation={
type="vertical_frames",
aspect_w=16,
@ -319,7 +319,7 @@ homedecor.register("well", {
mesh = "homedecor_well.obj",
tiles = {
"homedecor_rope_texture.png",
"homedecor_generic_metal_black.png^[brighten",
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
"default_water.png",
"default_cobble.png",
"default_wood.png",

18
homedecor/furniture_medieval.lua
View File

@ -3,7 +3,7 @@ local S = homedecor.gettext
homedecor.register("bars", {
description = S("Bars"),
tiles = { "homedecor_generic_metal_black.png^[transformR270" },
tiles = { { name = "homedecor_generic_metal.png^[transformR270", color = homedecor.color_black } },
node_box = {
type = "fixed",
fixed = {
@ -25,7 +25,7 @@ homedecor.register("bars", {
--L Binding Bars
homedecor.register("L_binding_bars", {
description = S("Binding Bars"),
tiles = { "homedecor_generic_metal_black.png^[transformR270" },
tiles = { { name = "homedecor_generic_metal.png^[transformR270", color = homedecor.color_black } },
node_box = {
type = "fixed",
fixed = {
@ -50,7 +50,7 @@ local chain_cbox = {
homedecor.register("chains", {
description = S("Chains"),
mesh = "forniture_chains.obj",
tiles = { "homedecor_generic_metal_black.png" },
tiles = { { name = "homedecor_generic_metal.png", color = homedecor.color_black } },
inventory_image="forniture_chains_inv.png",
selection_box = chain_cbox,
walkable = false,
@ -71,8 +71,8 @@ homedecor.register("torch_wall", {
length=1.0,
},
},
"homedecor_generic_metal_black.png",
"homedecor_generic_metal_black.png^[brighten",
{ name = "homedecor_generic_metal.png", color = homedecor.color_black },
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
"forniture_coal.png",
},
inventory_image="forniture_torch_inv.png",
@ -93,8 +93,12 @@ local wl_cbox = {
homedecor.register("wall_lamp", {
description = S("Wall Lamp"),
mesh = "homedecor_wall_lamp.obj",
tiles = {"homedecor_generic_metal_black.png^[brighten", "homedecor_generic_wood_luxury.png^[colorize:#000000:30",
"homedecor_light.png", "homedecor_generic_metal_wrought_iron.png"},
tiles = {
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
homedecor.lux_wood,
"homedecor_light.png",
"homedecor_generic_metal_wrought_iron.png"
},
use_texture_alpha = true,
inventory_image = "homedecor_wall_lamp_inv.png",
groups = {snappy=3},

19
homedecor/init.lua
View File

@ -67,18 +67,15 @@ end
screwdriver = screwdriver or {}
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)"
homedecor.plain_wood = { name = "homedecor_generic_wood_plain.png", color = 0xffa76820 }
homedecor.mahogany_wood = { name = "homedecor_generic_wood_plain.png", color = 0xff7d2506 }
homedecor.white_wood = "homedecor_generic_wood_plain.png"
homedecor.dark_wood = { name = "homedecor_generic_wood_plain.png", color = 0xff39240f }
homedecor.lux_wood = { name = "homedecor_generic_wood_luxury.png", color = 0xff643f23 }
homedecor.color_black = 0xff303030
homedecor.color_dark_grey = 0xff606060
homedecor.color_med_grey = 0xffa0a0a0
-- load different handler subsystems
dofile(modpath.."/handlers/init.lua")

2
homedecor/laundry.lua
View File

@ -52,7 +52,7 @@ homedecor.register("ironing_board", {
mesh = "homedecor_ironing_board.obj",
tiles = {
"wool_grey.png",
"homedecor_generic_metal_black.png^[brighten"
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
},
expand = {right = "placeholder"},
groups = { snappy = 3 },

60
homedecor/lighting.lua
View File

@ -151,7 +151,7 @@ homedecor.register("plasma_ball", {
description = S("Plasma Ball"),
mesh = "homedecor_plasma_ball.obj",
tiles = {
"homedecor_generic_plastic_black.png",
"homedecor_generic_plastic.png",
{
name = "homedecor_plasma_ball_streamers.png",
animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0},
@ -281,10 +281,10 @@ homedecor.register("oil_lamp", {
mesh = "homedecor_oil_lamp.obj",
tiles = {
"homedecor_generic_metal_brass.png",
"homedecor_generic_metal_black.png",
"homedecor_generic_metal_black.png^[colorize:#ff0000:160",
{ name = "homedecor_generic_metal.png", color = homedecor.color_black },
{ name = "homedecor_generic_metal.png", color = 0xffa00000 },
"homedecor_oil_lamp_wick.png",
"homedecor_generic_metal_black.png^[colorize:#ff0000:150",
{ name = "homedecor_generic_metal.png", color = 0xffa00000 },
"homedecor_oil_lamp_glass.png",
},
use_texture_alpha = true,
@ -414,22 +414,28 @@ local slamp_cbox = {
fixed = { -0.25, -0.5, -0.25, 0.25, 1.5, 0.25 }
}
local function reg_lamp(suffix, nxt, tilesuffix, light, color)
local brightness_tab = {
0xffd0d0d0,
0xffd8d8d8,
0xffe0e0e0,
0xffe8e8e8,
0xffffffff,
}
local function reg_lamp(suffix, nxt, tilesuffix, light, color, brightness)
local lampcolor = "_"..color[1]
local colordesc = S(color[1])
local woolcolor = color[1]
local invcolor = color[2]
local wool_brighten = (light or 0) * 7
local bulb_brighten = (light or 0) * 14
homedecor.register("table_lamp"..lampcolor.."_"..suffix, {
description = S("Table Lamp (@1)", colordesc),
mesh = "homedecor_table_lamp.obj",
tiles = {
"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
{ name = "wool_"..woolcolor..".png", color = brightness_tab[brightness] },
{ name = "homedecor_table_standing_lamp_lightbulb.png", color = brightness_tab[brightness] },
"homedecor_generic_wood_red.png",
"homedecor_generic_metal_black.png^[brighten",
{ name = "homedecor_generic_metal.png", color = homedecor.color_black },
},
inventory_image = "homedecor_table_lamp_foot_inv.png^(homedecor_table_lamp_top_inv.png^[colorize:"..invcolor..")",
walkable = false,
@ -452,10 +458,10 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
description = S("Standing Lamp (@1)", colordesc),
mesh = "homedecor_standing_lamp.obj",
tiles = {
"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
{ name = "wool_"..woolcolor..".png", color = brightness_tab[brightness] },
{ name = "homedecor_table_standing_lamp_lightbulb.png", color = brightness_tab[brightness] },
"homedecor_generic_wood_red.png",
"homedecor_generic_metal_black.png^[brighten",
{ name ="homedecor_generic_metal.png", color = homedecor.color_black },
},
inventory_image = "homedecor_standing_lamp_foot_inv.png^(homedecor_standing_lamp_top_inv.png^[colorize:"..invcolor..")",
walkable = false,
@ -482,12 +488,12 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
end
end
for _, color in ipairs(lamp_colors) do
reg_lamp("off", "low", "", nil, color )
reg_lamp("low", "med", "l", 3, color )
reg_lamp("med", "hi", "m", 7, color )
reg_lamp("hi", "max", "h", 11, color )
reg_lamp("max", "off", "x", 14, color )
for n, color in ipairs(lamp_colors) do
reg_lamp("off", "low", "", nil, color, 1 )
reg_lamp("low", "med", "l", 3, color, 2 )
reg_lamp("med", "hi", "m", 7, color, 3 )
reg_lamp("hi", "max", "h", 11, color, 4 )
reg_lamp("max", "off", "x", 14, color, 5 )
end
local dlamp_cbox = {
@ -502,10 +508,10 @@ for _, color in ipairs(dlamp_colors) do
description = S("Desk Lamp (@1)", S(color)),
mesh = "homedecor_desk_lamp.obj",
tiles = {
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200",
"homedecor_generic_metal_black.png^[colorize:"..color..":150",
"homedecor_generic_metal_black.png",
"homedecor_generic_metal_black.png^[colorize:"..color..":150"
{ name = "homedecor_table_standing_lamp_lightbulb.png", color = brightness_tab[5] },
{ name = "homedecor_generic_metal.png", color = color },
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
{ name = "homedecor_generic_metal.png", color = color }
},
inventory_image = "homedecor_desk_lamp_stem_inv.png^(homedecor_desk_lamp_metal_inv.png^[colorize:"..color..":140)",
selection_box = dlamp_cbox,
@ -520,8 +526,8 @@ homedecor.register("ceiling_lamp", {
tiles = {
"homedecor_generic_metal_brass.png",
"homedecor_ceiling_lamp_glass.png",
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200",
"homedecor_generic_plastic_black.png^[colorize:#442d04:200",
"homedecor_table_standing_lamp_lightbulb.png",
{ name = "homedecor_generic_plastic.png", color = 0xff442d04 },
},
inventory_image = "homedecor_ceiling_lamp_inv.png",
light_source = default.LIGHT_MAX,
@ -538,8 +544,8 @@ homedecor.register("ceiling_lamp_off", {
tiles = {
"homedecor_generic_metal_brass.png",
"homedecor_ceiling_lamp_glass.png",
"homedecor_table_standing_lamp_lightbulb.png",
"homedecor_generic_plastic_black.png^[colorize:#442d04:200",
{ "homedecor_table_standing_lamp_lightbulb.png", color = 0xffd0d0d0 },
{ name = "homedecor_generic_plastic.png", color = 0xff442d04 },
},
groups = {snappy=3, not_in_creative_inventory=1},
walkable = false,

22
homedecor/misc-nodes.lua
View File

@ -74,7 +74,7 @@ homedecor.register("flower_pot_"..p, {
mesh = "homedecor_flowerpot.obj",
tiles = {
"homedecor_flower_pot_"..p..".png",
"default_dirt.png^[colorize:#000000:175"
{ name = "default_dirt.png", color = 0xff505050 },
},
groups = { snappy = 3, potting_soil=1 },
sounds = default.node_sound_stone_defaults(),
@ -100,7 +100,7 @@ for _, f in ipairs(flowers_list) do
mesh = "homedecor_potted_plant.obj",
tiles = {
"homedecor_flower_pot_terracotta.png",
"default_dirt.png^[colorize:#000000:175",
{ name = "default_dirt.png", color = 0xff303030 },
"flowers_"..flower..".png"
},
walkable = false,
@ -167,7 +167,7 @@ homedecor.register("fishtank", {
description = S("Fishtank"),
mesh = "homedecor_fishtank.obj",
tiles = {
"homedecor_generic_plastic_black.png",
{ name = "homedecor_generic_plastic.png", color = homedecor.color_black },
"homedecor_fishtank_filter.png",
"homedecor_fishtank_fishes.png",
"homedecor_fishtank_gravel.png",
@ -189,7 +189,7 @@ homedecor.register("fishtank_lighted", {
description = S("Fishtank (lighted)"),
mesh = "homedecor_fishtank.obj",
tiles = {
"homedecor_generic_plastic_black.png",
{ name = "homedecor_generic_plastic.png", color = homedecor.color_black },
"homedecor_fishtank_filter.png",
"homedecor_fishtank_fishes_lighted.png",
"homedecor_fishtank_gravel_lighted.png",
@ -268,7 +268,7 @@ homedecor.register("pool_table", {
"homedecor_pool_table_baize.png",
"homedecor_pool_table_pockets.png",
"homedecor_pool_table_balls.png",
"homedecor_generic_wood_luxury.png^[colorize:#000000:90"
homedecor.lux_wood,
},
description = S("Pool Table"),
inventory_image = "homedecor_pool_table_inv.png",
@ -290,7 +290,7 @@ local piano_cbox = {
homedecor.register("piano", {
mesh = "homedecor_piano.obj",
tiles = {
"homedecor_generic_wood_luxury.png^[colorize:#000000:175",
{ name = "homedecor_generic_wood_luxury.png", color = homedecor.color_black },
"homedecor_piano_keys.png",
"homedecor_generic_metal_brass.png",
},
@ -336,7 +336,7 @@ homedecor.register("sportbench", {
tiles = {
"homedecor_generic_metal_wrought_iron.png",
"homedecor_generic_metal_bright.png",
"homedecor_generic_metal_black.png",
{ name = "homedecor_generic_metal.png", color = homedecor.color_black },
"wool_black.png"
},
inventory_image = "homedecor_sport_bench_inv.png",
@ -368,10 +368,10 @@ homedecor.register("tool_cabinet", {
description = S("Metal tool cabinet and work table"),
mesh = "homedecor_tool_cabinet.obj",
tiles = {
"homedecor_generic_metal_black.png^[colorize:#ff0000:150",
{ name = "homedecor_generic_metal.png", color = 0xffd00000 },
"homedecor_tool_cabinet_drawers.png",
"homedecor_generic_metal_black.png^[colorize:#006000:150",
"homedecor_generic_metal_black.png^[brighten",
{ name = "homedecor_generic_metal.png", color = 0xff006000 },
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
"homedecor_generic_metal_bright.png",
"homedecor_tool_cabinet_misc.png",
},
@ -400,7 +400,7 @@ for _, i in ipairs(n) do
mesh = "homedecor_picture_frame.obj",
tiles = {
"homedecor_picture_frame_image"..i..".png",
"homedecor_generic_wood_luxury.png^[colorize:#000000:50",
homedecor.lux_wood,
"homedecor_picture_frame_back.png",
},
inventory_image = "homedecor_picture_frame"..i.."_inv.png",

2
homedecor/office.lua
View File

@ -52,7 +52,7 @@ homedecor.register("desk_globe", {
mesh = "homedecor_desk_globe.obj",
tiles = {
"homedecor_generic_wood_red.png",
"homedecor_generic_metal_black.png^[brighten",
{ name = "homedecor_generic_metal.png", color = homedecor.color_med_grey },
"homedecor_earth.png"
},
inventory_image = "homedecor_desk_globe_inv.png",

26
homedecor/shutters.lua
View File

@ -3,17 +3,17 @@
local S = homedecor.gettext
local shutters = {
{"oak", S("unpainted oak"), "#bf8a51:200" },
{"mahogany", S("mahogany"), "#822606:200" },
{"red", S("red"), "#d00000:150" },
{"yellow", S("yellow"), "#ffff00:150" },
{"forest_green", S("forest green"), "#006000:150" },
{"light_blue", S("light blue"), "#1963c7:150" },
{"violet", S("violet"), "#6000ff:150" },
{"black", S("black"), "#000000:200" },
{"dark_grey", S("dark grey"), "#202020:200" },
{"grey", S("grey"), "#c0c0c0:150" },
{"white", S("white"), "#ffffff:150" },
{"oak", S("unpainted oak"), "bf8a51" },
{"mahogany", S("mahogany"), "822606" },
{"red", S("red"), "d00000" },
{"yellow", S("yellow"), "ffff00" },
{"forest_green", S("forest green"), "006000" },
{"light_blue", S("light blue"), "2878d8" },
{"violet", S("violet"), "7000e0" },
{"black", S("black"), "181818" },
{"dark_grey", S("dark grey"), "404040" },
{"grey", S("grey"), "b0b0b0" },
{"white", S("white"), "ffffff" },
}
local shutter_cbox = {
@ -26,8 +26,8 @@ local shutter_cbox = {
for _, s in ipairs(shutters) do
local name, desc, hue = unpack(s)
local tile = "homedecor_window_shutter.png^[colorize:"..hue
local inv = "homedecor_window_shutter_inv.png^[colorize:"..hue
local tile = { name = "homedecor_window_shutter.png", color = tonumber("0xff"..hue) }
local inv = "homedecor_window_shutter_inv.png^[colorize:#"..hue..":150"
homedecor.register("shutter_"..name, {
mesh = "homedecor_window_shutter.obj",

BIN
homedecor/textures/homedecor_generic_metal.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 218 B

BIN
homedecor/textures/homedecor_generic_metal_black.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 211 B

BIN
homedecor/textures/homedecor_generic_plastic.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 226 B

BIN
homedecor/textures/homedecor_generic_plastic_black.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 217 B

BIN
homedecor/textures/homedecor_generic_wood_boards_overlay.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 98 B

BIN
homedecor/textures/homedecor_generic_wood_luxury.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 590 B

BIN
homedecor/textures/homedecor_generic_wood_plain.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 605 B

After

Width:  |  Height:  |  Size: 293 B

BIN
homedecor/textures/homedecor_marble.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 818 B

After

Width:  |  Height:  |  Size: 233 B

BIN
homedecor/textures/homedecor_table_standing_lamp_lightbulb.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 594 B

BIN
homedecor/textures/homedecor_window_shutter.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 278 B

After

Width:  |  Height:  |  Size: 278 B

BIN
homedecor/textures/homedecor_window_shutter_inv.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

24
homedecor/window_treatments.lua
View File

@ -102,12 +102,12 @@ homedecor.register("blinds_thin", {
})
local curtaincolors = {
{ N_("red"), "#ad2323e0:175" },
{ N_("green"), "#27a927e0:175" },
{ N_("blue"), "#2626c6e0:175" },
{ N_("white"), "#ffffffe0:175" },
{ N_("pink"), "#ff8fb7e0:175" },
{ N_("violet"), "#7f29d7e0:175" },
{ N_("red"), "ad2323" },
{ N_("green"), "27a927" },
{ N_("blue"), "2626c6" },
{ N_("white"), "ffffff" },
{ N_("pink"), "ff8fb7" },
{ N_("violet"), "7f29d7" },
}
for _, c in ipairs(curtaincolors) do
@ -115,9 +115,9 @@ for _, c in ipairs(curtaincolors) do
homedecor.register("curtain_"..color, {
description = S("Curtains (@1)", S(color)),
tiles = { "homedecor_curtain.png^[colorize:"..hue },
inventory_image = "homedecor_curtain.png^[colorize:"..hue,
wield_image = "homedecor_curtain.png^[colorize:"..hue,
tiles = { { name = "homedecor_curtain.png", color = tonumber("0xff"..hue) } },
inventory_image = "homedecor_curtain.png^[colorize:#"..hue.."e0:175",
wield_image = "homedecor_curtain.png^[colorize:#"..hue.."e0:175",
drawtype = 'signlike',
use_texture_alpha = true,
walkable = false,
@ -138,9 +138,9 @@ for _, c in ipairs(curtaincolors) do
homedecor.register("curtain_open_"..color, {
description = S("Curtains (@1)", S(color)),
tiles = { "homedecor_curtain_open.png^[colorize:"..hue },
inventory_image = "homedecor_curtain_open.png^[colorize:"..hue,
wield_image = "homedecor_curtain_open.png^[colorize:"..hue,
tiles = { { name = "homedecor_curtain_open.png", color = tonumber("0xff"..hue) } },
inventory_image = "homedecor_curtain_open.png^[colorize:#"..hue.."e0:175",
wield_image = "homedecor_curtain_open.png^[colorize:#"..hue.."e0:175",
drawtype = 'signlike',
use_texture_alpha = true,
walkable = false,

2
lrfurn/armchairs.lua
View File

@ -16,7 +16,7 @@ for i in ipairs(lrfurn.colors) do
drawtype = "mesh",
mesh = "lrfurn_armchair.obj",
tiles = {
"lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png",
{ name = "lrfurn_upholstery.png", color = hue },
"lrfurn_sofa_bottom.png"
},
paramtype = "light",

32
lrfurn/init.lua
View File

@ -8,22 +8,22 @@ lrfurn.fdir_to_fwd = {
{ -1, 0 },
}
lrfurn.colors = { -- mod changed to use colorize feature of minetest engine (cg72)
{ "black", "#000000:230" },
{ "brown", "#251005:225" },
{ "blue", "#0000d0:225" },
{ "cyan", "#009fa7:250" },
{ "dark_grey", "#101010:175" },
{ "dark_green", "#007000:230" },
{ "green", "#00d000:250" },
{ "grey", "#101010:100" },
{ "magenta", "#e0048b:250" },
{ "orange", "#ee9000:240" },
{ "pink", "#ff90b0:250" },
{ "red", "#800000:240" },
{ "violet", "#9000d0:250" },
{ "white", "#000000:000" },
{ "yellow", "#dde000:240" }
lrfurn.colors = {
{ "black", 0xff000000 },
{ "brown", 0xff251005 },
{ "blue", 0xff0000d0 },
{ "cyan", 0xff009fa7 },
{ "dark_grey", 0xff101010 },
{ "dark_green", 0xff007000 },
{ "green", 0xff00d000 },
{ "grey", 0xff303030 },
{ "magenta", 0xffe0048b },
{ "orange", 0xffee9000 },
{ "pink", 0xffff90b0 },
{ "red", 0xff800000 },
{ "violet", 0xff9000d0 },
{ "white", 0xff000000 },
{ "yellow", 0xffdde000 }
}
function lrfurn.check_forward(pos, fdir, long, placer)

2
lrfurn/longsofas.lua
View File

@ -21,7 +21,7 @@ for i in ipairs(lrfurn.colors) do
drawtype = "mesh",
mesh = "lrfurn_sofa_long.obj",
tiles = {
"lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png",
{ name = "lrfurn_upholstery.png", color = hue },
"lrfurn_sofa_bottom.png"
},
paramtype = "light",

2
lrfurn/sofas.lua
View File

@ -22,7 +22,7 @@ for i in ipairs(lrfurn.colors) do
drawtype = "mesh",
mesh = "lrfurn_sofa_short.obj",
tiles = {
"lrfurn_bg_white.png^[colorize:"..hue.."^lrfurn_sofa_overlay.png",
{ name = "lrfurn_upholstery.png", color = hue },
"lrfurn_sofa_bottom.png"
},
paramtype = "light",

BIN
lrfurn/textures/lrfurn_bg_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 121 B

BIN
lrfurn/textures/lrfurn_sofa_overlay.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
lrfurn/textures/lrfurn_upholstery.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB