From 282e14cc185e1c2ed264f403326f9b238b815fdb Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 6 Feb 2017 18:29:13 +0100 Subject: [PATCH] Add beetroot items --- mods/mcl_farming/beetroot.lua | 64 ++++++++++-------- mods/mcl_farming/init.lua | 3 +- .../textures/mcl_farming_beetroot.png | Bin 0 -> 705 bytes .../textures/mcl_farming_beetroot_0.png | Bin 0 -> 274 bytes .../textures/mcl_farming_beetroot_1.png | Bin 0 -> 315 bytes .../textures/mcl_farming_beetroot_2.png | Bin 0 -> 448 bytes .../textures/mcl_farming_beetroot_3.png | Bin 0 -> 667 bytes .../textures/mcl_farming_beetroot_seeds.png | Bin 0 -> 14785 bytes .../textures/mcl_farming_beetroot_soup.png | Bin 0 -> 15468 bytes 9 files changed, 37 insertions(+), 30 deletions(-) create mode 100644 mods/mcl_farming/textures/mcl_farming_beetroot.png create mode 100644 mods/mcl_farming/textures/mcl_farming_beetroot_0.png create mode 100644 mods/mcl_farming/textures/mcl_farming_beetroot_1.png create mode 100644 mods/mcl_farming/textures/mcl_farming_beetroot_2.png create mode 100644 mods/mcl_farming/textures/mcl_farming_beetroot_3.png create mode 100644 mods/mcl_farming/textures/mcl_farming_beetroot_seeds.png create mode 100644 mods/mcl_farming/textures/mcl_farming_beetroot_soup.png diff --git a/mods/mcl_farming/beetroot.lua b/mods/mcl_farming/beetroot.lua index 230725ff..c0eb3db9 100644 --- a/mods/mcl_farming/beetroot.lua +++ b/mods/mcl_farming/beetroot.lua @@ -4,15 +4,35 @@ minetest.register_craftitem("mcl_farming:beetroot_seeds", { inventory_image = "mcl_farming_beetroot_seeds.png", wield_image = "mcl_farming_beetroot_seeds.png", on_place = function(itemstack, placer, pointed_thing) - return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:beetroot_1") + return mcl_farming:place_seed(itemstack, placer, pointed_thing, "mcl_farming:beetroot_0") end }) +minetest.register_node("mcl_farming:beetroot_0", { + paramtype = "light", + walkable = false, + drawtype = "plantlike", + drop = "", + tiles = {"mcl_farming_beetroot_0.png"}, + selection_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.125, 0.5} + }, + }, + groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, + sounds = mcl_core.node_sound_leaves_defaults(), +}) + minetest.register_node("mcl_farming:beetroot_1", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "", + drop = { + items = { + { items = {"mcl_farming:beetroot_seeds"}, rarity = 5 }, + }, + }, tiles = {"mcl_farming_beetroot_1.png"}, selection_box = { type = "fixed", @@ -20,7 +40,7 @@ minetest.register_node("mcl_farming:beetroot_1", { {-0.5, -0.5, -0.5, 0.5, -0.125, 0.5} }, }, - groups = {snappy=3, not_in_creative_inventory=1,dig_by_water=1}, + groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, sounds = mcl_core.node_sound_leaves_defaults(), }) @@ -28,31 +48,19 @@ minetest.register_node("mcl_farming:beetroot_2", { paramtype = "light", walkable = false, drawtype = "plantlike", - drop = "", - tiles = {"mcl_farming_beetroot_2.png"}, + drop = { + items = { + { items = {"mcl_farming:beetroot_seeds"}, rarity = 4 }, + }, + }, + tiles = {"farming_carrot_2.png"}, selection_box = { type = "fixed", fixed = { {-0.5, -0.5, -0.5, 0.5, -0.125, 0.5} }, }, - groups = {snappy=3, not_in_creative_inventory=1,dig_by_water=1}, - sounds = mcl_core.node_sound_leaves_defaults(), -}) - -minetest.register_node("mcl_farming:beetroot_3", { - paramtype = "light", - walkable = false, - drawtype = "plantlike", - drop = "", - tiles = {"farming_carrot_3.png"}, - selection_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, -0.125, 0.5} - }, - }, - groups = {snappy=3, not_in_creative_inventory=1,dig_by_water=1}, + groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, sounds = mcl_core.node_sound_leaves_defaults(), }) @@ -64,19 +72,19 @@ minetest.register_node("mcl_farming:beetroot", { max_items = 2, items = { { items = {"mcl_farming:beetroot_item"}, rarity = 1 }, - { items = {"mcl_farming:beetroot_seed 3"}, rarity = 4 }, - { items = {"mcl_farming:beetroot_seed 2"}, rarity = 4 }, - { items = {"mcl_farming:beetroot_seed 1"}, rarity = 4 }, + { items = {"mcl_farming:beetroot_seeds 3"}, rarity = 4 }, + { items = {"mcl_farming:beetroot_seeds 2"}, rarity = 4 }, + { items = {"mcl_farming:beetroot_seeds 1"}, rarity = 4 }, }, }, - tiles = {"mcl_farming_beetroot_4.png"}, + tiles = {"mcl_farming_beetroot_3.png"}, selection_box = { type = "fixed", fixed = { {-0.5, -0.5, -0.5, 0.5, -0.125, 0.5} }, }, - groups = {snappy=3, not_in_creative_inventory=1,dig_by_water=1}, + groups = {dig_immediate=3, not_in_creative_inventory=1,dig_by_water=1}, sounds = mcl_core.node_sound_leaves_defaults(), }) @@ -106,4 +114,4 @@ minetest.register_craft({ }, }) -mcl_farming:add_plant("mcl_farming:beetroot", {"mcl_farming:beetroot_1", "mcl_farming:beetroot_2", "mcl_farming:beetroot_3", "mcl_farming:beetroot_4"}, 68, 3) +mcl_farming:add_plant("mcl_farming:beetroot", {"mcl_farming:beetroot_0", "mcl_farming:beetroot_1", "mcl_farming:beetroot_2"}, 68, 3) diff --git a/mods/mcl_farming/init.lua b/mods/mcl_farming/init.lua index 10664e84..77f489a8 100644 --- a/mods/mcl_farming/init.lua +++ b/mods/mcl_farming/init.lua @@ -92,8 +92,7 @@ dofile(minetest.get_modpath("mcl_farming").."/potatoes.lua") dofile(minetest.get_modpath("mcl_farming").."/mushrooms.lua") -- ========= BEETROOT ========= --- TODO: Add beetroot textures ---dofile(minetest.get_modpath("mcl_farming").."/beetroot.lua") +dofile(minetest.get_modpath("mcl_farming").."/beetroot.lua") local time_to_load= os.clock() - init print(string.format("[MOD] "..minetest.get_current_modname().." loaded in %.4f s", time_to_load)) diff --git a/mods/mcl_farming/textures/mcl_farming_beetroot.png b/mods/mcl_farming/textures/mcl_farming_beetroot.png new file mode 100644 index 0000000000000000000000000000000000000000..e848a4dbbe19ab48db0ae25f372fa6348708a793 GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>ePc|l0AZa z85pY67#JE_7#MyrFfcT{U|=XUU|@Kaz`$TNgMmT3V9u^U8wLgj&H|6fVg?3oVGw3y zm^DX&fq}`&)5S3);_%z)-rmuHB5t4cwLG}{TnaAr$!H|isF=FE-h9!+WbMTnTLim> zasvW6OctFJ`6#J>ZF^@|ztqCsty@a3Mb@9YzIpwefV_9cn#;EE*)b{J%zj&Y&hwlp zqrp?7W%Y3h`<94Ind6_ZXa&QRIeLt~PFjWf1^N?09iJa&pYY6&<;TQF={3(zCV%)o z#pTHZNzQ%`FVgJFh!=FtUSGt5T$<#ghw&X$l;ou)8B8MvT8D{5rK4ICSQc~{!!ML2?j?G!= zPj!me$p;#KyZ?4yAtiaZ^LF>%Wo0=xXK&2fwu-Bzo7-4e zV0U?m!b9E%lS=2vRCS-{@w+Q;5%b7UMCaAx^BxTkOt$$}U(Wr$cl}KkCXXL%9~$?{ zmF*FEcrk0X+MN7DJuG2bSp`pOCZ1CCK6A12?lH49Gjw-7xUx5q@z%yKsaj4#yK@$Q z%(=cjY2%q34!v@w67GOSInzI{3AHojnf^NNx==>rrpEt)jK9_hMZBH2K;uBUp1uxm z;}S!rFp+>?(No(TE=e#h=geq)vM%0jeaipmn;*vOf8ahcxr%SkWHCVo1_lOCS3j3^ HP6ePc|l0AZa z85pY67#JE_7#MyrFfcT{U|=XUU|@Kaz`$TNgMmT3V9u^U8wLgj&H|6fVg?4jBOuH; zRhv(mfq|jh)5S3);&Aex|Nrd|J20uWF|sY@lPEo~g4s>h;8jB)dyiGZ6-Ky_!$f9@ za<4z~pA-);ypmQ*ZgXe)fAQ#s#I~)Ej;yq9i|eePc|l0AZa z85pY67#JE_7#MyrFfcT{U|=XUU|@Kaz`$TNgMmT3V9u^U8wLgj&H|6fVg?4jBOuH; zRhv(mfq`L*r;B4q#NoFS4f&c4cwBW=!mg~eOgVqp@P@U)bA`Pf2d4&2O0aI?TX9w1 z=*Z81b@vt1mTB`dG9UwcUWfJ4|HTgoI{Q|$y(rO|^*&$Lw{ic?WA{EVI7q$wy7kYO zkjUUwnP2^X`6M&WXgIpm=#20?p7{q^7wp(u8Lgpr*CNNaH-zbe&weM7*b}0ya z{a^L}{i~#c_S+2E!T(?QCSN?U`^BYeA)n72zoe@%XO-1mTZTg*M|isWxvXePc|l0AZa z85pY67#JE_7#MyrFfcT{U|=XUU|@Kaz`$TNgMmT3V9u^U8wLgj&H|6fVg?4jBOuH; zRhv(mfq~J|)5S3);_%z4wtR;Scv_X0^eLzndGsARW4J3l;h92=$`!%RIbV*Nd4#r3 zQDpvc^Iy>aBS$6f&O6TAz-Yk0c7WlBHp6$T<98XhdF*3aprUax?4&ls_Z>${q&jpb z9~KHx@R#4OIZ<@arBYY#q6j{QsgsMNukUAlYuRD`pwr=#90SYRo--$z0+^H-1oZ#r zl}?%*@ws1bZbNlz^TH=PID5~AGc<|MUi-qzaO2}QUyWGunM3th{@dK~e`Ykp?Tb3Y z>9>b=eO$7$J(-g+?|4R~I7f(AoR_9a*;dB23`@5iTwUF)a3n74x`BHB!CS7OZatYM z4Ofer=Ib;!9C(}b^3|qZ#ue2H*G=p_9z9p*y&86DV(qu9MnSU;d>L5hw_ZG{pY~x> xALEC%tBhjHUs{ziPi}h?seN^R_QYqrUYqSt#(JK6%fP_E;OXk;vd$@?2>^~1ugU-b literal 0 HcmV?d00001 diff --git a/mods/mcl_farming/textures/mcl_farming_beetroot_3.png b/mods/mcl_farming/textures/mcl_farming_beetroot_3.png new file mode 100644 index 0000000000000000000000000000000000000000..aa72b500e4b8b32c061f7045af1c004c5ab01d29 GIT binary patch literal 667 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jPK-BC>ePc|l0AZa z85pY67#JE_7#MyrFfcT{U|=XUU|@Kaz`$TNgMmT3V9u^U8wLgj&H|6fVg?4jBOuH; zRhv(mfq_ZH)5S3);_%z4XT7BZMUFn_7l@gv@#;`icbIrrch`bTA<15?ms*?RHFgM0 zS};*;$;1_nYZggf-r~w!_b@zW1$XJ{j;`6?>aEVr{laVfaqn~QOOMjT(hc9=vwS|i zI^9T$;jQJ;oeX*n+z*&`F!-CP*i@J?yxk&ntBw7?@T2)m0r3krT>3EUshQ8R>W4Ec zv%RuP!We@hS2f=DHhs5~%b{{n9M^$EGe1?kK6hd${!-6a_hPYF14q*t@yW?z40qG7 z_N^*@em(TTS`SGF6IQV-c8&X0Z&?-;sD(0cr7(QUmTS0~T+Oy-mf#NA*+mRbsx_E5 zblUv-dd!mfg~gu-GbS-7=x>)&Wib0BU8}m?oRi^egs{P}w>Rv4)s3>+CQp%fV%sot z&S9sbAl`;DUB(5U55+kj*0Gj8balIa+K=On)9?JfzifZ9-389vm#v!BwpAZQt6mtF zfAL~C{xCD$~eZlta1-$=K`UPI( zi_H3e@2=~YSmUmLVt1C6{P|MV&1TW>?#;ZzQ*FY_&)mH4u3tBJFUmfLb?knfgoSP*44oo6F!wHhlH!HSza5U+sFLnDvZVhYXo?KbVaK&TUl8EHBnnoL?rv^=D`jGc*=9H-I>2?e;E|(*f U=3NwLU|?YIboFyt=akR{0AuSL!2kdN literal 0 HcmV?d00001 diff --git a/mods/mcl_farming/textures/mcl_farming_beetroot_seeds.png b/mods/mcl_farming/textures/mcl_farming_beetroot_seeds.png new file mode 100644 index 0000000000000000000000000000000000000000..929200da54f291380fd7e2644abf9acae5ceea83 GIT binary patch literal 14785 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 N>*?y}vd$@?2>=Ex)pY;> literal 0 HcmV?d00001