From 86eb9d488f6442006f7c805cece62df1bf71d34b Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 5 Jan 2017 00:54:50 +0100 Subject: [PATCH] Minecraft-style wool colors --- mods/wool/init.lua | 40 +++++++++++++------------ mods/wool/textures/wool_dark_green.png | Bin 552 -> 0 bytes mods/wool/textures/wool_light_blue.png | Bin 0 -> 5168 bytes mods/wool/textures/wool_lime.png | Bin 0 -> 4995 bytes 4 files changed, 21 insertions(+), 19 deletions(-) delete mode 100644 mods/wool/textures/wool_dark_green.png create mode 100644 mods/wool/textures/wool_light_blue.png create mode 100644 mods/wool/textures/wool_lime.png diff --git a/mods/wool/init.lua b/mods/wool/init.lua index a40f20f306..194498c768 100644 --- a/mods/wool/init.lua +++ b/mods/wool/init.lua @@ -9,33 +9,35 @@ local wool = {} -- colors, and then some recipes using more specific colors for a few non-base -- colors available. When crafting, the last recipes will be checked first. wool.dyes = { - {"white", "White", nil}, - {"grey", "Grey", "basecolor_grey"}, - {"black", "Black", "basecolor_black"}, - {"red", "Red", "basecolor_red"}, - {"yellow", "Yellow", "basecolor_yellow"}, - {"green", "Green", "basecolor_green"}, - {"cyan", "Cyan", "basecolor_cyan"}, - {"blue", "Blue", "basecolor_blue"}, - {"magenta", "Magenta", "basecolor_magenta"}, - {"orange", "Orange", "excolor_orange"}, - {"violet", "Violet", "excolor_violet"}, - {"brown", "Brown", "unicolor_dark_orange"}, - {"pink", "Pink", "unicolor_light_red"}, - {"dark_grey", "Dark Grey", "unicolor_darkgrey"}, - {"dark_green", "Dark Green", "unicolor_dark_green"}, + {"white", "white", "White", nil}, + {"grey", "dark_grey", "Grey", "unicolor_darkgrey"}, + {"silver", "grey", "Light Gray", "basecolor_grey"}, + {"black", "black", "Black", "basecolor_black"}, + {"red", "red", "Red", "basecolor_red"}, + {"yellow", "yellow", "Yellow", "basecolor_yellow"}, + {"green", "green", "Green", "unicolor_dark_green"}, + {"cyan", "cyan", "Cyan", "basecolor_cyan"}, + {"blue", "blue", "Blue", "basecolor_blue"}, + {"magenta", "magenta", "Magenta", "basecolor_magenta"}, + {"orange", "orange", "Orange", "excolor_orange"}, + {"purple", "violet", "Purple", "excolor_violet"}, + {"brown", "brown", "Brown", "unicolor_dark_orange"}, + {"pink", "pink", "Pink", "unicolor_light_red"}, + {"lime", "lime", "Lime", "basecolor_green"}, + {"light_blue", "light_blue", "Light Blue", "unicolor_light_blue"}, } for _, row in ipairs(wool.dyes) do local name = row[1] - local desc = row[2] - local craft_color_group = row[3] + local texture = row[2] + local desc = row[3] + local craft_color_group = row[4] -- Node Definition minetest.register_node("wool:"..name, { description = desc.." Wool", stack_max = 64, is_ground_content = false, - tiles = {"wool_"..name..".png"}, + tiles = {"wool_"..texture..".png"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1}, sounds = default.node_sound_defaults(), }) @@ -43,7 +45,7 @@ for _, row in ipairs(wool.dyes) do description = desc.." Carpet", walkable = false, is_ground_content = false, - tiles = {"wool_"..name..".png"}, + tiles = {"wool_"..texture..".png"}, wield_image = "wool_"..name..".png", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,carpet=1}, sounds = default.node_sound_defaults(), diff --git a/mods/wool/textures/wool_dark_green.png b/mods/wool/textures/wool_dark_green.png deleted file mode 100644 index f02bd9f193781a1b4364a5634cf9a41fd1d3e33e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 552 zcmV+@0@wYCP)$IMHVwh7Bol~HA)vYOBgpz7&%TEI#3xqQ5rl`8a-7SK2{q)SQ|iD z93cz!*8l(ks!2paR2Ufr!3mDzHV^>7YPJsBI|#D>|7I|d2SQ>9pk4lqd#g8A`*8>Ba?w!C8hP zPEDy!b7(^y4qVcqG#163~GMVi$G{VOMS; zZ1D@nrU@R#TF-pA!4}{!#7lL~x&E~OB5&Tw3J&^3+c2Tl)R=coy2X~ qwafAF3X$Z?>_}(a7Iy6-Uc~<@818|JYUd{a0000KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000SFNklO^l$M${>K%cAzdax7Q`XM=mBA&ZX-bE$IeNU25K3mMAGW zbdG-Xj4t4Z$d_e@6oN@(s0&SI6t9~jWv;2K413z^-AzMXXxiQ(g+PZ88La1Gl93t7 z=jS8!=~jac45KGAk}}un>2@PNL@s9;S_!tTWwha(x?%A2F~xlScEX4I9sTH8T$BJf z7kOUy++A1nqeo{(0iAu-*@d zePr5X2$2Gn5(or$*A=h3fo|~3nv616thNK&!$?(VnkvWp$jiFpVvEil%-26fr`XE1F94;qw8d(k5>f1-sS) zFrQ?^82Ryj55V<2#b;Wc zc1-KkqO;oIeB|NfNRew^w*x;v9B@8xInB79m#nq}x$(@W8N1f9+74(Xm`_r%Iv;5} z%eJ+I5ZUa<)P^4)4qQ$%s$4Uv4gdYi4kZO|7bUq-SQijda62ym_~FAAqXn1Kk`N-@ z7}y?0%3Lw6GydySiZ3!nW+X40f%msHg%A{{8W94%d7IKC{_dat82Nv{rquMKKj$qs ziV!2KO$t;}5F!WxO=&1|g%6RUG^IX?S)}b9=9CiW0$NLy6!fFVI**bP{j%u^ zA^kBx+c~Z-QW0Lwaz1=MFuFjDk-E?Q&$B}xhO*Ee-)opwY?!C(Jwj*^o5r=-skV5dy+nTQTEH}g1lol5`UGLc)9s2Y0kq{zx z*A?r7Ww3!vOX@nTF z3-@8&2eus(3?Jw{8s z4?M0qW_8Bhn~LBIy3ylYpzS1q%zEE!{KPz9xQJzOKz`9w)>Iib)8ExRJo9Zuk;O@F&vJtzA@lQ*dN~62poq3?l6;H1{ZD&t#Aqg?^%j1D*lTqc0 z)waiIg%ECT<>i=o0{HaUQszlXGb0iI_%Ht+r4&4` zdqRkqQ}O)j=MgBfBp~A$`1ZC2V0ZHK7$fqe?;%8-k7thD9xSsa`Ni|PXB-1p^PFjI za4x1U`04Wjaq@F11&5lJtTj>ImLH_C)0`| zm&_W&4m0 zW8lm3NCYmY8H)Iqx z*$k<0T}V9e5C8mc5n#08jA8xgaW0~iAjVV=hoc3NzO4&v4g*bT7;OLnlhOb%n;5)L z1C5e`JX7pi%V<4XC%&{k;9Q_74fpGUAm7ifEj5OC3C9DB$1U=adBfT~nHymVL> z&bT&qp8e4=j6V6p30y9kjP+sUaN>a^%Yq;8_e^V(7}0ukH>O-T9~rIZ?V>~}$$$L3 zWgI<=i-M*!NSW4r|7}vTH2*nrqqzIF;(6WE4UW1nNG163^PX|^yt}R`vP4zZ1%CJS z1c2pcV7ckhRj#?3=TwEpD9Lh@bYRwGSnJsyEKR9#KDE}4AF7U8Ca=R$WvosGbH%V#hQuF?{Nj&hn9eG@KcpqsheRi}e*G!wpaqwrQ zyO|egCC(#Sk!fO#XA`@*Ea(O(GsSv8^4+@zCFL2#id^yTs-zn{UzQ#E=Pw5`BUwyy zgox)N%Z#G`l?Osh1zKvpEIVe6;d-80FPT_U#coVWcX67M?yf6-yx*tzLXn#UsJk`| eGK-6x{~Z7+P-=jd{KLlp0000KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000QCNklAI{f6= zE*TAqGyup;>HmWw3RFW>a8b!~rELuq;=_OlY+n-^6qR1Tz80(+-X9#I!tOL82-ynO z3=MB9l}1^>jY?e_>73C)@smTHpraxx#29d@T%K-V&`QHkj`U@t8t5RHz;e#06a1)P z;Qit6d{8vV_sz!1 zQL6zkK1N~;q?8dA)G*3c2}e(uJlC%a`BrJIQCp#03;9-XPH;{rOJSW8<1pYSN6n40 zRx~PMbhKPab3uUJ$B{BuwsZboZ_T)!S9Vjxd%=rWoYC)X?Dv>TVf!^9&4?dIbWrlG zP}at9^Z;DG%(PCjiqrmndrst~vitLd9~2U_Y`9&&*~`m9D~4}NMXC{^ z;#9c3Wa?50JBK)-yk;uk5B|HDaDoU-j|2HqXsHo)4j&!cIg_phH#ywsuxhMd6XRjP zjY_*VvJ^zX?;L)*ix|STCR%RzL5U}iicq$O?3Ca<+m-;h`*7$dObPWu+(+`YQngT< z;iKZF2nOP$|E7WUx)Gd7!WgFKh3@VF5-%#2A~;!P)cfSUpHzs!roJIVOe{tAo6 zf*TYKO8T0aevAa?!5PcEf(VDlJ!TF0xBvWSGkLQoAcR0|1;2M}FWvnxNaut~HxmIG zZz39$)}UN_O&A866>2r=Qcq|zge+*z*D)Hn&Al?UVzbw?; zO+;ev3O6~zDWHS0JSW=L@Ho9D6@;U1xB@aPY)&Ae}SQDWXB&oV0SAS3*$y!-UtMST@${274n+4y_Fa zk2oPj&sH+&k^%5h@uQ=xm9lifVvt@lx4JMrM#K!=IjU<+A4j&5*)AI*U7XW?q^^~m z61qHXEKeJLP|}=8=S(ez4@z!@<+_sRf*T$27@$}e+^$>h^0cvCGCn%gE4NQekJ+H8 zSFYb~tS}xrw_1PO zzzJ^b3!VQmql4n2BkWyoD;44xP*K*Ddi#am+74s=ZAC}z8hYNa1}-{==<(EUo%8bz zQNiy$(v0dV={4h`Lse+WFpT5h@9`*^MqMh-bq(BJR{Y*^_+j7cQ=^qe%9-I#XigY{ z=k5#h}g5qm2##5lChA6}z23oalFc&!e`G^~o z<+ftk7(c|{@xb&rKk_j6ZmE6v{b+?>rFiJo!?P|5tzcyi%9SaO`bt#n@g`4>ai;b5RK= z4?*$M{RjxlWo3EE_(AbQ_iu4RZiRT7NGV}!!B2)a(!7kdId*aGPi5@ z_USYtq9p0~?FPl|J@Zd9n@jkeBTSCuDy$V3dM9}a9kH)p7bwPX@Z`0U00nA;-D98` z%%4`qQ=sI={N;ujod@m%>n(L2IC{$3*j_X0h44Nyja^r5Yc$u`UNYO(I+mLmZL8l0 zkol(>RPaZS1!a5)NKg*Dk;DCtZ~yZOh3|P@rBb(wsu1>`+b`Xo{aqKIZhd$;93$(N zxLp_G`-oeFh9Up{U;k<*Ld^{~D8n#NYo=Dio1?jgHKQ&CL@?{a%62I|!n0xgEzaW< zsdOF?0XI0xTqvc_7dj|X4NE<;{rZwY=&FAU7!eqEkz6wMrC@IW;-ZkhroP#|2Ngrs0cY)h=MFhg3cSw3p7#&b;bliSf81^3BxsK(Q`U$B=?f{0rvVw2!3I)Jj6Y5=^E;lX)mWZ3#`m2EhNvu; z6)O!tI*uRrod@!{u+_v|jj;3hQK_X5D?Ucjn#o)3?e;L>oRBWLhsxXOmMz*TU}Off^dimkmVv-0>KxYh`|3@bl*t4NAQ8o!!i+x#5FSw#GWI)Y@a#Pmblw zM%a78{eayH%hQGl#8aT9#`5cmJ9u1_Za|-wF6hzqao##lV7=yl2LSf$RBGob literal 0 HcmV?d00001