From 2fe54e38e07c30ddfcc223c2d41c9da3f71646c5 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Wed, 25 Jun 2014 02:08:54 -0400 Subject: [PATCH] add table lamps in different colors to match curtains --- homedecor/furniture.lua | 29 +++++++++++------- .../textures/forniture_table_lamp_blue_l.png | Bin 0 -> 298 bytes .../textures/forniture_table_lamp_blue_lh.png | Bin 0 -> 304 bytes .../textures/forniture_table_lamp_blue_ll.png | Bin 0 -> 299 bytes .../textures/forniture_table_lamp_blue_lm.png | Bin 0 -> 296 bytes .../textures/forniture_table_lamp_blue_lx.png | Bin 0 -> 306 bytes .../textures/forniture_table_lamp_green_l.png | Bin 0 -> 311 bytes .../forniture_table_lamp_green_lh.png | Bin 0 -> 327 bytes .../forniture_table_lamp_green_ll.png | Bin 0 -> 318 bytes .../forniture_table_lamp_green_lm.png | Bin 0 -> 321 bytes .../forniture_table_lamp_green_lx.png | Bin 0 -> 333 bytes .../textures/forniture_table_lamp_pink_l.png | Bin 0 -> 348 bytes .../textures/forniture_table_lamp_pink_lh.png | Bin 0 -> 325 bytes .../textures/forniture_table_lamp_pink_ll.png | Bin 0 -> 343 bytes .../textures/forniture_table_lamp_pink_lm.png | Bin 0 -> 334 bytes .../textures/forniture_table_lamp_pink_lx.png | Bin 0 -> 317 bytes .../textures/forniture_table_lamp_red_l.png | Bin 0 -> 303 bytes .../textures/forniture_table_lamp_red_lh.png | Bin 0 -> 357 bytes .../textures/forniture_table_lamp_red_ll.png | Bin 0 -> 330 bytes .../textures/forniture_table_lamp_red_lm.png | Bin 0 -> 336 bytes .../textures/forniture_table_lamp_red_lx.png | Bin 0 -> 364 bytes .../forniture_table_lamp_violet_l.png | Bin 0 -> 314 bytes .../forniture_table_lamp_violet_lh.png | Bin 0 -> 338 bytes .../forniture_table_lamp_violet_ll.png | Bin 0 -> 322 bytes .../forniture_table_lamp_violet_lm.png | Bin 0 -> 326 bytes .../forniture_table_lamp_violet_lx.png | Bin 0 -> 331 bytes 26 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 homedecor/textures/forniture_table_lamp_blue_l.png create mode 100644 homedecor/textures/forniture_table_lamp_blue_lh.png create mode 100644 homedecor/textures/forniture_table_lamp_blue_ll.png create mode 100644 homedecor/textures/forniture_table_lamp_blue_lm.png create mode 100644 homedecor/textures/forniture_table_lamp_blue_lx.png create mode 100644 homedecor/textures/forniture_table_lamp_green_l.png create mode 100644 homedecor/textures/forniture_table_lamp_green_lh.png create mode 100644 homedecor/textures/forniture_table_lamp_green_ll.png create mode 100644 homedecor/textures/forniture_table_lamp_green_lm.png create mode 100644 homedecor/textures/forniture_table_lamp_green_lx.png create mode 100644 homedecor/textures/forniture_table_lamp_pink_l.png create mode 100644 homedecor/textures/forniture_table_lamp_pink_lh.png create mode 100644 homedecor/textures/forniture_table_lamp_pink_ll.png create mode 100644 homedecor/textures/forniture_table_lamp_pink_lm.png create mode 100644 homedecor/textures/forniture_table_lamp_pink_lx.png create mode 100644 homedecor/textures/forniture_table_lamp_red_l.png create mode 100644 homedecor/textures/forniture_table_lamp_red_lh.png create mode 100644 homedecor/textures/forniture_table_lamp_red_ll.png create mode 100644 homedecor/textures/forniture_table_lamp_red_lm.png create mode 100644 homedecor/textures/forniture_table_lamp_red_lx.png create mode 100644 homedecor/textures/forniture_table_lamp_violet_l.png create mode 100644 homedecor/textures/forniture_table_lamp_violet_lh.png create mode 100644 homedecor/textures/forniture_table_lamp_violet_ll.png create mode 100644 homedecor/textures/forniture_table_lamp_violet_lm.png create mode 100644 homedecor/textures/forniture_table_lamp_violet_lx.png diff --git a/homedecor/furniture.lua b/homedecor/furniture.lua index d3f6d756..f51cfa48 100644 --- a/homedecor/furniture.lua +++ b/homedecor/furniture.lua @@ -110,15 +110,18 @@ for i in ipairs(chaircolors) do end local repl = { off="low", low="med", med="hi", hi="max", max="off", } +local lamp_colors = { "", "blue", "green", "pink", "red", "violet" } -local function reg_lamp(suffix, nxt, desc, tilesuffix, light) - minetest.register_node("homedecor:table_lamp_"..suffix, { +local function reg_lamp(suffix, nxt, desc, tilesuffix, light, color) + local lampcolor = "_"..color + if color == "" then lampcolor = "" end + minetest.register_node("homedecor:table_lamp"..lampcolor.."_"..suffix, { description = S(desc), drawtype = "nodebox", tiles = { "forniture_table_lamp_s"..tilesuffix..".png", "forniture_table_lamp_s"..tilesuffix..".png", - "forniture_table_lamp_l"..tilesuffix..".png", + "forniture_table_lamp"..lampcolor.."_l"..tilesuffix..".png", }, paramtype = "light", node_box = { @@ -144,21 +147,25 @@ local function reg_lamp(suffix, nxt, desc, tilesuffix, light) groups = {cracky=2,oddly_breakable_by_hand=1, not_in_creative_inventory=((desc == nil) and 1) or nil, }, - drop = "homedecor:table_lamp_off", + drop = "homedecor:table_lamp"..lampcolor.."_off", on_punch = function(pos, node, puncher) - node.name = "homedecor:table_lamp_"..repl[suffix] + node.name = "homedecor:table_lamp"..lampcolor.."_"..repl[suffix] minetest.set_node(pos, node) nodeupdate(pos) end, }) - minetest.register_alias("3dforniture:table_lamp_"..suffix, "homedecor:table_lamp_"..suffix) + if lampcolor == "" then + minetest.register_alias("3dforniture:table_lamp_"..suffix, "homedecor:table_lamp_"..suffix) + end end -reg_lamp("off", "low", "Table Lamp", "", nil ) -reg_lamp("low", "med", nil, "l", 3 ) -reg_lamp("med", "hi" , nil, "m", 7 ) -reg_lamp("hi" , "max", nil, "h", 11 ) -reg_lamp("max", "off", nil, "x", 14 ) +for _, color in ipairs(lamp_colors) do + reg_lamp("off", "low", "Table Lamp", "", nil, color ) + reg_lamp("low", "med", nil, "l", 3, color ) + reg_lamp("med", "hi" , nil, "m", 7, color ) + reg_lamp("hi" , "max", nil, "h", 11, color ) + reg_lamp("max", "off", nil, "x", 14, color ) +end -- Aliases for 3dforniture mod. minetest.register_alias("3dforniture:table", "homedecor:table") diff --git a/homedecor/textures/forniture_table_lamp_blue_l.png b/homedecor/textures/forniture_table_lamp_blue_l.png new file mode 100644 index 0000000000000000000000000000000000000000..e656f7427f2691a3697ba5d058d81a1c83a45d6d GIT binary patch literal 298 zcmV+_0oDGAP)aOZ8_~X&| zt?`d-{&SA?A|f+4o5%hBb+K5t?RGX>we4;`Uv;1F&o2)>0EnRy+Yw<`Nw#c5Ne)A) zF>07;sbu;DuvCVK5y26%T}sc<)O1W-1-MpAKFNq7Eha;(k|f*8OmLVB9{K_jHks}L zQUK{3cF_4UtZ%qq(is85rU{;QY!62O(EN~Jn!Dv~cQ$F7puBx>sAo(wvXHf=0ry?= wxQ%O5x|XzG2;Y(}#IBj76#}7t$&>8z1t^Dk8ex3qd;kCd07*qoM6N<$f|sp*(EtDd literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_blue_lh.png b/homedecor/textures/forniture_table_lamp_blue_lh.png new file mode 100644 index 0000000000000000000000000000000000000000..2a022874406c2214b613a89fdbe3ebc33e3f78d0 GIT binary patch literal 304 zcmV-00nh%4P)b;E%!O zoy&|Q{3phKW)=}``*=RTY`3?k)6-_N@4Dxv+4t|q`-i&$0Kle`NRg6Bg=7S!0J7s_ zI;zbH&0S=6myItX^9(UBh?FQP=j<-h)}n2tDgjYSkTPS%)G}Kwv5;maiS7GENdxbDV)I4{EtRozwH1%Esm zzBT-@&413JUPNT(a`~{?tY@>kwtbmQ7H#`Boi6sXtmpE?+5Fc^U8DqCEfr002ovPDHLkV1lO!f%pIb literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_blue_lm.png b/homedecor/textures/forniture_table_lamp_blue_lm.png new file mode 100644 index 0000000000000000000000000000000000000000..89693056cdd0f79a9a6a873ba5c4a3a71120bf1e GIT binary patch literal 296 zcmV+@0oVSCP)ex?GM66a1`~9YAZnxX#*=)Jnz0T*$?(_Ze>AnI0XsE=tq=-V&rX4^Ev_q*H z4UDjqB76dvOhd$oV2Ke<Fon;=`nd^Axa4YaGe_F uuUq;lY2OgOBwdJIo}?8J2-Z)YWETf2S$P;*@w`O<0000q1YrWo1}&?H=DQF>~^(!nM@Yz_3L!HXt$pak9R!)&`^nOsmbgj!d9lC zRKAB&H6qMRsbqQ&uvCVKQG+FAx|EWcQUJY@a}9mPUFQhzWi-QE>F9`^6cK4htqE?- zi5>a@5!lpfPy~{I>N;eILo(c4aX+Us0R%QhJbm!q?f}5w3pC|=KJ5-aYl>*TRRrH60^s=pv_`Y50|N!gl4ztssH`9LL_}2R58}7<6g}@c;k-07*qoM6N<$ Eg4d~lHUIzs literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_green_l.png b/homedecor/textures/forniture_table_lamp_green_l.png new file mode 100644 index 0000000000000000000000000000000000000000..2fab23c21c70dc5cfe8bd8d6f5b3e884b924d52d GIT binary patch literal 311 zcmV-70m%M|P)d6ECSe)NE zf3c1K)XzLgRrUD%IDU-F`{lSDhxM@A?iTlp{L0PC<|qK5X%cq2Tqt#!Cdp0~r%^Sv zt1J*rZ9nb_7OJtKT}0C5f)Evl7*<1M5R3?yZ#Eb-@W->p~S^G;o8 z@1Hp2Nz-Q>RAw1~kFI6T(9oYqyU}ot^b2=U5atb6tX(-4y_y!Njr}7D2LyM?D6eL^(=UtoPB64>LMTDD`t+8ijHNb@> z<6g#-h`@j9aF3+Bub;GO|vzND&pO zg@t{o?9*k-5L8<2KlciCcqJ9mKoW-rL1FvV&TeL{wE}6a_2PX<8sZ})0#Uw;)s{4o z3`GC0h769x#6(S6qb{W=6$NKJbO%V9nVVZSRs><$a?X7Q`F#Soo#0`K91sA42qfb1 z9j|r(j6G1(_3|pm(NiMyqk)z4rh)KMJOD(;>LH_O@S>#sv2c`hCU)s0tpFhq03oN@ Z#ShAtfex~z?NI;#002ovPDHLkV1mV-iZK8H literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_green_ll.png b/homedecor/textures/forniture_table_lamp_green_ll.png new file mode 100644 index 0000000000000000000000000000000000000000..5acfaeabe773039551511019a48b1190e678710c GIT binary patch literal 318 zcmV-E0m1%>P)Ybd;(w5UH5&Q778v3qcYz7bfM@t>Oz{$<%T5ZBz(Y=A>+S{ zGntA1#AzPMh**8DcAMR7G24D`+xNEn>ZXgSb+%rvj|BiYbi#(=;c!kE5+cG0=^R?+ zP|nRkG}`RDJwb;z(x6;f;`M@1(Z287*Y;osf_?47<6%P}QZkX=d#zQADm9VATV3lJ zR8>{8q(G`wk_g<{;W$8x*1o#AnW-ui)v8q+D#-as;BA8C9F`COf=m?RV}qZ1Di~X$ zmUjMPdAUI$^mmKu=bAF&AlxGXK!po>b~RPBL!84klmdLNcuRH{lxR3+oY?qU$k46s1;CQ4-c{~tZz z#-j0^#xL%U|I}e0Gn?7!ch$T%iSY35J!?PfcDp6ZvbAJ<(20PZ{Cn%z7jhdLM= z3sX&$sc)70a=FbQM2fp+$KZkz5m5~+@h~8SB&9UFpS9W&C~5NSR|gz!Vh%5(dleE&epu_uf;uu{wcc&BPkBQ*FX(yk1gEM34ZoY4v} f2n4|CoL&3@NgaXqroy)900000NkvXXu0mjfCQylL literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_pink_l.png b/homedecor/textures/forniture_table_lamp_pink_l.png new file mode 100644 index 0000000000000000000000000000000000000000..3c6f17e7c03cba0851f498ccf5e8d5bff526fe1d GIT binary patch literal 348 zcmV-i0i*tjP)`Tc6Ws&1++n&tCj4*)pB1@sW{9D&Kgq0Zn_XF!P5m>=XI)eK7|#-t zuokUDYJCz;ZAvq1U83QxMugntZP%)Kp{-(wRayo1sXH-4-yjH+ru1FMC^oYo&CC>J zsGtsq0CyG-3q*nH2ND><>lZ%49sppx0d1}pMLhhhz!3CyhmZ~!Gsyv`!~#HiRTedg u23?f2GlV}&Ct_!g(h3k16aZ1j*~Ks6Ba0qJ0sM*p0000syN|o&QH4o z0Is)?b>ngr_CKpQ!7ggrcyK+)L5eXcpj*|XW)KazC~0R12TLbn=Z?|}g24c4jd7wR8U0jW^6d2DR+k*ZD8_M^f-t6h0KGu{C% zEE?Zw{96#01uV$jjK`@1?0R~ zt9gtuh}uvp59!jTb&ffP)p8kK)H?ZmLK8Ra;X{2EVrc43QQXy=b)IEyUA3K@1&Aq| z<0MTIGpR+g5TfvKR|kNJ&zh#8Y0iNZ7RgbkNt+WM`T?COJJMApV!=nSQ#DRDWT4$) zKpF8gLua7gkij$Fzp+T$1_1uRkn`8Gt8VwR2G4LmYoxtzKgxkhzjy0d)o2tAz9?yD p0DDO%V&{+23NQ!+!00%;_ygpKiy*=Vb3_0D002ovPDHLkV1n)*lPLfI literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_pink_lm.png b/homedecor/textures/forniture_table_lamp_pink_lm.png new file mode 100644 index 0000000000000000000000000000000000000000..ecb6dd474bad07bde5a1189b750efc95d877a59e GIT binary patch literal 334 zcmV-U0kQsxP)a=)9*Yi=tq&9_3@IO=#Qm08Lhf5UVDU zVjUxy_ffiD^#N{FH#N5t>jBM-C8Q9W6Fck%Xc7^A%eIBgBZ4Lqw98=jhr+$*aYm~c zz@Ul~UKf0ZT?5c}z`Cp1q}~6l;sm=|6XHSjz@-#pQb4z?NzEV{a#7OG01lE)#LgY1 g6$FC;)EsA*KVe3H7ZP-Ap8x;=07*qoM6N<$f>y7Q5&!@I literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_pink_lx.png b/homedecor/textures/forniture_table_lamp_pink_lx.png new file mode 100644 index 0000000000000000000000000000000000000000..508167da79379bed734194442118391f7c042969 GIT binary patch literal 317 zcmV-D0mA-?P)mN-Yudo8Fw*lgJqtR8rOW4(pSJv|-)fJ~I!dYYC9K41;Yj5I-QELA3a zWkV3Mz}F6+Qa9uoSr|iPb|Gm>RdTnXJg~^AE4uFTfGOr_Bdwy57)cVMjJ=u;gatn} ztDMAv;XIuYn=?1`3rz9CcSSUk6!ECi*_groJqGtF&ucov0S+^Q@bXE~_5fh&fDbq8 zWoLs0LGb$nZ5&k3T+$fT06Vg(xmh&is-#^Q7$lvET{uZA2o49BJIyY?Y%OsjTgw3; P00000NkvXXu0mjf{rZ1x literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_red_l.png b/homedecor/textures/forniture_table_lamp_red_l.png new file mode 100644 index 0000000000000000000000000000000000000000..31a2108adbac8208bba6934a4577f4339565a2b9 GIT binary patch literal 303 zcmV+~0nq-5P)9kyr^N;E>qEp;c*9Kw9BT6l*49PX;)%*x%WA zB;h|bzh`Ed`EYypR_paJoN66?IMvUq;vboh$KwP5VCzYgvpkt#Nbpibu1B@CoEamk zAzKTAl(^e+Lue81B{C205n-jYO#DGGG6QBF87Yx8a&l?$$~sd)iZl*nX{`yGp#2V0 zH<<(?0+0xjM$fGRmqWnK0rw-CKmddUH$1)Ixy}FpzS*Jp<#^GSpB3CtUf)q;!FZR0 zj7R~{q?%$E4Ld7ozYxAh`XP3{ODkX?2teFt7hgd{e-eD)9Fzb6002ovPDHLkV1hf% BdglND literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_red_lh.png b/homedecor/textures/forniture_table_lamp_red_lh.png new file mode 100644 index 0000000000000000000000000000000000000000..72ba1251f554aaa0578044ae6f2c9467c7116a19 GIT binary patch literal 357 zcmV-r0h<1aP)WmWj}Adtd>RAdirKhNg|EnDjv%BqqQAQAyHLO0Ku@?=)sK-*SQ!LF}6ck#MsM1 z%^JMN1?>=;#oqwm6Bp~)yz~vX0*p=;0JQVa@Giapf1-fHh_uee00000NkvXXu0mjf DHl3AP literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_red_ll.png b/homedecor/textures/forniture_table_lamp_red_ll.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7fc87cc601e367b230935d1c6424f0d5de0fe9 GIT binary patch literal 330 zcmV-Q0k!^#P)?pz5Gp>(2S}Wx>LGfiUZIESLAXYRR8^5kK*`$fM<@*mLaOQ?YyBE~c7Q*c zjNdYjL`$k4QGPVlx?I%mue)7e0D!|y!p`uT0OstWsv$C5 zl|witsgE_`)u9$p0hwHR)zIaL@3g;bm594 zQb7s9ER~dWXqrIurQ;j=sL_

_E6cNpjZZJVcO-3t&^=WrZ9N0D=f8@&1W@cP;>+ z*DUE~`-V_B$YrEfuKkD8zjVU@Nb;C_iqpq70@(rXx3|UNQm;NDj|GXt#>?Qdk6Sq z(DY8zjJxAM(eW{}nLXXze>VGzyx27RODSHyx2tkdn?0`AEdT%yJ8|pei43Go)DVIb z4O``*95d~{c8s*yRs_nkjAm1g3Zm-S=}9uXUM`brS(a*sBLx|gDVQZCP3}a*MD3RP zUGaDY3?gS@E|@}9*A92H12eP)i4p-x6)hpe)?nu44bQ4q;@~D`M&~Vd8_2s#ZtTC_$peg~-Gje8dG3WS%@!@XHuuoIi${ iTLDJS0zh(^c^5wn34kn4et`G@0000L;3SZhyKrLsyFNsd0=C5orlF~LMi);elwZtURn*f@9D?^|PfX_`BS zJp+==mPX2WzFN8vNJbm!+qc>!qyXs!yYT^qdYMcDd^u3xp#*R&5~Z!RfcHeAb;LN! z^D2Yb9sxMfxITmn5C8;1fF$ldF}3Rk0CGoBB(KhUX8W@qI>P?jVsnx!S$jsa8`^ER{Vmy8Oe4dQ2=3g)8C(}hYe|WlE0)W_5VyBSF62&-; zLQ>n58bi8heTwM1begmzJa835e_2O0Tb_(6NI^C`eQ-dEY_^<9W=f$TR5ouF!xPxF zQVMDkkl4L*kB8*~+Yb%7 M07*qoM6N<$g1Fj=`2YX_ literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_violet_lh.png b/homedecor/textures/forniture_table_lamp_violet_lh.png new file mode 100644 index 0000000000000000000000000000000000000000..2b57d96f2604206d787c2e0ad3b34f5bf0518313 GIT binary patch literal 338 zcmV-Y0j>UtP)X*M{tWT&GXAR{cftL_Al!ICO9 zDNHRN6by*W+HchXK-`hCm_ZT+Wi^9&?Y70kVu72Hs4D}4(?)|agl4JDz}4Zv`2lVV zBnJTy?ude?FHD=|0D#z06ymTrN~@oBL_zo|(X4&PUJgvv9Dpxa&Do2F?3J_~fVHG8 kv5OmN1q1{EI5)G4KjOKEIku-kYXATM07*qoM6N<$g4}43;{X5v literal 0 HcmV?d00001 diff --git a/homedecor/textures/forniture_table_lamp_violet_ll.png b/homedecor/textures/forniture_table_lamp_violet_ll.png new file mode 100644 index 0000000000000000000000000000000000000000..31cce4d79a150189508e5055820f6b28bbccf7d4 GIT binary patch literal 322 zcmV-I0lof-P))V&i`9H~dAC^2uSd7b&Eom>VLJeLSBVsknR)SA zD1=pJ-gKpUpRQ_uQp)d5WF&2hAbYNQ0AxBErpTSDvwF z*1&;a|IYr4B>V^KerA@L_qVgf@?~;9oqarAo?X3uK3|Nci=X-3!*xRdU|lDvLQn{= zJfRfKNS3Zu>&h9ttb(Xk-=P$WXa@B-9i+<9@Hk4G3^U!hRRRJqtgDY;D+jbi8@-2_i~UCDFA9zQ|v{<4ocddfh#NL+&*YU0JNUO9YF*7 z?SX?iTA-TiQMGQTkY^?^9F4-5{ES7wo17IqXdSdH(`$DCEwD_LWV=8G%N~LmX7t(@ zT2M%;ztx%m#mQ+8B#ZDhddHcCZ@EJ?z#SE46QBs?^kje%ZgmG)E&*pP?z-ea03m{; zJeGXS7X%=!B`VTU_b@MiHb_b_{AO-TPHObP%{+jpTs@>w4c)0}e+X8Qw$v_dv=tOV dfRN4Z@(Ut&d0%$Sc=rGR002ovPDHLkV1l6uj}QO= literal 0 HcmV?d00001