crabman77/homedecor_modpack
1
0
Fork 0
forked from nalc/homedecor_modpack
Code Issues Pull Requests Projects Releases Wiki Activity

phase out the generic red, green, white and neutral metals

Browse Source 
generic black metal is used for all of these now, colorized.
also, added a bit of noise to the texture.
This commit is contained in:
Vanessa Ezekowitz 2015-05-03 18:30:56 -04:00
parent 94f7e63ba7
commit d6cdff41aa
12 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
homedecor/bathroom_sanitation.lua
View File

@ -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_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, selection_box = toilet_sbox,
node_box = toilet_cbox, node_box = toilet_cbox,
@ -39,7 +39,7 @@ homedecor.register("toilet_open", {
"homedecor_marble.png^[colorize:#ffffff:175", "homedecor_marble.png^[colorize:#ffffff:175",
"homedecor_marble.png^[colorize:#ffffff:175", "homedecor_marble.png^[colorize:#ffffff:175",
"default_water.png", "default_water.png",
"homedecor_generic_metal_neutral.png" "homedecor_generic_metal_black.png^[brighten"
}, },
selection_box = toilet_sbox, selection_box = toilet_sbox,
collision_box = toilet_cbox, collision_box = toilet_cbox,
@ -106,9 +106,9 @@ homedecor.register("taps", {
description = S("Bathroom taps/faucet"), description = S("Bathroom taps/faucet"),
mesh = "homedecor_bathroom_faucet.obj", mesh = "homedecor_bathroom_faucet.obj",
tiles = { tiles = {
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
"homedecor_generic_metal_bright.png", "homedecor_generic_metal_bright.png",
"homedecor_generic_metal_white.png", "homedecor_generic_metal_black.png^[colorize:#ffffff:200",
"homedecor_generic_metal_bright.png" "homedecor_generic_metal_bright.png"
}, },
inventory_image = "3dforniture_taps_inv.png", inventory_image = "3dforniture_taps_inv.png",
@ -128,7 +128,7 @@ homedecor.register("taps_brass", {
tiles = { tiles = {
"homedecor_generic_metal_brass.png", "homedecor_generic_metal_brass.png",
"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" "homedecor_generic_metal_brass.png"
}, },
inventory_image = "3dforniture_taps_brass_inv.png", inventory_image = "3dforniture_taps_brass_inv.png",
@ -205,7 +205,7 @@ homedecor.register("shower_head", {
drawtype = "mesh", drawtype = "mesh",
mesh = "homedecor_shower_head.obj", mesh = "homedecor_shower_head.obj",
tiles = { tiles = {
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
"homedecor_shower_head.png" "homedecor_shower_head.png"
}, },
inventory_image = "homedecor_shower_head_inv.png", inventory_image = "homedecor_shower_head_inv.png",

2
homedecor/climate-control.lua
View File

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

2
homedecor/exterior.lua
View File

@ -274,7 +274,7 @@ homedecor.register("well", {
mesh = "homedecor_well.obj", mesh = "homedecor_well.obj",
tiles = { tiles = {
"homedecor_rope_texture.png", "homedecor_rope_texture.png",
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
"default_water.png", "default_water.png",
"default_cobble.png", "default_cobble.png",
"default_wood.png", "default_wood.png",

4
homedecor/furniture_medieval.lua
View File

@ -72,7 +72,7 @@ homedecor.register("torch_wall", {
}, },
}, },
"homedecor_generic_metal_black.png", "homedecor_generic_metal_black.png",
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
"forniture_coal.png", "forniture_coal.png",
}, },
inventory_image="forniture_torch_inv.png", inventory_image="forniture_torch_inv.png",
@ -93,7 +93,7 @@ local wl_cbox = {
homedecor.register("wall_lamp", { homedecor.register("wall_lamp", {
description = S("Wall Lamp"), description = S("Wall Lamp"),
mesh = "homedecor_wall_lamp.obj", 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"}, "homedecor_light.png", "homedecor_generic_metal_wrought_iron.png"},
use_texture_alpha = true, use_texture_alpha = true,
inventory_image = "homedecor_wall_lamp_inv.png", inventory_image = "homedecor_wall_lamp_inv.png",

2
homedecor/laundry.lua
View File

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

12
homedecor/lighting.lua
View File

@ -409,7 +409,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
"homedecor_generic_wood_red.png", "homedecor_generic_wood_red.png",
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
}, },
inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png", inventory_image = "homedecor_table_lamp"..lampcolor.."_inv.png",
walkable = false, walkable = false,
@ -435,7 +435,7 @@ local function reg_lamp(suffix, nxt, tilesuffix, light, color)
"wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten, "wool_"..woolcolor..".png^[colorize:#ffffff:"..wool_brighten,
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten, "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:"..bulb_brighten,
"homedecor_generic_wood_red.png", "homedecor_generic_wood_red.png",
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
}, },
inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png", inventory_image = "homedecor_standing_lamp"..lampcolor.."_inv.png",
walkable = false, walkable = false,
@ -480,8 +480,12 @@ for _, color in ipairs(dlamp_colors) do
homedecor.register("desk_lamp_"..color, { homedecor.register("desk_lamp_"..color, {
description = S("Desk Lamp ("..color..")"), description = S("Desk Lamp ("..color..")"),
mesh = "homedecor_desk_lamp.obj", mesh = "homedecor_desk_lamp.obj",
tiles = { "homedecor_generic_metal_white.png", "homedecor_generic_metal_black.png^[colorize:"..color..":150", tiles = {
"homedecor_generic_metal_black.png", "homedecor_generic_metal_black.png^[colorize:"..color..":150" }, "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", inventory_image = "homedecor_desk_lamp_inv_"..color..".png",
wield_image = "homedecor_desk_lamp_inv_"..color..".png", wield_image = "homedecor_desk_lamp_inv_"..color..".png",
selection_box = dlamp_cbox, selection_box = dlamp_cbox,

8
homedecor/misc-nodes.lua
View File

@ -568,10 +568,10 @@ homedecor.register("tool_cabinet", {
description = "Metal tool cabinet and work table", description = "Metal tool cabinet and work table",
mesh = "homedecor_tool_cabinet.obj", mesh = "homedecor_tool_cabinet.obj",
tiles = { tiles = {
"homedecor_generic_metal_red.png", "homedecor_generic_metal_black.png^[colorize:#ff0000:150",
"homedecor_tool_cabinet_drawers.png", "homedecor_tool_cabinet_drawers.png",
"homedecor_generic_metal_green.png", "homedecor_generic_metal_black.png^[colorize:#006000:150",
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
"homedecor_generic_metal_bright.png", "homedecor_generic_metal_bright.png",
"homedecor_tool_cabinet_misc.png", "homedecor_tool_cabinet_misc.png",
}, },
@ -626,7 +626,7 @@ homedecor.register("desk_globe", {
mesh = "homedecor_desk_globe.obj", mesh = "homedecor_desk_globe.obj",
tiles = { tiles = {
"homedecor_generic_wood_red.png", "homedecor_generic_wood_red.png",
"homedecor_generic_metal_neutral.png", "homedecor_generic_metal_black.png^[brighten",
"homedecor_earth.png" "homedecor_earth.png"
}, },
inventory_image = "homedecor_desk_globe_inv.png", inventory_image = "homedecor_desk_globe_inv.png",

BIN
homedecor/textures/homedecor_generic_metal_black.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 211 B

BIN
homedecor/textures/homedecor_generic_metal_green.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 303 B

BIN
homedecor/textures/homedecor_generic_metal_neutral.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 189 B

BIN
homedecor/textures/homedecor_generic_metal_red.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 471 B

BIN
homedecor/textures/homedecor_generic_metal_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 156 B