From a346bf5803aace59ed1e4a2236ed0dfdcd9c467c Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Mon, 27 Apr 2015 18:35:14 -0400
Subject: [PATCH] rework brass texture(s) and usage thereof

---
 chains/textures/chains_brass.png                | Bin 801 -> 356 bytes
 homedecor/bathroom_sanitation.lua               |   6 +++---
 homedecor/clocks.lua                            |   2 +-
 homedecor/lighting.lua                          |   8 ++++----
 homedecor/misc-nodes.lua                        |   6 +++---
 homedecor/textures/homedecor_tile_brass.png     | Bin 449 -> 356 bytes
 homedecor/textures/homedecor_tile_brass2.png    | Bin 801 -> 0 bytes
 .../homedecor_tile_horizlines_overlay.png       | Bin 0 -> 86 bytes
 homedecor/window_treatments.lua                 |   2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 homedecor/textures/homedecor_tile_brass2.png
 create mode 100644 homedecor/textures/homedecor_tile_horizlines_overlay.png

diff --git a/chains/textures/chains_brass.png b/chains/textures/chains_brass.png
index e8f1f34f4383def2603b81d02892becbc8bb4eb6..89a5c221827ae99cee5d500306e9388c797b0bb7 100644
GIT binary patch
delta 340
zcmV-a0jvI@2IK;e8Gix*005AYXf^-<0V_#FK~yNub&=hUf-n$9vpOtok!kTp3O@M0
z*FM4~`~*<xkI@#By>MMHq4y_~`Of+H`TlaMb*A@MHQCWwRoCZw(0jU(IWiQ$5E#Z>
z5>ZB!gVQs8(_>Yix<T)EAal-AKGVG1QZac8PQPd~R`t0XbbrdAI0%~Jf-ZoGhqrgt
z!i!c_eeMT^36uv;@kI+sco|XQy>+_rriaOnH?6AX)b;9ln_>E-Ke>#>F(Np5<8|wG
z@2?8n^^ZmdMJ{%H{v^(h5y8pX<xZ%o=ii$$=gER5*>Owo;jA+Yhh~Jf8?yw8oRj~R
zq99m6%pd;kwoS9DZZ41|AakU+G+0EGPu{Hd0V&sghx))fJ^S`%y$^(Z2m6G42m6G4
mhx$Oschy{0`#{KdsLwBWJb#(;RV$VN0000<MNUMnLSTX@d#LUJ

delta 789
zcmV+w1M2+b0-*+w8Gi!+001a04^sdD00d`2O+f$vv5yP<VFdsH0nt!QR7JwEQpB`g
z$GLCh&tK@)dgjw_!?RuD%~r;^Y{0Nl<Ii5@(rM1cm(IqU$-REd!Hvzsk@4rU@8hS<
z#g^>ef#uR@?ca&-;*{sscI@7Q;mlU>=Az2Lhwa~(?BAK~-+!0p({0GSdgs=6^69VW
z*nH~RgzDUj?%##->8<ePpYGz3=hk@i?Yr*bqUzm{<<V*C+lcn>#_#5^^y|6m+K27n
zn)dO|_3XX&@XPPysPE&Z=hb!Z<D}@;dGYA9@8qfQ=CJSPvF+fS>)w^_<EHN9r|#mS
z>f4L!+>Yzrk$>vkjO^c*=hb%T*ns8IYUtN~=-7Yg*L&m6T<F<@=G1WG&S2!vUFOnk
z;?H2^(`~@6O7P{Z^69(r=(qCdweRGo?ctv8;-T^9wD9Gx>)w;;*@NWJXX)61<<e{7
z&0F&6xbEYn<IiC6=CSYMr|aF4>fDa%+llVsq2kV5<A2Uw<IiF0+luDZcH+%k<<oBI
z+K24lnBmP=>e_|m&S2xuU**$m@#nGV*M0Kox$WVd>)nv#(P!n;Z}RH8^60kl=d<nN
zqT<e8=+}JX&R^xyZ1Co<<k4yD-j(OpdE(4h;>=dz%va&eSn}z*@#(qZ%vfYAt3Ln$
z0Q*TqL4Q;j(_>KA($vr~G_x=_R+bhQlN4dlZ_?8>nmN-lrLecMbh=atgLXmDgqbrY
zIMq&WsGBt{Q<T9VAvtSCZnu}u#GY9-#c2`@)zPsXUD^48Z57jJ)lV$1Ww7duNy?j)
zo>4M&dSCzKs!0ruGvZvmgWLP2PK$`_b+7Jb=zr{TnUormGi6#&zrRO|eItWSORH~t
z=#(j8;Q^kB4$XE9&SgORXH5<AYif0KoY@@DU;?qf%@*PwQwAl7{nmvL_mnYkL+n?T
zgSdx<feT`PiV)O24D3^K6jan?69qfs;^k9WnHi!u**Fws1cZ5c`1zO^8KMA3`C?j5
Tm=1+h00000NkvXXu0mjfEdTDb

diff --git a/homedecor/bathroom_sanitation.lua b/homedecor/bathroom_sanitation.lua
index c95406a8..382687ca 100644
--- a/homedecor/bathroom_sanitation.lua
+++ b/homedecor/bathroom_sanitation.lua
@@ -120,10 +120,10 @@ homedecor.register("taps_brass", {
 	description = S("Bathroom taps/faucet (brass)"),
 	mesh = "homedecor_bathroom_faucet.obj",
 	tiles = {
-		"homedecor_tile_brass2.png",
-		"homedecor_tile_brass2.png",
+		"homedecor_tile_brass.png",
+		"homedecor_tile_brass.png",
 		"homedecor_white_metal.png",
-		"homedecor_tile_brass2.png"
+		"homedecor_tile_brass.png"
 	},
 	inventory_image = "3dforniture_taps_brass_inv.png",
 	wield_image = "3dforniture_taps_brass_inv.png",
diff --git a/homedecor/clocks.lua b/homedecor/clocks.lua
index 06cd7d46..cbb56fc1 100644
--- a/homedecor/clocks.lua
+++ b/homedecor/clocks.lua
@@ -81,7 +81,7 @@ homedecor.register("grandfather_clock", {
 		"homedecor_grandfather_clock_face.png",
 		"homedecor_grandfather_clock_wood.png",
 		"homedecor_grandfather_clock_face_edge.png",
-		"homedecor_tile_brass2.png"
+		"homedecor_tile_brass.png"
 	},
 	inventory_image = "homedecor_grandfather_clock_inv.png",
 	groups = { snappy = 3 },
diff --git a/homedecor/lighting.lua b/homedecor/lighting.lua
index 2bee15f0..25cfccc4 100644
--- a/homedecor/lighting.lua
+++ b/homedecor/lighting.lua
@@ -222,7 +222,7 @@ homedecor.register("candlestick_brass", {
 	tiles = {
 		"homedecor_candle_sides.png",
 		{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",
 	selection_box = cs_cbox,
@@ -266,7 +266,7 @@ homedecor.register("oil_lamp", {
 	tiles = {
 		"homedecor_oil_lamp_handles.png",
 		"homedecor_oil_lamp_glass.png",
-		"homedecor_tile_brass2.png",
+		"homedecor_tile_brass.png",
 		"homedecor_oil_lamp_base.png",
 		"homedecor_oil_lamp_top.png",
 	},
@@ -488,7 +488,7 @@ homedecor.register("ceiling_lamp", {
 	description = S("Ceiling Lamp"),
 	mesh = "homedecor_ceiling_lamp.obj",
 	tiles = {
-		"homedecor_tile_brass2.png",
+		"homedecor_tile_brass.png",
 		"homedecor_ceiling_lamp_glass.png",
 		"homedecor_table_standing_lamp_lightbulb.png^[colorize:#ffffff:200",
 		"homedecor_generic_brown_plastic.png",
@@ -505,7 +505,7 @@ homedecor.register("ceiling_lamp_off", {
 	description = S("Ceiling Lamp (off)"),
 	mesh = "homedecor_ceiling_lamp.obj",
 	tiles = {
-		"homedecor_tile_brass2.png",
+		"homedecor_tile_brass.png",
 		"homedecor_ceiling_lamp_glass.png",
 		"homedecor_table_standing_lamp_lightbulb.png",
 		"homedecor_generic_brown_plastic.png",
diff --git a/homedecor/misc-nodes.lua b/homedecor/misc-nodes.lua
index 3fd955e5..8d460c5b 100644
--- a/homedecor/misc-nodes.lua
+++ b/homedecor/misc-nodes.lua
@@ -62,7 +62,7 @@ end
 homedecor.register("pole_brass", {
     description = S("Brass Pole"),
 	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",
     wield_image = "homedecor_pole_brass_inv.png",
     selection_box = {
@@ -437,7 +437,7 @@ homedecor.register("piano", {
 	mesh = "homedecor_piano.obj",
 	tiles = {
 		"homedecor_piano_keys.png",
-		"homedecor_tile_brass2.png",
+		"homedecor_tile_brass.png",
 		"homedecor_piano_wood.png"
 	},
 	inventory_image = "homedecor_piano_inv.png",
@@ -694,7 +694,7 @@ homedecor.banister_materials = {
 	{	"brass",
 		"brass",
 		"homedecor_white_wood.png",
-		"homedecor_tile_brass2.png",
+		"homedecor_tile_brass.png",
 		"technic:brass_ingot",
 		"group:stick",
 		"",
diff --git a/homedecor/textures/homedecor_tile_brass.png b/homedecor/textures/homedecor_tile_brass.png
index 7743fa94fb3dd14896e89949cd7d4c3e0a92b0b7..89a5c221827ae99cee5d500306e9388c797b0bb7 100644
GIT binary patch
delta 340
zcmV-a0jvJO1LOjb8Gix*005AYXf^-<0V_#FK~yNub&=hUf-n$9vpOtok!kTp3O@M0
z*FM4~`~*<xkI@#By>MMHq4y_~`Of+H`TlaMb*A@MHQCWwRoCZw(0jU(IWiQ$5E#Z>
z5>ZB!gVQs8(_>Yix<T)EAal-AKGVG1QZac8PQPd~R`t0XbbrdAI0%~Jf-ZoGhqrgt
z!i!c_eeMT^36uv;@kI+sco|XQy>+_rriaOnH?6AX)b;9ln_>E-Ke>#>F(Np5<8|wG
z@2?8n^^ZmdMJ{%H{v^(h5y8pX<xZ%o=ii$$=gER5*>Owo;jA+Yhh~Jf8?yw8oRj~R
zq99m6%pd;kwoS9DZZ41|AakU+G+0EGPu{Hd0V&sghx))fJ^S`%y$^(Z2m6G42m6G4
mhx$Oschy{0`#{KdsLwBWJb#(;RV$VN0000<MNUMnLSTYV0;vlC

delta 434
zcmV;j0Zsno0>J~28Gi!+001a04^sdD00d`2O+f$vv5yP<VFdsH0L)NKR7K3ahQ_jP
z&Ax}hvxCvYlghe!%EPYK&8F7PsM^u8#=M-yux`Jtch0?p$h3C3sB5~ZY_OM1u$oNG
zyob7<Le|cx#JiZ*%cj!Cn##ni*3GKb$)U`>h{LR1#I9t=z<-_5#FxUhjH!@2#I9o1
z%cZ)fY_FM1$hUgHr&6hoGttGF!mVW5(zd{`dcdVp(!`X;ux8fJs;iPc)5xL4v2D@A
zk;=Dt(ZP$$!>7lzbI-no%ei~n(z3s%QMj8p#;|0zp;+6}x!TdRxSm32(arq;005v#
zL_t&-(>2aD0)N5)00hCq-QD7bgdl-9vH$-GD6ZUU7H2owJJ0*&{&WykgafSG+uOzY
zLJ9*lDL*Ar^R+7S_!I`|zZ2-SuD|h@_9&YuN5#lcZx@$hyPid^a5(oGRY-AOXfHFp
zmY;c&4hLxE9nE{+eqCB>5T4K!<^DLEK8_C~(`{J<eJlQeK7T-;KcLSa(B}{6^9S_#
c1N!{=0vT~C(_~e$-v9sr07*qoM6N<$f?Ck)O#lD@

diff --git a/homedecor/textures/homedecor_tile_brass2.png b/homedecor/textures/homedecor_tile_brass2.png
deleted file mode 100644
index e8f1f34f4383def2603b81d02892becbc8bb4eb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 801
zcmV++1K#|JP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00004XF*Lt006O%
z3;baP0005eP)t-s!m(1sv|h)#Z{*Kk=+=7X({IDGUE<AF#<*<2uu<dBUggqh&c&C`
z#+%8#e#^m)&BKxL=d$nPr_IHd?B0Rp(rE49iSOc+=hk-Y-h$!GR`BMc%D{*1-<a&*
zneE?~=F@G+yn5%>ck=14=-7Pf+Jx%di|*fr^69Pc<)7~2k>}QU^zFOu;iBr@kmb>7
z>f4C+@5b-uu=MM>>e`3x;F|XF&h_lQ_VCN^<f!lCrsvgl@8hKC)_L*hwD07p@aC}Z
z=CSSIo9o_{?&GHJ<frc9qUzg=>)ej(-I40tjO^c*=hb%T*ns8IYUtN~=-7Yg*L&m6
zT<F<@=G1WG&S2!vUFOnk;?H2^(`~@6O7P{Z^69(r=(qCdweRGo?ctv8;-T^9wD9Gx
z>)w;;*@NWJXX)61<<e{7&0F&6xbEYn<IiC6=CSYMr|aF4>fDa%+llVsq2kV5<IY{<
z&tdA@issdJ;>}#;({Ab7hwR^&;mud-+J)rKVB^nU<<o5O=dtM5ee&tK?cts4-H_zb
zXXVpx^6I+s=(h3av+d%d;?7>^*L>s7U**zl@aC`N(P`}7mFL!Z;>=g#%vRydSK-W9
z^69$q>AB*}SY#`!KL7v#`$<GWR2b7^P}kDb&@nW#FgI3~78jEgVbE{V(>0no(=w&7
zx3YA)R0)H2LD7VnGbT9IPHw21H7!$=!5|?yYesIjm(RqWSvAFJ5)9SRu^nC6`GIW}
z(`VIBEU#s->WoRso0OhWGIe@i|KzGk42?75T)l(a`=(Bdi0pN*?q=xha+#DGk~3vm
zPrtuMi+v-5O-rk9d+3xYVc`Lui4M(n49;ah`)5rJ@@r~!bDY^6&tL+vzs(ln9#aM-
zi2c@u5ciZZa6{}@m4mp4g@FrVe~J*)Jq+wqauih5WD^BD;^O5~S(zE4IN3N9WdwwI
fdHDI57#X4fNBLq}PMC#M00000NkvXXu0mjfP?PL?

diff --git a/homedecor/textures/homedecor_tile_horizlines_overlay.png b/homedecor/textures/homedecor_tile_horizlines_overlay.png
new file mode 100644
index 0000000000000000000000000000000000000000..daf157ef8920adad81eb77a397d5e1a9fbde082f
GIT binary patch
literal 86
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`vYsxEAr_~T|NQ;E-TttK1nc4i
i2?jSdHnv<Z9tH*nSLQrhm#`F|LIzJ)KbLh*2~7YZ<rHoJ

literal 0
HcmV?d00001

diff --git a/homedecor/window_treatments.lua b/homedecor/window_treatments.lua
index 73e67892..f4f20363 100644
--- a/homedecor/window_treatments.lua
+++ b/homedecor/window_treatments.lua
@@ -171,7 +171,7 @@ for c in ipairs(curtaincolors) do
 end
 
 local mats = {
-	{ "brass", "Brass", "homedecor_tile_brass2.png" },
+	{ "brass", "Brass", "homedecor_tile_brass.png" },
 	{ "wrought_iron", "Wrought iron", "homedecor_tile_wrought_iron2.png" },
 	{ "wood", "Wooden", "default_wood.png" }
 }