From d6cdff41aaca2063c89850fb821fc5826cbb41ac Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 3 May 2015 18:30:56 -0400 Subject: [PATCH] phase out the generic red, green, white and neutral metals generic black metal is used for all of these now, colorized. also, added a bit of noise to the texture. --- homedecor/bathroom_sanitation.lua | 12 ++++++------ homedecor/climate-control.lua | 2 +- homedecor/exterior.lua | 2 +- homedecor/furniture_medieval.lua | 4 ++-- homedecor/laundry.lua | 2 +- homedecor/lighting.lua | 12 ++++++++---- homedecor/misc-nodes.lua | 8 ++++---- .../textures/homedecor_generic_metal_black.png | Bin 152 -> 211 bytes .../textures/homedecor_generic_metal_green.png | Bin 303 -> 0 bytes .../homedecor_generic_metal_neutral.png | Bin 189 -> 0 bytes .../textures/homedecor_generic_metal_red.png | Bin 471 -> 0 bytes .../textures/homedecor_generic_metal_white.png | Bin 156 -> 0 bytes 12 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 homedecor/textures/homedecor_generic_metal_green.png delete mode 100644 homedecor/textures/homedecor_generic_metal_neutral.png delete mode 100644 homedecor/textures/homedecor_generic_metal_red.png delete mode 100644 homedecor/textures/homedecor_generic_metal_white.png 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 a34fc849a916764643934df0c5a4b8fa45a27f41..c5437468d9ebecc1e654c3d0625afcedaeb7b8cd 100644 GIT binary patch delta 183 zcmV;o07(Cs0n-7HB!8MoL_t&-(*?o7fderN0zg1=($w|e(LHvJL}vJx$G!j92hZNU z@|N0Fdxp`V=j+e=4addoS(OWw<9LGIr(4hB1^9)pE|ftA=$)E_s7;}80lVH}gang9 zS2>2ngI!=|B}{G)26_|7yCS(Q||x( delta 123 zcmV->0EGY30hj@hBy?X%L_t&-83n?w%Z^+MvZOgHW>`uLI8Dz3mFa=6fRW(aZnV=C#4s?aO)}Rk*Q(jmOp?a&&M`;P3T~>6A8~m03QJ*^L90@DJThA z98%bmeaZwTbp~TKRHDvP42(3fZemVEA+gGmf5VBDKhZyO(IG>Hx zh5dJd*m7ST*R#fX-@?;_(wJY@GE5gsB}Pt|q<g6!Q>0o6egV%DOQY)XrUD|K7v}g0(4R}*>zopr0G9VcCIA2c diff --git a/homedecor/textures/homedecor_generic_metal_red.png b/homedecor/textures/homedecor_generic_metal_red.png deleted file mode 100644 index ed579d940897f337d83a73ee3217e781998a2c94..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 471 zcmV;|0Vw{7P)>41~Yot}M$*gB~RJze4Ym!igp62Vll zIf9UAKnG&AQ6(br(i$IQ99)4(A`0>n!7Q<6a-@siB(k9Gg#zHUHMSCUEmSA`F5#jS z&rA%=5!}kklhPzHs_3acfa?_y@uT8rCafr8zu)1`FT?SCjP5`Br_v-rNX#xs+U z_!xs*1gm{?%=}O2)h2-cuo=Kh1QhHp;U8+B8Z-%)6Mx4bBsx`f*dP%S_e_=&?H0jq z^RyY6%o5l%AkR6-;*>QUQ%z$#cc40{hAPYQCJ~QJZ1bp#=M-+`^;TS43BA_NteNaK z{jIe_*|Mrt^-)%x&uQDWteztd5l@vz`MlHuT_bRDS8d}Q!B;go&);M`I$9;e8Jz$C N002ovPDHLkV1oX();9nE diff --git a/homedecor/textures/homedecor_generic_metal_white.png b/homedecor/textures/homedecor_generic_metal_white.png deleted file mode 100644 index 01cbd9a2fb40c1b099d121c147a57822d1baa2cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAl097