diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua index ec2891eb..6bad1f61 100644 --- a/homedecor/bathroom_sanitation.lua +++ b/homedecor/bathroom_sanitation.lua @@ -20,7 +20,7 @@ homedecor.register("toilet", { "homedecor_marble.png^[colorize:#ffffff:175", "homedecor_marble.png^[colorize:#ffffff:175", "homedecor_marble.png^[colorize:#ffffff:175", - "homedecor_generic_metal_neutral.png" + "homedecor_generic_metal_black.png^[brighten" }, selection_box = toilet_sbox, node_box = toilet_cbox, @@ -39,7 +39,7 @@ homedecor.register("toilet_open", { "homedecor_marble.png^[colorize:#ffffff:175", "homedecor_marble.png^[colorize:#ffffff:175", "default_water.png", - "homedecor_generic_metal_neutral.png" + "homedecor_generic_metal_black.png^[brighten" }, selection_box = toilet_sbox, collision_box = toilet_cbox, @@ -106,9 +106,9 @@ homedecor.register("taps", { description = S("Bathroom taps/faucet"), mesh = "homedecor_bathroom_faucet.obj", tiles = { - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "homedecor_generic_metal_bright.png", - "homedecor_generic_metal_white.png", + "homedecor_generic_metal_black.png^[colorize:#ffffff:200", "homedecor_generic_metal_bright.png" }, inventory_image = "3dforniture_taps_inv.png", @@ -128,7 +128,7 @@ homedecor.register("taps_brass", { tiles = { "homedecor_generic_metal_brass.png", "homedecor_generic_metal_brass.png", - "homedecor_generic_metal_white.png", + "homedecor_generic_metal_black.png^[colorize:#ffffff:200", "homedecor_generic_metal_brass.png" }, inventory_image = "3dforniture_taps_brass_inv.png", @@ -205,7 +205,7 @@ homedecor.register("shower_head", { drawtype = "mesh", mesh = "homedecor_shower_head.obj", tiles = { - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "homedecor_shower_head.png" }, inventory_image = "homedecor_shower_head_inv.png", diff --git a/homedecor/climate-control.lua b/homedecor/climate-control.lua index 111960a4..a99d231c 100644 --- a/homedecor/climate-control.lua +++ b/homedecor/climate-control.lua @@ -160,7 +160,7 @@ local r_cbox = { homedecor.register("radiator", { mesh = "homedecor_radiator.obj", tiles = { - "homedecor_generic_metal_white.png", + "homedecor_generic_metal_black.png^[colorize:#ffffff:200", "homedecor_radiator_controls.png" }, inventory_image = "homedecor_radiator_inv.png", diff --git a/homedecor/exterior.lua b/homedecor/exterior.lua index 77ec36c3..1ae253e2 100644 --- a/homedecor/exterior.lua +++ b/homedecor/exterior.lua @@ -274,7 +274,7 @@ homedecor.register("well", { mesh = "homedecor_well.obj", tiles = { "homedecor_rope_texture.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "default_water.png", "default_cobble.png", "default_wood.png", diff --git a/homedecor/furniture_medieval.lua b/homedecor/furniture_medieval.lua index 9755a160..f465796c 100644 --- a/homedecor/furniture_medieval.lua +++ b/homedecor/furniture_medieval.lua @@ -72,7 +72,7 @@ homedecor.register("torch_wall", { }, }, "homedecor_generic_metal_black.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "forniture_coal.png", }, inventory_image="forniture_torch_inv.png", @@ -93,7 +93,7 @@ local wl_cbox = { homedecor.register("wall_lamp", { description = S("Wall Lamp"), mesh = "homedecor_wall_lamp.obj", - tiles = {"homedecor_generic_metal_neutral.png", "homedecor_generic_wood_luxury_brown1.png", + tiles = {"homedecor_generic_metal_black.png^[brighten", "homedecor_generic_wood_luxury_brown1.png", "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png"}, use_texture_alpha = true, inventory_image = "homedecor_wall_lamp_inv.png", diff --git a/homedecor/laundry.lua b/homedecor/laundry.lua index 1fed668e..01a448fe 100644 --- a/homedecor/laundry.lua +++ b/homedecor/laundry.lua @@ -52,7 +52,7 @@ homedecor.register("ironing_board", { mesh = "homedecor_ironing_board.obj", tiles = { "wool_grey.png", - "homedecor_generic_metal_neutral.png" + "homedecor_generic_metal_black.png^[brighten" }, expand = {right = "air"}, groups = { snappy = 3 }, diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua index fb60d83f..3ae72000 100644 --- a/homedecor/lighting.lua +++ b/homedecor/lighting.lua @@ -409,7 +409,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_generic_wood_red.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", }, inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png", walkable = false, @@ -435,7 +435,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color) "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_generic_wood_red.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", }, inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png", walkable = false, @@ -480,8 +480,12 @@ for _, color in ipairs(dlamp_colors) do homedecor.register("desk_lamp_"..color, { description = S("Desk Lamp ("..color..")"), mesh = "homedecor_desk_lamp.obj", - tiles = { "homedecor_generic_metal_white.png", "homedecor_generic_metal_black.png^[colorize:"..color..":150", - "homedecor_generic_metal_black.png", "homedecor_generic_metal_black.png^[colorize:"..color..":150" }, + 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" + }, inventory_image = "homedecor_desk_lamp_inv_"..color..".png", wield_image = "homedecor_desk_lamp_inv_"..color..".png", selection_box = dlamp_cbox, diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua index 47383866..7bd7d3e6 100644 --- a/homedecor/misc-nodes.lua +++ b/homedecor/misc-nodes.lua @@ -568,10 +568,10 @@ homedecor.register("tool_cabinet", { description = "Metal tool cabinet and work table", mesh = "homedecor_tool_cabinet.obj", tiles = { - "homedecor_generic_metal_red.png", + "homedecor_generic_metal_black.png^[colorize:#ff0000:150", "homedecor_tool_cabinet_drawers.png", - "homedecor_generic_metal_green.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[colorize:#006000:150", + "homedecor_generic_metal_black.png^[brighten", "homedecor_generic_metal_bright.png", "homedecor_tool_cabinet_misc.png", }, @@ -626,7 +626,7 @@ homedecor.register("desk_globe", { mesh = "homedecor_desk_globe.obj", tiles = { "homedecor_generic_wood_red.png", - "homedecor_generic_metal_neutral.png", + "homedecor_generic_metal_black.png^[brighten", "homedecor_earth.png" }, inventory_image = "homedecor_desk_globe_inv.png", diff --git a/homedecor/textures/homedecor_generic_metal_black.png b/homedecor/textures/homedecor_generic_metal_black.png index a34fc849..c5437468 100644 Binary files a/homedecor/textures/homedecor_generic_metal_black.png and b/homedecor/textures/homedecor_generic_metal_black.png differ diff --git a/homedecor/textures/homedecor_generic_metal_green.png b/homedecor/textures/homedecor_generic_metal_green.png deleted file mode 100644 index 90cde47c..00000000 Binary files a/homedecor/textures/homedecor_generic_metal_green.png and /dev/null differ diff --git a/homedecor/textures/homedecor_generic_metal_neutral.png b/homedecor/textures/homedecor_generic_metal_neutral.png deleted file mode 100644 index d9d21221..00000000 Binary files a/homedecor/textures/homedecor_generic_metal_neutral.png and /dev/null differ diff --git a/homedecor/textures/homedecor_generic_metal_red.png b/homedecor/textures/homedecor_generic_metal_red.png deleted file mode 100644 index ed579d94..00000000 Binary files a/homedecor/textures/homedecor_generic_metal_red.png and /dev/null differ diff --git a/homedecor/textures/homedecor_generic_metal_white.png b/homedecor/textures/homedecor_generic_metal_white.png deleted file mode 100644 index 01cbd9a2..00000000 Binary files a/homedecor/textures/homedecor_generic_metal_white.png and /dev/null differ