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

rework brass texture(s) and usage thereof

This commit is contained in:
Vanessa Ezekowitz 2015-04-27 18:35:14 -04:00
parent 0323ba021b
commit a346bf5803
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
chains/textures/chains_brass.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 801 B

After

Width:  |  Height:  |  Size: 356 B

6
homedecor/bathroom_sanitation.lua
View File

@ -120,10 +120,10 @@ homedecor.register("taps_brass", {
description = S("Bathroom taps/faucet (brass)"), description = S("Bathroom taps/faucet (brass)"),
mesh = "homedecor_bathroom_faucet.obj", mesh = "homedecor_bathroom_faucet.obj",
tiles = { tiles = {
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
"homedecor_white_metal.png", "homedecor_white_metal.png",
"homedecor_tile_brass2.png" "homedecor_tile_brass.png"
}, },
inventory_image = "3dforniture_taps_brass_inv.png", inventory_image = "3dforniture_taps_brass_inv.png",
wield_image = "3dforniture_taps_brass_inv.png", wield_image = "3dforniture_taps_brass_inv.png",

2
homedecor/clocks.lua
View File

@ -81,7 +81,7 @@ homedecor.register("grandfather_clock", {
"homedecor_grandfather_clock_face.png", "homedecor_grandfather_clock_face.png",
"homedecor_grandfather_clock_wood.png", "homedecor_grandfather_clock_wood.png",
"homedecor_grandfather_clock_face_edge.png", "homedecor_grandfather_clock_face_edge.png",
"homedecor_tile_brass2.png" "homedecor_tile_brass.png"
}, },
inventory_image = "homedecor_grandfather_clock_inv.png", inventory_image = "homedecor_grandfather_clock_inv.png",
groups = { snappy = 3 }, groups = { snappy = 3 },

8
homedecor/lighting.lua
View File

@ -222,7 +222,7 @@ homedecor.register("candlestick_brass", {
tiles = { tiles = {
"homedecor_candle_sides.png", "homedecor_candle_sides.png",
{name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}}, {name="homedecor_candle_flame.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0}},
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
}, },
inventory_image = "homedecor_candlestick_brass_inv.png", inventory_image = "homedecor_candlestick_brass_inv.png",
selection_box = cs_cbox, selection_box = cs_cbox,
@ -266,7 +266,7 @@ homedecor.register("oil_lamp", {
tiles = { tiles = {
"homedecor_oil_lamp_handles.png", "homedecor_oil_lamp_handles.png",
"homedecor_oil_lamp_glass.png", "homedecor_oil_lamp_glass.png",
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
"homedecor_oil_lamp_base.png", "homedecor_oil_lamp_base.png",
"homedecor_oil_lamp_top.png", "homedecor_oil_lamp_top.png",
}, },
@ -488,7 +488,7 @@ homedecor.register("ceiling_lamp", {
description = S("Ceiling Lamp"), description = S("Ceiling Lamp"),
mesh = "homedecor_ceiling_lamp.obj", mesh = "homedecor_ceiling_lamp.obj",
tiles = { tiles = {
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
"homedecor_ceiling_lamp_glass.png", "homedecor_ceiling_lamp_glass.png",
"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200", "homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200",
"homedecor_generic_brown_plastic.png", "homedecor_generic_brown_plastic.png",
@ -505,7 +505,7 @@ homedecor.register("ceiling_lamp_off", {
description = S("Ceiling Lamp (off)"), description = S("Ceiling Lamp (off)"),
mesh = "homedecor_ceiling_lamp.obj", mesh = "homedecor_ceiling_lamp.obj",
tiles = { tiles = {
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
"homedecor_ceiling_lamp_glass.png", "homedecor_ceiling_lamp_glass.png",
"homedecor_table_standing_lamp_lightbulb.png", "homedecor_table_standing_lamp_lightbulb.png",
"homedecor_generic_brown_plastic.png", "homedecor_generic_brown_plastic.png",

6
homedecor/misc-nodes.lua
View File

@ -62,7 +62,7 @@ end
homedecor.register("pole_brass", { homedecor.register("pole_brass", {
description = S("Brass Pole"), description = S("Brass Pole"),
mesh = "homedecor_round_pole.obj", mesh = "homedecor_round_pole.obj",
tiles = {"homedecor_tile_brass2.png"}, tiles = {"homedecor_tile_brass.png^homedecor_tile_horizlines_overlay.png",},
inventory_image = "homedecor_pole_brass_inv.png", inventory_image = "homedecor_pole_brass_inv.png",
wield_image = "homedecor_pole_brass_inv.png", wield_image = "homedecor_pole_brass_inv.png",
selection_box = { selection_box = {
@ -437,7 +437,7 @@ homedecor.register("piano", {
mesh = "homedecor_piano.obj", mesh = "homedecor_piano.obj",
tiles = { tiles = {
"homedecor_piano_keys.png", "homedecor_piano_keys.png",
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
"homedecor_piano_wood.png" "homedecor_piano_wood.png"
}, },
inventory_image = "homedecor_piano_inv.png", inventory_image = "homedecor_piano_inv.png",
@ -694,7 +694,7 @@ homedecor.banister_materials = {
{ "brass", { "brass",
"brass", "brass",
"homedecor_white_wood.png", "homedecor_white_wood.png",
"homedecor_tile_brass2.png", "homedecor_tile_brass.png",
"technic:brass_ingot", "technic:brass_ingot",
"group:stick", "group:stick",
"", "",

BIN
homedecor/textures/homedecor_tile_brass.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 449 B

After

Width:  |  Height:  |  Size: 356 B

BIN
homedecor/textures/homedecor_tile_brass2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 801 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 86 B

2
homedecor/window_treatments.lua
View File

@ -171,7 +171,7 @@ for c in ipairs(curtaincolors) do
end end
local mats = { local mats = {
{ "brass", "Brass", "homedecor_tile_brass2.png" }, { "brass", "Brass", "homedecor_tile_brass.png" },
{ "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron2.png" }, { "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron2.png" },
{ "wood", "Wooden", "default_wood.png" } { "wood", "Wooden", "default_wood.png" }
} }