From 1064ebaf04c0e967865f8d0138ca3e9c903cb468 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 28 Sep 2021 14:03:49 +0100 Subject: [PATCH 1/3] added sunflowers (thanks Felfa) --- README.md | 2 +- crops/sunflower.lua | 158 +++++++++++++++++++ init.lua | 4 +- license.txt | 1 + mapgen.lua | 1 + textures/farming_sunflower.png | Bin 0 -> 703 bytes textures/farming_sunflower_1.png | Bin 0 -> 107 bytes textures/farming_sunflower_2.png | Bin 0 -> 121 bytes textures/farming_sunflower_3.png | Bin 0 -> 136 bytes textures/farming_sunflower_4.png | Bin 0 -> 162 bytes textures/farming_sunflower_5.png | Bin 0 -> 170 bytes textures/farming_sunflower_6.png | Bin 0 -> 273 bytes textures/farming_sunflower_7.png | Bin 0 -> 320 bytes textures/farming_sunflower_8.png | Bin 0 -> 432 bytes textures/farming_sunflower_bread.png | Bin 0 -> 440 bytes textures/farming_sunflower_oil.png | Bin 0 -> 164 bytes textures/farming_sunflower_seeds.png | Bin 0 -> 196 bytes textures/farming_sunflower_seeds_toasted.png | Bin 0 -> 196 bytes 18 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 crops/sunflower.lua create mode 100644 textures/farming_sunflower.png create mode 100644 textures/farming_sunflower_1.png create mode 100644 textures/farming_sunflower_2.png create mode 100644 textures/farming_sunflower_3.png create mode 100644 textures/farming_sunflower_4.png create mode 100644 textures/farming_sunflower_5.png create mode 100644 textures/farming_sunflower_6.png create mode 100644 textures/farming_sunflower_7.png create mode 100644 textures/farming_sunflower_8.png create mode 100644 textures/farming_sunflower_bread.png create mode 100644 textures/farming_sunflower_oil.png create mode 100644 textures/farming_sunflower_seeds.png create mode 100644 textures/farming_sunflower_seeds_toasted.png diff --git a/README.md b/README.md index 281b35f..6c7b1a8 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This mod works by adding your new plant to the {growing=1} group and numbering t ### Changelog: -- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya and vanilla (thanks Felfa), added tofu, added salt crystals (thanks gorlock) +- 1.46 - Added min/max default light settings, added lettuce and blackberries with food items (thanks OgelGames), added soya, vanilla and sunflowers (thanks Felfa), added tofu, added salt crystals (thanks gorlock) - 1.45 - Dirt and Hoes are more in line with default by using dry/wet/base, added cactus juice, added pasta, spaghetti, cabbage, korean bibimbap, code tidy options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton to savanna - 1.44 - Added 'farming_stage_length' in mod settings for speed of crop growth, also thanks to TheDarkTiger for translation updates diff --git a/crops/sunflower.lua b/crops/sunflower.lua new file mode 100644 index 0000000..94701d0 --- /dev/null +++ b/crops/sunflower.lua @@ -0,0 +1,158 @@ +local S = farming.intllib + +-- sunflower +minetest.register_craftitem("farming:sunflower", { + description = S("Sunflower"), + inventory_image = "farming_sunflower.png", + groups = {flammable = 2} +}) + +-- sunflower seeds +minetest.register_craftitem("farming:sunflower_seeds", { + description = S("Sunflower Seeds"), + inventory_image = "farming_sunflower_seeds.png", + groups = {seed = 2, food_sunflower_seeds = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:sunflower_1") + end +}) + +minetest.register_craft({ + output = "farming:sunflower_seeds 5", + recipe = {{"farming:sunflower"}} +}) + +-- sunflower seeds (toasted) +minetest.register_craftitem("farming:sunflower_seeds_toasted", { + description = S("Toasted Sunflower Seeds"), + inventory_image = "farming_sunflower_seeds_toasted.png", + groups = {food_sunflower_seeds_toasted = 1, flammable = 2}, + on_use = minetest.item_eat(1) +}) + +minetest.register_craft({ + type = "cooking", + cooktime = 10, + output = "farming:sunflower_seeds_toasted", + recipe = "farming:sunflower_seeds" +}) + +-- sunflower oil +minetest.register_node("farming:sunflower_oil", { + description = S("Bottle of Sunflower Oil"), + drawtype = "plantlike", + tiles = {"farming_sunflower_oil.png"}, + inventory_image = "farming_sunflower_oil.png", + wield_image = "farming_sunflower_oil.png", + paramtype = "light", + is_ground_content = false, + walkable = false, + selection_box = { + type = "fixed", + fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} + }, + groups = { + food_oil = 1, vessel = 1, dig_immediate = 3, attached_node = 1, + flammable = 2 + }, + sounds = default.node_sound_glass_defaults() +}) + +minetest.register_craft( { + output = "farming:sunflower_oil", + recipe = { + {"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"}, + {"group:food_sunflower_seeds", "group:food_sunflower_seeds", "group:food_sunflower_seeds"}, + {"group:food_sunflower_seeds", "vessels:glass_bottle", "group:food_sunflower_seeds"} + } +}) + +minetest.register_craft({ + type = "fuel", + recipe = "farming:sunflower_oil", + burntime = 30, + replacements = {{"farming:sunflower_oil", "vessels:glass_bottle"}} +}) + +-- sunflower seed bread +minetest.register_craftitem("farming:sunflower_bread", { + description = S("Sunflower Seed Bread"), + inventory_image = "farming_sunflower_bread.png", + on_use = minetest.item_eat(8), + groups = {food_bread = 1, flammable = 2} +}) + +minetest.register_craftitem("farming:sunflower_bread", { + description = S("Sunflower Bread"), + inventory_image = "farming_sunflower_bread.png" +}) + +minetest.register_craft({ + output = "farming:sunflower_bread", + recipe = {{"group:food_sunflower_seeds_toasted", "group:food_bread", "group:food_sunflower_seeds_toasted"}} +}) + +-- sunflower definition +local def = { + drawtype = "plantlike", + tiles = {"farming_sunflower_1.png"}, + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + drop = "", + selection_box = farming.select, + groups = { + snappy = 3, flammable = 2, plant = 1, attached_node = 1, + not_in_creative_inventory = 1, growing = 1 + }, + sounds = default.node_sound_leaves_defaults() +} + +-- stage 1 +minetest.register_node("farming:sunflower_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_sunflower_2.png"} +minetest.register_node("farming:sunflower_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_sunflower_3.png"} +minetest.register_node("farming:sunflower_3", table.copy(def)) + +-- stage 4 +def.tiles = {"farming_sunflower_4.png"} +minetest.register_node("farming:sunflower_4", table.copy(def)) + +-- stage 5 +def.tiles = {"farming_sunflower_5.png"} +minetest.register_node("farming:sunflower_5", table.copy(def)) + +-- stage 6 +def.tiles = {"farming_sunflower_6.png"} +def.visual_scale = 1.9 +minetest.register_node("farming:sunflower_6", table.copy(def)) + +-- stage 7 +def.tiles = {"farming_sunflower_7.png"} +minetest.register_node("farming:sunflower_7", table.copy(def)) + +-- stage 8 (final) +def.tiles = {"farming_sunflower_8.png"} +def.groups.growing = nil +def.drop = { + items = { + {items = {"farming:sunflower"}, rarity = 1}, + {items = {"farming:sunflower"}, rarity = 6} + } +} +minetest.register_node("farming:sunflower_8", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:sunflower"] = { + crop = "farming:sunflower", + seed = "farming:sunflower_seeds", + minlight = 14, + maxlight = farming.max_light, + steps = 8 +} diff --git a/init.lua b/init.lua index 9b9306c..e8f3fe4 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20210311", + version = "20210928", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -635,6 +635,7 @@ farming.vanilla = 0.001 farming.lettuce = 0.001 farming.artichoke = 0.001 farming.parsley = 0.002 +farming.sunflower = 0.001 farming.grains = true farming.rarety = 0.002 @@ -707,6 +708,7 @@ ddoo("vanilla.lua", farming.vanilla) ddoo("lettuce.lua", farming.lettuce) ddoo("artichoke.lua", farming.artichoke) ddoo("parsley.lua", farming.parsley) +ddoo("sunflower.lua", farming.sunflower) dofile(farming.path .. "/food.lua") dofile(farming.path .. "/mapgen.lua") diff --git a/license.txt b/license.txt index e7126bf..961a49f 100644 --- a/license.txt +++ b/license.txt @@ -166,6 +166,7 @@ Created by Felfa (CC0) farming_potato_omelette.png farming_spanish_potatoes.png farming_vanilla_flan.png + farming_sunflower*.png Created by gorlock (CC0) farming_salt_crystal.png diff --git a/mapgen.lua b/mapgen.lua index c32eebc..65d7cda 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -54,6 +54,7 @@ register_plant("lettuce_5", 5, 30, nil, "", -1, farming.lettuce) register_plant("blackberry_4", 3, 10, nil, "", -1, farming.blackberry) register_plant("vanilla_7", 5, 35, nil, "", -1, farming.vanilla) register_plant("parsley_3", 10, 40, nil, "", -1, farming.parsley) +register_plant("sunflower_8", 10, 40, nil, "", -1, farming.sunflower) register_plant("mint_4", 1, 75, { "default:dirt_with_grass", "default:dirt_with_coniferous_litter"}, "group:water", 1, farming.mint) diff --git a/textures/farming_sunflower.png b/textures/farming_sunflower.png new file mode 100644 index 0000000000000000000000000000000000000000..06b9387db5d1611cc119614f70184b2c74c573d0 GIT binary patch literal 703 zcmV;w0zmzVP)~My`TiSq65jF0Jf$E$fN+orU1OF0K=>S!?6k3tN_Qg0LHlh&btZB zzW~d`0M*9^)XV_i&;i}l2k71d>fj6L-o?C0004WQchCG?OIWFrxPlK z8v+FAs%l%>wGp6|%VOVkJ~rj^JrAFv-{rdiqg(@^7LC|wJm2oc$@z*QAiCz+ zXN(3h4<6D#yFEG#Qj4m73fUv`WA4StY`0g+IDdRUM57UX47_ME;C@p(3yi#C^oeh#37Ankj%Fy07r9>s9;lv{*c}A zWZoPBrF6wofai8S9zWcrZ`)2>-QfVNz~oD>Ry4=%pA}Eu7=lP3=X2YE)n4~nN?#M$ z-CWnLDW$d}m0B8`el~r6?JkMwDXv!6oG**w>zLmn7TIc*70cp<6wB9_K7xgfY?&9? lB46}Bp~$lAHOm&x^-mjINsT*=<<0;A002ovPDHLkV1lQaEpz|? literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_1.png b/textures/farming_sunflower_1.png new file mode 100644 index 0000000000000000000000000000000000000000..719ec40278aa6eb6c6f5694be9b0912cf51d08ee GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0T4lTR(M*`OK*Ii-8=* zk|4ie28U-i(tsQRPZ!4!j_b(@3xo<71bKNFm<1RPK3M!m4=Bgr>FVdQ&MBb@0G5s! AXaE2J literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_2.png b/textures/farming_sunflower_2.png new file mode 100644 index 0000000000000000000000000000000000000000..4ccfff3bf48274ae62c6bf979d019565cc2cf18b GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=4}t`WaL0isrg^toGe` zEO8o8h_NKdFPOpM*^M+HN5a#^F@)oKa>4@Rf`&^v#{$?UGx%^FVPN31Vwh!;dVvwB OhQZU-&t;ucLK6V!$RJ4o literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_3.png b/textures/farming_sunflower_3.png new file mode 100644 index 0000000000000000000000000000000000000000..719b5f17e1fdb785af6ee8be9074c8473b1f2ec5 GIT binary patch literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eIg?ADLy(~apjOr2sL zKizQlt}s{IgMB~+j3q&S!3+-1ZlnP@ik>cxAsp9}6Ba0OG#H8`@EB{HP2)*5kUp@4 e#Xy43frr5|g|XP~VBBP&Vg^rFKbLh*2~7YXpCp?A literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_4.png b/textures/farming_sunflower_4.png new file mode 100644 index 0000000000000000000000000000000000000000..2b03eb50dcb1fd3aba84cbc7088fa48186199dd7 GIT binary patch literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=68C+Q~hZ2@{M`ra2T& zbIhAsFuMQ% literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_5.png b/textures/farming_sunflower_5.png new file mode 100644 index 0000000000000000000000000000000000000000..a9c474ea4ab7d7a1d4e15705356c2e5fd42c6733 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=5~%S`odv$vu|wQ+0D@ zIaDuqtY6_Xb4S#SoniUCGfIFe7)yfuf*Bm1-ADs+tUO&DLpZJ{CmdkEB_X50bBr^9 ztvQux%E4C#oTonVG^|JrXg`=*Gh_e& literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_6.png b/textures/farming_sunflower_6.png new file mode 100644 index 0000000000000000000000000000000000000000..a2ee8432e22443b05bc1175a7f8c4ce07c209521 GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dymH|E?t_%!@s#&7$b((>l8o}K< zQ9b7I{f1GKv{I&+B~I5*pXr=E+qQVNUBxoH@(sS-8+>N&h?=)6Z07#R>pUH|frc=a z1o;IsI6S+N2IRDPx;TbdoPIm$ARm(=kBj>Xoill{AOG85GrQ*#HR)@X|Ad(b9CVL-W2=UQx71X@F?|+Ti V5R z?$ULKng70HJlyi?B?xt^k?1TD!LZp1M|-`W7^;{fjI0PyPo_woS$`T$?iEOh_? z00DGTPE!Ct=GbNc008(&L_t(I%e|9PZ^IxAgiW(`VX+ydTMLAG`2YXOnM!@Ag!{NW zL<)Dl`>+&%|9(V7-`&*vO&W`>OTX2ho!N2-^VJ<(ZNH{tcW>*#?JS0Yug8z|^H?pt zYr?WFu2~7fQr+UJ*)SZfHsNk1=slT*zu&EdlzL__N+QQ7;+PfoC!ibP^#_Dkeizil7W}?ucXl&VU%rpGz5@ a5B>mwU=n7K5655t0000 zHzZs<9&Af3bWtdNS~-YdGlphOg=kQTYdeo>MVoLnlX6&^bV-GdOM)fl)G{3>Fv8u zA3S{d{KeZ(9=E-EHmh7mU=vUoV@Z%-FoVOh8)-m}xu=U`2*>s01O+|=PKS(ZTeh%p zXnXQ#r5<2Qjo9LpF|DtUA*9XK-JP3lG0UoDvWwad>hO9nFc{bIoXTQ(YydQZ!PC{x JWt~$(69Ab(HJ$(f literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_seeds.png b/textures/farming_sunflower_seeds.png new file mode 100644 index 0000000000000000000000000000000000000000..fe67a0ce2d3ee8329008919890706b231b562cf9 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=8)U$x|mLO`n*!cy8i> z9VG{Llpow#dF;@_6GxVwJhtkf=ZXnHMT{jue!&b5&u*jvIf0%ojv*Y^lM@^m7&XpD zoH#InBgw!wJt2Z)a%z)TljpQBHa|u-GX?LEhO-Pu(h|%P^b!(`9E|vvOp!do;AI@u pB=M$|=S*sXWhq-(%F+S`h6Bc|yB{#CTmu@;;OXk;vd$@?2>^X1LPP)n literal 0 HcmV?d00001 diff --git a/textures/farming_sunflower_seeds_toasted.png b/textures/farming_sunflower_seeds_toasted.png new file mode 100644 index 0000000000000000000000000000000000000000..1973e48fc9a1c79dd9bf49c8e864bf5a5c3bddff GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=8;B?*9J%0RaIK5fK#? z6;)MLH8nM}X3d&6Z{DIsi=OPb<_J{8SQ6wH%;50sMjDV4=;`7Z!f`!0!GVEM<7~u< z0~0us41CiQA~+_eHhDF9P77o6V`MW^@D6D>%Wxzu!7M>9A;HMOh=0ix$s-J2#!*cY nZ(4cIq$XIFvX!MQEnr|cV9dJv0kg_Apy3Rju6{1-oD!M<0X03v literal 0 HcmV?d00001 From 3949775d297f15723a4462423cbf14e65fbfaf42 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 28 Sep 2021 14:07:35 +0100 Subject: [PATCH 2/3] missing example setting --- farming.conf_example | 1 + 1 file changed, 1 insertion(+) diff --git a/farming.conf_example b/farming.conf_example index 9a804a9..439ebe6 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -37,6 +37,7 @@ farming.soy = 0.001 farming.vanilla = 0.001 farming.artichoke = 0.001 farming.parsley = 0.002 +farming.sunflower = 0.001 farming.grains = true -- true or false only -- default rarety of crops on map (higher number = more crops) From f8533c415ba7007d31bcba10c47295c37321577a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 2 Oct 2021 08:09:11 +0100 Subject: [PATCH 3/3] tweak sunflower seed naming (thanks SwissalpS) --- crops/sunflower.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/crops/sunflower.lua b/crops/sunflower.lua index 94701d0..58a6c87 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -8,7 +8,7 @@ minetest.register_craftitem("farming:sunflower", { }) -- sunflower seeds -minetest.register_craftitem("farming:sunflower_seeds", { +minetest.register_craftitem("farming:seed_sunflower", { description = S("Sunflower Seeds"), inventory_image = "farming_sunflower_seeds.png", groups = {seed = 2, food_sunflower_seeds = 1, flammable = 2}, @@ -17,8 +17,10 @@ minetest.register_craftitem("farming:sunflower_seeds", { end }) +minetest.register_alias("farming:sunflower_seeds", "farming:seed_sunflower") + minetest.register_craft({ - output = "farming:sunflower_seeds 5", + output = "farming:seed_sunflower 5", recipe = {{"farming:sunflower"}} }) @@ -34,7 +36,7 @@ minetest.register_craft({ type = "cooking", cooktime = 10, output = "farming:sunflower_seeds_toasted", - recipe = "farming:sunflower_seeds" + recipe = "farming:seed_sunflower" }) -- sunflower oil @@ -151,7 +153,7 @@ minetest.register_node("farming:sunflower_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:sunflower"] = { crop = "farming:sunflower", - seed = "farming:sunflower_seeds", + seed = "farming:seed_sunflower", minlight = 14, maxlight = farming.max_light, steps = 8