From 996f1df4af241ee47d7875b3b701e3e318f4d37d Mon Sep 17 00:00:00 2001 From: jp Date: Mon, 12 Jan 2015 20:21:06 +0100 Subject: [PATCH 1/7] Add straw --- mods/farming/README.txt | 3 +++ mods/farming/init.lua | 9 +++++++++ mods/farming/nodes.lua | 8 ++++++++ mods/farming/textures/farming_straw.png | Bin 0 -> 880 bytes 4 files changed, 20 insertions(+) create mode 100644 mods/farming/textures/farming_straw.png diff --git a/mods/farming/README.txt b/mods/farming/README.txt index 4663181a..7bfc195c 100644 --- a/mods/farming/README.txt +++ b/mods/farming/README.txt @@ -57,3 +57,6 @@ Created by VanessaE (License: WTFPL): farming_cotton_6.png farming_cotton_7.png farming_cotton_8.png + +Created by MasterGollum (License: WTFPL): + farming_straw.png \ No newline at end of file diff --git a/mods/farming/init.lua b/mods/farming/init.lua index d3157a07..687ed4f9 100644 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -59,3 +59,12 @@ minetest.register_craft({ {"farming:cotton", "farming:cotton"}, } }) + +-- Straw +minetest.register_craft({ + output = "farming:straw", + recipe = { + {"farming:wheat", "farming:wheat"}, + {"farming:wheat", "farming:wheat"}, + } +}) diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua index a99f5051..83ce746c 100644 --- a/mods/farming/nodes.lua +++ b/mods/farming/nodes.lua @@ -80,6 +80,14 @@ minetest.register_node("farming:desert_sand_soil_wet", { } }) +minetest.register_node("farming:straw", { + description = "Straw", + drop = "farming:wheat 4", + tiles = {"farming_straw.png"}, + groups = {snappy=3, flammable=4}, + sounds = default.node_sound_leaves_defaults(), +}) + minetest.register_abm({ nodenames = {"group:field"}, interval = 15, diff --git a/mods/farming/textures/farming_straw.png b/mods/farming/textures/farming_straw.png new file mode 100644 index 0000000000000000000000000000000000000000..cdf9981b4eadd029c6e72cd349ff92ddf15b6ad8 GIT binary patch literal 880 zcmV-$1CRWPP)Fd8uEPsnnETJ|~iYc!|i`Z{JEmh5+07`95Vp0Jz=F5dWv zs*c$ATI~5M`|W~m&mqfqwB07d?;0E)8F;cF+3YY(8Mj^2kYT^4;aVD^?VWLSbi%uz zhvbFD>BTvgHpDP8oK{V#$OPe*Kz8X>wQ@y9<)>|v9-7_bfD z$1Cs$HhH#WvD!o4P_QYd%tkx>u0*?6vYP6MW{MCIY2u-|8M>8mcjGWPk&ucRv-^a{ z`x^22gG8t6GQCcDecr?KT73FkkVF+9?<_QR!R6b6x=88mfu`kHL!F@TaC`-kry0Rw z%cm!Yq{zvl2*qhp=WBv#OsA#cw{6lmr_)V|;t3bWJF=IMlWz=!>)M2quQ;yFVi^(6 z9ja}K5T{Hg8MRXK{;vwtP|1}hb=oE_G%BNy-p~+fDHG)~A}cTzk1uyI$O=X9AC{3J z3mtWvadc@AJdJqHD}wu!RU~--K0wyQlq8d|4=TdhgzfMD znCnzgN>)^nJ?nB3kP49_$+ zixAJu5aWLpBy+*&aY3zS#POWPQn0Q9KK`9jRtwZBB;V=W{JCb(jd^+y2(v+}uOosY z#gttRPhK-0El|aphS;!MmTaN~xe-wN2EYA2#gs}InqoF0`ojprJs??*X}brAUCRIC1#VC{1>MI00000 Date: Mon, 12 Jan 2015 21:24:52 +0100 Subject: [PATCH 2/7] update --- mods/farming/nodes.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua index 83ce746c..5595bed2 100644 --- a/mods/farming/nodes.lua +++ b/mods/farming/nodes.lua @@ -82,7 +82,6 @@ minetest.register_node("farming:desert_sand_soil_wet", { minetest.register_node("farming:straw", { description = "Straw", - drop = "farming:wheat 4", tiles = {"farming_straw.png"}, groups = {snappy=3, flammable=4}, sounds = default.node_sound_leaves_defaults(), From 1bd279b709610f3362f6202a4349b5674a9a81b5 Mon Sep 17 00:00:00 2001 From: jp Date: Tue, 13 Jan 2015 00:39:11 +0100 Subject: [PATCH 3/7] is ground content=false --- mods/farming/nodes.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua index 5595bed2..01f49fef 100644 --- a/mods/farming/nodes.lua +++ b/mods/farming/nodes.lua @@ -83,6 +83,7 @@ minetest.register_node("farming:desert_sand_soil_wet", { minetest.register_node("farming:straw", { description = "Straw", tiles = {"farming_straw.png"}, + is_ground_content = false, groups = {snappy=3, flammable=4}, sounds = default.node_sound_leaves_defaults(), }) From 4335fdbee15b4f9ce91c4c64f7b637bca86814cb Mon Sep 17 00:00:00 2001 From: jp Date: Wed, 14 Jan 2015 11:14:35 +0100 Subject: [PATCH 4/7] indentation --- mods/farming/nodes.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua index 01f49fef..6d25598b 100644 --- a/mods/farming/nodes.lua +++ b/mods/farming/nodes.lua @@ -83,7 +83,7 @@ minetest.register_node("farming:desert_sand_soil_wet", { minetest.register_node("farming:straw", { description = "Straw", tiles = {"farming_straw.png"}, - is_ground_content = false, + is_ground_content = false, groups = {snappy=3, flammable=4}, sounds = default.node_sound_leaves_defaults(), }) From 410079596a0e3bc2d3622c0b939e9a6539ce9dfd Mon Sep 17 00:00:00 2001 From: jp Date: Thu, 15 Jan 2015 10:06:04 +0100 Subject: [PATCH 5/7] changed flour recipe --- mods/farming/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/farming/init.lua b/mods/farming/init.lua index 687ed4f9..068cbbeb 100644 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -30,7 +30,7 @@ minetest.register_craftitem("farming:bread", { minetest.register_craft({ type = "shapeless", output = "farming:flour", - recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"} + recipe = {"farming:wheat", "farming:wheat", "farming:wheat"} }) minetest.register_craft({ From 4d491d13d6a1d44125f0d51de445fcfc15ef8a0a Mon Sep 17 00:00:00 2001 From: jp Date: Fri, 16 Jan 2015 13:39:56 +0100 Subject: [PATCH 6/7] new recipes --- mods/farming/init.lua | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mods/farming/init.lua b/mods/farming/init.lua index 068cbbeb..8606e94a 100644 --- a/mods/farming/init.lua +++ b/mods/farming/init.lua @@ -30,7 +30,7 @@ minetest.register_craftitem("farming:bread", { minetest.register_craft({ type = "shapeless", output = "farming:flour", - recipe = {"farming:wheat", "farming:wheat", "farming:wheat"} + recipe = {"farming:wheat", "farming:wheat", "farming:wheat", "farming:wheat"} }) minetest.register_craft({ @@ -62,9 +62,17 @@ minetest.register_craft({ -- Straw minetest.register_craft({ - output = "farming:straw", + output = "farming:straw 3", recipe = { - {"farming:wheat", "farming:wheat"}, - {"farming:wheat", "farming:wheat"}, + {"farming:wheat", "farming:wheat", "farming:wheat"}, + {"farming:wheat", "farming:wheat", "farming:wheat"}, + {"farming:wheat", "farming:wheat", "farming:wheat"}, + } +}) + +minetest.register_craft({ + output = "farming:wheat 3", + recipe = { + {"farming:straw"}, } }) From 3655ffe1ab7f7c170c183e405bf0c8e2ee39df55 Mon Sep 17 00:00:00 2001 From: jp Date: Sat, 17 Jan 2015 16:26:16 +0100 Subject: [PATCH 7/7] New texture --- mods/farming/textures/farming_straw.png | Bin 880 -> 892 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/farming/textures/farming_straw.png b/mods/farming/textures/farming_straw.png index cdf9981b4eadd029c6e72cd349ff92ddf15b6ad8..e4277723b128e9845d427fb22c6bffafd7292565 100644 GIT binary patch delta 824 zcmV-81IPUE2K)w)QGee75f2t8NVi&%0009CNklS&+18ff*L8c?e#KXJKI3Ww&&gP-uo}m^Q?AY{#}N+44n_Es1laUw*zSe*CG+ z+u!c#lqHr$L7bLocWlJL;`DXS+h2W*x(bnvRn~|$eU7w@qJQ2+;mj=B7y$#$c1`t=tmMH5|H zBAhjaq7o!4PTEzD&&!01h&Zm%J3qnk3WTi9kybNEGZcG+l!xe58M~yx_JEY@_(O#v zPjJjJ!AwDH1AkiGC5zb_fn+jzSboK&?-};%l-eE!34ix|9d|I^_U0q^!z>iIwBNdUZV-~X=9|jKW6N)fIb3BS9 zV)3w~RX3=56*kL+R(nmj8uH>SBc24Do!bc4tq=_U#c|67vn9dQA=~W{;yJ@%Orah4 z`}Z8%)_+OVD#hAknHuEw35KjAVoF4L1uYYlj1C_^Cn#oxZ1sRskPJdIuduEV5SKX1YaDODrcN zmdOfH@Ak+JE{;9p_SV9b+wAsL7IB5?qshv*d4JM)%Em73 zwTf&$GU`t#^n^_`W;zo@d!L&>HsnmuvIX(pz#ran+=v+5NysIYYS%^tS%fYhaol@N zFc_mt5sJJe3p1R~4owLu8a8j<+>=H!)gzOnNH}WFxbLe7OBk%zYdV)TS`E-VgF{wB zQZWjew!@d-T@ej7l=Xlory*9Q$2RCwv7RCFkpBT>mv7$x>1I#>00005Yfi7NH`1GFub|7EcAQ0>svw9gSx6uYNuNjh^_R=~_O0b@=oCz-8_=u{G*!NoO`F|?=?SgL4A@Z9jw_VeaVZW#0S{kD5opE$@!n>b`a);w@hqSsHqS;)bhzOxKX!-@+=7v^BquVtx8?a|PY&Q~yQgFDxq)c>N zV$Lr%6j_cy(tmjv$2hu!sCF#p732~2o`s}(yxa!(o=NYOiloV8DJ&KyR&#)FE)iEh znWVALMpAHGi-*yQx9>Kz8X>wQ@y9<)>|v9-7_bfD$1Cs$HhH#WvD!o4P_QYd%tkx> zu0*?6vYP6MW{MCIY2u-|8M>8mcjGWPk&ucRv-^a{`+pko`GZ8K>oUDgd41l)^IClR zT#!T+AMY$Qb;0G^g1SiQ?SZD{SVNtl@Nj$uk*68KV#}u|hos2Kq6o!lQRi!dX-uc3 z;kRwlIH%K1iQ)+t$2+o@kdto=gzMUbldm|g&0-l5&K;_4i4dnuCKg{?*2I(~ldume!r6rJc+L6Q4%K!!ZAv^oKvf9*WlfmtR8dM++05os$kzzB>yfM# zEct<(FBPJ+NYVzYMB@3mV)atfb6nPQn7)|Y-hUbl&onlR5YNmI<9`(-bHV6wL9J%Q z@tnm{u&x3={+&`*3)Ctk-|5`^xn|Ifd3q2Cvq7t`BZ4BulwA%_UNavpP{o>t*sxoc zY@!6Y5m5UEzx_VOvI1OBBPXZbS@CrwBTS(ZhZzUwExPR*wWYJG93%yPc;oTv>VjmN qVkI^r`ojprJs??*X}brAUCRIC1#VC{1>MI00000