From 41b1730ff2405d47bcdbb2c1aca37aec6b87e664 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Wed, 18 Jun 2014 06:53:07 -0400 Subject: [PATCH] Get rid of second and third shades of 3dforniture-related textures. Minetest has per-face shading of nodes now so these textures are redundant. --- homedecor/furniture.lua | 18 +------- homedecor/furniture_bathroom.lua | 39 ++++-------------- homedecor/furniture_medieval.lua | 27 ++---------- .../textures/forniture_black_metal_s1.png | Bin 426 -> 0 bytes .../textures/forniture_black_metal_s2.png | Bin 437 -> 0 bytes homedecor/textures/forniture_marble_s1.png | Bin 721 -> 0 bytes homedecor/textures/forniture_marble_s2.png | Bin 814 -> 0 bytes homedecor/textures/forniture_marble_sb1.png | Bin 788 -> 0 bytes homedecor/textures/forniture_marble_sb2.png | Bin 939 -> 0 bytes homedecor/textures/forniture_metal_s1.png | Bin 505 -> 0 bytes homedecor/textures/forniture_metal_s2.png | Bin 444 -> 0 bytes homedecor/textures/forniture_wood_s1.png | Bin 1097 -> 0 bytes homedecor/textures/forniture_wood_s2.png | Bin 1088 -> 0 bytes 13 files changed, 14 insertions(+), 70 deletions(-) delete mode 100644 homedecor/textures/forniture_black_metal_s1.png delete mode 100644 homedecor/textures/forniture_black_metal_s2.png delete mode 100644 homedecor/textures/forniture_marble_s1.png delete mode 100644 homedecor/textures/forniture_marble_s2.png delete mode 100644 homedecor/textures/forniture_marble_sb1.png delete mode 100644 homedecor/textures/forniture_marble_sb2.png delete mode 100644 homedecor/textures/forniture_metal_s1.png delete mode 100644 homedecor/textures/forniture_metal_s2.png delete mode 100644 homedecor/textures/forniture_wood_s1.png delete mode 100644 homedecor/textures/forniture_wood_s2.png diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua index 4ec11ad7..d3f6d756 100644 --- a/homedecor/furniture.lua +++ b/homedecor/furniture.lua @@ -3,14 +3,7 @@ local S = homedecor.gettext -- Test minetest.register_node("homedecor:table", { description = S("Table"), - tiles = { - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood_s1.png", - "forniture_wood_s1.png", - "forniture_wood_s2.png", - "forniture_wood_s2.png", - }, + tiles = { "forniture_wood.png" }, drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -33,14 +26,7 @@ minetest.register_node("homedecor:table", { minetest.register_node("homedecor:chair", { description = S("Chair"), - tiles = { - "forniture_wood.png", - "forniture_wood.png", - "forniture_wood_s1.png", - "forniture_wood_s1.png", - "forniture_wood_s2.png", - "forniture_wood_s2.png", - }, + tiles = { "forniture_wood.png" }, drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", diff --git a/homedecor/furniture_bathroom.lua b/homedecor/furniture_bathroom.lua index 7cf1e5d3..8e3c2a77 100644 --- a/homedecor/furniture_bathroom.lua +++ b/homedecor/furniture_bathroom.lua @@ -2,11 +2,7 @@ local S = homedecor.gettext minetest.register_node("homedecor:toilet", { description = S("Toilet"), - tiles = { - "forniture_marble.png", "forniture_marble.png", - "forniture_marble_s1.png", "forniture_marble_s1.png", - "forniture_marble_s2.png", "forniture_marble_s2.png", - }, + tiles = { "forniture_marble.png" }, drawtype = "nodebox", sunlight_propagates = false, paramtype = "light", @@ -33,9 +29,8 @@ minetest.register_node("homedecor:toilet", { minetest.register_node("homedecor:toilet_open", { tiles = { - "forniture_marble_top_toilet.png", "forniture_marble.png", - "forniture_marble_sb1.png", "forniture_marble_sb1.png", - "forniture_marble_sb2.png", "forniture_marble_sb2.png", + "forniture_marble_top_toilet.png", + "forniture_marble.png" }, drawtype = "nodebox", paramtype = "light", @@ -76,9 +71,8 @@ minetest.register_node("homedecor:toilet_open", { minetest.register_node("homedecor:sink", { description = S("Sink"), tiles = { - "forniture_marble_top_sink.png", "forniture_marble.png", - "forniture_marble_sb1.png", "forniture_marble_sb1.png", - "forniture_marble_sb2.png", "forniture_marble_sb2.png", + "forniture_marble_top_sink.png", + "forniture_marble.png" }, inventory_image="3dforniture_inv_sink.png", drawtype = "nodebox", @@ -109,11 +103,7 @@ minetest.register_node("homedecor:sink", { --Taps minetest.register_node("homedecor:taps", { description = S("Taps"), - tiles = { - "forniture_metal.png", "forniture_metal.png", - "forniture_metal_s1.png", "forniture_metal_s1.png", - "forniture_metal_s2.png", "forniture_metal_s2.png", - }, + tiles = { "forniture_metal.png" }, inventory_image="3dforniture_inv_taps.png", drawtype = "nodebox", sunlight_propagates = true, @@ -145,12 +135,8 @@ minetest.register_node("homedecor:taps", { minetest.register_node("homedecor:shower_tray", { description = S("Shower Tray"), tiles = { - "forniture_marble_base_ducha_top.png", - "forniture_marble_base_ducha_top.png", - "forniture_marble_sb1.png", - "forniture_marble_sb1.png", - "forniture_marble_sb2.png", - "forniture_marble_sb2.png", + "forniture_marble_base_ducha_top.png", + "forniture_marble.png" }, drawtype = "nodebox", sunlight_propagates = true, @@ -178,14 +164,7 @@ minetest.register_node("homedecor:shower_tray", { --Shower Head minetest.register_node("homedecor:shower_head", { description = S("Shower Head"), - tiles = { - "forniture_metal.png", - "forniture_metal.png", - "forniture_metal_s1.png", - "forniture_metal_s1.png", - "forniture_metal_s2.png", - "forniture_metal_s2.png", - }, + tiles = { "forniture_metal.png" }, inventory_image="3dforniture_inv_shower_head.png", drawtype = "nodebox", sunlight_propagates = true, diff --git a/homedecor/furniture_medieval.lua b/homedecor/furniture_medieval.lua index a2c7bc1d..023a9a51 100644 --- a/homedecor/furniture_medieval.lua +++ b/homedecor/furniture_medieval.lua @@ -3,14 +3,7 @@ local S = homedecor.gettext minetest.register_node("homedecor:bars", { description = S("Bars"), - tiles = { - "forniture_black_metal.png", - "forniture_black_metal.png", - "forniture_black_metal_s1.png", - "forniture_black_metal_s1.png", - "forniture_black_metal_s2.png", - "forniture_black_metal_s2.png", - }, + tiles = { "forniture_black_metal.png" }, drawtype = "nodebox", sunlight_propagates = true, paramtype = "light", @@ -35,14 +28,7 @@ minetest.register_node("homedecor:bars", { --L Binding Bars minetest.register_node("homedecor:L_binding_bars", { description = S("Binding Bars"), - tiles = { - "forniture_black_metal.png", - "forniture_black_metal.png", - "forniture_black_metal_s1.png", - "forniture_black_metal_s1.png", - "forniture_black_metal_s2.png", - "forniture_black_metal_s2.png", - }, + tiles = { "forniture_black_metal.png" }, drawtype = "nodebox", sunlight_propagates = true, paramtype = "light", @@ -64,14 +50,7 @@ minetest.register_node("homedecor:L_binding_bars", { minetest.register_node("homedecor:chains", { description = S("Chains"), - tiles = { - "forniture_black_metal.png", - "forniture_black_metal.png", - "forniture_black_metal_s1.png", - "forniture_black_metal_s1.png", - "forniture_black_metal_s2.png", - "forniture_black_metal_s2.png", - }, + tiles = { "forniture_black_metal.png" }, inventory_image="3dforniture_inv_chains.png", drawtype = "nodebox", sunlight_propagates = true, diff --git a/homedecor/textures/forniture_black_metal_s1.png b/homedecor/textures/forniture_black_metal_s1.png deleted file mode 100644 index 64f5b90cba42a4e3f5369f5793aacb5a51c3cc90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmV;b0agBqP)A1Zgg~X zR=+|80002RNklMF8=3Mj&YrL?q^(Ek75Ipy`9WHOHWw5~duvzb{JkH7mfm)8jpX2+sgKlkS#>j(#kR>f!8fG8Zo2w4Ar-h-*9p0X@B zj<6v0TJ;oWO!x-yy2(012+n!6#td@=V8F6&5cWH2?qr diff --git a/homedecor/textures/forniture_black_metal_s2.png b/homedecor/textures/forniture_black_metal_s2.png deleted file mode 100644 index fc83526f81aae26271652e13251b5558dbbf3439..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstU&&p0G|+7 zVPRoKMMW(wEpc&iPEJk*1qEwsYbz@&F)=ZIets@4E_r!*V`F0t4Glg%J|!h3Nl8gw zUS4f&Z7C@!Gcz+578Y)9ZXO;Ub#-+K2?-q?9a&jf6%`d-U0pprJq`{I0|NtTX=zbW zQ4tXlK|w)fWo0%tHgj`xOG`_AeSHA|0XaE23kwTVQ&VEak7aas5L?QKm4JS-QgzErTfxUz(>L@imW>-*sU|Fa^sce6L89eQ%i zs-o@YqI+E$vg_7NW((}S`Ej0c;p~N*BSe#{&+nWeoPBwr*8eD3bEVqYnK9Dd26lX< zm+!ZA=04#sxy!+S?8K2>>W+Kf0lScQ1vJZFv*&5zf z+;NCMx+}wVLPWvU$}|76@6C^6>F^V@;hX-9n_pzs)v9qPkO-_sF!2e}0 dQ_S})=YP$qD%gxW?Fx($m$- z%gwH@v7n)%v9h$Xv$d$$qTy1c!%xVpr}$J5l-$;!;*F)4jjJ?e6Zu!^Gd<;ojikwYIp%$I0gB=;`X~yuQEj^76mH!ne7* z&(PDs!^OYB!^6bKeXG?9tQJ!^FnK#>n8|f<>uw*=-%Jq@bU4uxx2QvxzN(o($v1{!{X!R!^Owd*V)w7*Wcmd z?CtK*(bK}i#j~`w$jQsu+T6m##>dFY#m30R$H~~)+sn+(#>mRNy}#Ss-pjSNr4pR=`=>@nhR9x^k?B+&H{_LP zCJlq?gQ_D~Na0D*n+v#O_y9yZ&ekTq#;itbD`A!yhlcW1I6EaI12f|>X(0lUdsMXT zgm)Zvc+Oj21f;u7-zO5!IZ8KGmj))~NyS!2(quVfZHpV=>Fkv$=s)bA;UHzF4GojR z@7^9?yG$ilAaV(~j%Um6gO#aWcB}c1WFFL8qg$_^@F`hncG~Y3@N$!W($XZis~)13 z{aXS{#Or*F+-o$6BinA5fL5}atJMxvY(Lqup1=PAbl+4-Uh#2t00000NkvXXu0mjf Dj)lUs diff --git a/homedecor/textures/forniture_marble_s2.png b/homedecor/textures/forniture_marble_s2.png deleted file mode 100644 index b3cc0c0a184f288a3296f308961ca85ac4d7353b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 814 zcmV+}1JV46P)O8mYJKXuCaW7f!5dAprfY0!o=U;;*XP+ zcX@oQu(PYKvB}HMtgo_>l$OoU(X+R@n4F(_e165q%E-&jy}-iQ+1r|(p@W8qwz|E^ z%+A@`+}_{e+}_`lmzk@tvWJR|yS~ADet?OMkbQuHl$V;$(9)csqp7T~pQ5I#ud&?S z-?Fy3;o{`V%+8UNmx6|fjE|Cqh>D@5sFRnPZ*g;kh>C!Ng?4#+j**mzjE_i;lv@$C;g=uCld%f`pKimx_*&jggd*m6(Z)kA{hir>m}>qNS9Wo1>?y zrKzl)p`^7&dY1qI0Sie)K~xyi1;GPi0|5{Kz^!fDw%ydW9ox2zvwzze$jB00wMJD^ zQ5GvN)@d7HZE~PRBB?@3m stSip&6BIJPAwQM$xMpWkmgT*df8DoYWP)s`wy4l*?%FWN>FVq3?e5#$-kzeRouH$`#mLao)w{pJ;^X9^ zrl_T6)FO&(YM{+}-Z*@3pzS<>u#$kCDN} z$GN<}!NkYBzrwM#xW2;0uCcV0nVX-YrJ|;(rmC&Cy1kp9qRY+D)796ht+21NwX3hO z)z{hP=jgq`#Ky_XxV*o^#>l9wuE)yF$ji;Sy}-xH%)G$E#mLH}sH>{2u)o5^!p6w! z?Cr_S&&$rywz|EcrKr!*)2_0$s;;rp)Yihq$kf)@tgy4)-r&v9(zCX?rKzmg+T6gy z#;vimy}-lY;Nr!|%f7+Hr>m~CxVx*bvZ$=Du(Y?s#>sq`ScCuo0SQS&K~xyi1;GPi z!~hTgz^!fDw%x1kvu)dqo&2~nQ2WLuJAyVg%Z<5)jxGhnL#4P&t#8%UK})e)ZiX~X zCKTRLQ(JvgJIf+H@Rvvh=vrQz;W`aMwig4O@#c=!O8f}U4il;Z4({4>^`?r6J~gS~ zMP(oCpVLK(a&XH;X+M$0%w=S?kpF>|{A`^7RjDR$fZJ SRtCBN0000{b$We)hKW;GTC1m}^rKxarc*)GpwYa;yzrty4ad>@ziH?zXdw*^i;lX!!E<NUcA%uE zUu0)nUt&*FR%dK*VP$BGkCTLmjH0Hgqo=Bom6>E|Y>JPQv9-9hxx8LtWng7!YjAV4 zxVwjok6B$|gNTe+TwqsQUSMQsgNKV*U0`EqYiVwAeSw9kt*~EXW@l?}dVYeHnw^A+ zjCp>6W@>I*Ut@cKg#KYY@&Et<8A(JzR2b6*!2@E%01yDct!>-3ZQHhO+xFSE?c{Bp z0rSU;g@#uL_a$in0Gru-D>ks@ce%2}f}y_kV+HRr*?-sQbq zRBzN-i6zXVjZxq}ywi8Ea^TkW7l;4= N002ovPDHLkV1g^@#T5Vm diff --git a/homedecor/textures/forniture_metal_s1.png b/homedecor/textures/forniture_metal_s1.png deleted file mode 100644 index f6d0a2db3e4792a3c2f014d9bf072b00ab8966e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 505 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