From e7995ce981d43e99fabd5e8965bd81fd707a48b0 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Fri, 26 Mar 2021 06:13:37 -0400 Subject: [PATCH] Add kitchen cabinet with drawers and redesign the other kitchen cabinet textures to coordinate with it. --- homedecor_kitchen/init.lua | 85 +++++++++++++++--- .../homedecor_kitchen_cabinet_bevel.png | Bin 95 -> 112 bytes ...omedecor_kitchen_cabinet_colored_front.png | Bin 247 -> 244 bytes ...cor_kitchen_cabinet_colored_front_half.png | Bin 185 -> 190 bytes ...hen_cabinet_colored_front_with_drawers.png | Bin 0 -> 254 bytes .../homedecor_kitchen_cabinet_front.png | Bin 315 -> 532 bytes .../homedecor_kitchen_cabinet_front_half.png | Bin 265 -> 381 bytes ...cor_kitchen_cabinet_front_with_drawers.png | Bin 0 -> 561 bytes .../homedecor_kitchen_cabinet_half_bevel.png | Bin 0 -> 109 bytes 9 files changed, 73 insertions(+), 12 deletions(-) create mode 100644 homedecor_kitchen/textures/homedecor_kitchen_cabinet_colored_front_with_drawers.png create mode 100644 homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_with_drawers.png create mode 100644 homedecor_kitchen/textures/homedecor_kitchen_cabinet_half_bevel.png diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index f73497a3..34f04c0d 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -142,9 +142,8 @@ local cabinet_sides_colored = "(homedecor_generic_wood_plain.png^[transformR90)^ local ic_cabinet_sides = string.gsub(cabinet_sides, "%^", "&") local ic_cabinet_sides_colored = string.gsub(cabinet_sides_colored, "%^", "&") -local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)" - .."^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" -local cabinet_bottom_colored = "homedecor_generic_wood_plain.png^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)" +local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^homedecor_kitchen_cabinet_bevel.png" +local cabinet_bottom_colored = "homedecor_generic_wood_plain.png^homedecor_kitchen_cabinet_bevel.png" local function N_(x) return x end @@ -159,6 +158,7 @@ for _, mat in ipairs(counter_materials) do if mat ~= "" then desc = S("Kitchen Cabinet (@1 top)", S(mat)) + desc2 = S("Kitchen Cabinet with drawers (@1 top)", S(mat)) material = "_"..mat end @@ -170,7 +170,7 @@ for _, mat in ipairs(counter_materials) do cabinet_sides, cabinet_sides, cabinet_sides, - 'homedecor_kitchen_cabinet_front.png' + 'homedecor_kitchen_cabinet_front.png^homedecor_kitchen_cabinet_bevel.png' }, inventory_image = "[inventorycube" .."{homedecor_kitchen_cabinet_top"..material..".png" @@ -193,9 +193,6 @@ for _, mat in ipairs(counter_materials) do end }) - homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1] = "homedecor:kitchen_cabinet"..material - homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1] = "homedecor:kitchen_cabinet_locked"..material - homedecor.register("kitchen_cabinet_colored"..material, { description = desc, tiles = { @@ -204,7 +201,7 @@ for _, mat in ipairs(counter_materials) do cabinet_sides_colored, cabinet_sides_colored, cabinet_sides_colored, - 'homedecor_kitchen_cabinet_colored_front.png' + 'homedecor_kitchen_cabinet_colored_front.png^homedecor_kitchen_cabinet_bevel.png' }, inventory_image = "[inventorycube" .."{homedecor_kitchen_cabinet_top"..material..".png" @@ -224,6 +221,70 @@ for _, mat in ipairs(counter_materials) do unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) end }) + + homedecor.register("kitchen_cabinet_colorable_with_drawers"..material, { + description = desc2, + tiles = { + 'homedecor_kitchen_cabinet_top'..material..'.png', + cabinet_bottom, + cabinet_sides, + cabinet_sides, + cabinet_sides, + 'homedecor_kitchen_cabinet_front_with_drawers.png^homedecor_kitchen_cabinet_bevel.png' + }, + inventory_image = "[inventorycube" + .."{homedecor_kitchen_cabinet_top"..material..".png" + .."{homedecor_kitchen_cabinet_front_with_drawers.png" + .."{"..ic_cabinet_sides, + mesh = "homedecor_kitchen_cabinet.obj", + paramtype2 = "wallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + airbrush_replacement_node = "homedecor:kitchen_cabinet_colored_with_drawers"..material, + place_param2 = 0, + groups = { snappy = 3, ud_param2_colorable = 1}, + sounds = default.node_sound_wood_defaults(), + infotext=S("Kitchen Cabinet with drawers"), + inventory = { + size=24, + lockable=true, + }, + after_place_node = function(pos, placer, itemstack, pointed_thing) + unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) + end + }) + + homedecor.register("kitchen_cabinet_colored_with_drawers"..material, { + description = desc2, + tiles = { + {name = 'homedecor_kitchen_cabinet_top'..material..'.png', color = 0xFFFFFFFF}, + {name = cabinet_bottom, color = 0xFFFFFFFF }, + cabinet_sides_colored, + cabinet_sides_colored, + cabinet_sides_colored, + 'homedecor_kitchen_cabinet_colored_front_with_drawers.png^homedecor_kitchen_cabinet_bevel.png' + }, + inventory_image = "[inventorycube" + .."{homedecor_kitchen_cabinet_top"..material..".png" + .."{homedecor_kitchen_cabinet_colored_front_with_drawers.png" + .."{"..ic_cabinet_sides_colored, + mesh = "homedecor_kitchen_cabinet.obj", + paramtype2 = "colorwallmounted", + palette = "unifieddyes_palette_colorwallmounted.png", + groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = 1 }, + sounds = default.node_sound_wood_defaults(), + infotext=S("Kitchen Cabinet with drawers"), + inventory = { + size=24, + lockable=true, + }, + after_place_node = function(pos, placer, itemstack, pointed_thing) + unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing) + end + }) + + homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1] = "homedecor:kitchen_cabinet"..material + homedecor.kitchen_convert_nodes[#homedecor.kitchen_convert_nodes + 1] = "homedecor:kitchen_cabinet_locked"..material + end local kitchen_cabinet_half_box = homedecor.nodebox.slab_z(0.5, 0.5) @@ -236,7 +297,7 @@ homedecor.register("kitchen_cabinet_colorable_half", { cabinet_sides, cabinet_sides, cabinet_sides, - 'homedecor_kitchen_cabinet_front_half.png' + 'homedecor_kitchen_cabinet_front_half.png^homedecor_kitchen_cabinet_half_bevel.png' }, mesh = "homedecor_kitchen_cabinet_half.obj", paramtype2 = "wallmounted", @@ -268,7 +329,7 @@ homedecor.register("kitchen_cabinet_colored_half", { cabinet_sides_colored, cabinet_sides_colored, cabinet_sides_colored, - 'homedecor_kitchen_cabinet_colored_front_half.png' + 'homedecor_kitchen_cabinet_colored_front_half.png^homedecor_kitchen_cabinet_half_bevel.png' }, mesh = "homedecor_kitchen_cabinet_half.obj", paramtype2 = "colorwallmounted", @@ -296,7 +357,7 @@ homedecor.register("kitchen_cabinet_colorable_with_sink", { cabinet_sides, cabinet_sides, cabinet_sides, - "homedecor_kitchen_cabinet_front.png" + "homedecor_kitchen_cabinet_front.png^homedecor_kitchen_cabinet_bevel.png" }, inventory_image = "[inventorycube" .."{homedecor_kitchen_sink_top.png" @@ -343,7 +404,7 @@ homedecor.register("kitchen_cabinet_colored_with_sink", { cabinet_sides_colored, cabinet_sides_colored, cabinet_sides_colored, - "homedecor_kitchen_cabinet_colored_front.png", + "homedecor_kitchen_cabinet_colored_front.png^homedecor_kitchen_cabinet_bevel.png", }, inventory_image = "[inventorycube" .."{homedecor_kitchen_sink_top.png" diff --git a/homedecor_kitchen/textures/homedecor_kitchen_cabinet_bevel.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_bevel.png index 0184d73ba38f345ddce08d47c2c25695dbc9402d..ad6dac3fec5290bfa327063df43aade63ce49e44 100644 GIT binary patch delta 81 zcmV-X0IvUEaF8TSH%UZ6R5;7+%&`psAP7alhoN;mR`~lT7L-`H0k+%#XH~Unk`xYL nW~X`N;?o2ZOz^m*0J0lg9Rmp<|Gl=&00000NkvXXu0mjfUSS}{ delta 64 zcmXSjpP*u`=IP=XVsSdTq^xY-2?x#vM;Ox6pLhE3h%^N*Q2nrUP$td_=O=iU= zIP<_T@dKS82K7yc`V4-ba^Z3h*9h*HQonj5Y^|3`b6X(LN1bRrNbX0S=-yI5=+7O0 z#YD+@aZxwXevIIQ2`DoE1$Y2%^ewtEF#cKO6{weTedZ2QNm0b?xj0CWHpuj)G_auo zk?oj(%MYe7VjqB$0{8s_a0YNJBRGWFy~yHi()?b~7I?MNuzYc*opo+h!Fm7?ML@p< S=9D}D0000+NWS{Om8?e=!{6+i#MOLfTW4 z9-?J6iPl*)0euDt1V}SBFt2+8##C>F01_nLSHRz!qWE}V zHBuHSw7+2NH;%6#*60foXz$OS0??_T>eQ%wkrd7AgYP?0QV=ruG%i+oqZQv^XrAt5 VJ7ds7xJLj0002ovPDHLkV1mbpW{v;= diff --git a/homedecor_kitchen/textures/homedecor_kitchen_cabinet_colored_front_half.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_colored_front_half.png index 45e93f7d5e03db0a83321ca8e5bfa4cc207833b9..0c180fa5e42a210a1fcae340db08d836ad1d7b16 100644 GIT binary patch delta 162 zcmV;T0A2sN0loo{B!7iTL_t&-)6K!L3W7i!z~P^V)esRa9WGIGLql6ZAT;*6&GiB& zj&90jXh9Gp9tPdNt!L=_0^_^+Y55_GtI}=n5k?wuB4_6tadIp}$g~~kD@nVsv&%{$ z`bGkf0-%7F9zP0zJ-{Xh2u%HaDBm9qYu;+|I)sd;T^?6mz8j7TyDRt?Uklwetr0K3 Q@Bjb+07*qoM6N<$f@>i}hX4Qo delta 157 zcmV;O0Al~X0l5K?B!7TOL_t&-)6K`b3c@fLfYC28O(hjXaj0`}adGq^d}U{6(Wz4C z7zOdCD8&SCgFb|3J8Bn8iB?_Wlvp0g4f|6&ylLTVQ{%$YJO?WztGDm@q!`Ht4FXh9 zVE}Z`@$&*&^fw;m#}BSx2y55%?}_F><~j^BFVU)y7dF8{_!bi%qp&Lyk)ML<00000 LNkvXXu0mjfD=9=S diff --git a/homedecor_kitchen/textures/homedecor_kitchen_cabinet_colored_front_with_drawers.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_colored_front_with_drawers.png new file mode 100644 index 0000000000000000000000000000000000000000..c367510a196df2cf6bf214a4e70fb63a463520ae GIT binary patch literal 254 zcmV3Fp;dIq+|^6+*3@X6|ti zC&q$Bn$QKQc_pYP>0gl8Y;L%HY7NU}Ic$}U>-XKtFJ(ng=Qj=7Q2+n{07*qoM6N<$ Ef~in!B>(^b literal 0 HcmV?d00001 diff --git a/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front.png index 406739f8a8780ac3d5dae8b7679389b5e94305f7..8f66ff6450f3871dbf9dc37de99a190080cb3b72 100644 GIT binary patch delta 517 zcmV+g0{Z>C0+a-h8Gi-<001BJ|6u?C0ozGLK~y-)os&yz6JZpFpGhY(xsK5!%#hT= zV9`J{pcE8b>8b=5UFgD9{Q>?Ae?>uXZ=tvz^GV!HGg8a zJ7lk)qg1oeH3bo1Av@2OxkoYM9n+INP_0BJpjPZCG!w%a|~!i_l{VC2!D zH&Eb{L}Y)c4-n{kJQe8iui=rrQzYVNC{`_|)%dYXR(``7IiwPhfWKH6132SrKG}!p z5&D1O;o}!004?fL_t(|+Evd3 z5(GgE1<+oO?H2Oyf5tJ3sTVWHhlUqT5H@qfJ;z*Ygkd_*#ZPEc&7cY7!)C@E%;1(dL&bHkNI3QiYnH{oZhWG-TDUdv7)Y4iU5T78o!^{E0 x9Z*^%*r3uzza(}3(ck^K|N4Fy@PczbxCy!r8_teTljQ&a002ovPDHLkV1iJmaN_^~ diff --git a/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_half.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_half.png index 2e6a60ca241fffa2852578e0b384aaf0337a400b..d5d8e31b7cdd3318cd05d81737bbfead189b6f21 100644 GIT binary patch delta 355 zcmV-p0i6Dc0{sGzBYy!zNkl3wVa}^jLF2QAlV0G1`$Pdh@^w< z(IGFztejU9&vIUA%@zU zuFd=1@k?URDXy($W5NL#<);`w-syc zL^2aQ+_#uOv;C;xcq(WC-j+JO@Vh_(0PuKsrE^YER&zAG9HS@_u#(MOtDT-+Wkp$S z`4~l(5LzSw6snqsb1Ic8faHyW5$W3(d`Etz*A4-|Od0qU`J*4~ER5FOjhXv=ZFHdk zoSmn&W~p3nlUyW~$_~sXYSK=}6X{A(0?_RZNRkpI`tvXrUJY1@2Jf2kvZj_kJQ9Kv zjKyI^pGKMzQMr(=uqRE8 zd6nb}CsORcb?tK@9Ne?=j`h2a6MUTa+|J;Xs%Y(Vg-}86w+7vp(;xdoLLZEL9F5(q z_p!))9*v{PP`cgd7l8S*Mx2d3vf}D-MnAEBmL9hU*#(EaNoUFuOc@|90dI$662JjS zX(v?xg4YC?3I%pc0C#H)=${J!EcJ7VP?o}hwKBkKJl=a-qk07*qoM6N<$g3C>D{{R30 diff --git a/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_with_drawers.png b/homedecor_kitchen/textures/homedecor_kitchen_cabinet_front_with_drawers.png new file mode 100644 index 0000000000000000000000000000000000000000..510243b22ab2d3d2a6e10d78c56faddaf9a6ce4c GIT binary patch literal 561 zcmV-10?z%3P)$C zU2oE07(Fj5RG_U8R;Y}X5lp~nWYa`0h&P&;#cO|nKVVn>hF$vyyzz1|#u$xeF~&rf zZAM2%Of*0YAhdj>n{%bmwXotvYlq6YdfxLs=XuY0AF{r-N=`LH*RrYj(|48pmH612 z04RRz+`E;jchy?+r*<;BTS!ZamJ&F!zP5Vf+A?OLua8*27XX3D2AM}s-rl|%q5v%L z%zp8s+xOx_89?`NAVh-c#d!c+zz3k!Y{3?Mm$gb$bp@HFIDpL3*;7LU0L(D}PypWV z>`7AFzUv+i>_UhH|8W=%(~h8!&mo_)S=;n<0J{e8Y;)HUuzqjx^Um}zb!Y;(oSJuz z14A`DO1BQIPylq(acN^~zit=1U*wxBDVI0L6adN`onBmE`XYB0TFe3XT0Z~~pdFGB z5)ISkdYc09@bR1eQQH;#>KiBKcxG-V!-M;GWJM$1bF9x|1HN+eC@Y2m$ci@Iy76k8 z_D`HW?0xzxbg4LF@wHkb9Zga`?_4bG%ZQxRQ;vrOz;@|}+f-Oio)1hCF&;pr@n;Y6 z!9eOMi5Q;%rhn5#tEbx8C=a0kWW}(q@HYED2#m!T4ZA!u6{1- HoD!M