From 92a77b43fe87f28d2fe1e445365da14ebf9e9772 Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Mon, 4 May 2015 05:34:10 -0400
Subject: [PATCH] phase out redundant kitchen cabinet images

---
 homedecor/kitchen_furniture.lua               |  28 ++++++++++--------
 .../homedecor_kitchen_cabinet_bevel.png       | Bin 0 -> 95 bytes
 .../homedecor_kitchen_cabinet_bottom.png      | Bin 225 -> 0 bytes
 .../homedecor_kitchen_cabinet_sides.png       | Bin 238 -> 0 bytes
 4 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 homedecor/textures/homedecor_kitchen_cabinet_bevel.png
 delete mode 100644 homedecor/textures/homedecor_kitchen_cabinet_bottom.png
 delete mode 100644 homedecor/textures/homedecor_kitchen_cabinet_sides.png

diff --git a/homedecor/kitchen_furniture.lua b/homedecor/kitchen_furniture.lua
index 58ee196c..cd39c853 100644
--- a/homedecor/kitchen_furniture.lua
+++ b/homedecor/kitchen_furniture.lua
@@ -3,6 +3,8 @@
 local S = homedecor.gettext
 
 local counter_materials = { "", "granite", "marble", "steel" }
+local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
+local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)"
 
 for _, mat in ipairs(counter_materials) do
 
@@ -17,10 +19,10 @@ for _, mat in ipairs(counter_materials) do
 	homedecor.register("kitchen_cabinet"..material, {
 		description = desc,
 		tiles = { 'homedecor_kitchen_cabinet_top'..material..'.png',
-				'homedecor_kitchen_cabinet_bottom.png',
-				'homedecor_kitchen_cabinet_sides.png',
-				'homedecor_kitchen_cabinet_sides.png',
-				'homedecor_kitchen_cabinet_sides.png',
+				cabinet_bottom,
+				cabinet_sides,
+				cabinet_sides,
+				cabinet_sides,
 				'homedecor_kitchen_cabinet_front.png'},
 		groups = { snappy = 3 },
 		sounds = default.node_sound_wood_defaults(),
@@ -34,12 +36,14 @@ end
 local kitchen_cabinet_half_box = homedecor.nodebox.slab_y(0.5, 0.5)
 homedecor.register("kitchen_cabinet_half", {
 	description = S('Half-height Kitchen Cabinet (on ceiling)'),
-	tiles = { 'homedecor_kitchen_cabinet_sides.png',
-			'homedecor_kitchen_cabinet_bottom.png',
-			'homedecor_kitchen_cabinet_sides.png',
-			'homedecor_kitchen_cabinet_sides.png',
-			'homedecor_kitchen_cabinet_sides.png',
-			'homedecor_kitchen_cabinet_front_half.png'},
+	tiles = {
+		cabinet_sides,
+		cabinet_bottom,
+		cabinet_sides,
+		cabinet_sides,
+		cabinet_sides,
+		'homedecor_kitchen_cabinet_front_half.png'
+	},
 	selection_box = kitchen_cabinet_half_box,
 	node_box = kitchen_cabinet_half_box,
 	groups = { snappy = 3 },
@@ -56,8 +60,8 @@ homedecor.register("kitchen_cabinet_with_sink", {
 	tiles = {
 		"homedecor_kitchen_sink_top.png",
 		"homedecor_kitchen_cabinet_front.png",
-		"homedecor_kitchen_cabinet_sides.png",
-		"homedecor_kitchen_cabinet_bottom.png"
+		cabinet_sides,
+		cabinet_bottom
 	},
 	groups = { snappy = 3 },
 	sounds = default.node_sound_wood_defaults(),
diff --git a/homedecor/textures/homedecor_kitchen_cabinet_bevel.png b/homedecor/textures/homedecor_kitchen_cabinet_bevel.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b0ddc3e0ba3f093b25c079a4ba57becdf74679e
GIT binary patch
literal 95
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`YMw5RAr_~Tc{YX5JK?~&;7Ef)
s_0vut9+9R%W;b35QwAmp&9mnixMEoi&nNO`0d+8Vy85}Sb4q9e0Qo@|(*OVf

literal 0
HcmV?d00001

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

literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMVbu$w6vy`^d6tvS74ziJr
zcT@JW6c4nPiFcI=vXxEqRc}l*ig|f|9#DOSr;B3<hpg<ugPeyPL|86p9+t{E$fT1b
z9Z@7U?T$_B`)67$`@;htJyA>H^efJ*;kWy`@35o$#F|BucX)_8@>(uPE)Ht_zm)q_
z4sU$N;xg@~FRE)7P1w?FKIgaQ&fl_y=TzjGxx_tx_Abz!93`0h$D^#Z+H2mO`U6(J
VVaB@W>w#`y@O1TaS?83{1OOM7O@9CY

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

literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<Nq6*hWMJ6X&;2Kn706c)@Ck8E
z_faki)eduzi*ZpbkJ2xX*6&O=D+*OFi_q;%)2)cspIm6Ov)AX#g^S;ST8cbf978y+
zCr5<E1%<tmJ9c!#uP2?h>f!HZ0$E==Z8wV_mRS9~L1Ou{H!PnTcvf3hALudO?Vz+=
zBJ6#m(KQCi-Mjs>8zh(S_IJ9{AnB`c?3AssM3q8MBv1CaH@7NxNuP+=$$sJmi;>v0
g(AMR<+Cv!`woeSvd#JNf0%$vfr>mdKI;Vst0Fe_|x&QzG