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 a40f20f3..194498c7 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 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4rT@h2A3sW#~2tGECYN(Ty^b)_3TCT9YqYB zL=9a;ja6_?IWZeB4rf0zg}lx zU|i+t;us}&j`FR0=CD15i+ktJ z&Z#?k=4=fM37PX|w}DQuuh{I{ZC9ews;;okYVqB}6D0g!r>$UBzh$9zmS%FRx{*Uf+I%dzX1e3tpn zzGK10JpJF+j(QWTKjuBBy{?hvLGUqJakmU0qqEPb}zQ?(1vl5e?Mg>EgP<{zP$6U-ROQ zu2a7sRxi%Jw&(k^v;VeUw|lQz`~GlIyvbvLx3(rf_nY4%M1;3f6T0AWQd-kD9X5C zB7=f(YKIF$hBd>Q^I=`C3=swlB5B@7EE#U-G8lMT#JFBV&*2Bohp{DjnN#sh3w(sdU6`)JjJy| z%o3RrXF2E{s+=il)M�PV*|l=S%D z)AOqf92giLmegJRr=!1Fs==DAA@|=R)pslzaoh_^zjvo?;&<4}u;Asb@XrOHuyI{D zVdu@8PoF%w;dR6*I`LF^?Z5Ox@dv{H=KQR)`SbnjgME)w8jWHb-C2G-ICSQV&r+H5 zlQ>(F?mX*v|FfO@{~y`QN=H1Cc1CE4JPs5p>~opb^Vw*rQm4}-&7-Q9{-->;uk)MP z?!GC*hAcbA>WR85Vw0J_d8-RVlpJ{Uoq^%g?)-ySG&qj}HTE=evN)dL5KdIQ z)xnt56`|b6AwIM9hvGpG7NKqxg_9j3flA&JO+5^QxN*)_l1-a!&&`e3ua#^+9GA!W47@5h1D7SxBBgz zj~g6#A;E5ZB*#GS*kPxQ7CM}hlTU9{TEnyYnAC=_HO#v^zb2pGSk5BU=z4(DjHTR3 zAyLlJBf=-b?}o<;1sN3+!CRc>oXjnOht!oOukhZYwoCBm5s4%t!}bUd9p!66{lfYJ z)g8`9%vFRsosHCYPGIufxFqC~&?UD^c|poAbym(c@sLuUeDYRG_9k}ADLM+;Ct9D( zeRBAT@e}DMil3sn<|a85F8LAsNF(S}mY3vHfu|-<*-~d1IfgEt6?AvS!Vp2z{wSxl z3%3QW4{To{Y*ISQ@@%u1r}xsei>6+d$`H@^p1J--$u7aWQ|0`oUkJZ+`lb7e=`WbS zl=JYmi8deaNY{{@Ex|64E?F+IeumF7$;;i6$3qOv4PVcAK9hfDerSZ&Hmw@biKn=x zdQDZEDy^j-vU1h3RrgkLhkgz{9n!xtF1U7`Tc~mHe>d_u9`{m@QFl-8KgT-vdGO8PyUV$j zi}~7GeO;%wDtoE)!rd*_s-Zv4yNvdDMa_T;rjSw=362#t!}?6!99TGea2*X~{}xO}JIWWUw(uB9K| z@NwJ8Z7a7+Zg_fw?e@BDx!Y zH{DKew)C;PC-y$^D*0L%`>^WL*SWJd&pz~a#qIU)%-&_bYrix9jLCe>d6CA&7Y?6r zeh~QdqCNNgsRr5i*VOqt`!}Xte?weiF{Ks~WZOrc( z-HVJrV}4-!iS4KT59iN|Z@uqaulzsdf7Sns49go-8Pl0N8yy>?nSTGMs!`nEXK!^o z_1mVKZykFU>~s`$>~C7z^z`6b#f%egCahKb{(Q!{iRUu;S_A4{T)V)Y_$;yea2=0& zYkO;Wn|)tFM}*Wx!|A5w7w~uqa%k{cmrdoEZ^s;PjneQ^$Wq(XB zE%MCOh`AA-Io>jsdRptu@^bdw|MT{9`=hy!xF1)G&(J>+TTr?1+@UY6%f(je3F%l( zbMWc#vzYS1Q9x^jSdZ!_;d0eJuF6BQhtiewFPdHKxZxb5CFl3aL(8{n(wm8UOe9?^Mp05k-A*loR+-^iPE^P#l9&$H9T$q+0Ijz(^k*ZKKu5}=2N#P zn9q4X|NmQ|LqZQHZCl#r9j+@I@oev!EXz$cg_XCt9*eSSw}r8-vDwkJO)K}R|LV8l z)7RDQRjcyNZj3v4s_EcX#_ZSJpLO=5U*2G_JbEWM>JG<72+!miM zT7N_1PQ_E{_WV=(XWp5zW##H4J5$c5T}pfT?4IttXufHyrazm`m&bea))wCTVO!pQ z{pNaGfBIRC+q;{$IqzJ&-)6_2)a577owc?PSrYOkt)mB z$?2cY_spF-x3*62=bePxi?&riPd;})i$DMUE`gGVmt6mMKeygveJhIR>@!u2w#o?{vP3ODqSM8(!-MR7pPJPya z@&%tS-f{oV*4ljj-^8!|{LZZXGy6}s@wUC5XJKb)`N+QL@5?{SozJJ7SDPpPZ_&Tg z>%_(M>wa8)ef`|U85b8$|1^E_{@j|Se_tJVExG>ou|vn?_MNOSHjMic_WSL@@;l|S z?-$?a_kU8OP_OYnPdLDx|Cf#JkHx*O=h&oT&EBj!Q#37TWuwUP)7D3xxNgWW zFBk6+?&&B#_rKo#&)fU|vvai08dNP232AlnJoqia|9;o5D>>hlXHNXVz;OKDL`lzO zs$QIHxHD_l-P}4Y&*S&qGu$l=&#%uruB4eg7Scq4~eZLbM z{$;Uyx*O95`>0hh%1akW+xD;SlTePoYw~1fQvH@KbCc~(GX8kFGIdMi{d>L{)$SY< zS6w&}+$SF{d;H#~+w0RsW+rX;o7#w@MlzfYXr^*Cu#plH{&?G^k^ z9BNY?-Z0RwK?{#pOzL9I1ivH}z@7qmV1w@uh2{P@g zoP9~<-@Ez$B!1TKUv}loV*BU1=3N5Ht9`jbf&`Q}7=1G}id*?7o~=u`m145gt}}AU zTiIt*gq|}+c~24fviP`F|0JQmn_hA%{xx*CZMjY_NHFefkzI|Q!7hiMiMuZ7Y-cWA z8F{9tE9PTr=@NMx-=#O-u;0?-^a;*<<@9;O8v&**Q_d{!YM;KOXM4D+7w4Dj=A~J4 z%UnDU#{bXjn>6Y7@@WUH_EiN3N*q0{x%~cJUk=4h*}Cg*HV`%i?^jNj zd*_|4JM!BjHp@u)rmT*&_>MWx)|4@SKd)Q5aOa$7CCW8FY95?Tbxc!<@|26Sn&U6@ zC;QLF@)*D3o@pn0@}9A_pWAdZy03MSL05Zf`;?~ga8;)Re?Lz=%TvR-6Bo9uEd-zs;kU8*|TINkKrMH`Rx(%7vk@Rq|5#Iw)Vll zpB!Ww<#PjKo zPwGCby!xnV!5LH6br%$!N+$k(E~ctF`PPHlS2wS}b(pBV#N#OEhxYf+G&DEZ6}+)^ z^WMX6v(755^w{0mT@Sc-U3?s~;H^y*_m$3db^p(bsIsnp>(HZ6tb9|(tt%#Y`pW5R zxqYG_W;PF@H1 zZT%szQE$^7o|>wxnOD@Vo_xX7op~<7){FCA+%yaM%9zqEbD#dsUna6MX|ud!?t|5{ zU+Gsoc(*HQ3+HW%nG^Y6-kj?5He%|mw+BDvRKF7D|MSt`dzRPY-S_5JE;u9Vzuq=C z-M>JQ)9};j$Bmhj1D|$X-F7^qRiNpp&ht|9Kdyg{w=?Ia@0{@@L$%QE)6=IjDwuwJ zxe@ft)6-a4@c$3}|8h%3Y}Qvhb<7C<_~+GgL5)o+3XdgzeA~vBQ2yz&gz~2)?-gC< z^r!dTk<;0%_VeiHUFkB+;h*PZ<`(EJ)BExAGh^YWVolce#oo5{Oc#%bwueo+<8jLA zW9rpFajC_sx%QiERqFR!9xZQHzucuX{fyLMe);VgnlrC>YS!D<Tf6kJS^sXqQKL6FI*VO5CDo{|Xhb34q+=KZ~B*kkweFlUV3 zte&rlPYND2s+?|;fB)Sld$PpEsuJ^MF&6TYYoEVe=rz{5?_XIOo~9-2e0ec+ z-OgFhLt2k%oGhALl5j00;`L2A9p9COc3ZDq&hDSqw7PPhhL^+j>blQ)la6gYXxx+O zSD^P{gH6$Hjgy;A`1Q;^GhYXN{G6El-~(uH^L)Oo?CVSKd8{?pyvY^qNsk9Ng;e79$Kj7Rr8|sXGR1a&GYdpFPt^$-8${MJ@=RYaGE%qWyNkY hUZd{rIsauDGy}34ru{j5oPmLX!PC{xWt~$(698g))1LqU literal 0 HcmV?d00001 diff --git a/mods/wool/textures/wool_lime.png b/mods/wool/textures/wool_lime.png new file mode 100644 index 0000000000000000000000000000000000000000..c9fd1b4857a75aafcc0e1bc3c6c7d244d7549787 GIT binary patch literal 4995 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}oCO|{#S9GG!XV7ZFl&wk z0|S?Trn7TEKt_H^esM;Afr6*AvqC{pep+TuDg#5st+~PJA;B-jY`@?8;^f`YFvUAR zNR&e%$f>(QWTKjuBBy{?hvLGUqJakmU0qqEPb}zQ?(1vl5e?Mg>EgP<{zP$6U-ROQ zu2a7sRxi%Jw&(k^v;VeUw|lQz`~GlIyvbvLx3(rf_nY4%M1;3f6T0AWQd-kD9X5C zB7=f(YKIF$hBd>Q^I=`C3=swlB5B@7EE#U-G8lMT#JFBV&*2Bohp{DjnN#sh3w(sdU6`)JjJy| z%o3RrXF2E{s+=il)M�PV*|l=S%D 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 GgeCwsSb%i^ literal 0 HcmV?d00001