From c94510023702c68e5c8c00db75300c417b8fe5d0 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 10 Sep 2022 08:44:29 +0100 Subject: [PATCH 01/50] tweak crop levels on map, add strawberry if ethereal mod not active --- README.md | 2 +- crops/strawberry.lua | 94 +++++++++++++++++++++++++++++ farming.conf_example | 1 + init.lua | 2 + mapgen.lua | 37 ++++++------ textures/ethereal_strawberry.png | Bin 0 -> 382 bytes textures/ethereal_strawberry_1.png | Bin 0 -> 116 bytes textures/ethereal_strawberry_2.png | Bin 0 -> 137 bytes textures/ethereal_strawberry_3.png | Bin 0 -> 157 bytes textures/ethereal_strawberry_4.png | Bin 0 -> 209 bytes textures/ethereal_strawberry_5.png | Bin 0 -> 234 bytes textures/ethereal_strawberry_6.png | Bin 0 -> 240 bytes textures/ethereal_strawberry_7.png | Bin 0 -> 258 bytes textures/ethereal_strawberry_8.png | Bin 0 -> 258 bytes 14 files changed, 117 insertions(+), 19 deletions(-) create mode 100644 crops/strawberry.lua create mode 100644 textures/ethereal_strawberry.png create mode 100644 textures/ethereal_strawberry_1.png create mode 100644 textures/ethereal_strawberry_2.png create mode 100644 textures/ethereal_strawberry_3.png create mode 100644 textures/ethereal_strawberry_4.png create mode 100644 textures/ethereal_strawberry_5.png create mode 100644 textures/ethereal_strawberry_6.png create mode 100644 textures/ethereal_strawberry_7.png create mode 100644 textures/ethereal_strawberry_8.png diff --git a/README.md b/README.md index cfabffa..81e352f 100644 --- a/README.md +++ b/README.md @@ -163,7 +163,7 @@ There is one abm for new group `group:growing`. ### Changelog: -- NEXT - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus) +- NEXT - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active - 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 diff --git a/crops/strawberry.lua b/crops/strawberry.lua new file mode 100644 index 0000000..d049d9e --- /dev/null +++ b/crops/strawberry.lua @@ -0,0 +1,94 @@ + +local S = farming.intllib + +-- Strawberry (can also be planted as seed) +minetest.register_craftitem(":ethereal:strawberry", { + description = S("Strawberry"), + inventory_image = "ethereal_strawberry.png", + wield_image = "ethereal_strawberry.png", + groups = {food_strawberry = 1, food_berry = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:strawberry_1") + end, + on_use = minetest.item_eat(1) +}) + +-- Define Strawberry Bush growth stages +local crop_def = { + drawtype = "plantlike", + tiles = {"ethereal_strawberry_1.png"}, + paramtype = "light", + sunlight_propagates = true, + waving = 1, + walkable = false, + buildable_to = true, + drop = "", + selection_box = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} + }, + 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(":ethereal:strawberry_1", table.copy(crop_def)) + +-- stage 2 +crop_def.tiles = {"ethereal_strawberry_2.png"} +minetest.register_node(":ethereal:strawberry_2", table.copy(crop_def)) + +-- stage 3 +crop_def.tiles = {"ethereal_strawberry_3.png"} +minetest.register_node(":ethereal:strawberry_3", table.copy(crop_def)) + +-- stage 4 +crop_def.tiles = {"ethereal_strawberry_4.png"} +minetest.register_node(":ethereal:strawberry_4", table.copy(crop_def)) + +-- stage 5 +crop_def.tiles = {"ethereal_strawberry_5.png"} +minetest.register_node(":ethereal:strawberry_5", table.copy(crop_def)) + +-- stage 6 +crop_def.tiles = {"ethereal_strawberry_6.png"} +crop_def.drop = { + items = { + {items = {"ethereal:strawberry 1"}, rarity = 2}, + {items = {"ethereal:strawberry 2"}, rarity = 3} + } +} +minetest.register_node(":ethereal:strawberry_6", table.copy(crop_def)) + +-- stage 7 +crop_def.tiles = {"ethereal_strawberry_7.png"} +crop_def.drop = { + items = { + {items = {"ethereal:strawberry 1"}, rarity = 1}, + {items = {"ethereal:strawberry 2"}, rarity = 3} + } +} +minetest.register_node(":ethereal:strawberry_7", table.copy(crop_def)) + +-- stage 8 +crop_def.tiles = {"ethereal_strawberry_8.png"} +crop_def.groups.growing = nil +crop_def.drop = { + items = { + {items = {"ethereal:strawberry 2"}, rarity = 1}, + {items = {"ethereal:strawberry 3"}, rarity = 3} + } +} +minetest.register_node(":ethereal:strawberry_8", table.copy(crop_def)) + +-- add to registered_plants +farming.registered_plants["ethereal:strawberry"] = { + crop = "ethereal:strawberry", + seed = "ethereal:strawberry", + minlight = farming.min_light, + maxlight = farming.max_light, + steps = 8 +} diff --git a/farming.conf_example b/farming.conf_example index 7f103cd..a8f0288 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -38,6 +38,7 @@ farming.vanilla = 0.001 farming.artichoke = 0.001 farming.parsley = 0.002 farming.sunflower = 0.001 +farming.strawberry = minetest.get_modpath("ethereal") and nil or 0.002 farming.grains = true -- true or false only farming.rice = true diff --git a/init.lua b/init.lua index ff97c2c..c8ed458 100644 --- a/init.lua +++ b/init.lua @@ -659,6 +659,7 @@ farming.lettuce = 0.001 farming.artichoke = 0.001 farming.parsley = 0.002 farming.sunflower = 0.001 +farming.strawberry = not minetest.get_modpath("ethereal") and 0.002 farming.grains = true farming.rice = true farming.rarety = 0.002 @@ -734,6 +735,7 @@ ddoo("lettuce.lua", farming.lettuce) ddoo("artichoke.lua", farming.artichoke) ddoo("parsley.lua", farming.parsley) ddoo("sunflower.lua", farming.sunflower) +ddoo("strawberry.lua", farming.strawberry) dofile(farming.path .. "/food.lua") dofile(farming.path .. "/mapgen.lua") diff --git a/mapgen.lua b/mapgen.lua index 65d7cda..598675c 100644 --- a/mapgen.lua +++ b/mapgen.lua @@ -38,20 +38,21 @@ end -- add crops to mapgen register_plant("potato_3", 15, 40, nil, "", -1, farming.potato) -register_plant("tomato_7", 5, 20, nil, "", -1, farming.tomato) -register_plant("corn_7", 12, 22, nil, "", -1, farming.corn) -register_plant("raspberry_4", 3, 10, nil, "", -1, farming.raspberry) -register_plant("rhubarb_3", 3, 15, nil, "", -1, farming.rhubarb) -register_plant("blueberry_4", 3, 10, nil, "", -1, farming.blueberry) -register_plant("beanbush", 18, 35, nil, "", -1, farming.beans) -register_plant("grapebush", 25, 45, nil, "", -1, farming.grapes) -register_plant("onion_5", 5, 22, nil, "", -1, farming.onion) -register_plant("garlic_5", 3, 30, nil, "group:tree", 1, farming.garlic) -register_plant("pea_5", 25, 50, nil, "", -1, farming.peas) -register_plant("beetroot_5", 1, 15, nil, "", -1, farming.beetroot) -register_plant("cabbage_6", 2, 10, nil, "", -1, farming.cabbage) -register_plant("lettuce_5", 5, 30, nil, "", -1, farming.lettuce) -register_plant("blackberry_4", 3, 10, nil, "", -1, farming.blackberry) +register_plant("tomato_7", 5, 25, nil, "", -1, farming.tomato) +register_plant("corn_7", 12, 25, nil, "", -1, farming.corn) +register_plant("strawberry_7", 20, 55, nil, "", -1, farming.strawberry) +register_plant("raspberry_4", 3, 15, nil, "", -1, farming.raspberry) +register_plant("rhubarb_3", 3, 20, nil, "", -1, farming.rhubarb) +register_plant("blueberry_4", 3, 15, nil, "", -1, farming.blueberry) +register_plant("beanbush", 18, 38, nil, "", -1, farming.beans) +register_plant("grapebush", 25, 50, nil, "", -1, farming.grapes) +register_plant("onion_5", 5, 28, nil, "", -1, farming.onion) +register_plant("garlic_5", 3, 35, nil, "group:tree", 1, farming.garlic) +register_plant("pea_5", 25, 55, nil, "", -1, farming.peas) +register_plant("beetroot_5", 1, 20, nil, "", -1, farming.beetroot) +register_plant("cabbage_6", 2, 15, nil, "", -1, farming.cabbage) +register_plant("lettuce_5", 5, 35, nil, "", -1, farming.lettuce) +register_plant("blackberry_4", 3, 20, 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) @@ -67,16 +68,16 @@ if mg_name == "v6" then register_plant("cucumber_4", 1, 20, nil, "group:water", 1, farming.cucumber) register_plant("melon_8", 1, 20, nil, "group:water", 1, farming.melon) register_plant("pumpkin_8", 1, 20, nil, "group:water", 1, farming.pumpkin) - register_plant("coffee_5", 20, 45, nil, "", -1, farming.coffee) + register_plant("coffee_5", 20, 50, nil, "", -1, farming.coffee) register_plant("soy_6", 20, 50, nil, "", -1, farming.soy) else -- v7 maps have a beach so plants growing near water is limited to 6 high - register_plant("carrot_8", 1, 15, nil, "", -1, farming.carrot) - register_plant("cucumber_4", 1, 10, nil, "", -1, farming.cucumber) + register_plant("carrot_8", 1, 20, nil, "", -1, farming.carrot) + register_plant("cucumber_4", 1, 20, nil, "", -1, farming.cucumber) register_plant("melon_8", 1, 6, {"default:dirt_with_dry_grass", "default:dirt_with_rainforest_litter"}, "", -1, farming.melon) register_plant("pumpkin_8", 1, 6, nil, "", -1, farming.pumpkin) - register_plant("coffee_5", 20, 45, {"default:dirt_with_dry_grass", + register_plant("coffee_5", 20, 55, {"default:dirt_with_dry_grass", "default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee) register_plant("soy_6", 20, 50, {"default:dirt_with_dry_grass", diff --git a/textures/ethereal_strawberry.png b/textures/ethereal_strawberry.png new file mode 100644 index 0000000000000000000000000000000000000000..5b43e6bc99bc21663a9e91440fcc97a2320b5adf GIT binary patch literal 382 zcmV-^0fGLBP)U1tMAsC~XQXdKo#37T$6IK&m1K!cZOn z0004WQchC^n!~IR0GvPyIJQwW;ofr5@vS_Kk7&-n<{r4R7rea`}dn-usvKah|<3eHx&}k07WI z`e^tbA;t*d0!DATge86gx><#a56X$J{usBwLD+9@5O}LQAv0evdU2--{q|!1v(hB0g#UjTEfK8F8}}l07*qoM6N<$f~dNbB>(^b literal 0 HcmV?d00001 diff --git a/textures/ethereal_strawberry_1.png b/textures/ethereal_strawberry_1.png new file mode 100644 index 0000000000000000000000000000000000000000..3fa21edc5a73cff8a86f367ab663d9748427e6bb GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)T(`YgAKzr5#Q)p?D8g70 zKHs- L{an^LB{Ts52<05a literal 0 HcmV?d00001 diff --git a/textures/ethereal_strawberry_2.png b/textures/ethereal_strawberry_2.png new file mode 100644 index 0000000000000000000000000000000000000000..751115e9876d20ce7264a801486428c48f93640d GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@&H$ef*R`Ai@l6*0|Nnn`Y>5z1 zkg+7lFPOpM*^M+HN6*v6F+}2Wa)LxlgDJx)fsO_vsgMOid;U#F1){khtTJ h1S7A-Re=NshV%DWZ#dh_tpn<0@O1TaS?83{1OO8ICRYFe literal 0 HcmV?d00001 diff --git a/textures/ethereal_strawberry_3.png b/textures/ethereal_strawberry_3.png new file mode 100644 index 0000000000000000000000000000000000000000..8b7a7b8c0b24eb4b9ed1b13d7a32af01bfc850a4 GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnH3?%tPCZz)@o&cW^S0EkVWbq#a7|wSV_X7Eh zB|(0{3=Yq3qyahho-U3d5|@(`7VszVHW;}mD@H&jT;+>O^7y>6A;z%_} xNY-$WTxY$Yhk^A@*TNnLjpk0#`6nYJ8M0(JUs}{0Jqa|5!PC{xWt~$(69D26Fcbg) literal 0 HcmV?d00001 diff --git a/textures/ethereal_strawberry_4.png b/textures/ethereal_strawberry_4.png new file mode 100644 index 0000000000000000000000000000000000000000..dcf001753c0770e613b6b5b551349f958886bd22 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0EkVWbq#a7`AQ8JvQ~) zF`y7*NswPKgTu2MX+Tbar;B5V#`(MFHu5$Y@UR>(KgIB0kh$ST11Hm|f5w6uI_xfv z-PZHtw>8R7IkL_?laJT&^lIm64n6ZWq_TDHvP?N7CDLw|HKE3JmG}eM0KW;#{;l7# zUe@5MoukMdg)0e0Q4Oh0CniXq(|&mQd0&131IHnDf#!9p++dMnYy*H10g>_g(pKiq+|M*?o-WC78H+75Uf?UQD-oL+& b-2cF+)xpi>{&|5G&_xWMu6{1-oD!M<02*B^ literal 0 HcmV?d00001 diff --git a/textures/ethereal_strawberry_6.png b/textures/ethereal_strawberry_6.png new file mode 100644 index 0000000000000000000000000000000000000000..a4d0d603fc091f7ead1faa645646ba09e305e3d9 GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvp#Yx{S0EkVWbq#a82;zx-oEY0 z&L*=GD9Tt8I9474ezNrP=8{z3;zN`o{YNk%ZJ(Erp-=)mD6xY+$^6WyXqFuE5#r8GN4IDq#ue zzqoEfMsdZui4Mo*w#4!^D0gH(_-VI2??UC9)X@C5@-IL2?%Pwg@tp(HdoF{e&83XH i*1X=5@TdAXqg~50?wf6EcW(i@i^0>?&t;ucLK6UGzF^M) literal 0 HcmV?d00001 diff --git a/textures/ethereal_strawberry_7.png b/textures/ethereal_strawberry_7.png new file mode 100644 index 0000000000000000000000000000000000000000..ace223cd88a0cd46bf55c2eda7c3d7d1646b8439 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv(Ey(iS0EkVWbq#a7@jzq-M;Pl zKR5T*s@x8s1Y=2%UoeBivm0qZ&TLN?#}JM4XD3+mF&Xl(=4vkbwprk-+fGLHh%iro z!NB0B|J)BuJaErdrXl3yiTRa^zrG*-#M+my!Es~rB*_yO^FdP8W62jemm=(T}r zFeG1>!TUf|yhe8Ev`4lHJPb!gL!Pm$n5X!z<5Nv~-zCQ4dC@l)Z{5f2_V%Lfas{hh ztJQ8?ym(LLwmy5zS3AaoI_DSgEGlNI?05gq;Pg}U Date: Sat, 10 Sep 2022 08:46:07 +0100 Subject: [PATCH 02/50] add strawberry rarity to farming.conf_example --- farming.conf_example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/farming.conf_example b/farming.conf_example index a8f0288..7315775 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -38,7 +38,7 @@ farming.vanilla = 0.001 farming.artichoke = 0.001 farming.parsley = 0.002 farming.sunflower = 0.001 -farming.strawberry = minetest.get_modpath("ethereal") and nil or 0.002 +farming.strawberry = not minetest.get_modpath("ethereal") and 0.002 farming.grains = true -- true or false only farming.rice = true From ff526980da6ba6db7a47c03e8a44597ab5ab53ca Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 10 Sep 2022 08:49:26 +0100 Subject: [PATCH 03/50] change golden carrot recipe (carrot + gold lump) --- crops/carrot.lua | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/crops/carrot.lua b/crops/carrot.lua index 2dd45f3..cbbdf8f 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -46,11 +46,7 @@ minetest.register_craftitem("farming:carrot_gold", { minetest.register_craft({ output = "farming:carrot_gold", - recipe = { - {"", "default:gold_lump", ""}, - {"default:gold_lump", "group:food_carrot", "default:gold_lump"}, - {"", "default:gold_lump", ""} - } + recipe = {{"group:food_carrot", "default:gold_lump"}} }) -- carrot definition From 97d15d3ea17d28bb824d6c585a2f06cb12736cc0 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 13 Sep 2022 12:30:10 +0100 Subject: [PATCH 04/50] added spinach; eggplant; asparagus; Chili Powder; new Onigiri (thanks Atlante for new textures), mapgen now inside own crop file, added new lucky blocks --- README.md | 4 +- crops/artichoke.lua | 22 ++- crops/asparagus.lua | 95 ++++++++++++ crops/beans.lua | 18 +++ crops/beetroot.lua | 18 +++ crops/blackberry.lua | 20 ++- crops/blueberry.lua | 18 +++ crops/cabbage.lua | 18 +++ crops/carrot.lua | 28 ++++ crops/chili.lua | 36 +++++ crops/coffee.lua | 26 ++++ crops/corn.lua | 18 +++ crops/cotton.lua | 24 +++ crops/cucumber.lua | 27 ++++ crops/eggplant.lua | 87 +++++++++++ crops/garlic.lua | 20 +++ crops/grapes.lua | 18 +++ crops/hemp.lua | 22 ++- crops/lettuce.lua | 20 ++- crops/melon.lua | 30 ++++ crops/mint.lua | 20 +++ crops/onion.lua | 18 +++ crops/parsley.lua | 18 +++ crops/peas.lua | 18 +++ crops/pepper.lua | 23 +++ crops/pineapple.lua | 25 ++++ crops/potato.lua | 18 +++ crops/pumpkin.lua | 28 ++++ crops/raspberry.lua | 18 +++ crops/rhubarb.lua | 18 +++ crops/soy.lua | 25 ++++ crops/spinach.lua | 88 +++++++++++ crops/strawberry.lua | 18 +++ crops/sunflower.lua | 18 +++ crops/tomato.lua | 18 +++ crops/vanilla.lua | 18 +++ farming.conf_example | 3 + init.lua | 14 +- license.txt | 21 +++ lucky_block.lua | 6 + mapgen.lua | 241 ------------------------------ textures/farming_asparagus.png | Bin 0 -> 153 bytes textures/farming_asparagus_1.png | Bin 0 -> 115 bytes textures/farming_asparagus_2.png | Bin 0 -> 140 bytes textures/farming_asparagus_3.png | Bin 0 -> 165 bytes textures/farming_asparagus_4.png | Bin 0 -> 177 bytes textures/farming_asparagus_5.png | Bin 0 -> 200 bytes textures/farming_chili_powder.png | Bin 0 -> 205 bytes textures/farming_eggplant.png | Bin 0 -> 194 bytes textures/farming_eggplant_1.png | Bin 0 -> 113 bytes textures/farming_eggplant_2.png | Bin 0 -> 137 bytes textures/farming_eggplant_3.png | Bin 0 -> 170 bytes textures/farming_eggplant_4.png | Bin 0 -> 195 bytes textures/farming_onigiri.png | Bin 204 -> 166 bytes textures/farming_rice.png | Bin 325 -> 207 bytes textures/farming_spinach.png | Bin 0 -> 166 bytes textures/farming_spinach_1.png | Bin 0 -> 119 bytes textures/farming_spinach_2.png | Bin 0 -> 139 bytes textures/farming_spinach_3.png | Bin 0 -> 146 bytes textures/farming_spinach_4.png | Bin 0 -> 163 bytes 60 files changed, 992 insertions(+), 251 deletions(-) create mode 100644 crops/asparagus.lua create mode 100644 crops/eggplant.lua create mode 100644 crops/spinach.lua delete mode 100644 mapgen.lua create mode 100644 textures/farming_asparagus.png create mode 100644 textures/farming_asparagus_1.png create mode 100644 textures/farming_asparagus_2.png create mode 100644 textures/farming_asparagus_3.png create mode 100644 textures/farming_asparagus_4.png create mode 100644 textures/farming_asparagus_5.png create mode 100644 textures/farming_chili_powder.png create mode 100644 textures/farming_eggplant.png create mode 100644 textures/farming_eggplant_1.png create mode 100644 textures/farming_eggplant_2.png create mode 100644 textures/farming_eggplant_3.png create mode 100644 textures/farming_eggplant_4.png create mode 100644 textures/farming_spinach.png create mode 100644 textures/farming_spinach_1.png create mode 100644 textures/farming_spinach_2.png create mode 100644 textures/farming_spinach_3.png create mode 100644 textures/farming_spinach_4.png diff --git a/README.md b/README.md index 81e352f..61bc474 100644 --- a/README.md +++ b/README.md @@ -163,7 +163,7 @@ There is one abm for new group `group:growing`. ### Changelog: -- NEXT - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active +- 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures) - 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 @@ -219,4 +219,4 @@ options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton t - 0.1 - Fixed growing bug - 0.0 - Initial release -### Lucky Blocks: 39 +### Lucky Blocks: 41 diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 92143f6..5604b09 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -19,7 +19,7 @@ local def = { sunlight_propagates = true, walkable = false, buildable_to = true, - drop = "", + drop = "", selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, @@ -62,3 +62,23 @@ farming.registered_plants["farming:artichoke"] = { maxlight = 15, steps = 5 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.artichoke, + spread = {x = 100, y = 100, z = 100}, + seed = 448, + octaves = 3, + persist = 0.6 + }, + y_min = 1, + y_max = 13, + decoration = {"farming:artichoke_5"}, + spawn_by = "group:tree", + num_spawn_by = 1 +}) diff --git a/crops/asparagus.lua b/crops/asparagus.lua new file mode 100644 index 0000000..558e7da --- /dev/null +++ b/crops/asparagus.lua @@ -0,0 +1,95 @@ +-- asparagus +minetest.register_craftitem("farming:asparagus", { + description = "asparagus", + inventory_image = "farming_asparagus.png", + groups = {seed = 2, food_asparagus = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:asparagus_1") + end, + on_use = minetest.item_eat(1) +}) + +-- asparagus definition +local def = { + drawtype = "plantlike", + tiles = {"farming_asparagus_1.png"}, + paramtype = "light", + sunlight_propagates = true, + walkable = false, + buildable_to = true, + drop = "", + selection_box = { + type = "fixed", + fixed = {-6 / 16, -8 / 8, -6 / 16, 6 / 16, 1 / 55, 6 / 16}, + }, + groups = { + snappy = 3, flammable = 2, plant = 1, attached_node = 1, + not_in_creative_inventory = 1, growing = 1 + }, + sounds = default.node_sound_leaves_defaults(), + place_param2 = 3 +} + +-- stage 1 +minetest.register_node("farming:asparagus_1", table.copy(def)) + + +-- stage 2 +def.tiles = {"farming_asparagus_2.png"} +minetest.register_node("farming:asparagus_2", table.copy(def)) + + +-- stage 3 +def.tiles = {"farming_asparagus_3.png"} +minetest.register_node("farming:asparagus_3", table.copy(def)) + + +-- stage 4 +def.tiles = {"farming_asparagus_4.png"} +def.drop = { + items = { + {items = {"farming:asparagus"}, rarity = 2} + } +} +minetest.register_node("farming:asparagus_4", table.copy(def)) + + +-- stage 5 +def.tiles = {"farming_asparagus_5.png"} +def.drop = { + items = { + {items = {"farming:asparagus"}, rarity = 1}, + {items = {"farming:asparagus 2"}, rarity = 2} + } +} +minetest.register_node("farming:asparagus_5", table.copy(def)) + + +-- add to registered_plants +farming.registered_plants["farming:asparagus"] = { + crop = "farming:asparagus", + seed = "farming:asparagus", + minlight = 7, + maxlight = farming.max_light, + steps = 5 +} + +-- mapgen +minetest.register_decoration({ + name = "farming:asparagus_5", + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = -0.1, + scale = farming.asparagus, + spread = {x = 50, y = 50, z = 50}, + seed = 4242, + octaves = 3, + persist = 0.7 + }, + y_min = 8, + y_max = 32, + decoration = "farming:asparagus_5", + param2 = 3 +}) diff --git a/crops/beans.lua b/crops/beans.lua index 02ebe1a..a6d7369 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -253,3 +253,21 @@ minetest.register_node("farming:beanbush", { }, sounds = default.node_sound_leaves_defaults() }) + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.beans, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 18, + y_max = 38, + decoration = "farming:beanbush" +}) diff --git a/crops/beetroot.lua b/crops/beetroot.lua index 05e0b3a..a2eec21 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -87,3 +87,21 @@ farming.registered_plants["farming:beetroot"] = { maxlight = farming.max_light, steps = 5 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.beetroot, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 1, + y_max = 20, + decoration = "farming:beetroot_5" +}) diff --git a/crops/blackberry.lua b/crops/blackberry.lua index e2122fd..daadfcb 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -10,7 +10,7 @@ minetest.register_craftitem("farming:blackberry", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:blackberry_1") end, - on_use = minetest.item_eat(1), + on_use = minetest.item_eat(1) }) local def = { @@ -60,3 +60,21 @@ farming.registered_plants["farming:blackberry"] = { maxlight = farming.max_light, steps = 4 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.blackberry, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 3, + y_max = 20, + decoration = "farming:blackberry_4" +}) diff --git a/crops/blueberry.lua b/crops/blueberry.lua index be1d3b2..df32b0e 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -97,3 +97,21 @@ farming.registered_plants["farming:blueberries"] = { maxlight = farming.max_light, steps = 4 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.blueberry, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 3, + y_max = 15, + decoration = "farming:blueberry_4" +}) diff --git a/crops/cabbage.lua b/crops/cabbage.lua index b57ac00..92b2f71 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -67,3 +67,21 @@ farming.registered_plants["farming:cabbage"] = { maxlight = farming.max_light, steps = 6 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.cabbage, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 2, + y_max = 15, + decoration = "farming:cabbage_6" +}) diff --git a/crops/carrot.lua b/crops/carrot.lua index cbbdf8f..6ea8eca 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -119,3 +119,31 @@ farming.registered_plants["farming:carrot"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +local mg = farming.mapgen == "v6" + +def = { + y_max = mg and 30 or 20, + near = mg and "group:water" or nil, + num = mg and 1 or -1, +} + +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.carrot, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 1, + y_max = def.y_max, + decoration = "farming:carrot_8", + spawn_by = def.near, + num_spawn_by = def.num +}) diff --git a/crops/chili.lua b/crops/chili.lua index 95f3a30..a4a5cf3 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -33,6 +33,22 @@ minetest.register_craft({ recipe = {{"farming:chili_pepper"}} }) +-- chili powder +minetest.register_craftitem("farming:chili_powder", { + description = S("Chili Powder"), + on_use = minetest.item_eat(-1), + inventory_image = "farming_chili_powder.png" +}) + +minetest.register_craft({ + output = "farming:chili_powder", + recipe = { + {"farming:chili_pepper", "farming:mortar_pestle"} + }, + replacements = {{"farming:mortar_pestle", "farming:mortar_pestle"}} +}) + + -- chili definition local def = { drawtype = "plantlike", @@ -96,3 +112,23 @@ farming.registered_plants["farming:chili_pepper"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.chili, + spread = {x = 100, y = 100, z = 100}, + seed = 760, + octaves = 3, + persist = 0.6 + }, + y_min = 5, + y_max = 35, + decoration = {"farming:chili_8"}, + spawn_by = "group:tree", + num_spawn_by = 1 +}) diff --git a/crops/coffee.lua b/crops/coffee.lua index 490547e..2e6fccb 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -95,3 +95,29 @@ farming.registered_plants["farming:coffee"] = { maxlight = farming.max_light, steps = 5 } + +-- mapgen +local mg = farming.mapgen == "v6" + +def = { + y_max = mg and 50 or 55, + spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", + "default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass"} +} + +minetest.register_decoration({ + deco_type = "simple", + place_on = def.spawn_on, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.coffee, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 20, + y_max = def.y_max, + decoration = "farming:coffee_5" +}) diff --git a/crops/corn.lua b/crops/corn.lua index 97bb86a..099a647 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -176,3 +176,21 @@ farming.registered_plants["farming:corn"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.corn, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 12, + y_max = 25, + decoration = "farming:corn_7" +}) diff --git a/crops/cotton.lua b/crops/cotton.lua index 6ea2e6f..2b7079e 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -184,3 +184,27 @@ farming.register_plant("farming:cotton", { groups = {flammable = 2}, steps = 8, })]] + +-- mapgen +local grow_on = farming.mapgen == "v6" and {"default:dirt_with_grass"} + or {"default:dry_dirt_with_dry_grass"} +local biome = farming.mapgen == "v6" and {"jungle"} or {"savanna"} + +minetest.register_decoration({ + name = "farming:cotton_wild", + deco_type = "simple", + place_on = grow_on, + sidelen = 16, + noise_params = { + offset = -0.1, + scale = 0.1, + spread = {x = 50, y = 50, z = 50}, + seed = 4242, + octaves = 3, + persist = 0.7 + }, + biomes = biome, + y_max = 31000, + y_min = 1, + decoration = "farming:cotton_wild" +}) diff --git a/crops/cucumber.lua b/crops/cucumber.lua index c5e70de..f63eeee 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -63,3 +63,30 @@ farming.registered_plants["farming:cucumber"] = { maxlight = farming.max_light, steps = 4 } + +-- mapgen +local mg = farming.mapgen == "v6" + +def = { + near = mg and "group:water" or nil, + num = mg and 1 or -1, +} + +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.cucumber, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 1, + y_max = 20, + decoration = "farming:cucumber_4", + spawn_by = def.near, + num_spawn_by = def.num +}) diff --git a/crops/eggplant.lua b/crops/eggplant.lua new file mode 100644 index 0000000..afda25b --- /dev/null +++ b/crops/eggplant.lua @@ -0,0 +1,87 @@ +local S = farming.intllib + +-- eggplant +minetest.register_craftitem("farming:eggplant", { + description = S("Eggplant"), + inventory_image = "farming_eggplant.png", + groups = {seed = 2, food_eggplant = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:eggplant_1") + end, + on_use = minetest.item_eat(3) +}) + +-- definition +local def = { + drawtype = "plantlike", + tiles = {"farming_eggplant_1.png"}, + paramtype = "light", + sunlight_propagates = true, + waving = 1, + 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:eggplant_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_eggplant_2.png"} +minetest.register_node("farming:eggplant_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_eggplant_3.png"} +def.drop = { + items = { + {items = {"farming:eggplant"}, rarity = 1}, + {items = {"farming:eggplant"}, rarity = 3} + } +} +minetest.register_node("farming:eggplant_3", table.copy(def)) + +-- stage 4 +def.tiles = {"farming_eggplant_4.png"} +def.groups.growing = nil +def.drop = { + items = { + {items = {"farming:eggplant 2"}, rarity = 1}, + {items = {"farming:eggplant 2"}, rarity = 2} + } +} +minetest.register_node("farming:eggplant_4", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:eggplant"] = { + crop = "farming:eggplant", + seed = "farming:eggplant", + minlight = 7, + maxlight = farming.max_light, + steps = 4 +} + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = -0.1, + scale = farming.eggplant, + spread = {x = 50, y = 50, z = 50}, + seed = 4242, + octaves = 3, + persist = 0.7 + }, + biomes = {"deciduous_forest"}, + y_max = 31000, + y_min = 1, + decoration = "farming:eggplant_4", + param2 = 3 +}) diff --git a/crops/garlic.lua b/crops/garlic.lua index e141479..279bbc7 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -134,3 +134,23 @@ farming.registered_plants["farming:garlic"] = { maxlight = farming.max_light, steps = 5 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.garlic, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 3, + y_max = 35, + decoration = "farming:garlic_5", + spawn_by = "group:tree", + num_spawn_by = 1 +}) diff --git a/crops/grapes.lua b/crops/grapes.lua index ee8fe38..342318f 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -260,3 +260,21 @@ minetest.register_node("farming:grapebush", { }, sounds = default.node_sound_leaves_defaults() }) + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.grapes, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 25, + y_max = 50, + decoration = "farming:grapebush" +}) diff --git a/crops/hemp.lua b/crops/hemp.lua index c63487a..60d2ffe 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -257,7 +257,27 @@ minetest.register_node("farming:hemp_8", table.copy(def)) farming.registered_plants["farming:hemp"] = { crop = "farming:hemp", seed = "farming:seed_hemp", - mminlight = farming.min_light, + minlight = farming.min_light, maxlight = farming.max_light, steps = 8 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.hemp, + spread = {x = 100, y = 100, z = 100}, + seed = 420, + octaves = 3, + persist = 0.6 + }, + y_min = 3, + y_max = 45, + decoration = "farming:hemp_7", + spawn_by = "group:tree", + num_spawn_by = 1 +}) diff --git a/crops/lettuce.lua b/crops/lettuce.lua index bbd7138..863e703 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -8,7 +8,7 @@ minetest.register_craftitem("farming:lettuce", { on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:lettuce_1") end, - on_use = minetest.item_eat(2), + on_use = minetest.item_eat(2) }) local def = { @@ -61,3 +61,21 @@ farming.registered_plants["farming:lettuce"] = { maxlight = farming.max_light, steps = 5 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.lettuce, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 5, + y_max = 35, + decoration = "farming:lettuce_5" +}) diff --git a/crops/melon.lua b/crops/melon.lua index 66decdc..65efcae 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -96,3 +96,33 @@ farming.registered_plants["farming:melon"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +local mg = farming.mapgen == "v6" + +def = { + y_max = mg and 20 or 6, + spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", + "default:dirt_with_rainforest_litter"}, + near = mg and "group:water" or nil, + num = mg and 1 or -1, +} + +minetest.register_decoration({ + deco_type = "simple", + place_on = def.spawn_on, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.melon, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 1, + y_max = def.y_max, + decoration = "farming:melon_8", + spawn_by = def.near, + num_spawn_by = def.num +}) diff --git a/crops/mint.lua b/crops/mint.lua index de4b6b3..b0e91a4 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -87,3 +87,23 @@ farming.registered_plants["farming:mint"] = { maxlight = farming.max_light, steps = 4 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass", "default:dirt_with_coniferous_litter"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.mint, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 1, + y_max = 75, + decoration = "farming:mint_4", + spawn_by = "group:water", + num_spawn_by = 1 +}) diff --git a/crops/onion.lua b/crops/onion.lua index 63cdbe5..64e4ec5 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -93,3 +93,21 @@ farming.registered_plants["farming:onion"] = { maxlight = farming.max_light, steps = 5 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.onion, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 5, + y_max = 28, + decoration = "farming:onion_5" +}) diff --git a/crops/parsley.lua b/crops/parsley.lua index 0bc20eb..74561dd 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -54,3 +54,21 @@ farming.registered_plants["farming:parsley"] = { maxlight = 15, steps = 3 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.parsley, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 10, + y_max = 40, + decoration = "farming:parsley_3" +}) diff --git a/crops/peas.lua b/crops/peas.lua index 94053f2..172fa42 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -89,3 +89,21 @@ farming.registered_plants["farming:pea_pod"] = { maxlight = farming.max_light, steps = 5 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.peas, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 25, + y_max = 55, + decoration = "farming:pea_5" +}) diff --git a/crops/pepper.lua b/crops/pepper.lua index bdf6287..19f5850 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -153,3 +153,26 @@ farming.registered_plants["farming:pepper"] = { maxlight = farming.max_light, steps = 5 } + +-- mapgen +local grow_on = farming.mapgen == "v6" and {"default:dirt_with_grass"} + or {"default:dirt_with_rainforest_litter"} + +minetest.register_decoration({ + deco_type = "simple", + place_on = grow_on, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.pepper, + spread = {x = 100, y = 100, z = 100}, + seed = 933, + octaves = 3, + persist = 0.6 + }, + y_min = 5, + y_max = 35, + decoration = {"farming:pepper_5", "farming:pepper_6", "farming:pepper_7"}, + spawn_by = "group:tree", + num_spawn_by = 1 +}) diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 6bb1918..f702ce3 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -139,3 +139,28 @@ farming.registered_plants["farming:pineapple"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +local grow_on = farming.mapgen == "v6" and {"default:dirt_with_grass"} + or {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"} +local grow_near = farming.mapgen == "v6" and "default:desert_sand" or nil +local num = farming.mapgen == "v6" and 1 or -1 + +minetest.register_decoration({ + deco_type = "simple", + place_on = grow_on, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.pineapple, + spread = {x = 100, y = 100, z = 100}, + seed = 917, + octaves = 3, + persist = 0.6 + }, + y_min = 18, + y_max = 30, + decoration = {"farming:pineapple_8"}, + spawn_by = grow_near, + num_spawn_by = num +}) diff --git a/crops/potato.lua b/crops/potato.lua index a55ab29..032d954 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -110,3 +110,21 @@ farming.registered_plants["farming:potato"] = { maxlight = farming.max_light, steps = 4 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.potato, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 15, + y_max = 40, + decoration = "farming:potato_3" +}) diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 2829d47..65a8f82 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -206,3 +206,31 @@ farming.registered_plants["farming:pumpkin"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +local mg = farming.mapgen == "v6" + +def = { + y_max = mg and 20 or 6, + near = mg and "group:water" or nil, + num = mg and 1 or -1, +} + +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.pumpkin, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 1, + y_max = def.y_max, + decoration = "farming:pumpkin_8", + spawn_by = def.near, + num_spawn_by = def.num +}) diff --git a/crops/raspberry.lua b/crops/raspberry.lua index df1d3d9..34860bd 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -78,3 +78,21 @@ farming.registered_plants["farming:raspberries"] = { maxlight = farming.max_light, steps = 4 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.raspberry, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 3, + y_max = 15, + decoration = "farming:raspberry_4" +}) diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index d0ac58a..0b48687 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -75,3 +75,21 @@ farming.registered_plants["farming:rhubarb"] = { maxlight = 12, steps = 3 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.rhubarb, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 3, + y_max = 20, + decoration = "farming:rhubarb_3" +}) diff --git a/crops/soy.lua b/crops/soy.lua index e0ed093..90d1932 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -190,3 +190,28 @@ farming.registered_plants["farming:soy_pod"] = { maxlight = farming.max_light, steps = 7 } + +-- mapgen +local mg = farming.mapgen == "v6" + +def = { + spawn_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", + "default:dirt_with_rainforest_litter", "default:dry_dirt_with_dry_grass"} +} + +minetest.register_decoration({ + deco_type = "simple", + place_on = def.spawn_on, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.soy, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 20, + y_max = 50, + decoration = "farming:soy_6" +}) diff --git a/crops/spinach.lua b/crops/spinach.lua new file mode 100644 index 0000000..8b09461 --- /dev/null +++ b/crops/spinach.lua @@ -0,0 +1,88 @@ +local S = farming.intllib + +-- spinach +minetest.register_craftitem("farming:spinach", { + description = S("spinach"), + inventory_image = "farming_spinach.png", + groups = {seed = 2, food_spinach = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:spinach_1") + end, + on_use = minetest.item_eat(1) +}) + +-- definition +local def = { + drawtype = "plantlike", + tiles = {"farming_spinach_1.png"}, + paramtype = "light", + sunlight_propagates = true, + waving = 1, + 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:spinach_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_spinach_2.png"} +minetest.register_node("farming:spinach_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_spinach_3.png"} +def.drop = { + items = { + {items = {"farming:spinach"}, rarity = 1}, + {items = {"farming:spinach"}, rarity = 3} + } +} +minetest.register_node("farming:spinach_3", table.copy(def)) + +-- stage 4 +def.tiles = {"farming_spinach_4.png"} +def.groups.growing = nil +def.drop = { + items = { + {items = {"farming:spinach 2"}, rarity = 1}, + {items = {"farming:spinach 2"}, rarity = 2}, + {items = {"farming:spinach 2"}, rarity = 3} + } +} +minetest.register_node("farming:spinach_4", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:spinach"] = { + crop = "farming:spinach", + seed = "farming:spinach", + minlight = 7, + maxlight = farming.max_light, + steps = 4 +} + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = -0.1, + scale = farming.spinach, + spread = {x = 50, y = 50, z = 50}, + seed = 4242, + octaves = 3, + persist = 0.7 + }, + biomes = {"deciduous_forest"}, + y_max = 31000, + y_min = 1, + decoration = "farming:spinach_4", + param2 = 3 +}) diff --git a/crops/strawberry.lua b/crops/strawberry.lua index d049d9e..20361d0 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -92,3 +92,21 @@ farming.registered_plants["ethereal:strawberry"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.strawberry, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 20, + y_max = 55, + decoration = "farming:strawberry_7" +}) diff --git a/crops/sunflower.lua b/crops/sunflower.lua index 1a45054..c1defde 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -153,3 +153,21 @@ farming.registered_plants["farming:sunflower"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.sunflower, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 10, + y_max = 40, + decoration = "farming:sunflower_8" +}) diff --git a/crops/tomato.lua b/crops/tomato.lua index 6eff7c6..da458d8 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -104,3 +104,21 @@ farming.registered_plants["farming:tomato"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.tomato, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 5, + y_max = 25, + decoration = "farming:tomato_7" +}) diff --git a/crops/vanilla.lua b/crops/vanilla.lua index f014a8d..5ced49e 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -120,3 +120,21 @@ farming.registered_plants["farming:vanilla"] = { maxlight = farming.max_light, steps = 8 } + +-- mapgen +minetest.register_decoration({ + deco_type = "simple", + place_on = {"default:dirt_with_grass"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.vanilla, + spread = {x = 100, y = 100, z = 100}, + seed = 329, + octaves = 3, + persist = 0.6 + }, + y_min = 5, + y_max = 35, + decoration = "farming:vanilla_7" +}) diff --git a/farming.conf_example b/farming.conf_example index 7315775..102d14c 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -6,6 +6,9 @@ --]] -- true to enable crop/food in-game and on mapgen set spawn rarety +farming.asparagus = 0.002 +farming.eggplant = 0.002 +farming.spinach = 0.002 farming.carrot = 0.001 farming.potato = 0.001 farming.tomato = 0.001 diff --git a/init.lua b/init.lua index c8ed458..1261811 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20220603", + version = "20220913", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -15,7 +15,8 @@ farming = { }, registered_plants = {}, min_light = 12, - max_light = 15 + max_light = 15, + mapgen = minetest.get_mapgen_setting("mg_name") } @@ -548,7 +549,7 @@ farming.register_plant = function(name, def) on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, mname .. ":" .. pname .. "_1") - end, + end }) -- Register harvest @@ -627,6 +628,9 @@ end -- default settings +farming.asparagus = 0.002 +farming.eggplant = 0.002 +farming.spinach = 0.002 farming.carrot = 0.001 farming.potato = 0.001 farming.tomato = 0.001 @@ -736,8 +740,10 @@ ddoo("artichoke.lua", farming.artichoke) ddoo("parsley.lua", farming.parsley) ddoo("sunflower.lua", farming.sunflower) ddoo("strawberry.lua", farming.strawberry) +ddoo("asparagus.lua", farming.asparagus) +ddoo("eggplant.lua", farming.eggplant) +ddoo("spinach.lua", farming.eggplant) dofile(farming.path .. "/food.lua") -dofile(farming.path .. "/mapgen.lua") dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility dofile(farming.path .. "/lucky_block.lua") diff --git a/license.txt b/license.txt index ded3fee..5e4fa30 100644 --- a/license.txt +++ b/license.txt @@ -183,3 +183,24 @@ Created by RZR0 (CC-BY-NC-SA) Created by DMBuce (MIT - https://github.com/DMBuce/hatchling-snacks) farming_mac_and_cheese.png + + +Copyright (C) 2021-2022: Atlante - AFL-1.1 +License for code: AFL-1.1 + +Attribution — You must give appropriate credit, provide a link to the license, and +indicate if changes were made. You may do so in any reasonable manner, but not in any way +that suggests the licensor endorses you or your use. + +ShareAlike — If you remix, transform, or build upon the material, you must distribute +your contributions under the same license as the original. + +Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + farming_asparagus* + farming_eggplant* + farming_spinach* + farming_onigiri.png + farming_rice.png + farming_chili_powder.png diff --git a/lucky_block.lua b/lucky_block.lua index c6a2000..3f98896 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -63,6 +63,10 @@ if minetest.get_modpath("lucky_block") then {"farming:wheat_8", "farming:chili_8"}, {"farming:cotton_8", "farming:cucumber_4"}, }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:spinach_4"}, + {"farming:cotton_8", "farming:eggplant_4"}, + }}, {"nod", "default:chest", 0, { {name = "farming:seed_wheat", max = 15}, {name = "farming:seed_barley", max = 15}, @@ -74,6 +78,8 @@ if minetest.get_modpath("lucky_block") then {name = "farming:soil_wet", max = 10}, {name = "farming:cotton_wild", max = 5}, {name = "farming:grapebush", max = 5}, + {name = "farming:asparagus", max = 7} }}, + {"dro", {"farming:chili_powder"}, 5} }) end diff --git a/mapgen.lua b/mapgen.lua deleted file mode 100644 index 598675c..0000000 --- a/mapgen.lua +++ /dev/null @@ -1,241 +0,0 @@ --- what mapgen are we using -local mg_name = minetest.get_mapgen_setting("mg_name") - --- temp vars -local tmp1, tmp2, tmp3 - --- decoration function -local function register_plant(name, min, max, spawnon, spawnby, num, rarety) - - -- do not place on mapgen if no value given (or not true) - if not rarety then - return - end - - -- set rarety value or default to farming.rarety if not a number - rarety = tonumber(rarety) or farming.rarety - - minetest.register_decoration({ - deco_type = "simple", - place_on = spawnon or {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 329, - octaves = 3, - persist = 0.6 - }, - y_min = min, - y_max = max, - decoration = "farming:" .. name, - spawn_by = spawnby, - num_spawn_by = num - }) -end - - --- add crops to mapgen -register_plant("potato_3", 15, 40, nil, "", -1, farming.potato) -register_plant("tomato_7", 5, 25, nil, "", -1, farming.tomato) -register_plant("corn_7", 12, 25, nil, "", -1, farming.corn) -register_plant("strawberry_7", 20, 55, nil, "", -1, farming.strawberry) -register_plant("raspberry_4", 3, 15, nil, "", -1, farming.raspberry) -register_plant("rhubarb_3", 3, 20, nil, "", -1, farming.rhubarb) -register_plant("blueberry_4", 3, 15, nil, "", -1, farming.blueberry) -register_plant("beanbush", 18, 38, nil, "", -1, farming.beans) -register_plant("grapebush", 25, 50, nil, "", -1, farming.grapes) -register_plant("onion_5", 5, 28, nil, "", -1, farming.onion) -register_plant("garlic_5", 3, 35, nil, "group:tree", 1, farming.garlic) -register_plant("pea_5", 25, 55, nil, "", -1, farming.peas) -register_plant("beetroot_5", 1, 20, nil, "", -1, farming.beetroot) -register_plant("cabbage_6", 2, 15, nil, "", -1, farming.cabbage) -register_plant("lettuce_5", 5, 35, nil, "", -1, farming.lettuce) -register_plant("blackberry_4", 3, 20, 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) - - --- v6 mapgen compatibility for specific crops -if mg_name == "v6" then - - register_plant("carrot_8", 1, 30, nil, "group:water", 1, farming.carrot) - register_plant("cucumber_4", 1, 20, nil, "group:water", 1, farming.cucumber) - register_plant("melon_8", 1, 20, nil, "group:water", 1, farming.melon) - register_plant("pumpkin_8", 1, 20, nil, "group:water", 1, farming.pumpkin) - register_plant("coffee_5", 20, 50, nil, "", -1, farming.coffee) - register_plant("soy_6", 20, 50, nil, "", -1, farming.soy) -else - -- v7 maps have a beach so plants growing near water is limited to 6 high - register_plant("carrot_8", 1, 20, nil, "", -1, farming.carrot) - register_plant("cucumber_4", 1, 20, nil, "", -1, farming.cucumber) - register_plant("melon_8", 1, 6, {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter"}, "", -1, farming.melon) - register_plant("pumpkin_8", 1, 6, nil, "", -1, farming.pumpkin) - register_plant("coffee_5", 20, 55, {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter", - "default:dry_dirt_with_dry_grass"}, "", -1, farming.coffee) - register_plant("soy_6", 20, 50, {"default:dirt_with_dry_grass", - "default:dirt_with_rainforest_litter", - "default:dry_dirt_with_dry_grass"}, "", -1, farming.soy) -end - - -if farming.hemp then -minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.hemp) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 420, - octaves = 3, - persist = 0.6 - }, - y_min = 3, - y_max = 45, - decoration = "farming:hemp_7", - spawn_by = "group:tree", - num_spawn_by = 1 -}) -end - - -if farming.chili then -minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass", "default:dirt_with_rainforest_litter"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.chili) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 760, - octaves = 3, - persist = 0.6 - }, - y_min = 5, - y_max = 35, - decoration = {"farming:chili_8"}, - spawn_by = "group:tree", - num_spawn_by = 1 -}) -end - - -if farming.artichoke then -minetest.register_decoration({ - deco_type = "simple", - place_on = {"default:dirt_with_grass"}, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.artichoke) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 448, - octaves = 3, - persist = 0.6 - }, - y_min = 1, - y_max = 13, - decoration = {"farming:artichoke_5"}, - spawn_by = "group:tree", - num_spawn_by = 1, -}) -end - - -if farming.pepper then - -local tmp1 = {"default:dirt_with_rainforest_litter"} -- v7 - -if mg_name == "v6" then - tmp1 = {"default:dirt_with_grass"} -- v6 -end - -minetest.register_decoration({ - deco_type = "simple", - place_on = tmp1, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.pepper) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 933, - octaves = 3, - persist = 0.6 - }, - y_min = 5, - y_max = 35, - decoration = {"farming:pepper_5", "farming:pepper_6", "farming:pepper_7"}, - spawn_by = "group:tree", - num_spawn_by = 1 -}) -end - - -if farming.pineapple then - -tmp1 = {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"} -tmp2 = nil -tmp3 = -1 - -if mg_name == "v6" then - tmp1 = {"default:dirt_with_grass"} - tmp2 = "default:desert_sand" - tmp3 = 1 -end - -minetest.register_decoration({ - deco_type = "simple", - place_on = tmp1, - sidelen = 16, - noise_params = { - offset = 0, - scale = tonumber(farming.pineapple) or farming.rarety, - spread = {x = 100, y = 100, z = 100}, - seed = 917, - octaves = 3, - persist = 0.6 - }, - y_min = 18, - y_max = 30, - decoration = {"farming:pineapple_8"}, - spawn_by = tmp2, - num_spawn_by = tmp3 -}) -end - -tmp1 = {"default:dry_dirt_with_dry_grass"} -tmp2 = {"savanna"} - -if mg_name == "v6" then - tmp1 = {"default:dirt_with_grass"} - tmp2 = {"jungle"} -end - -minetest.register_decoration({ - name = "farming:cotton_wild", - deco_type = "simple", - place_on = tmp1, - sidelen = 16, - noise_params = { - offset = -0.1, - scale = 0.1, - spread = {x = 50, y = 50, z = 50}, - seed = 4242, - octaves = 3, - persist = 0.7 - }, - biomes = tmp2, - y_max = 31000, - y_min = 1, - decoration = "farming:cotton_wild" -}) diff --git a/textures/farming_asparagus.png b/textures/farming_asparagus.png new file mode 100644 index 0000000000000000000000000000000000000000..4dbc1ecb7c9faab745546690004d452985c88341 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4xHBpZ(Y^aoO+0X`wF`9-;IDQZ3iYW~IQAyt}j zU3!@_P35wZdVmTTOM?7@862M7NCR?=JY5_^IIbrrI53@Y61a6%;1I7b(`B8NOah4= wCdMvP4vH$B5@LBc%W21%0KLf!n@;jD+*reWh2z(vCqUf{p00i_>zopr0J2jp*Z=?k literal 0 HcmV?d00001 diff --git a/textures/farming_asparagus_1.png b/textures/farming_asparagus_1.png new file mode 100644 index 0000000000000000000000000000000000000000..87444d1b361d59443eca33cf1fea0764269c42e8 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0Yx;PT4(0&A(VZN@l_@ zAfK@$$S;_|;n|HeAV<{G#W95AdUC=734>+>;Ry*zDM>)#jSPJDFKuoESqz@8elF{r G5}E)uRU0G# literal 0 HcmV?d00001 diff --git a/textures/farming_asparagus_2.png b/textures/farming_asparagus_2.png new file mode 100644 index 0000000000000000000000000000000000000000..cb8c6b4bea138df631377ebad21652abded12d0c GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWWysHQic@w^QS&cW_b*kA zXw-5q3_1>!Wh@Eu3ubV5b|VeQ(eQL}4B@z*oUlMOq17-VLZL=%ngEA=%S=|ClV^^w i2qq;Zr6eXLFfhn$Wwd?z?}R*14}+(xpUXO@geCw#EhcpU literal 0 HcmV?d00001 diff --git a/textures/farming_asparagus_3.png b/textures/farming_asparagus_3.png new file mode 100644 index 0000000000000000000000000000000000000000..904fb25f685ae165655f5624556a90f064c6a788 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDUO)Ow=ic@w^QS&cW_b*iq zte1~y)Qad-e%fGj2dIXzB*-tA!Qt7BG$6;?)5S4_k?h=!qd*ZME zgA%5f>b{J2`8G4ywlGv~6VE?=%=FYsYmMGjReM5=rk+sZVlSJ_7_1wb{7B|(0{3=Yq3qyahZo-U3d9M|V|9pr5=;9+*&a5SoJ$lUC_8#FuY7`;S%r&8$l;ikS;{H(c8)I*0whub4y4SyB?VjjOGd&3EXR+~9U! W#%{T0m+cv#kqn-$elF{r5}E*V&pQkN literal 0 HcmV?d00001 diff --git a/textures/farming_asparagus_5.png b/textures/farming_asparagus_5.png new file mode 100644 index 0000000000000000000000000000000000000000..1ed183e03d89549b0cf0524329a0fda20d0e65df GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=7x$5+3=|zU49jjgkS) z;$f}wK@<2QCrC%m7JQ{SR~M*)u_VYZn8D%MjWi%9!qdeugyVYcsg1l120Si-$;E~_ zi4$AzxHuf=FcINtikNQEBo_Yuwa=I09~*v2Z(i)W_EES)=10SVHx0+mzua+AO{2}> s{2EoYiGDj9XQ~=3)kzbb{Y1r$zm$oycJ52lJfIy6p00i_>zopr0G3xnrT_o{ literal 0 HcmV?d00001 diff --git a/textures/farming_chili_powder.png b/textures/farming_chili_powder.png new file mode 100644 index 0000000000000000000000000000000000000000..6451a5d6044f974926e09f5d6de7340d4e585d3e GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV1=67m42cX39SjV!7#O@Q zq$8aaQoU6xqD@;eoaa&XcUTm`z* z?lCOdDb6V!-5ha8>ztp{>PDWvyG~wF){Q-pvb)1{-!mC$rB9t6zLv@8l6CspsI5XL xIJDo-uq?KkaBx=GJTWN-BMpU0WPXVo9@O1TaS?83{1OPP6KA`{r literal 0 HcmV?d00001 diff --git a/textures/farming_eggplant.png b/textures/farming_eggplant.png new file mode 100644 index 0000000000000000000000000000000000000000..4315adda2f3424585cd9cb62fec29cb00278649e GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMV1=2dA#+I6%_F5qxhVcQ` z=~1pFIU!wMCDLuF%i|^~6>ry4wg^xJs$(n(@(X5gcy=QV$no)XaSY+Oo}6%iRm?%- z9V@Q@+hwj5E!XrqI)X|RB6=@8wrQNa-n@(_ l4LI6%aX9e^iX6$)X5d)N*Q3V&@(R#g22WQ%mvv4FO#p-$IsO0u literal 0 HcmV?d00001 diff --git a/textures/farming_eggplant_1.png b/textures/farming_eggplant_1.png new file mode 100644 index 0000000000000000000000000000000000000000..7246860d3a02887a78dc9685071617e671b3422b GIT binary patch literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9oB=)|u0Yy5PbH#Jt3>JVKOl#( zB*-tA!Qt7BG$2RJ)5S4_<9c$!0v3ZN4mE?-j4oCN3=AwS3`f^*jp7HYVDNPHb6Mw< G&;$S;Z5nz2 literal 0 HcmV?d00001 diff --git a/textures/farming_eggplant_2.png b/textures/farming_eggplant_2.png new file mode 100644 index 0000000000000000000000000000000000000000..bfaf3634013536c770dc22f7f85c809bca088c20 GIT binary patch literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=8MmDk0SxX)_Ir7daKU z%FO`^F_r}R1v5B2yO9RuXn49fhHzX@PEe3GaMloGQxoGj-Ex%SP(e{qgH~XJW}9({ efeXt7NrnVr#)s0M?sfq6FnGH9xvXAc)B=-a9mGLaA13B&}KX%g}b1&V5V!t z0wKP2I-Ch^GgohBn4x$^>IuWdV9tijcEbpf1SKy6wwNP~a}O?JQen8biuH>1VsD^P O3=E#GelF{r5}E)5LNt5; literal 0 HcmV?d00001 diff --git a/textures/farming_eggplant_4.png b/textures/farming_eggplant_4.png new file mode 100644 index 0000000000000000000000000000000000000000..7b32b1be4ec69c1bde7653a0e0f6b9d5c93362f4 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa2=EDUO)Oy0mvV7b2@ldqa7>VE zbZPa-RtzXt_IVWZ8mNY`B*-tA!Qt7BG$1F^)5S4_<9c#}LjzMAi^18j335DwiOIoY z48~2DTSd7VOcn=LEvk^5a4_XW+$6S1i6X_?9Bi+>`7|0*9f# zcdzeYbqU-Hlw~Xl@(X5gcy=QV$Z_&?aSY+Oo}6%iJ0@m9$%<~~j3+wVhB9w@G61v$?EN8<}8jiO{|_9dz*}Wo6khc yxX8{~q*J9FazuJl$#9-i8M$#n;k6U1 zpWZt0{_)AruWtYR`jY+N{&1jD#*!evUG zecp$C;|=TZvoRC-QZ`IEZ+SC}E2U-Ul%=Y>86}q`9mg&&8DLW!6N^62*${Qgm rDV`JqElF)ot_B{V5EGFDX@U&;7DA1pfu1{nRxo(F`njxgN@xNA7~)5= delta 310 zcmX@lc$8^^L_G&H0|SGGE`KnPstE82aRt&#mMmGbX3dr@TefZ6wr9_tef#zuI&|pB zks~Kho;-8r%+;$`Z{ECl_wL;X4<0;z{P@kAH*ep*efRF&moHzwef#$P`}czf51u%2 z;@r7&=g*(Nc=6)3Yu9evxN-aT?K^kw0Chco{v4>~!-o%_K7IQ9x&HIluU~)s`0@Y$ z|J10hZ-ADIl?3^L9D@ZYp5VC#6i)MWaSV}=WIf2rbjW~#Wy6DO55p1+zWn>|ECkYY zAd!zj!#l#1!C=Xossn7wGk6b3O<`h?c(2RgFi*Ue;r68aUs)QWFI|mdTvDrlSAM<> u^N($@yKIW;{x>{TF+FK{ma9P%Xik0ba<;xHjio*yLp@#nT-G@yGywn(*_^ll diff --git a/textures/farming_spinach.png b/textures/farming_spinach.png new file mode 100644 index 0000000000000000000000000000000000000000..2e7d519abfef1b0d7b6a0f5bb728f9d02ebd94d9 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWWysIbvJ*D)61R<#_Q+NU zs#Nve>BZ#0 zro9IWF_r}R1v5B2yO9Ru7<#%mhHzX@PFTQN&~QmdP2g6GYwJ;lBL!t)Mr_`zBsf=U oG)VY(HF+i6x_RWr%}z#!teq?oH-Ect1ZrmRboFyt=akR{060}EGynhq literal 0 HcmV?d00001 diff --git a/textures/farming_spinach_4.png b/textures/farming_spinach_4.png new file mode 100644 index 0000000000000000000000000000000000000000..9435bc66d4d0d9ad7a3ae6435381aece9d87539d GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=3n}!iMf*W&skmQPMqq zX?;K;#*!evU^W^E!_YB literal 0 HcmV?d00001 From 6ac255d4c0c5eab0474c16b4ce881e43b035c4cc Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 13 Sep 2022 18:30:55 +0100 Subject: [PATCH 05/50] add random seed for each registered decoration, tidy code --- crops/artichoke.lua | 2 +- crops/asparagus.lua | 26 +++---- crops/beans.lua | 2 +- crops/beetroot.lua | 2 +- crops/blackberry.lua | 2 +- crops/blueberry.lua | 2 +- crops/cabbage.lua | 2 +- crops/carrot.lua | 2 +- crops/chili.lua | 2 +- crops/coffee.lua | 2 +- crops/corn.lua | 2 +- crops/cucumber.lua | 2 +- crops/eggplant.lua | 7 +- crops/garlic.lua | 2 +- crops/grapes.lua | 2 +- crops/lettuce.lua | 2 +- crops/melon.lua | 2 +- crops/mint.lua | 2 +- crops/onion.lua | 2 +- crops/parsley.lua | 2 +- crops/peas.lua | 2 +- crops/pepper.lua | 2 +- crops/pineapple.lua | 2 +- crops/potato.lua | 2 +- crops/pumpkin.lua | 2 +- crops/raspberry.lua | 2 +- crops/rhubarb.lua | 2 +- crops/soy.lua | 2 +- crops/spinach.lua | 7 +- crops/strawberry.lua | 2 +- crops/sunflower.lua | 2 +- crops/tomato.lua | 2 +- crops/vanilla.lua | 2 +- food.lua | 18 +++-- hoes.lua | 52 ++++++-------- init.lua | 13 ++-- lucky_block.lua | 164 +++++++++++++++++++++---------------------- statistics.lua | 4 +- 38 files changed, 170 insertions(+), 181 deletions(-) diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 5604b09..4a29157 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -72,7 +72,7 @@ minetest.register_decoration({ offset = 0, scale = farming.artichoke, spread = {x = 100, y = 100, z = 100}, - seed = 448, + seed = 123, octaves = 3, persist = 0.6 }, diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 558e7da..39cbb04 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -1,6 +1,9 @@ + +local S = farming.intllib + -- asparagus minetest.register_craftitem("farming:asparagus", { - description = "asparagus", + description = S("asparagus"), inventory_image = "farming_asparagus.png", groups = {seed = 2, food_asparagus = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) @@ -14,36 +17,31 @@ local def = { drawtype = "plantlike", tiles = {"farming_asparagus_1.png"}, paramtype = "light", + paramtype2 = "meshoptions", + place_param2 = 3, sunlight_propagates = true, walkable = false, buildable_to = true, drop = "", - selection_box = { - type = "fixed", - fixed = {-6 / 16, -8 / 8, -6 / 16, 6 / 16, 1 / 55, 6 / 16}, - }, + 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(), - place_param2 = 3 + sounds = default.node_sound_leaves_defaults() } -- stage 1 minetest.register_node("farming:asparagus_1", table.copy(def)) - -- stage 2 def.tiles = {"farming_asparagus_2.png"} minetest.register_node("farming:asparagus_2", table.copy(def)) - -- stage 3 def.tiles = {"farming_asparagus_3.png"} minetest.register_node("farming:asparagus_3", table.copy(def)) - -- stage 4 def.tiles = {"farming_asparagus_4.png"} def.drop = { @@ -53,7 +51,6 @@ def.drop = { } minetest.register_node("farming:asparagus_4", table.copy(def)) - -- stage 5 def.tiles = {"farming_asparagus_5.png"} def.drop = { @@ -64,7 +61,6 @@ def.drop = { } minetest.register_node("farming:asparagus_5", table.copy(def)) - -- add to registered_plants farming.registered_plants["farming:asparagus"] = { crop = "farming:asparagus", @@ -83,10 +79,10 @@ minetest.register_decoration({ noise_params = { offset = -0.1, scale = farming.asparagus, - spread = {x = 50, y = 50, z = 50}, - seed = 4242, + spread = {x = 100, y = 100, z = 100}, + seed = 234, octaves = 3, - persist = 0.7 + persist = 0.6 }, y_min = 8, y_max = 32, diff --git a/crops/beans.lua b/crops/beans.lua index a6d7369..7ab204e 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -263,7 +263,7 @@ minetest.register_decoration({ offset = 0, scale = farming.beans, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 345, octaves = 3, persist = 0.6 }, diff --git a/crops/beetroot.lua b/crops/beetroot.lua index a2eec21..9409d8d 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -97,7 +97,7 @@ minetest.register_decoration({ offset = 0, scale = farming.beetroot, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 456, octaves = 3, persist = 0.6 }, diff --git a/crops/blackberry.lua b/crops/blackberry.lua index daadfcb..741865c 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -70,7 +70,7 @@ minetest.register_decoration({ offset = 0, scale = farming.blackberry, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 567, octaves = 3, persist = 0.6 }, diff --git a/crops/blueberry.lua b/crops/blueberry.lua index df32b0e..0e92374 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -107,7 +107,7 @@ minetest.register_decoration({ offset = 0, scale = farming.blueberry, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 678, octaves = 3, persist = 0.6 }, diff --git a/crops/cabbage.lua b/crops/cabbage.lua index 92b2f71..f0c617f 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -77,7 +77,7 @@ minetest.register_decoration({ offset = 0, scale = farming.cabbage, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 789, octaves = 3, persist = 0.6 }, diff --git a/crops/carrot.lua b/crops/carrot.lua index 6ea8eca..61910c6 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -137,7 +137,7 @@ minetest.register_decoration({ offset = 0, scale = farming.carrot, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 890, octaves = 3, persist = 0.6 }, diff --git a/crops/chili.lua b/crops/chili.lua index a4a5cf3..7793558 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -122,7 +122,7 @@ minetest.register_decoration({ offset = 0, scale = farming.chili, spread = {x = 100, y = 100, z = 100}, - seed = 760, + seed = 901, octaves = 3, persist = 0.6 }, diff --git a/crops/coffee.lua b/crops/coffee.lua index 2e6fccb..8184326 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -113,7 +113,7 @@ minetest.register_decoration({ offset = 0, scale = farming.coffee, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 12, octaves = 3, persist = 0.6 }, diff --git a/crops/corn.lua b/crops/corn.lua index 099a647..55a7ab6 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -186,7 +186,7 @@ minetest.register_decoration({ offset = 0, scale = farming.corn, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 134, octaves = 3, persist = 0.6 }, diff --git a/crops/cucumber.lua b/crops/cucumber.lua index f63eeee..f5520ad 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -80,7 +80,7 @@ minetest.register_decoration({ offset = 0, scale = farming.cucumber, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 245, octaves = 3, persist = 0.6 }, diff --git a/crops/eggplant.lua b/crops/eggplant.lua index afda25b..9d6426f 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -1,3 +1,4 @@ + local S = farming.intllib -- eggplant @@ -74,10 +75,10 @@ minetest.register_decoration({ noise_params = { offset = -0.1, scale = farming.eggplant, - spread = {x = 50, y = 50, z = 50}, - seed = 4242, + spread = {x = 100, y = 100, z = 100}, + seed = 356, octaves = 3, - persist = 0.7 + persist = 0.6 }, biomes = {"deciduous_forest"}, y_max = 31000, diff --git a/crops/garlic.lua b/crops/garlic.lua index 279bbc7..7560321 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -144,7 +144,7 @@ minetest.register_decoration({ offset = 0, scale = farming.garlic, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 467, octaves = 3, persist = 0.6 }, diff --git a/crops/grapes.lua b/crops/grapes.lua index 342318f..5771e37 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -270,7 +270,7 @@ minetest.register_decoration({ offset = 0, scale = farming.grapes, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 578, octaves = 3, persist = 0.6 }, diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 863e703..65e22cf 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -71,7 +71,7 @@ minetest.register_decoration({ offset = 0, scale = farming.lettuce, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 689, octaves = 3, persist = 0.6 }, diff --git a/crops/melon.lua b/crops/melon.lua index 65efcae..01d5c83 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -116,7 +116,7 @@ minetest.register_decoration({ offset = 0, scale = farming.melon, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 790, octaves = 3, persist = 0.6 }, diff --git a/crops/mint.lua b/crops/mint.lua index b0e91a4..f1e2cac 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -97,7 +97,7 @@ minetest.register_decoration({ offset = 0, scale = farming.mint, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 801, octaves = 3, persist = 0.6 }, diff --git a/crops/onion.lua b/crops/onion.lua index 64e4ec5..d801f42 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -103,7 +103,7 @@ minetest.register_decoration({ offset = 0, scale = farming.onion, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 912, octaves = 3, persist = 0.6 }, diff --git a/crops/parsley.lua b/crops/parsley.lua index 74561dd..21babdb 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -64,7 +64,7 @@ minetest.register_decoration({ offset = 0, scale = farming.parsley, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 23, octaves = 3, persist = 0.6 }, diff --git a/crops/peas.lua b/crops/peas.lua index 172fa42..83445f6 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -99,7 +99,7 @@ minetest.register_decoration({ offset = 0, scale = farming.peas, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 132, octaves = 3, persist = 0.6 }, diff --git a/crops/pepper.lua b/crops/pepper.lua index 19f5850..20f787b 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -166,7 +166,7 @@ minetest.register_decoration({ offset = 0, scale = farming.pepper, spread = {x = 100, y = 100, z = 100}, - seed = 933, + seed = 243, octaves = 3, persist = 0.6 }, diff --git a/crops/pineapple.lua b/crops/pineapple.lua index f702ce3..69afba4 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -154,7 +154,7 @@ minetest.register_decoration({ offset = 0, scale = farming.pineapple, spread = {x = 100, y = 100, z = 100}, - seed = 917, + seed = 354, octaves = 3, persist = 0.6 }, diff --git a/crops/potato.lua b/crops/potato.lua index 032d954..5a28fb4 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -120,7 +120,7 @@ minetest.register_decoration({ offset = 0, scale = farming.potato, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 465, octaves = 3, persist = 0.6 }, diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 65a8f82..77e1932 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -224,7 +224,7 @@ minetest.register_decoration({ offset = 0, scale = farming.pumpkin, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 576, octaves = 3, persist = 0.6 }, diff --git a/crops/raspberry.lua b/crops/raspberry.lua index 34860bd..f7e3b61 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -88,7 +88,7 @@ minetest.register_decoration({ offset = 0, scale = farming.raspberry, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 687, octaves = 3, persist = 0.6 }, diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index 0b48687..cd4f074 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -85,7 +85,7 @@ minetest.register_decoration({ offset = 0, scale = farming.rhubarb, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 798, octaves = 3, persist = 0.6 }, diff --git a/crops/soy.lua b/crops/soy.lua index 90d1932..268c3dc 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -207,7 +207,7 @@ minetest.register_decoration({ offset = 0, scale = farming.soy, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 809, octaves = 3, persist = 0.6 }, diff --git a/crops/spinach.lua b/crops/spinach.lua index 8b09461..93832e8 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -1,3 +1,4 @@ + local S = farming.intllib -- spinach @@ -75,10 +76,10 @@ minetest.register_decoration({ noise_params = { offset = -0.1, scale = farming.spinach, - spread = {x = 50, y = 50, z = 50}, - seed = 4242, + spread = {x = 100, y = 100, z = 100}, + seed = 910, octaves = 3, - persist = 0.7 + persist = 0.6 }, biomes = {"deciduous_forest"}, y_max = 31000, diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 20361d0..4db37b1 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -102,7 +102,7 @@ minetest.register_decoration({ offset = 0, scale = farming.strawberry, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 143, octaves = 3, persist = 0.6 }, diff --git a/crops/sunflower.lua b/crops/sunflower.lua index c1defde..a51f1d6 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -163,7 +163,7 @@ minetest.register_decoration({ offset = 0, scale = farming.sunflower, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 254, octaves = 3, persist = 0.6 }, diff --git a/crops/tomato.lua b/crops/tomato.lua index da458d8..a18401e 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -114,7 +114,7 @@ minetest.register_decoration({ offset = 0, scale = farming.tomato, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 365, octaves = 3, persist = 0.6 }, diff --git a/crops/vanilla.lua b/crops/vanilla.lua index 5ced49e..a64a836 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -130,7 +130,7 @@ minetest.register_decoration({ offset = 0, scale = farming.vanilla, spread = {x = 100, y = 100, z = 100}, - seed = 329, + seed = 476, octaves = 3, persist = 0.6 }, diff --git a/food.lua b/food.lua index 07c1fce..b87fdc5 100644 --- a/food.lua +++ b/food.lua @@ -2,6 +2,7 @@ local S = farming.intllib --= filter sea water into river water + minetest.register_craft({ output = "bucket:bucket_river_water", recipe = { @@ -71,14 +72,14 @@ minetest.register_craft({ minetest.register_craftitem("farming:caramel", { description = S("Caramel"), - inventory_image = "farming_caramel.png", + inventory_image = "farming_caramel.png" }) minetest.register_craft({ type = "cooking", cooktime = 6, output = "farming:caramel", - recipe = "group:food_sugar", + recipe = "group:food_sugar" }) --= Salt @@ -165,8 +166,9 @@ minetest.register_node("farming:salt_crystal", { selection_box = { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.3, 0.25} - }, + } }) + minetest.register_craft({ output = "farming:salt 9", recipe = { @@ -367,13 +369,9 @@ minetest.register_craftitem("farming:cactus_juice", { groups = {vessel = 1, drink = 1}, on_use = function(itemstack, user, pointed_thing) if user then - if math.random(5) == 1 then - return minetest.do_item_eat(-1, "vessels:drinking_glass", - itemstack, user, pointed_thing) - else - return minetest.do_item_eat(2, "vessels:drinking_glass", - itemstack, user, pointed_thing) - end + local num = math.random(5) == 1 and -1 or 2 + return minetest.do_item_eat(num, "vessels:drinking_glass", + itemstack, user, pointed_thing) end end }) diff --git a/hoes.lua b/hoes.lua index 9340d55..3370452 100644 --- a/hoes.lua +++ b/hoes.lua @@ -190,29 +190,29 @@ farming.register_hoe(":farming:hoe_diamond", { -- Toolranks support if tr then -minetest.override_item("farming:hoe_wood", { - original_description = "Wood Hoe", - description = toolranks.create_description("Wood Hoe")}) + minetest.override_item("farming:hoe_wood", { + original_description = "Wood Hoe", + description = toolranks.create_description("Wood Hoe")}) -minetest.override_item("farming:hoe_stone", { - original_description = "Stone Hoe", - description = toolranks.create_description("Stone Hoe")}) + minetest.override_item("farming:hoe_stone", { + original_description = "Stone Hoe", + description = toolranks.create_description("Stone Hoe")}) -minetest.override_item("farming:hoe_steel", { - original_description = "Steel Hoe", - description = toolranks.create_description("Steel Hoe")}) + minetest.override_item("farming:hoe_steel", { + original_description = "Steel Hoe", + description = toolranks.create_description("Steel Hoe")}) -minetest.override_item("farming:hoe_bronze", { - original_description = "Bronze Hoe", - description = toolranks.create_description("Bronze Hoe")}) + minetest.override_item("farming:hoe_bronze", { + original_description = "Bronze Hoe", + description = toolranks.create_description("Bronze Hoe")}) -minetest.override_item("farming:hoe_mese", { - original_description = "Mese Hoe", - description = toolranks.create_description("Mese Hoe")}) + minetest.override_item("farming:hoe_mese", { + original_description = "Mese Hoe", + description = toolranks.create_description("Mese Hoe")}) -minetest.override_item("farming:hoe_diamond", { - original_description = "Diamond Hoe", - description = toolranks.create_description("Diamond Hoe")}) + minetest.override_item("farming:hoe_diamond", { + original_description = "Diamond Hoe", + description = toolranks.create_description("Diamond Hoe")}) end @@ -314,13 +314,13 @@ local function throw_potion(itemstack, player) local dir = player:get_look_dir() local velocity = 20 - obj:setvelocity({ + obj:set_velocity({ x = dir.x * velocity, y = dir.y * velocity, z = dir.z * velocity }) - obj:setacceleration({ + obj:set_acceleration({ x = dir.x * -3, y = -9.5, z = dir.z * -3 @@ -386,15 +386,9 @@ minetest.register_tool("farming:scythe_mithril", { local def = minetest.registered_nodes[node.name] - if not def then - return - end - - if not def.drop then - return - end - - if not def.groups + if not def + or not def.drop + or not def.groups or not def.groups.plant then return end diff --git a/init.lua b/init.lua index 1261811..5a20ae0 100644 --- a/init.lua +++ b/init.lua @@ -104,7 +104,7 @@ end -- Growth Logic local STAGE_LENGTH_AVG = tonumber( - minetest.settings:get("farming_stage_length")) or 200 -- 160 + minetest.settings:get("farming_stage_length")) or 200 local STAGE_LENGTH_DEV = STAGE_LENGTH_AVG / 6 @@ -367,8 +367,8 @@ function farming.plant_growth_timer(pos, elapsed, node_name) growth = 1 else - local night_light = (minetest.get_node_light(light_pos, 0) or 0) - local day_light = (minetest.get_node_light(light_pos, 0.5) or 0) + local night_light = (minetest.get_node_light(light_pos, 0) or 0) + local day_light = (minetest.get_node_light(light_pos, 0.5) or 0) local night_growth = night_light >= MIN_LIGHT and night_light <= MAX_LIGHT local day_growth = day_light >= MIN_LIGHT and day_light <= MAX_LIGHT @@ -746,4 +746,9 @@ ddoo("spinach.lua", farming.eggplant) dofile(farming.path .. "/food.lua") dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility -dofile(farming.path .. "/lucky_block.lua") + +if minetest.get_modpath("lucky_block") then + dofile(farming.path .. "/lucky_block.lua") +end + +print("[MOD] Farming Redo loaded") diff --git a/lucky_block.lua b/lucky_block.lua index 3f98896..525ea36 100644 --- a/lucky_block.lua +++ b/lucky_block.lua @@ -1,85 +1,79 @@ - --- add lucky blocks - -if minetest.get_modpath("lucky_block") then - - lucky_block:add_blocks({ - {"dro", {"farming:corn"}, 5}, - {"dro", {"farming:coffee_cup_hot"}, 1}, - {"dro", {"farming:bread"}, 5}, - {"nod", "farming:jackolantern", 0}, - {"tro", "farming:jackolantern_on"}, - {"nod", "default:river_water_source", 1}, - {"tel"}, - {"dro", {"farming:trellis", "farming:grapes"}, 5}, - {"dro", {"farming:bottle_ethanol"}, 1}, - {"nod", "farming:melon", 0}, - {"dro", {"farming:donut", "farming:donut_chocolate", "farming:donut_apple"}, 5}, - {"dro", {"farming:hemp_leaf", "farming:hemp_fibre", "farming:seed_hemp"}, 10}, - {"nod", "fire:permanent_flame", 1}, - {"dro", {"farming:chili_pepper", "farming:chili_bowl"}, 5}, - {"dro", {"farming:bowl"}, 3}, - {"dro", {"farming:saucepan"}, 1}, - {"dro", {"farming:pot"}, 1}, - {"dro", {"farming:baking_tray"}, 1}, - {"dro", {"farming:skillet"}, 1}, - {"exp", 4}, - {"dro", {"farming:mortar_pestle"}, 1}, - {"dro", {"farming:cutting_board"}, 1}, - {"dro", {"farming:juicer"}, 1}, - {"dro", {"farming:mixing_bowl"}, 1}, - {"dro", {"farming:hoe_bronze"}, 1}, - {"dro", {"farming:hoe_mese"}, 1}, - {"dro", {"farming:hoe_diamond"}, 1}, - {"dro", {"farming:hoe_bomb"}, 10}, - {"dro", {"farming:turkish_delight"}, 5}, - {"lig"}, - {"dro", {"farming:scythe_mithril"}, 1}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:carrot_8"}, - {"farming:cotton_8", "farming:rhubarb_3"}, - }}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:pepper_5"}, - {"farming:cotton_8", "farming:onion_5"}, - }}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:beetroot_5"}, - {"farming:cotton_8", "farming:barley_7"}, - }}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:corn_8"}, - {"farming:cotton_8", "farming:grapes_8"}, - }}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:pea_5"}, - {"farming:cotton_8", "farming:coffee_5"}, - }}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:raspberry_4"}, - {"farming:cotton_8", "farming:tomato_8"}, - }}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:chili_8"}, - {"farming:cotton_8", "farming:cucumber_4"}, - }}, - {"sch", "instafarm", 0, true, { - {"farming:wheat_8", "farming:spinach_4"}, - {"farming:cotton_8", "farming:eggplant_4"}, - }}, - {"nod", "default:chest", 0, { - {name = "farming:seed_wheat", max = 15}, - {name = "farming:seed_barley", max = 15}, - {name = "farming:seed_barley", max = 15}, - {name = "farming:seed_hemp", max = 15}, - {name = "farming:seed_rye", max = 15}, - {name = "farming:seed_rice", max = 15}, - {name = "farming:seed_oat", max = 15}, - {name = "farming:soil_wet", max = 10}, - {name = "farming:cotton_wild", max = 5}, - {name = "farming:grapebush", max = 5}, - {name = "farming:asparagus", max = 7} - }}, - {"dro", {"farming:chili_powder"}, 5} - }) -end +lucky_block:add_blocks({ + {"dro", {"farming:corn"}, 5}, + {"dro", {"farming:coffee_cup_hot"}, 1}, + {"dro", {"farming:bread"}, 5}, + {"nod", "farming:jackolantern", 0}, + {"tro", "farming:jackolantern_on"}, + {"nod", "default:river_water_source", 1}, + {"tel"}, + {"dro", {"farming:trellis", "farming:grapes"}, 5}, + {"dro", {"farming:bottle_ethanol"}, 1}, + {"nod", "farming:melon", 0}, + {"dro", {"farming:donut", "farming:donut_chocolate", "farming:donut_apple"}, 5}, + {"dro", {"farming:hemp_leaf", "farming:hemp_fibre", "farming:seed_hemp"}, 10}, + {"nod", "fire:permanent_flame", 1}, + {"dro", {"farming:chili_pepper", "farming:chili_bowl"}, 5}, + {"dro", {"farming:bowl"}, 3}, + {"dro", {"farming:saucepan"}, 1}, + {"dro", {"farming:pot"}, 1}, + {"dro", {"farming:baking_tray"}, 1}, + {"dro", {"farming:skillet"}, 1}, + {"exp", 4}, + {"dro", {"farming:mortar_pestle"}, 1}, + {"dro", {"farming:cutting_board"}, 1}, + {"dro", {"farming:juicer"}, 1}, + {"dro", {"farming:mixing_bowl"}, 1}, + {"dro", {"farming:hoe_bronze"}, 1}, + {"dro", {"farming:hoe_mese"}, 1}, + {"dro", {"farming:hoe_diamond"}, 1}, + {"dro", {"farming:hoe_bomb"}, 10}, + {"dro", {"farming:turkish_delight"}, 5}, + {"lig"}, + {"dro", {"farming:scythe_mithril"}, 1}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:carrot_8"}, + {"farming:cotton_8", "farming:rhubarb_3"}, + }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:pepper_5"}, + {"farming:cotton_8", "farming:onion_5"}, + }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:beetroot_5"}, + {"farming:cotton_8", "farming:barley_7"}, + }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:corn_8"}, + {"farming:cotton_8", "farming:grapes_8"}, + }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:pea_5"}, + {"farming:cotton_8", "farming:coffee_5"}, + }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:raspberry_4"}, + {"farming:cotton_8", "farming:tomato_8"}, + }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:chili_8"}, + {"farming:cotton_8", "farming:cucumber_4"}, + }}, + {"sch", "instafarm", 0, true, { + {"farming:wheat_8", "farming:spinach_4"}, + {"farming:cotton_8", "farming:eggplant_4"}, + }}, + {"nod", "default:chest", 0, { + {name = "farming:seed_wheat", max = 15}, + {name = "farming:seed_barley", max = 15}, + {name = "farming:seed_barley", max = 15}, + {name = "farming:seed_hemp", max = 15}, + {name = "farming:seed_rye", max = 15}, + {name = "farming:seed_rice", max = 15}, + {name = "farming:seed_oat", max = 15}, + {name = "farming:soil_wet", max = 10}, + {name = "farming:cotton_wild", max = 5}, + {name = "farming:grapebush", max = 5}, + {name = "farming:asparagus", max = 7} + }}, + {"dro", {"farming:chili_powder"}, 5} +}) diff --git a/statistics.lua b/statistics.lua index b892867..945d792 100644 --- a/statistics.lua +++ b/statistics.lua @@ -7,9 +7,9 @@ local ROOT_2 = math.sqrt(2.0) local erf local erf_inv -local A = 8 * (math.pi - 3.0)/(3.0 * math.pi * (4.0 - math.pi)) +local A = 8 * (math.pi - 3.0) / (3.0 * math.pi * (4.0 - math.pi)) local B = 4.0 / math.pi -local C = 2.0/(math.pi * A) +local C = 2.0 / (math.pi * A) local D = 1.0 / A From 2a41f1e9d51fa8d9a91b50d6136fa1f281cb0e42 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 08:03:41 +0100 Subject: [PATCH 06/50] increase selection box to show crop has matured, fix strawberry plant issue, add step to rhubarb growth --- crops/artichoke.lua | 1 + crops/asparagus.lua | 2 + crops/barley.lua | 1 + crops/beans.lua | 1 + crops/beetroot.lua | 1 + crops/blackberry.lua | 1 + crops/blueberry.lua | 1 + crops/cabbage.lua | 1 + crops/carrot.lua | 1 + crops/chili.lua | 1 + crops/coffee.lua | 1 + crops/corn.lua | 1 + crops/cotton.lua | 1 + crops/cucumber.lua | 1 + crops/eggplant.lua | 1 + crops/garlic.lua | 1 + crops/grapes.lua | 1 + crops/hemp.lua | 1 + crops/lettuce.lua | 1 + crops/melon.lua | 2 +- crops/mint.lua | 1 + crops/onion.lua | 1 + crops/parsley.lua | 1 + crops/peas.lua | 1 + crops/pepper.lua | 1 + crops/pineapple.lua | 1 + crops/potato.lua | 1 + crops/pumpkin.lua | 6 +-- crops/raspberry.lua | 1 + crops/rhubarb.lua | 11 ++++-- crops/rice.lua | 1 + crops/soy.lua | 1 + crops/spinach.lua | 1 + crops/strawberry.lua | 68 +++++++++++++++++---------------- crops/sunflower.lua | 1 + crops/tomato.lua | 1 + crops/vanilla.lua | 1 + crops/wheat.lua | 1 + init.lua | 11 +++++- textures/farming_rhubarb_1.png | Bin 119 -> 116 bytes textures/farming_rhubarb_2.png | Bin 152 -> 119 bytes textures/farming_rhubarb_3.png | Bin 167 -> 152 bytes textures/farming_rhubarb_4.png | Bin 0 -> 167 bytes 43 files changed, 92 insertions(+), 41 deletions(-) create mode 100644 textures/farming_rhubarb_4.png diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 4a29157..c42384f 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -46,6 +46,7 @@ minetest.register_node("farming:artichoke_4", table.copy(def)) -- stage 5 (final) def.tiles = {"farming_artichoke_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:artichoke 2"}, rarity = 1}, diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 39cbb04..169f321 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -53,6 +53,8 @@ minetest.register_node("farming:asparagus_4", table.copy(def)) -- stage 5 def.tiles = {"farming_asparagus_5.png"} +def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:asparagus"}, rarity = 1}, diff --git a/crops/barley.lua b/crops/barley.lua index e7f3840..eb9d12a 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -93,6 +93,7 @@ minetest.register_node("farming:barley_6", table.copy(def)) -- stage 7 (final) def.tiles = {"farming_barley_7.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:barley"}, rarity = 1}, diff --git a/crops/beans.lua b/crops/beans.lua index 7ab204e..90a30bd 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -210,6 +210,7 @@ minetest.register_node("farming:beanpole_4", table.copy(def)) -- stage 5 (final) def.tiles = {"farming_beanpole_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:beanpole"}, rarity = 1}, diff --git a/crops/beetroot.lua b/crops/beetroot.lua index 9409d8d..b8be3ef 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -69,6 +69,7 @@ minetest.register_node("farming:beetroot_4", table.copy(def)) -- stage 5 def.tiles = {"farming_beetroot_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { max_items = 4, items = { {items = {"farming:beetroot"}, rarity = 1}, diff --git a/crops/blackberry.lua b/crops/blackberry.lua index 741865c..47dd08e 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -43,6 +43,7 @@ minetest.register_node("farming:blackberry_3", table.copy(def)) -- stage 4 def.tiles = {"farming_blackberry_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {'farming:blackberry 2'}, rarity = 1}, diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 0e92374..1713bd1 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -80,6 +80,7 @@ minetest.register_node("farming:blueberry_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_blueberry_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:blueberries 2"}, rarity = 1}, diff --git a/crops/cabbage.lua b/crops/cabbage.lua index f0c617f..622782b 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -51,6 +51,7 @@ minetest.register_node("farming:cabbage_5", table.copy(def)) -- stage 6 def.tiles = {"farming_cabbage_6.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { max_items = 2, items = { {items = {"farming:cabbage 2"}, rarity = 1}, diff --git a/crops/carrot.lua b/crops/carrot.lua index 61910c6..da81fb5 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -103,6 +103,7 @@ minetest.register_node("farming:carrot_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_carrot_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:carrot 2"}, rarity = 1}, diff --git a/crops/chili.lua b/crops/chili.lua index 7793558..9e52870 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -96,6 +96,7 @@ minetest.register_node("farming:chili_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_chili_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:chili_pepper 3"}, rarity = 1}, diff --git a/crops/coffee.lua b/crops/coffee.lua index 8184326..728d307 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -78,6 +78,7 @@ minetest.register_node("farming:coffee_4", table.copy(def)) -- stage 5 (final) def.tiles = {"farming_coffee_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:coffee_beans 2"}, rarity = 1}, diff --git a/crops/corn.lua b/crops/corn.lua index 55a7ab6..602e545 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -159,6 +159,7 @@ minetest.register_node("farming:corn_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_corn_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:corn 2"}, rarity = 1}, diff --git a/crops/cotton.lua b/crops/cotton.lua index 2b7079e..787eaec 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -156,6 +156,7 @@ minetest.register_node("farming:cotton_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_cotton_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:cotton"}, rarity = 1}, diff --git a/crops/cucumber.lua b/crops/cucumber.lua index f5520ad..3494b16 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -47,6 +47,7 @@ minetest.register_node("farming:cucumber_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_cucumber_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:cucumber 2"}, rarity = 1}, diff --git a/crops/eggplant.lua b/crops/eggplant.lua index 9d6426f..818b490 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -50,6 +50,7 @@ minetest.register_node("farming:eggplant_3", table.copy(def)) -- stage 4 def.tiles = {"farming_eggplant_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:eggplant 2"}, rarity = 1}, diff --git a/crops/garlic.lua b/crops/garlic.lua index 7560321..bf929d0 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -117,6 +117,7 @@ minetest.register_node("farming:garlic_4", table.copy(def)) -- stage 5 def.tiles = {"crops_garlic_plant_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:garlic 3"}, rarity = 1}, diff --git a/crops/grapes.lua b/crops/grapes.lua index 5771e37..7622c0e 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -217,6 +217,7 @@ minetest.register_node("farming:grapes_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_grapes_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:trellis"}, rarity = 1}, diff --git a/crops/hemp.lua b/crops/hemp.lua index 60d2ffe..b5b86d2 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -243,6 +243,7 @@ minetest.register_node("farming:hemp_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_hemp_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:hemp_leaf 2"}, rarity = 1}, diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 65e22cf..9e3d314 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -45,6 +45,7 @@ minetest.register_node("farming:lettuce_4", table.copy(def)) -- stage 5 def.tiles = {"farming_lettuce_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {'farming:lettuce 2'}, rarity = 1}, diff --git a/crops/melon.lua b/crops/melon.lua index 01d5c83..dd81ecb 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -79,7 +79,7 @@ minetest.register_node("farming:melon_8", { "farming_melon_side.png" }, groups = { - food_melon = 1, snappy = 2, oddly_breakable_by_hand = 1, + food_melon = 1, snappy = 3, choppy = 3, oddly_breakable_by_hand = 2, flammable = 2, plant = 1 }, drop = "farming:melon_8", diff --git a/crops/mint.lua b/crops/mint.lua index f1e2cac..58f0263 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -69,6 +69,7 @@ minetest.register_node("farming:mint_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_mint_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:mint_leaf 2"}, rarity = 1}, diff --git a/crops/onion.lua b/crops/onion.lua index d801f42..049f869 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -74,6 +74,7 @@ minetest.register_node("farming:onion_4", table.copy(def)) -- stage 5 def.tiles = {"crops_onion_plant_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { max_items = 5, items = { {items = {"farming:onion"}, rarity = 1}, diff --git a/crops/parsley.lua b/crops/parsley.lua index 21babdb..3399cfc 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -37,6 +37,7 @@ minetest.register_node("farming:parsley_2", table.copy(def)) -- stage 3 (final) def.tiles = {"farming_parsley_3.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:parsley 2"}, rarity = 1}, diff --git a/crops/peas.lua b/crops/peas.lua index 83445f6..00ff5e3 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -71,6 +71,7 @@ minetest.register_node("farming:pea_4", table.copy(def)) -- stage 5 def.tiles = {"farming_pea_5.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { max_items = 5, items = { {items = {"farming:pea_pod"}, rarity = 1}, diff --git a/crops/pepper.lua b/crops/pepper.lua index 20f787b..a824bfd 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -113,6 +113,7 @@ minetest.register_node("farming:pepper_4", table.copy(def)) -- stage 5 (green pepper) def.tiles = {"crops_pepper_plant_5.png"} +def.selection_box = farming.select_final def.drop = { max_items = 2, items = { {items = {"farming:pepper 2"}, rarity = 1}, diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 69afba4..63c3ca5 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -123,6 +123,7 @@ minetest.register_node("farming:pineapple_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_pineapple_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:pineapple"}, rarity = 1}, diff --git a/crops/potato.lua b/crops/potato.lua index 5a28fb4..dc69bff 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -94,6 +94,7 @@ minetest.register_node("farming:potato_3", table.copy(def)) -- stage 4 def.tiles = {"farming_potato_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:potato 2"}, rarity = 1}, diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 77e1932..89a9d16 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -39,7 +39,7 @@ minetest.register_node("farming:jackolantern", { "farming_pumpkin_side.png", "farming_pumpkin_face_off.png" }, paramtype2 = "facedir", - groups = {choppy = 1, oddly_breakable_by_hand = 1, flammable = 2}, + groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults(), on_punch = function(pos, node, puncher) local name = puncher:get_player_name() or "" @@ -58,7 +58,7 @@ minetest.register_node("farming:jackolantern_on", { light_source = default.LIGHT_MAX - 1, paramtype2 = "facedir", groups = { - choppy = 1, oddly_breakable_by_hand = 1, flammable = 2, + snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, not_in_creative_inventory = 1 }, sounds = default.node_sound_wood_defaults(), @@ -187,7 +187,7 @@ minetest.register_node("farming:pumpkin_8", { "farming_pumpkin_side.png" }, groups = { - food_pumpkin = 1, choppy = 2, oddly_breakable_by_hand = 1, + food_pumpkin = 1, snappy = 3, choppy = 3, oddly_breakable_by_hand = 2, flammable = 2, plant = 1 }, drop = "farming:pumpkin_8", diff --git a/crops/raspberry.lua b/crops/raspberry.lua index f7e3b61..6d85461 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -61,6 +61,7 @@ minetest.register_node("farming:raspberry_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_raspberry_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:raspberries 2"}, rarity = 1}, diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index cd4f074..9ae2fa1 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -55,9 +55,14 @@ minetest.register_node("farming:rhubarb_1", table.copy(def)) def.tiles = {"farming_rhubarb_2.png"} minetest.register_node("farming:rhubarb_2", table.copy(def)) --- stage 3 (final) +-- stage3 def.tiles = {"farming_rhubarb_3.png"} +minetest.register_node("farming:rhubarb_3", table.copy(def)) + +-- stage 4 (final) +def.tiles = {"farming_rhubarb_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:rhubarb 2"}, rarity = 1}, @@ -65,7 +70,7 @@ def.drop = { {items = {"farming:rhubarb"}, rarity = 3} } } -minetest.register_node("farming:rhubarb_3", table.copy(def)) +minetest.register_node("farming:rhubarb_4", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:rhubarb"] = { @@ -73,7 +78,7 @@ farming.registered_plants["farming:rhubarb"] = { seed = "farming:rhubarb", minlight = 10, maxlight = 12, - steps = 3 + steps = 4 } -- mapgen diff --git a/crops/rice.lua b/crops/rice.lua index 6b8e2be..3b87003 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -108,6 +108,7 @@ minetest.register_node("farming:rice_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_rice_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:rice 2"}, rarity = 1}, diff --git a/crops/soy.lua b/crops/soy.lua index 268c3dc..13c20af 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -171,6 +171,7 @@ minetest.register_node("farming:soy_6", table.copy(def)) -- stage 7 def.tiles = {"farming_soy_7.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { max_items = 5, items = { {items = {"farming:soy_pod"}, rarity = 1}, diff --git a/crops/spinach.lua b/crops/spinach.lua index 93832e8..8a69830 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -50,6 +50,7 @@ minetest.register_node("farming:spinach_3", table.copy(def)) -- stage 4 def.tiles = {"farming_spinach_4.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:spinach 2"}, rarity = 1}, diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 4db37b1..6649bad 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -2,19 +2,22 @@ local S = farming.intllib -- Strawberry (can also be planted as seed) -minetest.register_craftitem(":ethereal:strawberry", { +minetest.register_craftitem("farming:strawberry", { description = S("Strawberry"), inventory_image = "ethereal_strawberry.png", - wield_image = "ethereal_strawberry.png", - groups = {food_strawberry = 1, food_berry = 1, flammable = 2}, + groups = {seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:strawberry_1") end, on_use = minetest.item_eat(1) }) +-- weird engine bug stops us from using on_place for ethereal: item when mod not active +-- so instead use farming:strawberry and do quick alias for compatibility. +minetest.register_alias("farming:strawberry", "ethereal:strawberry") + -- Define Strawberry Bush growth stages -local crop_def = { +local def = { drawtype = "plantlike", tiles = {"ethereal_strawberry_1.png"}, paramtype = "light", @@ -35,59 +38,60 @@ local crop_def = { } --stage 1 -minetest.register_node(":ethereal:strawberry_1", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_1", table.copy(def)) -- stage 2 -crop_def.tiles = {"ethereal_strawberry_2.png"} -minetest.register_node(":ethereal:strawberry_2", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_2.png"} +minetest.register_node(":ethereal:strawberry_2", table.copy(def)) -- stage 3 -crop_def.tiles = {"ethereal_strawberry_3.png"} -minetest.register_node(":ethereal:strawberry_3", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_3.png"} +minetest.register_node(":ethereal:strawberry_3", table.copy(def)) -- stage 4 -crop_def.tiles = {"ethereal_strawberry_4.png"} -minetest.register_node(":ethereal:strawberry_4", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_4.png"} +minetest.register_node(":ethereal:strawberry_4", table.copy(def)) -- stage 5 -crop_def.tiles = {"ethereal_strawberry_5.png"} -minetest.register_node(":ethereal:strawberry_5", table.copy(crop_def)) +def.tiles = {"ethereal_strawberry_5.png"} +minetest.register_node(":ethereal:strawberry_5", table.copy(def)) -- stage 6 -crop_def.tiles = {"ethereal_strawberry_6.png"} -crop_def.drop = { +def.tiles = {"ethereal_strawberry_6.png"} +def.drop = { items = { - {items = {"ethereal:strawberry 1"}, rarity = 2}, - {items = {"ethereal:strawberry 2"}, rarity = 3} + {items = {"farming:strawberry 1"}, rarity = 2}, + {items = {"farming:strawberry 2"}, rarity = 3} } } -minetest.register_node(":ethereal:strawberry_6", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_6", table.copy(def)) -- stage 7 -crop_def.tiles = {"ethereal_strawberry_7.png"} -crop_def.drop = { +def.tiles = {"ethereal_strawberry_7.png"} +def.drop = { items = { - {items = {"ethereal:strawberry 1"}, rarity = 1}, - {items = {"ethereal:strawberry 2"}, rarity = 3} + {items = {"farming:strawberry 1"}, rarity = 1}, + {items = {"farming:strawberry 2"}, rarity = 3} } } -minetest.register_node(":ethereal:strawberry_7", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_7", table.copy(def)) -- stage 8 -crop_def.tiles = {"ethereal_strawberry_8.png"} -crop_def.groups.growing = nil -crop_def.drop = { +def.tiles = {"ethereal_strawberry_8.png"} +def.groups.growing = nil +def.selection_box = farming.select_final +def.drop = { items = { - {items = {"ethereal:strawberry 2"}, rarity = 1}, - {items = {"ethereal:strawberry 3"}, rarity = 3} + {items = {"farming:strawberry 2"}, rarity = 1}, + {items = {"farming:strawberry 3"}, rarity = 3} } } -minetest.register_node(":ethereal:strawberry_8", table.copy(crop_def)) +minetest.register_node(":ethereal:strawberry_8", table.copy(def)) -- add to registered_plants farming.registered_plants["ethereal:strawberry"] = { - crop = "ethereal:strawberry", - seed = "ethereal:strawberry", + crop = "farming:strawberry", + seed = "farming:strawberry", minlight = farming.min_light, maxlight = farming.max_light, steps = 8 @@ -108,5 +112,5 @@ minetest.register_decoration({ }, y_min = 20, y_max = 55, - decoration = "farming:strawberry_7" + decoration = "ethereal:strawberry_7" }) diff --git a/crops/sunflower.lua b/crops/sunflower.lua index a51f1d6..03604c4 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -137,6 +137,7 @@ minetest.register_node("farming:sunflower_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_sunflower_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:sunflower"}, rarity = 1}, diff --git a/crops/tomato.lua b/crops/tomato.lua index a18401e..8362c68 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -87,6 +87,7 @@ minetest.register_node("farming:tomato_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_tomato_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:tomato 3"}, rarity = 1}, diff --git a/crops/vanilla.lua b/crops/vanilla.lua index a64a836..4e048e1 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -102,6 +102,7 @@ minetest.register_node("farming:vanilla_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_vanilla_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:vanilla 2"}, rarity = 1}, diff --git a/crops/wheat.lua b/crops/wheat.lua index 1a7de8a..3bb0b7a 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -216,6 +216,7 @@ minetest.register_node("farming:wheat_7", table.copy(def)) -- stage 8 (final) def.tiles = {"farming_wheat_8.png"} def.groups.growing = nil +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:wheat"}, rarity = 1}, diff --git a/init.lua b/init.lua index 5a20ae0..82712bd 100644 --- a/init.lua +++ b/init.lua @@ -7,12 +7,16 @@ farming = { mod = "redo", - version = "20220913", + version = "20220915", path = minetest.get_modpath("farming"), select = { type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5} }, + select_final = { + type = "fixed", + fixed = {-0.5, -0.5, -0.5, 0.5, -2.5/16, 0.5} + }, registered_plants = {}, min_light = 12, max_light = 15, @@ -575,13 +579,16 @@ farming.register_plant = function(name, def) } } + local sel = farming.select local g = { snappy = 3, flammable = 2, plant = 1, growing = 1, attached_node = 1, not_in_creative_inventory = 1, } -- Last step doesn't need growing=1 so Abm never has to check these + -- also increase selection box for visual indication plant has matured if i == def.steps then + sel = farming.select_final g.growing = 0 end @@ -604,7 +611,7 @@ farming.register_plant = function(name, def) buildable_to = true, sunlight_propagates = true, drop = drop, - selection_box = farming.select, + selection_box = sel, groups = g, sounds = default.node_sound_leaves_defaults(), minlight = def.minlight, diff --git a/textures/farming_rhubarb_1.png b/textures/farming_rhubarb_1.png index 01585b1bee3fcf44ad3e39e1cd562728576e0616..5ebf11605e3a449a93a03d47738c0127fc8b27b2 100644 GIT binary patch delta 85 zcmXRfnV=HD6W|l#%D}+zaT`O{LC-hm&)?Yf<28`aSQ6wH%;50sMjDVK=IP=X!f`!0 nVSz+}1_P%ox5B}i21W+9m5c#DG*`f(dW)@(X5gcy=QV$dU1MaSY+Oo}8c{ q+|k9v$U5|(Cy6V#K0gT$rvrHrN{_W$KdJe=d#Wzp$P!m{uiqN diff --git a/textures/farming_rhubarb_2.png b/textures/farming_rhubarb_2.png index 71845c750563c2898831177777aef51105c85b4a..01585b1bee3fcf44ad3e39e1cd562728576e0616 100644 GIT binary patch delta 101 zcmbQiSUy1_o{5=(fgx$G_$MI68Q>G*`f(dW)q B8QlN? delta 135 zcmXS)!8k#po`so#f#L1lM?pY}Kfou%m6M5KldEgcBKvdA%~=OM&%0_z0;L#Bg8YIR z9G=}s19HqgT^vI=t|uob@NclNG%&Dako42h;?vVoP;_Gxa}^V4mh5rhVb*9q*lJ5PR=G**PuoA=bD?d4tkz<)sAFfU|=i>@(X5gcy=QV$T9bHaSY+Oo}8e- zzrn)Nz`&A0(oaW=Pftrh(Tz>aRZO5+vd4jkS)=)2!$FB-1`S3t9`dlMurXYgWj?!y SS9}rB2nJ7AKbLh*2~7Ye$0BC{ delta 130 zcmV-|0Db?M0jB|wEPGufB(gY kHXCwag*}=LE64#KJm_czS@%>8M*si-07*qoM6N<$f&s!ap8x;= diff --git a/textures/farming_rhubarb_4.png b/textures/farming_rhubarb_4.png new file mode 100644 index 0000000000000000000000000000000000000000..b412f7e0105cdf29452d5c44e378ae73745dd3c0 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bKe4jKI@=o z!oo>#3(3IS&|cxLoW%%h0DVbHM{9#=G^)+7>Mg zc=+Jp+zIjmLhQNf#xw+RozDKEWt&^CE*a@_PucJJ3W1 MPgg&ebxsLQ0P7VvcmMzZ literal 0 HcmV?d00001 From c34bb8a5ed2d0fea4fc03b51fe7e20500f3d3ac3 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 08:25:44 +0100 Subject: [PATCH 07/50] fix strawberry issue --- compatibility.lua | 29 ++++++----------------------- crops/strawberry.lua | 22 +++++++++------------- 2 files changed, 15 insertions(+), 36 deletions(-) diff --git a/compatibility.lua b/compatibility.lua index 1fdf620..425132e 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -131,29 +131,12 @@ alias("farming_plus:rhubarb", "farming:rhubarb_3") alias("farming_plus:rhubarb_item", "farming:rhubarb") -- Strawberry -if eth then - alias("farming_plus:strawberry_item", "ethereal:strawberry") - alias("farming_plus:strawberry_seed", "ethereal:strawberry") - alias("farming_plus:strawberry_1", "ethereal:strawberry_1") - alias("farming_plus:strawberry_2", "ethereal:strawberry_3") - alias("farming_plus:strawberry_3", "ethereal:strawberry_5") - alias("farming_plus:strawberry", "ethereal:strawberry_7") -else - minetest.register_craftitem(":ethereal:strawberry", { - description = S("Strawberry"), - inventory_image = "farming_strawberry.png", - wield_image = "farming_strawberry.png", - groups = {food_strawberry = 1, flammable = 2}, - on_use = minetest.item_eat(1) - }) - - alias("farming_plus:strawberry_item", "ethereal:strawberry") - alias("farming_plus:strawberry_seed", "ethereal:strawberry") - alias("farming_plus:strawberry_1", "farming:raspberry_1") - alias("farming_plus:strawberry_2", "farming:raspberry_2") - alias("farming_plus:strawberry_3", "farming:raspberry_3") - alias("farming_plus:strawberry", "farming:raspberry_4") -end +alias("farming_plus:strawberry_item", "ethereal:strawberry") +alias("farming_plus:strawberry_seed", "ethereal:strawberry") +alias("farming_plus:strawberry_1", "ethereal:strawberry_1") +alias("farming_plus:strawberry_2", "ethereal:strawberry_3") +alias("farming_plus:strawberry_3", "ethereal:strawberry_5") +alias("farming_plus:strawberry", "ethereal:strawberry_7") -- Tomato alias("farming_plus:tomato_seed", "farming:tomato") diff --git a/crops/strawberry.lua b/crops/strawberry.lua index 6649bad..9e0792b 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -2,7 +2,7 @@ local S = farming.intllib -- Strawberry (can also be planted as seed) -minetest.register_craftitem("farming:strawberry", { +minetest.register_craftitem(":ethereal:strawberry", { description = S("Strawberry"), inventory_image = "ethereal_strawberry.png", groups = {seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2}, @@ -12,10 +12,6 @@ minetest.register_craftitem("farming:strawberry", { on_use = minetest.item_eat(1) }) --- weird engine bug stops us from using on_place for ethereal: item when mod not active --- so instead use farming:strawberry and do quick alias for compatibility. -minetest.register_alias("farming:strawberry", "ethereal:strawberry") - -- Define Strawberry Bush growth stages local def = { drawtype = "plantlike", @@ -60,8 +56,8 @@ minetest.register_node(":ethereal:strawberry_5", table.copy(def)) def.tiles = {"ethereal_strawberry_6.png"} def.drop = { items = { - {items = {"farming:strawberry 1"}, rarity = 2}, - {items = {"farming:strawberry 2"}, rarity = 3} + {items = {"ethereal:strawberry 1"}, rarity = 2}, + {items = {"ethereal:strawberry 2"}, rarity = 3} } } minetest.register_node(":ethereal:strawberry_6", table.copy(def)) @@ -70,8 +66,8 @@ minetest.register_node(":ethereal:strawberry_6", table.copy(def)) def.tiles = {"ethereal_strawberry_7.png"} def.drop = { items = { - {items = {"farming:strawberry 1"}, rarity = 1}, - {items = {"farming:strawberry 2"}, rarity = 3} + {items = {"ethereal:strawberry 1"}, rarity = 1}, + {items = {"ethereal:strawberry 2"}, rarity = 3} } } minetest.register_node(":ethereal:strawberry_7", table.copy(def)) @@ -82,16 +78,16 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {"farming:strawberry 2"}, rarity = 1}, - {items = {"farming:strawberry 3"}, rarity = 3} + {items = {"ethereal:strawberry 2"}, rarity = 1}, + {items = {"ethereal:strawberry 3"}, rarity = 3} } } minetest.register_node(":ethereal:strawberry_8", table.copy(def)) -- add to registered_plants farming.registered_plants["ethereal:strawberry"] = { - crop = "farming:strawberry", - seed = "farming:strawberry", + crop = "ethereal:strawberry", + seed = "ethereal:strawberry", minlight = farming.min_light, maxlight = farming.max_light, steps = 8 From 059b7f0fae0e8abf5db7f473d19cf43cc2a5d098 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 13:41:59 +0100 Subject: [PATCH 08/50] update readme --- README.md | 89 +++++++++++++++++++++++--------------------- farming.conf_example | 3 -- hoes.lua | 30 --------------- init.lua | 1 - 4 files changed, 46 insertions(+), 77 deletions(-) diff --git a/README.md b/README.md index 61bc474..409d608 100644 --- a/README.md +++ b/README.md @@ -45,60 +45,63 @@ Optional dependences: #### Configuration -It reads the configuration values from two places, `minetest.conf` and `farming.conf`, this last -must be at world path, if you have older place at mod path will be read but must be deprecated. +If found inside mod or world folder `farming.conf` is loaded set independent values for each crop. +Also `minetest.conf` contains a setting for crop growth speed. -| Configuration | type | default | place file | Notes about | +| Configuration | type | default | file | Notes | | -------------------- | ----- | ------- | ------------ | ----------------------------------------- | -| time_speed | float | 73 | minetest.conf | Speed to grow up the plants on engine (used as base for seed) | | farming_stage_length | float | 160.0 | minetest.conf | Contains a value used for speed of crop growth in seconds | -| farming.rarety | float | 0.002 | farming.conf | default rarety of crops on map (higher number = more crops) | -| farming.min_light | int | 12 | farming.conf | default minimum and maximum light levels crops need to grow | -| farming.max_light | int | 15 | farming.conf | default minimum and maximum light levels crops need to grow | -| farming.carrot | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.potato | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.tomato | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.cucumber | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.corn | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.coffee | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.melon | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.pumpkin | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.cocoa | bool | true | farming.conf | true or false only | -| farming.raspberry | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.blueberry | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.rhubarb | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.beans | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.grapes | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.barley | bool | true | farming.conf | true or false only | -| farming.chili | float | 0.003 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.hemp | float | 0.003 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.garlic | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.onion | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.pepper | float | 0.002 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.pineapple | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.peas | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.beetroot | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.mint | float | 0.005 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.cabbage | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.blackberry | float | 0.002 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.lettuce | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.soy | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.vanilla | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.artichoke | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.parsley | float | 0.002 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.sunflower | float | 0.001 | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | -| farming.grains | bool | true | farming.conf | true or false only | -| farming.rice | bool | true | farming.conf | true to enable crop/food in-game and on mapgen set spawn rarety | +| farming.min_light | int | 12 | farming.conf | default minimum light levels crops need to grow | +| farming.max_light | int | 15 | farming.conf | default maximum light levels crops need to grow | +| farming.carrot | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.potato | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.tomato | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.cucumber | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.corn | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.coffee | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.melon | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.pumpkin | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.cocoa | bool | true | farming.conf | true to enable crop/food or false to disable | +| farming.raspberry | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.blueberry | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.rhubarb | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.beans | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.grapes | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.barley | bool | true | farming.conf | true to enable crop/food, false to disable | +| farming.chili | float | 0.003 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.hemp | float | 0.003 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.garlic | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.onion | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.pepper | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.pineapple | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.peas | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.beetroot | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.mint | float | 0.005 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.cabbage | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.blackberry | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.lettuce | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.soy | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.vanilla | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.artichoke | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.parsley | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.sunflower | float | 0.001 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.grains | bool | true | farming.conf | true to enable crop/food or false to disable | +| farming.rice | bool | true | farming.conf | true to enable crop/food or false to disable | +| farming.asparagus | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.eggplant | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.spinach | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.strawberryy | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | #### Nodes and food -This farming mod provides a large featured basic foods production of farming: +This farming mod provides a large selection of craftable foods: | Node name | Description name | | ----------------------- | --------------------- | | farming:salt | Salt | -| farming:salt_crystal | Salt crystal | +| farming:salt_crystal | Salt Crystal | +| farming:chili_powder | Chili Powder | | farming:rose_water | Rose Water | | farming:glass_water | Glass of Water | | farming:sugar | Sugar | diff --git a/farming.conf_example b/farming.conf_example index 102d14c..42677af 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -45,9 +45,6 @@ farming.strawberry = not minetest.get_modpath("ethereal") and 0.002 farming.grains = true -- true or false only farming.rice = true --- default rarety of crops on map (higher number = more crops) -farming.rarety = 0.002 - -- default minimum and maximum light levels crops need to grow farming.min_light = 12 farming.max_light = 15 diff --git a/hoes.lua b/hoes.lua index 3370452..fa272d0 100644 --- a/hoes.lua +++ b/hoes.lua @@ -475,34 +475,4 @@ if minetest.get_modpath("moreores") then {"", "", "group:stick"} } }) ---[[ - farming.register_hoe(":moreores:hoe_silver", { - description = S("%s Hoe"):format(S("Silver")), - inventory_image = "moreores_tool_silverhoe.png", - max_uses = 300, - material = "moreores:silver_ingot" - }) - - farming.register_hoe(":moreores:hoe_mithril", { - description = S("%s Hoe"):format(S("Mithril")), - inventory_image = "moreores_tool_mithrilhoe.png", - max_uses = 1000, - material = "moreores:mithril_ingot" - }) - - -- Toolranks support - if tr then - - local desc = S("%s Hoe"):format(S("Silver")) - - minetest.override_item("moreores:hoe_silver", { - original_description = desc, - description = toolranks.create_description(desc)}) - - desc = S("%s Hoe"):format(S("Mithril")) - - minetest.override_item("moreores:hoe_mithril", { - original_description = desc, - description = toolranks.create_description(desc)}) - end]] end diff --git a/init.lua b/init.lua index 82712bd..d5e6f20 100644 --- a/init.lua +++ b/init.lua @@ -673,7 +673,6 @@ farming.sunflower = 0.001 farming.strawberry = not minetest.get_modpath("ethereal") and 0.002 farming.grains = true farming.rice = true -farming.rarety = 0.002 -- Load new global settings if found inside mod folder From 78ad44e37d18b9b661004054a0ba2d7d0c25e5c3 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 14:04:10 +0100 Subject: [PATCH 09/50] update readme --- README.md | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 409d608..cd19c00 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,20 @@ -minetest mod Farming Redo -========================= - -This mod improves all food and farming related content +Farming Redo mod for Minetest +============================= Information ----------- -This mod must be named `farming` a simplified but improved version of the built-in farming -mod in minetest but with more foods, it comes with wheat, cotton, carrot, cucumber, -potato, melon, cotton, cocoa, corn, better pumpkin and tomato to start out with which -spawn throughout the map... - -It also features that foods can be planted on tilled soil so for those then no seeds are required, -original wheat and cotton will require seeds which are found inside normal and jungle grass... +This mod replaces the default `farming` mod with a fully compatible API that allows +players to grow crops even when they are not nearby. It also includes many new foods +and crops which can be planted directly onto tilled soil without seeds. Crops that do +require seeds like wheat and cotton are found when digging in long grasses. ![screenshot.png](screenshot.png) Tech information ---------------- -Farming Redo is a simplified version of the built-in farming mod in minetest and comes with wheat, cotton, carrot, cucumber, potato and tomato to start out with which spawn throughout the map... new foods need only be planted on tilled soil so no seeds are required, original wheat and cotton will require seeds which are found inside normal and jungle grass... - -This mod works by adding your new plant to the {growing=1} group and numbering the stages from _1 to as many stages as you like, but the underscore MUST be used only once in the node name to separate plant from stage number e.g. +Crops grow by adding your new plant to the {growing = 1} group and numbering the stages from _1 to as many stages as you like, but the underscore MUST be used only once in the node name to separate plant from stage number e.g. * "farming:cotton_1" through to "farming:cotton_8" * "farming:wheat_1" through to "farming:wheat_8" @@ -45,8 +38,8 @@ Optional dependences: #### Configuration -If found inside mod or world folder `farming.conf` is loaded set independent values for each crop. -Also `minetest.conf` contains a setting for crop growth speed. +`farming.conf` is used to load custom settings for each crop and can be found in either the +farming mod folder or the world folder. Also `minetest.conf` contains a setting for crop growth speed. | Configuration | type | default | file | Notes | @@ -134,7 +127,7 @@ This farming mod provides a large selection of craftable foods: | node name | Description | | ----------------------- | --------------------- | -| farming:scythe_mithril | Mithril Scythe (Use to harvest and replant crops) | +| farming:scythe_mithril | Mithril Scythe (Use to harvest and replant crops) | | farming:hoe_bomb | Hoe Bomb (use or throw on grassy areas to hoe land) | | farming:hoe_wood | Wooden Hoe | | farming:hoe_stone | Stone Hoe | @@ -156,9 +149,8 @@ This farming mod provides a large selection of craftable foods: #### Nodes and Aliasing -This mod is a direct replacement for the old Farming Plus mod and -replaces all of it's nodes and items with one's found within -Farming Redo. +This mod is also a direct replacement for the older Farming Plus mod and will replace all +of it's nodes and items with one's found within Farming Redo. #### AMB @@ -221,5 +213,3 @@ options, onion soup added (thanks edcrypt), Added apple pie, added wild cotton t - 0.2 - Fixed check for wet soil - 0.1 - Fixed growing bug - 0.0 - Initial release - -### Lucky Blocks: 41 From b5454ac0eac740b19621340041f733d155a6537e Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 14:13:06 +0100 Subject: [PATCH 10/50] update readme --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cd19c00..e829e43 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ farming mod folder or the world folder. Also `minetest.conf` contains a setting | farming.asparagus | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | | farming.eggplant | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | | farming.spinach | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | -| farming.strawberryy | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | +| farming.strawberry | float | 0.002 | farming.conf | rarety value to enable crop/food in-game, false to disable | #### Nodes and food @@ -152,9 +152,10 @@ This farming mod provides a large selection of craftable foods: This mod is also a direct replacement for the older Farming Plus mod and will replace all of it's nodes and items with one's found within Farming Redo. -#### AMB +#### ABM -There is one abm for new group `group:growing`. +The ABM checks every 5 minutes to make sure crops in `group:growing` that were planted +on an older map are enabled and growing properly. ### Changelog: From 7be6bee04c7d8af8ecb3721f36154b1f1ce1d13c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 14:44:46 +0100 Subject: [PATCH 11/50] add items to readme craftable list --- README.md | 62 ++++++++++++++++++++++++++++++++++++++++++++++-- crops/garlic.lua | 3 +-- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e829e43..44fb630 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ farming mod folder or the world folder. Also `minetest.conf` contains a setting #### Nodes and food -This farming mod provides a large selection of craftable foods: +This farming mod provides a large selection of craftable food and items: | Node name | Description name | | ----------------------- | --------------------- | @@ -109,6 +109,7 @@ This farming mod provides a large selection of craftable foods: | farming:apple_pie | Apple Pie | | farming:cactus_juice | Cactus Juice | | farming:pasta | Pasta | +| farming:mac_and_cheese | Mac & Cheese | | farming:spaghetti | Spaghetti | | farming:bibimbap | Bibimbap | | farming:burger | Burger | @@ -122,11 +123,68 @@ This farming mod provides a large selection of craftable foods: | farming:onigiri | Onirigi | | farming:gyoza | Gyoza | | farming:mochi | Mochi | +| farming:beetroot_soup | Beetroot Soup | +| farming:muffin_blueberry | Blueberry Muffin | +| farming:blueberry_pie | Blueberry Pie | +| farming:carrot_juice | Carrot Juice | +| farming:carrot_gold | Golden Carrot (revives) | +| farming:chili_bowl | Bowl or Chili | +| farming:cocoa_beans | Cocoa Beans | +| farming:cookie | Chocolate Cookie | +| farming:chocolate_dark | Bar of Dark Chocolate | +| farming:chocolate_block | Chocolate Block | +| farming:coffee_cup | Cup of Coffee | +| farming:corn_cob | Corn on the Cob | +| farming:popcorn | Popcorn | +| farming:cornstarch | Cornstarch | +| farming:ethanol | Bottle of Ethanol (fuel) | +| farming:string | String | +| farming:garlic_braid | Garlic Braid | +| farming:garlic_clove | Garlic Clove | +| farming:hemp_oil | Hemp Oil | +| farming:hemp_fibre | Hemp Fibre | +| farming:hemp_block | Hemp Block | +| farming:hemp_rope | Hemp Rope | +| farming:mint_tea | Mint Tea | +| farming:onion_soup | Onion Soup | +| farming:pea_soup | Pea Soup | +| farming:pepper_ground | Ground Pepper | +| farming:pineapple_ring | Pineapple Ring | +| farming:pineapple_juice | Pineapple Juice | +| farming:baked_potato | Baked Potato | +| farming:potato_salad | Cucumber & Potato Salad | +| farming:jackolantern | Jack 'O Lantern | +| farming:scarecrow_bottom | Scarecrow Bottom | +| farming:pumpkin_dough | Pumpkin Dough | +| farming:pumpkin_bread | Pumpkin Bread | +| farming:smoothie_raspberry | Raspberry Smoothie | +| farming:rhubarb_pie | Rhybarb Pie | +| farming:rice_flour | Rice Flour | +| farming:rice_bread | Rice Bread | +| farming:flour_multigrain | Multigrain Rice | +| farming:bread_multigrain | Multigrain Bread | +| farming:soy_sauce | Soy Sauce | +| farming:soy_milk | Soy Milk | +| farming:tofu | Tofu | +| farming:tofu_cooked | Cooked Tofu | +| farming:sunflower_seeds_toasted | Toasted Sunflower Seeds | +| farming:sunflower_oil | Sunflower Oil | +| farming:sunflower_bread | Sunflower Bread | +| farming:tomato_soup | Tomato Soup | +| farming:vanilla_extract | Vanilla Extract | +| farming:flour | Flour | +| farming:bread | Bread | +| farming:straw | Straw Block | +| farming:bread_slice | Bread Slice | +| farming:toast | Toast | +| farming:toast_sandwich | Toast Sandwich | -#### Items tools +#### Item and Tools | node name | Description | | ----------------------- | --------------------- | +| farming:trellis | Trellis (for growing grapes) | +| farming:beanpole | Bean Pole (for growing beans) | | farming:scythe_mithril | Mithril Scythe (Use to harvest and replant crops) | | farming:hoe_bomb | Hoe Bomb (use or throw on grassy areas to hoe land) | | farming:hoe_wood | Wooden Hoe | diff --git a/crops/garlic.lua b/crops/garlic.lua index bf929d0..3366924 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -26,9 +26,8 @@ minetest.register_craftitem("farming:garlic", { }) minetest.register_craft({ - type = "shapeless", output = "farming:garlic_clove 8", - recipe = {"farming:garlic"} + recipe = {{"farming:garlic"}} }) minetest.register_craft({ From ff8e0d73a42455510b5378c7e9f9172ef7d3d3e7 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 15 Sep 2022 15:12:53 +0100 Subject: [PATCH 12/50] code consistency --- crops/cotton.lua | 13 ++++++++----- crops/pepper.lua | 9 ++++++--- crops/pineapple.lua | 18 +++++++++++------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/crops/cotton.lua b/crops/cotton.lua index 787eaec..6679333 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -187,14 +187,17 @@ farming.register_plant("farming:cotton", { })]] -- mapgen -local grow_on = farming.mapgen == "v6" and {"default:dirt_with_grass"} - or {"default:dry_dirt_with_dry_grass"} -local biome = farming.mapgen == "v6" and {"jungle"} or {"savanna"} +local mg = farming.mapgen == "v6" + +def = { + grow_on = mg and {"default:dirt_with_grass"} or {"default:dry_dirt_with_dry_grass"}, + biome = mg and {"jungle"} or {"savanna"} +} minetest.register_decoration({ name = "farming:cotton_wild", deco_type = "simple", - place_on = grow_on, + place_on = def.grow_on, sidelen = 16, noise_params = { offset = -0.1, @@ -204,7 +207,7 @@ minetest.register_decoration({ octaves = 3, persist = 0.7 }, - biomes = biome, + biomes = def.biome, y_max = 31000, y_min = 1, decoration = "farming:cotton_wild" diff --git a/crops/pepper.lua b/crops/pepper.lua index a824bfd..b5a4298 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -156,12 +156,15 @@ farming.registered_plants["farming:pepper"] = { } -- mapgen -local grow_on = farming.mapgen == "v6" and {"default:dirt_with_grass"} - or {"default:dirt_with_rainforest_litter"} +local mg = farming.mapgen == "v6" + +def = { + grow_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_rainforest_litter"} +} minetest.register_decoration({ deco_type = "simple", - place_on = grow_on, + place_on = def.grow_on, sidelen = 16, noise_params = { offset = 0, diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 63c3ca5..33ccf37 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -142,14 +142,18 @@ farming.registered_plants["farming:pineapple"] = { } -- mapgen -local grow_on = farming.mapgen == "v6" and {"default:dirt_with_grass"} - or {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"} -local grow_near = farming.mapgen == "v6" and "default:desert_sand" or nil -local num = farming.mapgen == "v6" and 1 or -1 +local mg = farming.mapgen == "v6" + +def = { + grow_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", + "default:dry_dirt_with_dry_grass"}, + grow_near = mg and "default:desert_sand" or nil, + num = mg and 1 or -1 +} minetest.register_decoration({ deco_type = "simple", - place_on = grow_on, + place_on = def.grow_on, sidelen = 16, noise_params = { offset = 0, @@ -162,6 +166,6 @@ minetest.register_decoration({ y_min = 18, y_max = 30, decoration = {"farming:pineapple_8"}, - spawn_by = grow_near, - num_spawn_by = num + spawn_by = def.grow_near, + num_spawn_by = def.num }) From a08b471415b482fcb5c80a9878b0160170cadaa0 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 18 Sep 2022 11:10:20 +0100 Subject: [PATCH 13/50] tweak mint and pineapple spawning --- crops/mint.lua | 4 ++-- crops/pineapple.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crops/mint.lua b/crops/mint.lua index 58f0263..53546ba 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -102,9 +102,9 @@ minetest.register_decoration({ octaves = 3, persist = 0.6 }, - y_min = 1, + y_min = 0, y_max = 75, decoration = "farming:mint_4", - spawn_by = "group:water", + spawn_by = {"group:water", "group:sand"}, num_spawn_by = 1 }) diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 33ccf37..e8a09b9 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -147,7 +147,7 @@ local mg = farming.mapgen == "v6" def = { grow_on = mg and {"default:dirt_with_grass"} or {"default:dirt_with_dry_grass", "default:dry_dirt_with_dry_grass"}, - grow_near = mg and "default:desert_sand" or nil, + grow_near = mg and "group:sand" or nil, num = mg and 1 or -1 } @@ -163,7 +163,7 @@ minetest.register_decoration({ octaves = 3, persist = 0.6 }, - y_min = 18, + y_min = 11, y_max = 30, decoration = {"farming:pineapple_8"}, spawn_by = def.grow_near, From 8fb7d6c28e37c78e1686e2136587aa974d6e2899 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 26 Sep 2022 17:34:15 +0100 Subject: [PATCH 14/50] fix translations to toolrank hoe's --- hoes.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/hoes.lua b/hoes.lua index fa272d0..f508b56 100644 --- a/hoes.lua +++ b/hoes.lua @@ -191,28 +191,28 @@ farming.register_hoe(":farming:hoe_diamond", { if tr then minetest.override_item("farming:hoe_wood", { - original_description = "Wood Hoe", - description = toolranks.create_description("Wood Hoe")}) + original_description = S("Wood Hoe"), + description = toolranks.create_description(S("Wood Hoe"))}) minetest.override_item("farming:hoe_stone", { - original_description = "Stone Hoe", - description = toolranks.create_description("Stone Hoe")}) + original_description = S("Stone Hoe"), + description = toolranks.create_description(S("Stone Hoe"))}) minetest.override_item("farming:hoe_steel", { - original_description = "Steel Hoe", - description = toolranks.create_description("Steel Hoe")}) + original_description = S("Steel Hoe"), + description = toolranks.create_description(S("Steel Hoe"))}) minetest.override_item("farming:hoe_bronze", { - original_description = "Bronze Hoe", - description = toolranks.create_description("Bronze Hoe")}) + original_description = S("Bronze Hoe"), + description = toolranks.create_description(S("Bronze Hoe"))}) minetest.override_item("farming:hoe_mese", { - original_description = "Mese Hoe", - description = toolranks.create_description("Mese Hoe")}) + original_description = S("Mese Hoe"), + description = toolranks.create_description(S("Mese Hoe"))}) minetest.override_item("farming:hoe_diamond", { - original_description = "Diamond Hoe", - description = toolranks.create_description("Diamond Hoe")}) + original_description = S("Diamond Hoe"), + description = toolranks.create_description(S("Diamond Hoe"))}) end From 3992a40123e1fd0803c96dd235bdf477b619aa5d Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 7 Oct 2022 10:36:54 +0100 Subject: [PATCH 15/50] localize math.random for cocoa generation --- crops/cocoa.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crops/cocoa.lua b/crops/cocoa.lua index 8c3e64e..47045d4 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -207,6 +207,9 @@ farming.registered_plants["farming:cocoa_beans"] = { steps = 4 } +-- localize math.random for speed +local random = math.random + -- add random cocoa pods to jungle tree's minetest.register_on_generated(function(minp, maxp) @@ -224,7 +227,7 @@ minetest.register_on_generated(function(minp, maxp) if minetest.find_node_near(pos, 1, {"default:jungleleaves", "moretrees:jungletree_leaves_green"}) then - dir = math.random(1, 80) + dir = random(80) if dir == 1 then pos.x = pos.x + 1 elseif dir == 2 then pos.x = pos.x - 1 @@ -239,7 +242,7 @@ minetest.register_on_generated(function(minp, maxp) --print ("Cocoa Pod added at " .. minetest.pos_to_string(pos)) minetest.swap_node(pos, { - name = "farming:cocoa_" .. tostring(math.random(4)) + name = "farming:cocoa_" .. tostring(random(4)) }) end end From 5daf8b8bc469b90d9a7a79526553ac07f7b03cfd Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 13 Oct 2022 08:27:18 +0100 Subject: [PATCH 16/50] change melon textures, complaints they looked too similar to minecraft --- textures/farming_melon_1.png | Bin 138 -> 139 bytes textures/farming_melon_2.png | Bin 161 -> 161 bytes textures/farming_melon_3.png | Bin 177 -> 170 bytes textures/farming_melon_4.png | Bin 181 -> 182 bytes textures/farming_melon_5.png | Bin 196 -> 187 bytes textures/farming_melon_6.png | Bin 219 -> 218 bytes textures/farming_melon_7.png | Bin 247 -> 244 bytes textures/farming_melon_slice.png | Bin 227 -> 198 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/farming_melon_1.png b/textures/farming_melon_1.png index 3c6ea6d8d6e4f801d2479de7d62ed05d755775ae..f18f63308d9ac70cebcf85c659f3657767e2a9b2 100644 GIT binary patch delta 84 zcmeBT>}H&x!l4-86XMFiz%Wr$&aqUGEdj`6ED7=pW^j0RBMr!r@N{tu;kcfhut0wX lL-K~h5;3d+Y|&t$}J7JYD@<);T3K0RVNI6|4XN delta 83 zcmeBX>|>!YUWw6XH5iN6vZu3&qn63=E7VL4Lsu4$p3+0Xb5hE{-7_*OL<#=x4MT k-jG?q<5#NDe3iiiD8<95`!?n2cc3Z;Pgg&ebxsLQ04mBE`2YX_ diff --git a/textures/farming_melon_2.png b/textures/farming_melon_2.png index 185ed8263087abd2af6704be4a67c4835ad1d438..d5d94133208e7a8f7bf93555ff9e38879c2c64b2 100644 GIT binary patch delta 100 zcmZ3;xR7yzga`*S0|SGGE`KnPG7j(wadlu|n5b#sIwd%^2q?r@666=m;PC858jvI7 z>Eak7aXC3bBB?>#xutsogS7lEF2)koKL%_Jf(IDl|4o0)2UN%4>FVdQ&MBb@0HNv{ AZ2$lO delta 100 zcmZ3;xR7yzgdhtu0|Ud`yN`l^ltF+`i0ech0}rd63^71HV@Z%-FoVOh8)-m}yr+v} z2*>s0gaxV=9LWWTBsl}z)-X*un9rK}L6m`$!8L-Z;#0C!2~a76r>mdKI;Vst0E0su A;{X5v diff --git a/textures/farming_melon_3.png b/textures/farming_melon_3.png index 6e661f9246721c226d8589099e56d187ba32e4ef..07730e97af4db436a6101316020f02525ecea527 100644 GIT binary patch delta 94 zcmdnUxQcOt3Wr&MPlzi61H(j3V{g87U%vvGj3q&S!3+-1ZlnP@N}eu`ArhC96C^?! v_?=s3PhhaN-^JxvqRR9_YsUrFibNg;B?pGOid&hoK-CPMu6{1-oD!MmdKI;Vst E0B~*~OaK4? diff --git a/textures/farming_melon_4.png b/textures/farming_melon_4.png index d9199f3c822400e9a2d64e085a6ff49d562a6d83..9ff1e2f663d474ad91fedc112cf5bd2150a7f37a 100644 GIT binary patch delta 121 zcmdnWxQ%gwga`*S0|SGGE`KnPG7j(wadlu|n5bzGHC1DaBT$I3B*-tA!Qt7BG$6;& z)5S4F;&O6=g7}8T+#eQk7Zfh)E)W)Ykodqk_`t#bb*=r4yrB*ZcSC#_d8R)UVPJ@{ WXSjPy?OiTVGlQqApUXO@geCy^AtkW@ delta 120 zcmdnSxRr5&gdhtu0|Ud`yN`l^ltF+`i0echgBa^WFY|$X#*!evUXt;1^PXL?yT*eTuYl;kq9(+%7NH=kioWpm5hoPpI WO=kau&zFGO89ZJ6T-G@yGywn^7bvR$ diff --git a/textures/farming_melon_5.png b/textures/farming_melon_5.png index 755cbd34062e5a62910963f304f544dddd80554e..c44afcdd4dda67bc103157cd838fbda0df635ba5 100644 GIT binary patch delta 111 zcmX@YxSMf;3Wr&MPlzi61H(j3;~4&{GRJ^S#*!evU=* OGkCiCxvXq^7IFiJ@rS6=e}HWKb-e&$ICSpjX~2_8%TM_ uEI!D}=6vQDqm(5JFXIgPwuyW;i=`E8nH~OQNiYIUXYh3Ob6Mw<&;$TmY&OdP delta 143 zcmV;A0C4}>0owtPBn2~2OjJdYEHi)nttI{d0004WQchC?Up|Iap|Kr2*rkE5~I%kul`9poLfzY4)%N(f*Fpi^5F!?6QF zwLaH}WE}>rEj`K60i!3vXJi^Z5~qP-xXT|Sf^6TQ6uX6r#CK$XF>D&V-g+*TMi%4+ X8n6X-J|c3@00000NkvXXu0mjf)~`a= delta 172 zcmV;d08{_;0rvrrBn2~2OjJdYEHi(K%F|8&0004WQchCey-7?tfas21OcF{YaktoMrj{;tIxk0sS{}`_2TNBMc5408Hu;qNg7~ zP{ejOQ)(u1tF`{SBca_erovPfDD_O>HSVFD2`AZ2n4nchw^S2PrPYG-UIEgc4f%Z|xQvoGy zMlmrW2|Vf=&PR?ioZ%=eEMzvcTE@`oAf?^VB@=s4-^n{BCQPKEHEeAb`|H;)UT84P gj*N@zD_~}3$gUAvTB(p`1~i|+)78&qol`;+04Vo9ng9R* delta 211 zcmV;^04)E;0pkIX7=H)@0000eEe}%w001*kOjJcU002z{0&@@$#~mlhA05OcA-^Xl z+#W2yd>?%$n?{=|K-T|@6?a1s>%QW00DGTPE!Ct=GbNc003S| zL_t&-(~XYV4!|G?1o2oZc+~&@+G^8SN&3)v+kp)beIUhVEll;W^Ol*7=)ocGjUE65 zBa++9tT2zA_=*f95Af=oBP4h{*JYR-2Dz4H`lJ=1Wo~r)PE~~daRJU31E69?ZE*kq N002ovPDHLkV1g&mSMdM< From 68580d270a2d29c6dfbd002ad6d205f4cd422bd6 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 18 Oct 2022 07:53:27 +0100 Subject: [PATCH 17/50] fix rhubarb_drops (thx Adam0207) and jaffa cake recipe (thx SFence) --- crops/rhubarb.lua | 7 ++++++- food.lua | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index 9ae2fa1..b8734de 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -57,6 +57,11 @@ minetest.register_node("farming:rhubarb_2", table.copy(def)) -- stage3 def.tiles = {"farming_rhubarb_3.png"} +def.drop = { + items = { + {items = {"farming:rhubarb"}, rarity = 1}, + } +} minetest.register_node("farming:rhubarb_3", table.copy(def)) -- stage 4 (final) @@ -65,7 +70,7 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {"farming:rhubarb 2"}, rarity = 1}, + {items = {"farming:rhubarb 2"}, rarity = 1}, {items = {"farming:rhubarb"}, rarity = 2}, {items = {"farming:rhubarb"}, rarity = 3} } diff --git a/food.lua b/food.lua index b87fdc5..92c2cf5 100644 --- a/food.lua +++ b/food.lua @@ -340,7 +340,7 @@ minetest.register_craft({ {"farming:baking_tray", "farming:baking_tray"}, {"mobs:bucket_milk", "bucket:bucket_empty"}, {"mobs:wooden_bucket_milk", "wooden_bucket:bucket_wood_empty"}, - {"farming:soy_milk", "vessels:drining_glass"} + {"farming:soy_milk", "vessels:drinking_glass"} } }) From 444e923acdb058cf341e3aef00f2b0b979917fea Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 28 Oct 2022 12:23:18 +0100 Subject: [PATCH 18/50] add ginger (thanks Atlante for textures) --- crops/ginger.lua | 86 ++++++++++++++++++++++++++++++++++ farming.conf_example | 1 + init.lua | 4 +- license.txt | 1 + textures/farming_ginger.png | Bin 0 -> 193 bytes textures/farming_ginger_1.png | Bin 0 -> 120 bytes textures/farming_ginger_2.png | Bin 0 -> 156 bytes textures/farming_ginger_3.png | Bin 0 -> 177 bytes textures/farming_ginger_4.png | Bin 0 -> 217 bytes 9 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 crops/ginger.lua create mode 100644 textures/farming_ginger.png create mode 100644 textures/farming_ginger_1.png create mode 100644 textures/farming_ginger_2.png create mode 100644 textures/farming_ginger_3.png create mode 100644 textures/farming_ginger_4.png diff --git a/crops/ginger.lua b/crops/ginger.lua new file mode 100644 index 0000000..4a68a96 --- /dev/null +++ b/crops/ginger.lua @@ -0,0 +1,86 @@ + +local S = farming.intllib + +-- ginger +minetest.register_craftitem("farming:ginger", { + description = S("Ginger"), + inventory_image = "farming_ginger.png", + groups = {seed = 2, food_ginger = 1, flammable = 2}, + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:ginger_1") + end, + on_use = minetest.item_eat(1) +}) + +-- ginger definition +local def = { + drawtype = "plantlike", + tiles = {"farming_ginger_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:ginger_1", table.copy(def)) + +-- stage 2 +def.tiles = {"farming_ginger_2.png"} +minetest.register_node("farming:ginger_2", table.copy(def)) + +-- stage 3 +def.tiles = {"farming_ginger_3.png"} +def.drop = { + items = { + {items = {"farming:ginger"}, rarity = 1}, + {items = {"farming:ginger"}, rarity = 3} + } +} +minetest.register_node("farming:ginger_3", table.copy(def)) + +-- stage 4 (final) +def.tiles = {"farming_ginger_4.png"} +def.drop = { + items = { + {items = {"farming:ginger 2"}, rarity = 1}, + {items = {"farming:ginger 2"}, rarity = 2} + } +} +minetest.register_node("farming:ginger_4", table.copy(def)) + +-- add to registered_plants +farming.registered_plants["farming:ginger"] = { + crop = "farming:ginger", + seed = "farming:ginger", + minlight = 5, + maxlight = default.LIGHT_MAX, + steps = 4 +} + +-- mapgen +minetest.register_decoration({ + name = "farming:ginger_4", + deco_type = "simple", + place_on = {"default:dirt_with_rainforest_litter"}, + sidelen = 16, + noise_params = { + offset = 0, + scale = farming.ginger, + spread = {x = 100, y = 100, z = 100}, + seed = 999, + octaves = 3, + persist = 0.6 + }, + y_max = 80, + y_min = 1, + decoration = "farming:ginger_3", + param2 = 3 +}) diff --git a/farming.conf_example b/farming.conf_example index 42677af..9840d7a 100644 --- a/farming.conf_example +++ b/farming.conf_example @@ -41,6 +41,7 @@ farming.vanilla = 0.001 farming.artichoke = 0.001 farming.parsley = 0.002 farming.sunflower = 0.001 +farming.ginger = 0.002 farming.strawberry = not minetest.get_modpath("ethereal") and 0.002 farming.grains = true -- true or false only farming.rice = true diff --git a/init.lua b/init.lua index d5e6f20..3e16f84 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20220915", + version = "20221028", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -670,6 +670,7 @@ farming.lettuce = 0.001 farming.artichoke = 0.001 farming.parsley = 0.002 farming.sunflower = 0.001 +farming.ginger = 0.002 farming.strawberry = not minetest.get_modpath("ethereal") and 0.002 farming.grains = true farming.rice = true @@ -749,6 +750,7 @@ ddoo("strawberry.lua", farming.strawberry) ddoo("asparagus.lua", farming.asparagus) ddoo("eggplant.lua", farming.eggplant) ddoo("spinach.lua", farming.eggplant) +ddoo("ginger.lua", farming.ginger) dofile(farming.path .. "/food.lua") dofile(farming.path .. "/compatibility.lua") -- Farming Plus compatibility diff --git a/license.txt b/license.txt index 5e4fa30..fc7ae48 100644 --- a/license.txt +++ b/license.txt @@ -204,3 +204,4 @@ Everyone is permitted to copy and distribute verbatim copies farming_onigiri.png farming_rice.png farming_chili_powder.png + farming_ginger* diff --git a/textures/farming_ginger.png b/textures/farming_ginger.png new file mode 100644 index 0000000000000000000000000000000000000000..22a48b5c85ea564ece59d268f3b315c9927ff520 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eJLvSR26;8>K#y`e(o zaKFpB75SD4b9Mj~FqQ=Q1v5B2yO9RuM0vV6hHzX@PH~-R;OXk;vd$@?2>|wpIJf`+ literal 0 HcmV?d00001 diff --git a/textures/farming_ginger_1.png b/textures/farming_ginger_1.png new file mode 100644 index 0000000000000000000000000000000000000000..84d0d457ec190499fa1561aa85e2a9f450a16e17 GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0UEo!AiN*L9xU5Nb!G8 zAfK@$$S;_|;n|HeAV{h|9aI1S literal 0 HcmV?d00001 diff --git a/textures/farming_ginger_2.png b/textures/farming_ginger_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c472d20c99713ea3519c92d5c70ea6bf9d40bbc6 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b1=7+X+VTlj%B2p99mac( z7$gFP7)yfuf*Bm1-ADs+tUX;ELpZJ{CoGUNNK0V5%yx#$jZ2}edEzFp+$B6#NTDD0XetH7fsob1ZR#<1`r%l!qGpN|8LVeoYIb6Mw<&;$Tgjw)vW literal 0 HcmV?d00001 diff --git a/textures/farming_ginger_3.png b/textures/farming_ginger_3.png new file mode 100644 index 0000000000000000000000000000000000000000..96f75d75f371bc21e93787156e7e79efb2f8b77e GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ%`eK84$+oRu$mOCs9frx z*kQad+o-XGvk|C(u_VYZn8D%MjWi&~%hSa%gyVX0f`ZTn0}BTUAH4*jj=2YF#MRmr zSSK_wuuWyy;K9+X<mdKI;Vst0Djdl?*IS* literal 0 HcmV?d00001 diff --git a/textures/farming_ginger_4.png b/textures/farming_ginger_4.png new file mode 100644 index 0000000000000000000000000000000000000000..32f6de5b7eabb801056bc7c147bb9287bf019a60 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=4kr922Cpr9-sk6Rai$ zD=L>dD0Ubx%r@H9<2hx*mNcLW#*!evUxU;yQDM(;oaN-i;dC|qH4YZWO)78&q Iol`;+0BsyX00000 literal 0 HcmV?d00001 From c43020e65e34aa97b9f4f9ccc1b24502fcd34e40 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 28 Oct 2022 12:28:50 +0100 Subject: [PATCH 19/50] fix ginger final select --- crops/ginger.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/crops/ginger.lua b/crops/ginger.lua index 4a68a96..1ef3aa1 100644 --- a/crops/ginger.lua +++ b/crops/ginger.lua @@ -48,6 +48,7 @@ minetest.register_node("farming:ginger_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_ginger_4.png"} +def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:ginger 2"}, rarity = 1}, From f20abc034f28d12ece11b0da7544c16ddc3d6c2b Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 28 Oct 2022 12:29:52 +0100 Subject: [PATCH 20/50] remove ginger growing --- crops/ginger.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/crops/ginger.lua b/crops/ginger.lua index 1ef3aa1..4098987 100644 --- a/crops/ginger.lua +++ b/crops/ginger.lua @@ -48,6 +48,7 @@ minetest.register_node("farming:ginger_3", table.copy(def)) -- stage 4 (final) def.tiles = {"farming_ginger_4.png"} +def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { From 50f6389c6bac8d31cbad74d1104228c939b78cd5 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 30 Oct 2022 08:37:23 +0000 Subject: [PATCH 21/50] remove some borrowed textures for new ones --- license.txt | 3 --- textures/farming_chili_powder.png | Bin 205 -> 190 bytes textures/farming_onigiri.png | Bin 166 -> 171 bytes textures/farming_rice.png | Bin 207 -> 190 bytes 4 files changed, 3 deletions(-) diff --git a/license.txt b/license.txt index fc7ae48..9cc6ab1 100644 --- a/license.txt +++ b/license.txt @@ -201,7 +201,4 @@ Everyone is permitted to copy and distribute verbatim copies farming_asparagus* farming_eggplant* farming_spinach* - farming_onigiri.png - farming_rice.png - farming_chili_powder.png farming_ginger* diff --git a/textures/farming_chili_powder.png b/textures/farming_chili_powder.png index 6451a5d6044f974926e09f5d6de7340d4e585d3e..5c3e31e12ea508a2134d9ef58f90185d7733b0cc 100644 GIT binary patch delta 162 zcmX@hxQ}syO1(sYPl#(`0Yf4KLk9!HECvQ^YwL7ht(FYuc@0r_7Vv5@FfcHd1o;Is zI6S+N2IPczx;Tb#Tu)9=;F=;nb7^BnnX+^0!w?1K$iT>mi##VdjD?K6m^*hYTe`Hh zP1RsSOG{hZwCSus#_s9U7aPbN@^0wa!ob!RupnuJ9-H)nM;91cTp70975jf;;dLvZ O1q`09elF{r5}E)c9y&?@ delta 177 zcmV;i08anD0nGuBB!47OOjJbx003100ATGz7$O1p=^~i?NA|3y9%tq@-j5Vi+q5 o3MoSwf?$R-kf8$B4r8DL0BRZxM_&H3v;Y7A07*qoM6N<$f^zII&Hw-a delta 129 zcmV-{0Dk|g0j2?vEP5?7EjvOx!>x+Zz?t3GxCKN}y#N3J0d!JMQvg8b*k%9#076Mb zK~xCWV_?7wTwI`ZsEY%LW^oM-1q-o+KpCz;5CW2OF*b2=F#s~0m6TMRK@4L>K_z1- jL&zAUm>I}0z-u7@1XBuE^aJI;00000NkvXXu0mjfzhEr6 diff --git a/textures/farming_rice.png b/textures/farming_rice.png index a5c6d244a2b3d252f615cea0beafa7d00752e214..9b42a346df15bb4038930eaa557ebbc6358a7c73 100644 GIT binary patch delta 162 zcmV;T0A2sj0loo{B!3uCOjJc-Z~!|yJ7-NQglI#afLi6+$nWFH`St0*$!F~V0004W zQchCn+a delta 179 zcmV;k08IbB0nY)DB!4GROjJbx002uk8(BgiWlJS^TQ!7eL!5b8v5;}r$gAbr$nWFH z^Xl9A_2~z}zgGYN00DGTPE!Ct=GbNc0034=L_t&t*JEHH3b18wF96Z(**nin2eH^Y zSIu0J4rH*D&pFvv3S@-2l%*xR0U4%Y#>Qr8K!&nwSXx>tkSrl&>=GIp3}i4W87m12 hfD95;G!(#Q5dbeZ5`h&_Nw@$2002ovPDHLkV1nVyM5O=# From 9744afeb9bce34c21ebd0528c4b85ede8f1fc5ca Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 6 Nov 2022 08:04:52 +0000 Subject: [PATCH 22/50] add Esperanto translation (thx Jolesh) --- locale/farming.eo.tr | 194 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 locale/farming.eo.tr diff --git a/locale/farming.eo.tr b/locale/farming.eo.tr new file mode 100644 index 0000000..0098ae6 --- /dev/null +++ b/locale/farming.eo.tr @@ -0,0 +1,194 @@ +# Translation of the farming mod by TenPlus1 +# textdomain: farming +# author: Jolesh +# last update: 2022/11/04 + +###### folder . ###### + +### init.lua ### +Seed=Semo + +### compatibility.lua ### +Banana=Banano +Banana Leaves=Bananaj Folioj +Orange=Oranĝo +Strawberry=Frago + +### food.lua ### +Sugar=Sukero +Salt=Salo +Rose Water=Roza Akvo +Turkish Delight=Turka Delico +Garlic Bread=Ajla Pano +Donut=Benjeto +Chocolate Donut=Ĉokolada Benjeto +Apple Donut=Poma Benjeto +Porridge=Kaĉo +Jaffa Cake=Jafa Kuko + +### hoes.lua ### +Hoe=Sarkilo +Wooden Hoe=Ligna Sarkilo +Stone Hoe=Ŝtona Sarkilo +Steel Hoe=Ŝtala Sarkilo +Bronze Hoe=Bronza Sarkilo +Mese Hoe=Mesea Sarkilo +Diamond Hoe=Diamanta Sarkilo +# Surcharge du mod [Toolranks] à faire # +Hoe Bomb (use or throw on grassy areas to hoe land)= +Mithril Scythe (Right-click to harvest and replant crops)= +# Surcharge du mod [Toolranks] à faire # + +### soil.lua ### +Soil=Tero +Wet Soil=Malseka Tero + +### utensils.lua ### +Wooden Bowl=Ligna Bovlo +Saucepan=Kaserolo +Cooking Pot=Kuirpoto +Baking Tray=Baka Pleto +Skillet=Pato +Mortar and Pestle=Pistujo +Cutting Board=Tranĉa Tabulo +Juicer=Spremilo +Glass Mixing Bowl=Vitra Miksa Bovlo + + +###### folder ./crops ###### + +### barley.lua ### +Barley Seed=Hordea Semo +Barley=Hordeo + +### beans.lua ### +Green Beans=Verdaj Fazeoloj +Bean Pole (place on soil before planting beans)=Fazeola Poluso (metu sur grundo antaŭ planti fabojn) + +### beetroot.lua ### +Beetroot=Betoto +Beetroot Soup=Betota Supo + +### blueberry.lua ### +Blueberries=Mirtiloj +Blueberry Muffin=Mirtila Mufino +Blueberry Pie=Mirtila Torto + +### carrot.lua ## +Carrot=Karoto +Carrot Juice=Karota Suko +Golden Carrot=Ora Karoto + +### chili.lua ### +Chili Pepper=Kapsiketo +Bowl of Chili=Bovlo da Kapsiketo + +### cocoa.lua ### +Cocoa Beans=Kakaa Faboj +Cookie=Kuketo +Bar of Dark Chocolate=Stango de Malhela Ĉokolado +Chocolate Block=Bloko de Ĉokolado + +### coffee.lua ### +Coffee Beans=Kafaj Seboj +Cup of Coffee=Taso da Kafo + +### corn.lua ### +Corn=Maizo +Corn on the Cob=Maiza sur la Spadiko +Cornstarch=Maizamelo +Bottle of Ethanol=Botelo da Etanolo + +### cotton.lua ### +Cotton Seed=Kotona Semo +Cotton=Kotono +String=Ŝnuro + +### cucumber.lua ### +Cucumber=Kukumo + +### garlic.lua ### +Garlic clove=Ajlokloko +Garlic=Ajlo +Garlic Braid=Ajla Plektaĵo + +### grapes.lua ### +Grapes=Vinberoj +Trellis (place on soil before planting grapes)=Trellis (meti sur grundo antaŭ planti vinberojn) + +### hemp.lua ### +Hemp Seed=Kanaba Semo +Hemp Leaf=Kanaba Folio +Bottle of Hemp Oil=Botelo da Kanaba Oleo +Hemp Fibre=Kanaba Fibro +Hemp Block=Kanaba Bloko +Hemp Rope=Kanaba Ŝnuro + +### melon.lua ### +Melon Slice=Tranĉaĵo de Melono +Melon=Melono + +### onion.lua ### +Onion=Cepo + +### peas.lua ### +Pea Pod=Pizujo +Peas=Pizoj +Pea Soup=Piza Supo + +### pepper.lua ### +Peppercorn=Piprograjno +Pepper=Pipro +Ground Pepper=Muelita Pipro + +### pinapple.lua ### +Pineapple Top=Pinto de Ananaso +Pineapple=Ananaso +Pineapple Ring=Ananasa Ringo +Pineapple Juice=Ananasa Suko + +### potato.lua ### +Potato=Terpomo +Baked Potato=Bakita Terpomo +Cucumber and Potato Salad=Salato de Kukumo kaj Terpomo + +### pumpkin.lua ### +Pumpkin Slice=Tranĉaĵo de Kukurbo +Jack 'O Lantern (punch to turn on and off)=Kukurba Lanterno (punu por ŝalti kaj malŝalti) +Scarecrow Bottom=Birdotimigilo Fundo +Pumpkin Bread=Kukurba Pano +Pumpkin Dough=Kukurba Pasto +Pumpkin=Kukurbo + +### raspberry.lua ### +Raspberries=Framboj +Raspberry Smoothie=Fraba Glataĵo + +### rhubarb.lua ### +Rhubarb=Rabarbo +Rhubarb Pie=Rabarba Torto + +### ryeoatrice.lua ### +Rye=Sekalo +Rye seed=Sekala Semo +Oat=Aveno +Oat seed=Avena Semo +Rice=Rizo +Rice grains=Rizaj grajnoj +Rice Bread=Riza Pano +Rice Flour=Riza Faruno +Multigrain Flour=Multgrajna Faruno +Multigrain Bread=Multgrajna Pano + +### tomato.lua ### +Tomato=Tomato + +### wheat.lua ### +Wheat Seed=Tritika Semo +Wheat=Tritiko +Straw=Pajlo +Flour=Faruno +Bread=Pano +Sliced Bread=Tranĉita Pano +Toast=Toasto +Toast Sandwich=Toasta Sandviĉo From 924bcd88683f1aab6e20adaede5b96474b7546ca Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 7 Nov 2022 18:56:24 +0000 Subject: [PATCH 23/50] fix onigiri typo (thx fluxionary) --- README.md | 2 +- food.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 44fb630..9250f01 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ This farming mod provides a large selection of craftable food and items: | farming:paella | Paella | | farming:flan | Vanilla Flan | | farming:cheese_vegan | Vegan Cheese | -| farming:onigiri | Onirigi | +| farming:onigiri | Onigiri | | farming:gyoza | Gyoza | | farming:mochi | Mochi | | farming:beetroot_soup | Beetroot Soup | diff --git a/food.lua b/food.lua index 92c2cf5..70b1392 100644 --- a/food.lua +++ b/food.lua @@ -645,7 +645,7 @@ minetest.register_craft({ -- Onigiri minetest.register_craftitem("farming:onigiri", { - description = S("Onirigi"), + description = S("Onigiri"), inventory_image = "farming_onigiri.png", on_use = minetest.item_eat(2), groups = {flammable = 2} From 46e0ef5a173567ec49b9ded11bc58a259ceaa3e7 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 12 Nov 2022 10:20:54 +0000 Subject: [PATCH 24/50] add sugar cube --- README.md | 3 ++- food.lua | 17 +++++++++++++++++ textures/farming_sugar_cube.png | Bin 0 -> 342 bytes 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 textures/farming_sugar_cube.png diff --git a/README.md b/README.md index 9250f01..56c20d2 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,7 @@ This farming mod provides a large selection of craftable food and items: | farming:rose_water | Rose Water | | farming:glass_water | Glass of Water | | farming:sugar | Sugar | +| farming:sugar_cube | Sugar Cube | | farming:caramel | Caramel | | farming:turkish_delight | Turkish Delight | | farming:garlic_bread | Garlic Bread | @@ -217,7 +218,7 @@ on an older map are enabled and growing properly. ### Changelog: -- 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures) +- 1.47 - Now blueberries can make blue dye, tweak soil types to work better with older 0.4.x clients and add spanish translation (thx mckaygerhard), add trellis setting to registered_crops and fix pea and soy crop names (thx nixnoxus), add strawberries if ethereal mod not active, added asparagus; spinach; eggplant (thx Atlante for new textures), Sugar Cube - 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 diff --git a/food.lua b/food.lua index 70b1392..d847a58 100644 --- a/food.lua +++ b/food.lua @@ -68,6 +68,23 @@ minetest.register_craft({ recipe = "default:papyrus" }) +minetest.register_node("farming:sugar_cube", { + description = S("Sugar Cube"), + tiles = {"farming_sugar_cube.png"}, + groups = {crumbly = 2}, + floodable = true, + sounds = default.node_sound_gravel_defaults() +}) + +minetest.register_craft({ + output = "farming:sugar_cube", + recipe = { + {"farming:sugar", "farming:sugar", "farming:sugar"}, + {"farming:sugar", "farming:sugar", "farming:sugar"}, + {"farming:sugar", "farming:sugar", "farming:sugar"} + } +}) + --= Sugar caramel minetest.register_craftitem("farming:caramel", { diff --git a/textures/farming_sugar_cube.png b/textures/farming_sugar_cube.png new file mode 100644 index 0000000000000000000000000000000000000000..326652bea6c8bf08d2849f2b94e2bda2850aba4b GIT binary patch literal 342 zcmV-c0jd6pP)lt)=I7_<=;-L_>FMg~ z>g((4?d|RE?(XmJ@9^;O@$vEU^78ZZ^Y!)h_xJa$KH1d(006p4L_t&-(-n_Fb^{>{ zL)|vb4A@vUHZUZ;|2aF^X`!e8Mc-i!1LEAw-`PmVQ+*l_c3}k3y1M=)GZJiFPqND` zAeL@x!j<~e(#*hjIMtnOjVy`rh9P8uR`{x)PDOL;g}%hy`0xTq%a;)x(YxsJkZVOd zsrJj_-dxXHEWA(-ONq`Xh_Npxu5KV(D?zoruRb^rhX07*qoM6N<$f*1q3LI3~& literal 0 HcmV?d00001 From 1bca2f00107e67c8adfc0c589cd49b6b80fb8f1c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 12 Nov 2022 10:24:17 +0000 Subject: [PATCH 25/50] add missing recipe --- food.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/food.lua b/food.lua index d847a58..f182bb1 100644 --- a/food.lua +++ b/food.lua @@ -85,6 +85,11 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "farming:sugar 9", + recipe = {{"farming:sugar_cube"}} +}) + --= Sugar caramel minetest.register_craftitem("farming:caramel", { From fd8970530748cd6626db64b57d7f5d6dc726cbfa Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 12 Nov 2022 11:01:57 +0000 Subject: [PATCH 26/50] new sugar cube texture --- textures/farming_sugar_cube.png | Bin 342 -> 315 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/farming_sugar_cube.png b/textures/farming_sugar_cube.png index 326652bea6c8bf08d2849f2b94e2bda2850aba4b..7c9b83527d68c34355bf46c180497d8925efdb49 100644 GIT binary patch delta 225 zcmV<703QF=0=oi`BnwVZOjJeF)6>@0){!+rfA#hC_xJbEW=#74005{-L_t&-(?yQU za>FnT15vk#qX!{Uvf}vvf3&K5$Y6%J>~H}F3kNe3#WxG;5I+fk@_O}@tXq=f0kJ78 ztFJn2`y*SamH&wGbs`$Pr70~HzH bAWjIs_)-eMp!F(#00000NkvXXu0mjf?qzHv delta 252 zcmVWK)Y8nrcR1CZY>h05@rEH}fmZmcpH4+{>xI6=-T3eV zNXwTI9MNFA=<$$iMLVhX%i`W#&s!|KP!3Cp&M1hnFDI^Z`C&6^9lmc>C|1#q^9P!~ z3c(~S+YLeAvMXtSv1o-qGD59U=)5n<_-)7B+sZ#=L=V5F68Clh0000 Date: Mon, 14 Nov 2022 18:06:56 +0000 Subject: [PATCH 27/50] change barley textures, increase steps to 8 --- crops/barley.lua | 24 ++++++++++++++---------- textures/farming_barley.png | Bin 230 -> 263 bytes textures/farming_barley_1.png | Bin 140 -> 114 bytes textures/farming_barley_2.png | Bin 151 -> 146 bytes textures/farming_barley_3.png | Bin 209 -> 176 bytes textures/farming_barley_4.png | Bin 229 -> 196 bytes textures/farming_barley_5.png | Bin 246 -> 225 bytes textures/farming_barley_6.png | Bin 271 -> 236 bytes textures/farming_barley_7.png | Bin 277 -> 256 bytes textures/farming_barley_8.png | Bin 0 -> 329 bytes 10 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 textures/farming_barley_8.png diff --git a/crops/barley.lua b/crops/barley.lua index eb9d12a..9c8a9df 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -72,12 +72,6 @@ minetest.register_node("farming:barley_4", table.copy(def)) -- stage 5 def.tiles = {"farming_barley_5.png"} -def.drop = { - items = { - {items = {"farming:barley"}, rarity = 2}, - {items = {"farming:seed_barley"}, rarity = 2} - } -} minetest.register_node("farming:barley_5", table.copy(def)) -- stage 6 @@ -85,13 +79,23 @@ def.tiles = {"farming_barley_6.png"} def.drop = { items = { {items = {"farming:barley"}, rarity = 2}, - {items = {"farming:seed_barley"}, rarity = 1} + {items = {"farming:seed_barley"}, rarity = 2} } } minetest.register_node("farming:barley_6", table.copy(def)) --- stage 7 (final) +-- stage 7 def.tiles = {"farming_barley_7.png"} +def.drop = { + items = { + {items = {"farming:barley"}, rarity = 2}, + {items = {"farming:seed_barley"}, rarity = 1} + } +} +minetest.register_node("farming:barley_7", table.copy(def)) + +-- stage 8 (final) +def.tiles = {"farming_barley_8.png"} def.groups.growing = nil def.selection_box = farming.select_final def.drop = { @@ -102,7 +106,7 @@ def.drop = { {items = {"farming:seed_barley"}, rarity = 3} } } -minetest.register_node("farming:barley_7", table.copy(def)) +minetest.register_node("farming:barley_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:barley"] = { @@ -110,7 +114,7 @@ farming.registered_plants["farming:barley"] = { seed = "farming:seed_barley", minlight = farming.min_light, maxlight = farming.max_light, - steps = 7 + steps = 8 } -- Fuel diff --git a/textures/farming_barley.png b/textures/farming_barley.png index ca929e0e0cfa7852ad952325191cf22bb215e6eb..c681954862b41fcbb2fbb7bd7d2ee0a570a369d2 100644 GIT binary patch delta 235 zcmVKY~B063nNpc=Zcq(LfFI9jfT7WHBfHPW&ENPlG zZJI=YmOiYLIfKMI(6dqD%#NkchFJgr00DGTPE!Ct=GbNc003c0L_t&-(|wIg5`ZuW zL#f4Dh=tz&wAvZ%XQA1>$s-Vbrmkpk+B@GOjsO4v diff --git a/textures/farming_barley_1.png b/textures/farming_barley_1.png index 4a458b166f4da9be9ab663b447decf7697f8f355..177fbdf17ce9a2857bdcc157e080a8f9c8344b7f 100644 GIT binary patch delta 96 zcmeBSESew@#lgnFz##wmecv?mu286AOWcFnGH9xvXo{$A9 zU@Qsp3ubV5b|VeMN%D4gVd!9$^#F1tJY5_^IIbrrNGKfON!M)f6k}_1X=7kxVA;xW UGht2XDxew$Pgg&ebxsLQ01;Oqxc~qF diff --git a/textures/farming_barley_2.png b/textures/farming_barley_2.png index 96610c2f9f4e98fa44990ef6d947acffe15fc04c..d5a5936e23233327dd9c2e738d259a5ee5bff9a6 100644 GIT binary patch delta 117 zcmbQvIEitBN}fc3Pl#(`0Rs?}_KHqetUha%&ho9M>vvgQIOn(Q<-N&33C5BjzhDN3 zXE)M-91Tww#}JO|$q5Uz3m62scyf3cd3<=dIC)(Vnh;F6*2UngHr9B(nej delta 122 zcmbQlIGu5VO0jf+Pl&4_0|P@oGuJd;%UOI3n}w}6aWGuswK&JX@SN3qKkqxBEMrNK zUoeBivm0qZj+Up3V+hCfAd%8G=a9mGLSYTJcAjrj&!^6nq!^6eNBjdoP-OMy0 z!PnqHf=5OIN2+N-f-i?b>WTzig9jWO1*sfq#s&tGrUn}r7_MyPICH#lP8Y~#Pgg&e IbxsLQ02_}oTL1t6 delta 193 zcmdnMc#&~}L_G&H0|SGGE`KnPG7j(wadiMPY#5kA8F;gp8ETmCJ@Pfw1 z?$r&Aa}O?PSU7jDVng@BL{?|ZY6qrjXGe>}I^Q^T8Dm&kU-B%KVPt&B$Qa0z_l8mU dim+M+1H&OF{-unwM0bN+vd$@?2>?x0KX3p5 delta 213 zcmV;`04o2)0p$UZ7=H)@0000eEe}%w001*kOjJcc000I+01Qz8C0_soYy=g02ndZ0 z0G|e5g9$#63jnbOXp{v=r4azd0!Xz3db0pW#tE{>p4b2Y00DGTPE!Ct=GbNc003Y~ zL_t&-)3uCA4!|G`105g`w!r^iTb8z}xHkvOvBn1eJAVe1&Q9Qiq@BEi;HJ}wRDO`a z>ZaMn$Q4G}L+_Dpibr#W%AymLqeUCiS4BCyOc2`!5e>lO%?6po3WRV0p#B1BZ8Fxs P00000NkvXXu0mjf=JHME diff --git a/textures/farming_barley_5.png b/textures/farming_barley_5.png index 68c0d683934b8b164bb092a1bbf61e83d453b49b..cc1d66ba8a323bad1aacac5cf914c01a74c3c2ec 100644 GIT binary patch delta 209 zcmeyy_>ggeL_G^L0|Ud`yN`l^lvaRGh%3WHAd6v2r`?o^Rx`UDXHK(SvB+!ng77s< z1J*Bz-n}k!|K|Mj`>HP-?YL3ZJsqf&u_VYZn8D%MjWi%9)zif>gyVX0f&#aJp-)0W zVnRT|gR}^SCmJ~k4<1GyIB;~qhK5A(>upSOZM@4R!@LSbeIDG}u%PQ9-}P3ed92)N zhC0vnG*)P7tVlfZL~BQa>BA<|!%6F!n6#UjjNA0?HEl9bU}6xPD;+2}(aR9zR8Lnw Jmvv4FO#t@#QG5UZ delta 230 zcmVCNTgnKL9mK07_*8 zQf>-cdkbZU3uui1aF+~tqY-we0D`jsi@^Yu(g1^((whJP00DGTPE!Ct=GbNc0041G zL_t&-)18b#7Q`S3LsKgPqA>SA?V#<-Wm)jTPYCdJ;smoF;9u9y^xXIXx=ve>uuVKw z3tCv8h&aS^`CH;LIbVW(w-|!8!Kz6|$3T$FxS`c(pw~=@wN8*?q>!vu5=w)w6wrdS gq-cd+tuXk;A4yXKuV%~)!2kdN07*qoM6N<$f`I^7W&i*H diff --git a/textures/farming_barley_6.png b/textures/farming_barley_6.png index 496a218526b6327d94126a7183d6588e1f1db3cf..e72dd2e572a437cc138f7d1686353410fa72e7e0 100644 GIT binary patch delta 220 zcmV<203-j80_*{h7=Hu<0002(-QrRJ001XYOjJbx004uIKZ1`ufRH@N9UK7#92*)U7*=vD z2;gjJs9;T2&o;drBe{mJuim*#D;WUKmH zhHaA$xq>X{)OFAHOCB8|;q$me@`LkyYQUigb)AeZlP7|1T6<<*V1re7xuZI8t002ovPDHLk FV1lVLV95Xg diff --git a/textures/farming_barley_7.png b/textures/farming_barley_7.png index 1c636afbea800b2748fade6f1718ddffc5b375f5..a37c51730bd297751195921d35a48c118efc5ba9 100644 GIT binary patch delta 240 zcmV>dP>`rh zma9~ltXQD4Vx_iVptxnFw`j4wY7zCn&;S4c0d!JMQvg8b*k%9#0E9_IK~xCWV_?7l z0t}1{3=IryK&k=66ky?}Q1J3{!am0wMzfVj0{y0~Tl&EYM+?#2FBvsSu#Tkj)hkVgf`APAqCA+Z0N+ qFgUZRY|&KMq5>4rQZX@5F#!Oa(H)iXaM@P6y<+Lx?zV;_A%ZupL= z@H^ZHF>If@^M-8Yj0K}u20h`GnhYPoS&!N!jkOs_0+k7w^H7Ug(41fjHPLMC*00000 LNkvXXu0mjfyBA>5 diff --git a/textures/farming_barley_8.png b/textures/farming_barley_8.png new file mode 100644 index 0000000000000000000000000000000000000000..a2a076538b641de80479bbb631ef851ce00d4760 GIT binary patch literal 329 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}a)3{WtEHhqOp$h4nNC)nenx{q zeydS-k7Y@pc}=fr;Y6GA$yQa9Z6^1cS5CLCnqgnD&~4citENTvT?_1*mN~ASWz(?2 zt6`;Q>l&A)wZ5(Ee7e_rO<3=}f3?S~UGaxEgq+x(bZTe1>4^$npmmHTL4Lsu4$p3+ z0Xb7VT^vIsF6;I%3N;xBFkf#H>Eh@ph;sS!U;C`#mbr6Prpx)4@YTr5OZZi`82w4G z|N5X!`tZBr&kiTrQvXMJ1*iEqK93fWp1X1C4Y%cO7lS1$Q*tlNb$>oJOUZoC&L<~- zCas$p9d#(mS~+uJxIp(03lE;EmvYlZ1VlxaCz Z{;gQR5&P6RI1lJP22WQ%mvv4FO#lb=fsFtF literal 0 HcmV?d00001 From bdec101edc556eb0512fa22f6f3ff492858863aa Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 20 Nov 2022 16:47:23 +0000 Subject: [PATCH 28/50] new melon textures and license (thanks alerikaisattera) --- license.txt | 2 +- textures/farming_melon_bottom.png | Bin 172 -> 309 bytes textures/farming_melon_side.png | Bin 179 -> 303 bytes textures/farming_melon_top.png | Bin 193 -> 309 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/license.txt b/license.txt index 9cc6ab1..036e88d 100644 --- a/license.txt +++ b/license.txt @@ -63,7 +63,7 @@ Created by VanessaE (License: CC BY 3.0): farming_cotton_7.png farming_cotton_8.png -Created by 7eventy7 (https://www.planetminecraft.com/member/7eventy7/) +Created by alerikaisattera (License: CC-BY-SA 4.0) farming_melon_top.png farming_melon_side.png farming_melon_bottom.png diff --git a/textures/farming_melon_bottom.png b/textures/farming_melon_bottom.png index 91d1e6cd443f4cd2590a6f88913b92c56cff8a13..471d6bec575b71a150cb91916a6ae3dc5caef413 100644 GIT binary patch delta 294 zcmV+>0onen0kr~<7=H)@0000eEe}%w002TzOjJcVZy!ExCqi%{LUJlbbtX%AB1(BG zQhq2?fFfOjCR&CcVu&kbjv#4`DQu4;aFQKylqhwWEPk0LdYmYHo*;vsEM9f1t^fc4 zu1Q2eR2b70P+JnjAPB?PinadggLcVPL7|EP#(u4uw*or4YYpV_*;a-GL#6Gpv%BxJgU?WX-b^kVK$!ME zXDAZ$YB>{Kk@W+g>7)CN69T#zY<)QomqSRy#)Pb4Ux0|8fQlpLC*t$TTU0PA~p?EpHPBcuRMu1-+^`7LR00Ix?ux&T_?7L@=M znSbN}>*Jcg0KN-OS^(s&n->5VoU;7@et30j0PVT$S^%}_>lI!zyCUML*LlnU0000< KMNUMnLSTY%?mE=~ diff --git a/textures/farming_melon_side.png b/textures/farming_melon_side.png index 07afb25d3d6fec12ab2e0e806c120ae153372003..7995ea5dc0613fba9ec3a37725d938c807804a6d 100644 GIT binary patch delta 288 zcmV+*0pI?!0j~m(7=H)@0000eEe}%w002TzOjJcNXdp6b88>z%Id>j1dLKS~BT|1M zPk|X$f+SpsC~S`-Z;=~sk|u4JAas{2b(kZ3m?eOlDSMqMe4ZeFp)G`2xJ~9@_@SkvvAwQ2X?hTf&3L_8Z>9d-#XN_#(NWTwG+*fQ5T<3x^hiC2FV&!M6 mekt|%{X&#_pBZP}=87*$5)1-5yJElq00000one+0kr~<7=H)@0000eEe}%w002TzOjJcJT^2cNA~|p$KyWBTb0kQ1AWM2H zPkbd)fFfRlCt8LdX^kmmk0Ec2Ds7M?ag!Z#l_`FiCw-YOd7LPGo*;yuE!>4ZMF0Q* zu1Q2eR2b70kXw#JF$hB`Aq`17Jc{rBw_4^0p##V^6yTAbJbw_$3?mpm+C<#2U`azW z2YXn+8@`B-KA4E*A_itc7bxtLk~Ie?!bFzyJ@>3-i(q1vk+fE@f_Ypz?m%Y!g>?gPI&{|zK{2nZfu?ao;T4aRy`v~6X0 stCVFoE}gb#9UrdY=)`^5KX_IA0C^=07@w|bg#Z8m07*qoM6N<$f>~&CzW@LL delta 177 zcmV;i08an40>J^07=Hu<0002(-QrRJ000kAOjJcIT^TWR98!TCZ<8Z^oh6xxX?_3z z0BuP`K~xCW4UNGO0x=8&H8&IhxfFmM7XY>zz)Jr$k&k8{yCcxV$stq+BZCkREH!2& z?^y;@$>ak&?_Rk!YMWhy1uxCdO2_beyeT`mo>y^$dex~4vMTE22#m-d@7)N+H+-G1 fW~z@vSL)0kP%jqdNi3`M00000NkvXXu0mjfBsN0m From 0d16d4352e5a942fcad35c9e54ae0cf68845971a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 20 Nov 2022 18:03:25 +0000 Subject: [PATCH 29/50] new coffee crop textures by XSSheep --- license.txt | 7 +++++++ textures/farming_coffee_1.png | Bin 135 -> 126 bytes textures/farming_coffee_2.png | Bin 145 -> 164 bytes textures/farming_coffee_3.png | Bin 171 -> 195 bytes textures/farming_coffee_4.png | Bin 192 -> 232 bytes textures/farming_coffee_5.png | Bin 192 -> 250 bytes textures/farming_coffee_beans.png | Bin 204 -> 162 bytes 7 files changed, 7 insertions(+) diff --git a/license.txt b/license.txt index 036e88d..eb4732c 100644 --- a/license.txt +++ b/license.txt @@ -184,6 +184,13 @@ Created by RZR0 (CC-BY-NC-SA) Created by DMBuce (MIT - https://github.com/DMBuce/hatchling-snacks) farming_mac_and_cheese.png +Created by XSSheep (CC BY-SA 4.0 - https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated) + farming.coffee_1.png + farming.coffee_2.png + farming.coffee_3.png + farming.coffee_4.png + farming.coffee_5.png + farming.coffee_beans.png Copyright (C) 2021-2022: Atlante - AFL-1.1 License for code: AFL-1.1 diff --git a/textures/farming_coffee_1.png b/textures/farming_coffee_1.png index 97c207a313610e5e4e8316d762ab75d8e8236aad..48d1b7ff007126eea955b4fdc21a9252eccaad48 100644 GIT binary patch delta 108 zcmZo?teYT_#=*wGz##wmelFzu{fQaAi=sgA%N*{z{&r5JEi`gG-FsI*|In` z<=^7&i76BMTYvmtqww{=0keai@@ZEE=LxaSMHLg)O5W5~=<$|g$XhGBddn>x1)zZp Mp00i_>zopr0Jb(Mo&W#< delta 117 zcmbAhe3 zBBLzwfyx+5g8YIR9G=}s19GH1T^vI=t|uof(AQ`&ydkrIhmTdG`6`141B3WtMo~|3 R{RKc(44$rjF6*2Ung9|iB60u# diff --git a/textures/farming_coffee_2.png b/textures/farming_coffee_2.png index a659f851fd94fe9e9025d2ef700b41bb19714e01..e80d7bef0e1f03e06b334f33eeb9dabd24f5551c 100644 GIT binary patch delta 136 zcmbQpxP)^)C{d1Bo!ArFfm+y&GJRyWc6pDSqz@8elF{r5*V8RC*3Ch delta 116 zcmZ3&IFWIJO0IN(Pl&4m0|RFOk7T8s*<72bLs7{W(i&gXG`y?o`r2od7AnlZz`$4% zlQQx6&pZzKlk7zloR(= TU;g9-RL|h)>gTe~DWM4fq{Jk= diff --git a/textures/farming_coffee_3.png b/textures/farming_coffee_3.png index 93088c80fb80b74a0e45c101060e04121d99bc92..a057d04ce07a9039f7e7b0a6b32095d3c527bb21 100644 GIT binary patch delta 162 zcmV;T0A2s90mA{1DStx>w7f!&q5CL>Rc6vd=To QfB*mh07*qoM6N<$f1I6 z$nf(fTWw?sdVD9j_2iM{>u0Z>H)wikw|nvdq-ozJ4GmDB_oXc<0Px=R9RPnFiUNOo SC=!bR0000&L_#J4dX z+(IO$| z3?#SzzF#HaBf?vRKPm#0;D@w?WEFh5oF=;Jt}Sg z)UiD5RXs01P3O*fLWS?YLmE_Yg@p4ppvoev1Rlqcd b$$^QX+=knGdWilSp!p1*u6{1-oD!M<*_k=3 diff --git a/textures/farming_coffee_beans.png b/textures/farming_coffee_beans.png index 0786f4e7ec4c60b67bc69814b5aa8a806e66b878..88e9438c4449d6522ae18d44abd90080e7184dfa 100644 GIT binary patch delta 146 zcmX@ZxQKCrL_G&H0|SGGE`KnP;t%i%adj{7=?Sx~^fC%HRaunmG0pzyCZH5!NswPK zgTu2MX+Vynr;B4q#jV~`(Oe7)0!|m*ZvUTEEb-EjnKo^K|udS?83{1OU(QHc0>g delta 188 zcmV;t07L(x0n7oA7=Hu<0002(-QrRJ000|MOjJc6001y16E-UoIxZGMG#5!a9ZWqM zQ$HPBMk04S*mFfYDD$gd=X?2(W=} zprUt2AkldC#N0xmho-MTDHvKjuH+AT(5u;{dHTT@(pzj{TQ$yv*r1nI9An8Q)-kDW q8-kG6DIr_-MVjgIap0EEOelVqN(s;az9W4A0000 Date: Sun, 20 Nov 2022 18:38:58 +0000 Subject: [PATCH 30/50] new popcorn texture by smoke_th --- license.txt | 2 +- textures/farming_popcorn.png | Bin 292 -> 345 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/license.txt b/license.txt index eb4732c..770f8a0 100644 --- a/license.txt +++ b/license.txt @@ -175,7 +175,7 @@ Created by sirrobzeroone (CC0) farming_gyoza.png farming_pineapple_ring.png -Created by TechM8 (https://www.deviantart.com/techm8) +Created by smoke_th (CC0 - https://opengameart.org/content/popcorn-icon) farming_popcorn.png Created by RZR0 (CC-BY-NC-SA) diff --git a/textures/farming_popcorn.png b/textures/farming_popcorn.png index 6a534b94436970d84305fb1227608e0988c653fe..846399e38ea68a64b18eb4e629834ab50abb5cbe 100644 GIT binary patch literal 345 zcmV-f0jB-!JtGMsOPwyOXK{00000NkvXXu0mjfcom4t literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^q9Dw|3?!p1cPs@`asfUeu0T4Too5P<&^A7?+lRzo zUvvEMpz!Y9yYJt>|Ns9#?=0r`KoyK7L4Lsu4$p3+fjCLt?k)@+tg;?J&T>x|#}JO| zspky&4lD4m1}qN}Db2p3n9b_UH=$9EVNs8y!CS^lXEbC#_^?})F-~21|MX^^XtooP z3)!NtzFJh~y0%A4dGV6UvtFuYx6Z66+iA<-@mMYJ(YGxZT-Sb=E#zcS7gs)|%En!= zFX&a%?>m=1DeftL->G-f#7*yyi`i^p;d$cx^KQI|G+m#!$K$BR|H~I Date: Mon, 21 Nov 2022 08:56:07 +0000 Subject: [PATCH 31/50] fix translation (thx fluxionary) --- locale/farming.de.tr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/farming.de.tr b/locale/farming.de.tr index 3fb935b..61f315d 100644 --- a/locale/farming.de.tr +++ b/locale/farming.de.tr @@ -38,7 +38,7 @@ Cornstarch=Speisestärke Cotton=Baumwolle Cotton Seed=Baumwollsamen Cucumber=Gurke -Cucumber and Potato Salad=Gurken und Tomatensalat +Cucumber and Potato Salad=Kartoffelsalat mit Gurke Cup of Coffee=Tasse Kaffee Cutting Board=Schneidebrett Diamond Hoe=Diamanthacke From d49630d08773ca03a81d7bade37be6a4347b2ae6 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 26 Nov 2022 19:06:00 +0000 Subject: [PATCH 32/50] new pumpkin & jack o' lantern textures (thanks alerikaisattera) --- crops/pumpkin.lua | 14 +++++--------- license.txt | 5 +++++ textures/farming_pumpkin_bottom.png | Bin 258 -> 1237 bytes textures/farming_pumpkin_face_off.png | Bin 259 -> 587 bytes textures/farming_pumpkin_face_on.png | Bin 269 -> 663 bytes textures/farming_pumpkin_side.png | Bin 231 -> 1053 bytes textures/farming_pumpkin_top.png | Bin 272 -> 605 bytes 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 89a9d16..b32b17f 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -1,8 +1,4 @@ ---[[ - Big thanks to PainterlyPack.net for allowing me to use these textures -]] - local S = farming.intllib -- pumpkin slice @@ -34,9 +30,9 @@ minetest.register_craft({ minetest.register_node("farming:jackolantern", { description = S("Jack 'O Lantern (punch to turn on and off)"), tiles = { - "farming_pumpkin_top.png", "farming_pumpkin_top.png", + "farming_pumpkin_bottom.png^farming_pumpkin_top.png", "farming_pumpkin_bottom.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", - "farming_pumpkin_side.png", "farming_pumpkin_face_off.png" + "farming_pumpkin_side.png", "farming_pumpkin_side.png^farming_pumpkin_face_off.png" }, paramtype2 = "facedir", groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, @@ -51,9 +47,9 @@ minetest.register_node("farming:jackolantern", { minetest.register_node("farming:jackolantern_on", { tiles = { - "farming_pumpkin_top.png", "farming_pumpkin_top.png", + "farming_pumpkin_bottom.png^farming_pumpkin_top.png", "farming_pumpkin_bottom.png", "farming_pumpkin_side.png", "farming_pumpkin_side.png", - "farming_pumpkin_side.png", "farming_pumpkin_face_on.png" + "farming_pumpkin_side.png", "farming_pumpkin_side.png^farming_pumpkin_face_on.png" }, light_source = default.LIGHT_MAX - 1, paramtype2 = "facedir", @@ -182,7 +178,7 @@ minetest.register_node("farming:pumpkin_7", table.copy(def)) minetest.register_node("farming:pumpkin_8", { description = S("Pumpkin"), tiles = { - "farming_pumpkin_top.png", + "farming_pumpkin_bottom.png^farming_pumpkin_top.png", "farming_pumpkin_bottom.png", "farming_pumpkin_side.png" }, diff --git a/license.txt b/license.txt index 770f8a0..f0644f8 100644 --- a/license.txt +++ b/license.txt @@ -67,6 +67,11 @@ Created by alerikaisattera (License: CC-BY-SA 4.0) farming_melon_top.png farming_melon_side.png farming_melon_bottom.png + farming_pumpkin_bottom.png + farming_pumpkin_top.png + farming_pumpkin_side.png + farming_pumpkin_face_on.png + farming_pumpkin_face_off.png Created by Doc (License: CC BY 3.0): farming_cucumber.png diff --git a/textures/farming_pumpkin_bottom.png b/textures/farming_pumpkin_bottom.png index b23d241372bcb3b187f44c7c2de334e5fbbab78b..8c8f56e830fc1cfe789543eb5a8192bf47e9bdf3 100644 GIT binary patch delta 1229 zcmV;;1Ty=A0@VqS7=H)`0000V^Z#K000C}kLqkw$V`BgSD3NuMJxjw-6owzGqG+Xq z4n-6?RB@;v3gW1B=u$+gf?rFLrmc|1khDl~68vt$##mp_?Ji@SL&9$u$42 z_Z#X|z3x}N{=fIv7!-nIQgk>7iDPo`QH2qL!trDK#g$DUU@(<^DTQFE=z8bPp$?@xk|B zdZ1|wJ~w^;ie9dTbN#zUvvpOyU;85Ba2@^U4LjNP;(c100009a7bBm000kR z000kR0jNKxX#fBN4M{{nR5;5eliN;QRT#&A`#gI%mFbj{8fcYT4JE}+XlrZDkcOrb z6QdVCL*Ky*-@r#O-g{SrEkr!T6wJUl!$9@IQ+k2`GliywS^F@1FTdHdu2$A}{2!L_ z^<7UVn14*4R5bR$w0+W!;`*3HJ4&cGUCcCM`ZR1E=1HS=cHeACUYcSiosfc`FjOKt zcWxa-?veNaN{DZRRsGKxCq8HBt#Xw&8WDT8ECvC-&b?=WF!Gsx61wE-Kg9uKXTDf5>U zm8zW;fAtOATOH=De3TVe*K;jmat1BO7tY-VSX+~$zvD_bNwCueKyR* z*dc~tQLD;(;xKR_;P0x>se*W6Po%7Tfq(8!4^x+wKf%jIyf<#K@id_%-tb?+{YH-2 ziyap0CL;xlH|(D2y2tLW-;hqjeFo)ni1h-N8zSq6P+K!H;y#%VSo+!Lv(E$WeH)=X zQDamS3kFlDWO&Ho@HpgYO`!bcGJDCTR?9OprzzwmNt#X$DOQ&?lP94(3$mguU92G|&*aIxo(#&Am^su{9RJJumx#t{pYliYPu7m;4CQ2cOldU4?5QhG^5L)e19gOW%1Mb=-{I?|*Ozw2$vv rnPKY99LJ$%Lk7MUHJS(DSO)(C>%3!cq4yZ!00000NkvXXu0mjfpBP@g delta 242 zcmV$#@Rfj|$_f1IMgU;Ku;V3THF`0050iL_t&t*A31w4#FT52H^h| zp2dSS9h{sPa5GApmTSo1Bc4JW`dB3|>}?42C?b%$3{o9K#9kgLW)Mx+gWVR0qw`UUfgW=DPCld0!6?-NcysT&^%Yv$ sYxcV_UYe)%i&OORDfx!Ip;&SE2Zrxb690RQ+yDRo07*qoM6N<$f>fhp3IG5A diff --git a/textures/farming_pumpkin_face_off.png b/textures/farming_pumpkin_face_off.png index df7017147ed7088768b756be54fef4da23b1b5e8..ed46e8339a649b4a5d645207cfd12308108ed501 100644 GIT binary patch delta 574 zcmV-E0>S-*0?P!D7=H)`0000V^Z#K000C}kLqkw$V`BgSD3NuMJxjw-6owzGqG+Xq z4n-6?RB@;v3gW1B=u$+gf?rFLrmc|1khDl~68vt$##mp_?Ji@SL&9$u$42 z_Z#X|z3x}N{=fIv7!-nIQgk>7iDPo`QH2qL!trDK#g$DUU@(<^DTQFE=z8bPp$?@xk|B zdZ1|wJ~w^;ie9dTbN#zUvvpOyU;85Ba2@^U4LjNP;(c100009a7bBm000kR z000kR0jNKxX#fBKgGod|R5;6HV4wx~c)j*NHZg4CST*Z1Frz4jiJ^;w028`q8_hP7 zT+4(@;_khNq#J-s6HI*J)@TNP&1OctCZ5|G_n%?F0D8z1idvk}haQ#aayT_3$2B%K zwzR;6EjRR$(*m}1fvg^EfRXniMo<*t1D6^8G7=0#kn`}-=0SOT>pYF8}}l M07*qoM6N<$f|a%nxc~qF delta 243 zcmV3C^`%>dz z9OD4;cp3=0@u#}+1SP`_EJklYz>XWiNU(V+{nE!oxlXFGC2Y15N_F`bS$?BJ-#N&D z=ZTMC-J>0Nd5D%_Od|$+x_STr002ovPDHLkV1hXvXZZjC diff --git a/textures/farming_pumpkin_face_on.png b/textures/farming_pumpkin_face_on.png index fa71c9d474c140e8b123c3da04fe468ad6d2846f..4708c9d6917c0a2de35a711723a43e5a74e7690c 100644 GIT binary patch delta 651 zcmV;60(AY20+$7l7=H)`0000V^Z#K000C}kLqkw$V`BgSD3NuMJxjw-6owzGqG+Xq z4n-6?RB@;v3gW1B=u$+gf?rFLrmc|1khDl~68vt$##mp_?Ji@SL&9$u$42 z_Z#X|z3x}N{=fIv7!-nIQgk>7iDPo`QH2qL!trDK#g$DUU@(<^DTQFE=z8bPp$?@xk|B zdZ1|wJ~w^;ie9dTbN#zUvvpOyU;85Ba2@^U4LjNP;(c100009a7bBm000kR z000kR0jNKxX#fBK&q+i z27{{z@xPC;voQ>SNpc9Sr!sy9G8I#5*ZjlQTp2pA_oF2bqIZ62224AfE2>`$ZWWL zHv>E{SukP%1fqeO-XDbUfox`=&<_|N6x|F5QKJ#$B#^0K0F6TQ=;SmZ5PjfqxN8p% lsQ)jUQE8|+ve@7O0D^sB*o3sty#N3J07*qoLC`|wW delta 253 zcmVQ0b?d3Vq<0y z025;~V`Fn@F#tA$msMoRI3oZyIm|_D%#$+!6`ai2UCnhe0CqEd&C^!iLpA_YOx`$Z zRyt(>Ry6K~SXirt09CM6ISB`AQvfxCbDW%fdNTl1WXH|U+{7~gHBHUl;N9Fq05;9- z9%$j*LjV#T9s_2hRv`cbV8vt$##mp_?Ji@SL&9$u$42 z_Z#X|z3x}N{=fIv7!-nIQgk>7iDPo`QH2qL!trDK#g$DUU@(<^DTQFE=z8bPp$?@xk|B zdZ1|wJ~w^;ie9dTbN#zUvvpOyU;85Ba2@^U4LjNP;(c100009a7bBm000kR z000kR0jNKxX#fBMRY^oaR5;5`Q`>HvKolHc0UO80*R)L(HHs9q>O+(->QD8*D)lW= z9-8J}#db^pgJEGi>tnZFX~nX0&YU@yb-sOtnRJ2U9&q&vbX_3T4ldpqmX&4 zXA0_oTUqiQfs>Qni=b&-q(ZQjOQ(Q%?}Y!p+<%Xl+U$}L6}uZvrciQpc247%h)rz` zJUlaZIyj8zv)BdgO(ocxf!u)7s+ykcLaEn?80BuhMu!D6Jlia0$COY4dV^hV+*I1w z;HAdj#SGvvvSQvIoi~pn(@d)^9z?rZ9RbCJ&rjMMWzXynkw4Xw#x%i}pjfCCBh?I0@m{xf zE7V#eS&(QB%-0I4<;3W;!iqzllRc|^Jl%U3bt@!!fakT3cu{X(X5RS3-G6OoAJt37 z@zoK|Ou|PpMqgF9=Cl2TiWxPG8sTc;W7acxs};U4J2>rY+@xx&>JRbJ?_3gj8x2wb O0000R21GVAU)nWd*!`N7~n`{ z010cW1AHG&Tvrpj3qO9}kTa+qkj7x)F=};Jl&44~OdHa6BCfbR% zh~XFyit`iQ@<{YogY>%z643EYje7pgUPT?_!qPgmSDd*vQ)n_EZ`!KJ@dZ7-CN<1( RV1obv002ovPDHLkV1mO?Sa|>d diff --git a/textures/farming_pumpkin_top.png b/textures/farming_pumpkin_top.png index 79283454ef1f0d5ab418e9c6366b49a5783c1579..6b8e91bb372fd9f58d72c5520cceccf6106a86b1 100644 GIT binary patch delta 592 zcmV-W08vt$##mp_?Ji@SL&9$u$42 z_Z#X|z3x}N{=fIv7!-nIQgk>7iDPo`QH2qL!trDK#g$DUU@(<^DTQFE=z8bPp$?@xk|B zdZ1|wJ~w^;ie9dTbN#zUvvpOyU;85Ba2@^U4LjNP;(c100009a7bBm000kR z000kR0jNKxX#fBKl}SWFR5;6HU>F6|2fXh5|M^td{}Zd81zod(%nt?z83u-j4DA0C zlzuYYeJsdu`1d!k{HHrV8PN@3Lf5RW`jg?|K?Vj}RxT8U^7arlSPekdeDgLtToPnE zG61PTH%WvMn+rgOfLsA`GAKMiwu8WfCmal)cYb8V8U`SV2T;=?-e8CO8x$V@l`%C_ eB^E{j0|NlbdPHHZpucDU0000$#@Rfj|$_f1IMgU;Ku;V3THF`005gwL_t&t*8z|KZ~p*QYkar1 z$7@vpSG&i&d&$Sw0Lz@&+??5c+W@@ToZG$G{k#BqoyoQldwINf0K6audg>dOya2*N zKyfiAy~_Y3NI(-20xi}6!X$(N5lBLJ0Bdq0AQJ*D%K%r)ws$vY+_nI`-Iuj?eVy9? zYsuW7yPes00C%0q+?|})#sFKroxPjM%XI)%YkX(CXS`L{NkypzQ5=o{0000 Date: Mon, 19 Dec 2022 17:54:06 +0000 Subject: [PATCH 33/50] add new pie textures --- license.txt | 19 +++++++++---------- textures/farming_apple_pie.png | Bin 200 -> 261 bytes textures/farming_blueberry_pie.png | Bin 195 -> 282 bytes textures/farming_rhubarb_pie.png | Bin 198 -> 265 bytes 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/license.txt b/license.txt index f0644f8..797b0fd 100644 --- a/license.txt +++ b/license.txt @@ -136,7 +136,6 @@ Created by TenPlus1 (CC BY 3.0) farming_rhubarb_2.png farming_rhubarb_3.png farming_rhubarb.png - farming_rhubarb_pie.png farming_hemp*.png farming_tofu*.png @@ -183,19 +182,19 @@ Created by sirrobzeroone (CC0) Created by smoke_th (CC0 - https://opengameart.org/content/popcorn-icon) farming_popcorn.png -Created by RZR0 (CC-BY-NC-SA) - farming_blueberry_pie.png - Created by DMBuce (MIT - https://github.com/DMBuce/hatchling-snacks) farming_mac_and_cheese.png Created by XSSheep (CC BY-SA 4.0 - https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated) - farming.coffee_1.png - farming.coffee_2.png - farming.coffee_3.png - farming.coffee_4.png - farming.coffee_5.png - farming.coffee_beans.png + farming_coffee_1.png + farming_coffee_2.png + farming_coffee_3.png + farming_coffee_4.png + farming_coffee_5.png + farming_coffee_beans.png + farming_apple_pie.png (edited by TenPlus1) + farming_blueberry_pie.png (edited by TenPlus1) + farming_rhubarb_pie.png (edited by TenPlus1) Copyright (C) 2021-2022: Atlante - AFL-1.1 License for code: AFL-1.1 diff --git a/textures/farming_apple_pie.png b/textures/farming_apple_pie.png index 0e4fdf4efb93a5630fdae7e18151700243be4bae..36de3957e65ad50a331b5dc6e23dfe3b25b7ebf4 100644 GIT binary patch delta 245 zcmVK6jQfb)7V|i$#a7I?kF_g|j@)n^(@9Sk0eX%%oq8yg!z{NR+}!p~_#i z&v@s-fwI$lriR!Z#Vu%uXi1u&=RqGPI%YBdBR8mvOW!L8E7PCbOc v(NsLH~e00000NkvXXu0mjfr1)h; delta 184 zcmZo=I>9(WqMn7Bfq~)e-A6${N-n@B#1%+8GBD`s>#SQHl@zEOosg82lDM!deEQ63 z7xp#_=`LUas$eV$@(X5gcy=QV$cgZDaSY+Oo}6%i>Bi~P+y_dYo|$>sam}fdlhx19 z;S-s`$;Qg_X0l^~7b7!wM8Ym+=E>Xv3A?(Pn1frq4O4e|&tPJ14r=fA&JsGIu(WTR j3hRc8US3>0KNuL)Yh@PZ6c-%=TEgJz>gTe~DWM4faF0K+ diff --git a/textures/farming_blueberry_pie.png b/textures/farming_blueberry_pie.png index 21746864837226f9d0b342536c614a11c12495e5..266716e90a7e0a0d26ec0f8158ab1ebf6453d187 100644 GIT binary patch delta 267 zcmV+m0rdXE0h$7k7=H)@0000eEe}%w003i9OjJbx002EAXF(%nOeSDWD}q!me^f7y zT{N9vHJp4u9c?_5Z9TY{ST~tjGn-l}hFr;rUB{7O!K!RWt8GB7ZZ)lSYp-`?wtPjm zeLc2)LB*4N$CY!)mT}3KYt5Nm&YD)|!GSGh^^E`k00DGTPJdGXK<3zH0001GNkl?Jc+~&@N^MCD&rF&oJ53)}h%~kb*Er*YL+4C#ZJE35mPC#+Q0xS#=~NSWfr$Ix{)4aZa1g#?{a( eCL)q>fSuu`oJ5IFT7=H)@0000eEe}%w002}_OjJbx003bjXJ{m0YbsiNDTI74fq^i2 zi7kzMKO2=ZoR>G4nmUl3L5QtCx|~`loLVldXI`ytGQVBQ#9qR~V!gO_Wwm@txP3m) zm|V@6Wz3pZ=D~wUfbG2i0004WQchC65J7w*!0DY=OEtw*;8A*atN@x)VB^9c; zQx-zxQBT4=ZL4HVeu4w=sqkE(3e7V*ch_Gpw}1sV2%R@f00000NkvXXu0mjfXD?s3 delta 182 zcmeBVI>tCbqMn7Bfq~)e-A6${N;<$N#I+=~c(JurmcQ|4XP1qh-n#>X>Qj8W^24W9 zCoc~+Ed(lKED7=pW^j0RBMr!j^mK6y;kcfhaDe^B>C@Z?N;YoXXwkvCq)}%9Lx-7} zPQn8LGc#UZ)4YTS875_-B0Q`{R!qIjtgO-!GmNaP^qWLjg(W1eSXoKUxYTfK<`pX` h1vO($&4jIj4BJx$XS(QYx(c*~!PC{xWt~$(69D4qJLdoZ From 9c09ac86d46a886bb04d94763774d9321574702f Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 24 Dec 2022 16:18:22 +0000 Subject: [PATCH 34/50] recipe for yellow dye using onion --- crops/onion.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crops/onion.lua b/crops/onion.lua index 049f869..af002ec 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -36,6 +36,12 @@ minetest.register_craft({ replacements = {{"farming:pot", "farming:pot"}} }) +-- yellow dye +minetest.register_craft({ + output = "dye:yellow", + recipe = {{"group:food_onion"}} +}) + -- crop definition local def = { drawtype = "plantlike", From 28fda57767035e2c46c85098671230f06c5c637c Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 24 Dec 2022 16:51:05 +0000 Subject: [PATCH 35/50] update pie textures --- textures/farming_apple_pie.png | Bin 261 -> 262 bytes textures/farming_blueberry_pie.png | Bin 282 -> 280 bytes textures/farming_rhubarb_pie.png | Bin 265 -> 263 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/farming_apple_pie.png b/textures/farming_apple_pie.png index 36de3957e65ad50a331b5dc6e23dfe3b25b7ebf4..a676135089e8cb224cdff7dd00c1c2acb7645dc0 100644 GIT binary patch delta 157 zcmV;O0Al}z0)_&RBnVVcOjJbx005CGQGf5zeTM)500DGTPE!Ct=GbNc003Y~L_t&- z)18me4uBvCMVppcsX#T|`2P|Nlcx;2>ujn5yYi4ouS+I$vksA;VTm?B=kfSbhaCr|6<%s*q|m z1R@%&LczhU(!@?Zguu~OUNqi&YbmM__XC;^&}%{pM)Do{*9Q@X1+J*d!ki2M0000< KMNUMnLSTZVAw3rW diff --git a/textures/farming_blueberry_pie.png b/textures/farming_blueberry_pie.png index 266716e90a7e0a0d26ec0f8158ab1ebf6453d187..1fa6b1c944092c24c75c8928f56118c4170703b3 100644 GIT binary patch delta 157 zcmV;O0Al}|0+<4jBnW0uOjJcM005CGV}C#6+~oiO00DGTPE!Ct=GbNc003Y~L_t&- z)18k=4!|G?02^BxYY$wyMC=0p|6~OY_3Xr$%n(ByhCZ?|wa(Q=xSgZ0{E5|xNwI+2 z6e<7^z{38T86NTo5M$KKpYR;qm(@bz=RV6(%0<2>VNy^}*S|jCGzSt5VsBmm015yA LNkvXXu0mjf$EH8U delta 159 zcmV;Q0AT-^0-6GlBn4woOjJdYEMtEyW%Z2!0004WQchC?Jc+~&@N^MCD&rF&oJ53)}h%~kb*Er*YL+4CAnB#QUVS_Udy4B1^8f$<00>D% JPDHLkV1hIbI{*Lx delta 157 zcmV;O0Al}#0*L~UBn4DZOjJdYEL49-fbG2i0004WQchCCSW$mv3eX2z*nIg0q zNrF;JXb}b_6{@&X7DD7vPr^KHt7J@mf&=iW@LZt^%`-Z8*IzHUfCV=Qoi`0k00000 LNkvXXu0mjfM1DCv From 498063553a40e03e7ca5da8cc614b5aa103df646 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 22 Jan 2023 10:31:16 +0000 Subject: [PATCH 36/50] Add ABM labels --- init.lua | 3 ++- soil.lua | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 3e16f84..88f5c3c 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20221028", + version = "20230122", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -307,6 +307,7 @@ end) -- Just in case a growing type or added node is missed (also catches existing -- nodes added to map before timers were incorporated). minetest.register_abm({ + label = "Start crop timer", nodenames = {"group:growing"}, interval = 300, chance = 1, diff --git a/soil.lua b/soil.lua index ea23c29..5ffda3b 100644 --- a/soil.lua +++ b/soil.lua @@ -144,6 +144,7 @@ minetest.register_alias("farming:desert_sand_soil_wet", dry_soil .. "_wet") -- if water near soil then change to wet soil minetest.register_abm({ + label = "Soil changes", nodenames = {"group:field"}, interval = 15, chance = 4, From a95ff7a1a4b8c7a16b7754311358959961679e7a Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 12 Feb 2023 10:36:49 +0000 Subject: [PATCH 37/50] reduce onion colours to fix blur --- textures/crops_onion.png | Bin 841 -> 262 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/crops_onion.png b/textures/crops_onion.png index 2099c63c717eaf37a5de6d5a39faadfbd11c5cba..8a6dc54a77482c24fa624fe0d783d93404b9b0f9 100644 GIT binary patch delta 245 zcmVP*PA(TwmNjp-T(jq0d!JM zQvg8b*k%9#0Ch=3K~xyiZO*|C#2^SoQB$j;APD;Z-&)&f7jB)o%ae%Dx#m7K_(1;= zhi1ymh#RtXQ&pxdB-UppTZnCpF`?3iKEXufg?2v>-GD?QRn&Oh$hnmIz*+=lMy#CU v`ZuMNX)X(XK?nedaC-l)j}hW|9PUpSkhBJf1<-H)00000NkvXXu0mjf!cu8W delta 829 zcmV-D1H$}<0?7uD8Gi-<001BJ|6u?C00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-*m695$?<08W?0008kNklCBDGl=4eo-p-_NyP9-I!aLYmwEN5bit$18**NTirfuw_8~3^|07W&`%=V71E;^=#$6sN&AxDj8 z?aB$%h(OzY5JKUL6fWC_EmIJ}5Qqo_Zkbrw2LKKL(r9Wt9!uf?wUQ{)n+UHCU>RU1 zBe-G;0DtgY!155DDiKi6Zy_)UJR!9PoYE+D4VGO;1Px+puto=@wFu8b$f7{0%ucQ$ z{~@U1JhvNCR)`pduBIqU0UL4zA_OBG6buFw$~tWCkgn?d3C_LE;Z^~4aqEIsRK3usSJR1(AC7Jl0t zU@)zb``~w}%;`UdH-`Tik`vE8{7k3WI@FBBeT;gsGs`-IE5q>WB)b-M`!_mC^23$u z`8L Date: Thu, 9 Mar 2023 08:39:51 +0000 Subject: [PATCH 38/50] capatalize spinach and asparagus descriptions --- crops/asparagus.lua | 2 +- crops/spinach.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 169f321..0a826dc 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -3,7 +3,7 @@ local S = farming.intllib -- asparagus minetest.register_craftitem("farming:asparagus", { - description = S("asparagus"), + description = S("Asparagus"), inventory_image = "farming_asparagus.png", groups = {seed = 2, food_asparagus = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) diff --git a/crops/spinach.lua b/crops/spinach.lua index 8a69830..528e7bf 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -3,7 +3,7 @@ local S = farming.intllib -- spinach minetest.register_craftitem("farming:spinach", { - description = S("spinach"), + description = S("Spinach"), inventory_image = "farming_spinach.png", groups = {seed = 2, food_spinach = 1, flammable = 2}, on_place = function(itemstack, placer, pointed_thing) From 02cf5688fada7d6649aab437e6e06c8a0c610484 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 19 Mar 2023 18:19:50 +0000 Subject: [PATCH 39/50] fix pea textures (thx fluxionary) --- textures/farming_pea_1.png | Bin 203 -> 207 bytes textures/farming_pea_2.png | Bin 215 -> 221 bytes textures/farming_pea_3.png | Bin 431 -> 441 bytes textures/farming_pea_4.png | Bin 528 -> 534 bytes textures/farming_pea_5.png | Bin 705 -> 711 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/textures/farming_pea_1.png b/textures/farming_pea_1.png index eb48e36398e3ea6b8e30f6835c6b5f7c0c127703..aa98af7c74301d0e848847b3e383287bdf8b2f7c 100644 GIT binary patch delta 49 zcmX@jc%E^B3gfhis;#QZ$9;NSckl{SxlHk%so|^6;K-|2g5u5-3 delta 44 zcmcc1c%5;A3gf(qs*@Cyzr3(xW`4Z<;Cw%Z#0-7asH2ykF#v(5tDnm{r-UW|ihdB( diff --git a/textures/farming_pea_3.png b/textures/farming_pea_3.png index 980d6eaaa3c89e0cd2fd926c836aa76d604920b2..5cfd90e31a3f2716bbfe4d031a395f0b48c99976 100644 GIT binary patch delta 415 zcmV;Q0bu^G1Gxi`B!7TOL_t(I%gvI_D}+%L#((#H$4oPt8B>PHO8E*YB~9^e6blx! zv9O!%9kTKl*x6dVvz;XV0VR^fD@{>KQZ&gzX@()+#(Z51FG?m88_(+8bIyIvbMAfM zUm|KT9krOPq*p7G?*nF{7VYl|84m@&YZNjb0=NW%)SRWr`hWLC0s>hu%OoKHm_f3N#;EvjpIZ9fIs_d%0%GOtc9B?K4=`fl0DKrJ%bX(LS2wb2)45ee4 z4fM-+X#JhQ0e>W8kwnkiaW^Sff+l+2rC!|4!u5QBUT7sRls(7`D4^>@!RKWgO3dSW z04=wyGEHMB2f}wX5Q`*yz^VOan;*aMjR#uPb;A*^dx2gQJO%Qx@VT>MAD9M73e|%+ za{^5%@}9|GxlwL7m0a_be(S_H=mqf;fun3C>$ii;KNu*e0Iwqadr5_aYD@qC002ov JPDHLkV1nI!!2tjO delta 405 zcmV;G0c!ra1Fr*+B!6~EL_t(I%gvI{D}!+y$6w#)*^f4Dvoazlq!rIaap16v zgWIm(k(0l`&DG)AbxHgKN+gFzT2V?;wB(@H#>mW%*=%12L&+j1@7w3|d4GPt;a?(Z zF&nj*{|#5G;U56zq84564jB&xz9R}54*^^O0qQT(6nqDw<$rh*xCM?(gMJwgE#pg# zlWQ4^MG|{oC&&YS?2lzU=_XuR!!&pREFdVC26|{bokD-sYOUY`biC;k3a&ElT%BC$ zJ2VYOfIAw_7N}?y?1lB}Dmz~b6oG5u%Y?~x&7djpWICf30pJq-X%tb>$aIH+U0_hg zL!0jfY(O#=Nq+?2%>ATX3z+C7r+Rj^3Fp%h`b!5Tp{k8MfC73yCiqOQLWxD3_n;M5 zRkn2kWkYzchhmY07dWrpZ2RL2-)Nv+-87%z%nS6g;L%@-g;S1S>%cTf@=`a9qbSgn zqU4_blN#lgL&*(y39~v5A}%x#f1XR{EWzb9|dlb`?|!h;|V&6$Akv7v-hA*)IkHt)7K0T zy#y*8bZveEK7X;+F;MSF*GE`C++cawCxQf$fI)U?k#;g5wU&0CoPF=wTos4vYYco0 z2xUlLdkVnutk+S24zMcvYb91r-9akI)P{8y%NVUOL@249E&*?V3yx>aY-IpcE8}zL zHp=;`^P=ElbmQtz@`Q-DK4A2Q=nADj$^Z&Dv*lp>v2{j?2gKJwcAl!0;x&|s$gYl7 z#^PHueHv~o?Xy&_>(zh79AfpY}rb;h;g;+-*m7<%v%|UQx yW6GIMg?sJE|Bj4M>?L6CI%#J%F9&t7KmG!`YN3j8x-&%p000037Dc79K^N?6+tL^T5l0L zi3D66yU9gY{{#BL8&)xIz9)ogc?j1gS?vI&^b)p-DVJ3n-9i zhlqX(84bHOKYsxqvvUmOTe8h@whp&g8}*5y0ck)dS6`u<4#{k0oyTY1xi(kCq2?w- zA3`E6BGH`%a6Ic(+#mop#9*V$`l;J!5(XNhs*5%B&LkqzXq+wsuYvQ9XU*?)0Mx2e zi)XjTrJD1+=%V+M@>lwVNOs<%_ebansXiJ2BrvvrcB3??xXIM6mu8?dA^ia?)^s41mlYP+Qf@@QwpS_G32sA0_Wp435 sI18q9<}%U0_KbaRx`V4Ef;tDD-^YuhS;ZMn$_tUP?ByGTg7 zi9)Yyw;Mrt;Z4^`7lN0YP~;#;=pv}ZFv?&TE~prGwJ>$!ac$Z>%;`>V7k-)r(jOk) z=fv-Y_jz6c;0^K~2>V?0Xz?I$6PWb5Xwh;G;1zJ%=b{o#ihp+Y0bXyACtCa#umGL> z(RDxtM)ne(fVvCtxflgr16Q@06Bv-Q7e9Lf>Kg!APzI$0nJOFd1k@={KwSY4do*v5 z4&X6x3Frqp<#Y=m(%9xyN*5wzO>5?4vo)W~>oPle0mOwTpaR4J2gkx`wrmkmw$utF zT*><9}0BM4OmvSUy#I!Wmy$#qKOmCKKyf1=s*=7`F0=ToJNR<8zS$f*8|P zAirQ;ZDhT26R9tri7a&W-5yh--xq3=D;q}@zzpapS&p!6&SP1#dY;!!_*}G;wq>y< zswgN0Oj{#B7tjshcZcGBcL)W@04t(2c8kQBdngi$V}G^YAPzPw^rY-{q{?-~&fWrs zfo4xYeRpt-lYV!|E~nL2r2amsGKns0k~`*Viq_{0Mm?m^ad!4+w? zSeT!Q0e{@^yF;S~mTP|#KW28aSgb`mZS{B7$XVMkW(0v{r*7uZuvv^h;SNEJlCo_bc1QyS6*??oS`SO&|$#m?(N)UK<~X++E!NX~Pcb8Foniqu>A6 V{17oLRuBLH002ovPDHLkV1n7+Lu>#5 delta 681 zcmV;a0#^OU1;GW7B!7rWL_t(I%axK_NYhaq$3N%4&E3*D-E6SvB8df=S$X-Fjz~y? z2t%K1uNy)5;7gB@^dR`S2}KTqgdTz}7)BWE!97$+ZwvE=I$cwnmpR?-^w57Mf)9P+ z@VoLkaL!i%_``exCITLMwR#A+4NL|+v}ipi@CG;?@KA*&MSqL^fZreHnO1)QEI=3k zbOTU)k>(H6 z0XzjR0RupnoNfU`8vDG8Z81vLxNc51Tl2ZRF0-2#KtlLJDnJ5oa%>{awmmA!ms)|O zTyrmzJZ{38n17;jwu$+MrNto|L1GRE3WC*-qd+ z(CiDTANPObWY8ON$Z53|seeGKT%yYw<*vCJ)5g4^L=Wi-pN}O@`pez z8Otk-TcBiyF>JZi_6vZJKo*$M-fXN05Sk&JB}PNM%3YC7mwjtooy|>P+!TPQWJ;z~yZKKgZP2I`t-ekuX1H(jz=u7`z*?iH` zejWsdg8;o22c#@Kip~Bi)&y@Q+ Date: Fri, 7 Apr 2023 14:41:51 +0100 Subject: [PATCH 40/50] check for old wheat/cotton seeds and grow to stage_1 via abm --- crops/barley.lua | 9 +++---- crops/cotton.lua | 9 +++---- crops/hemp.lua | 9 +++---- crops/wheat.lua | 9 +++---- init.lua | 61 ++++++++++++++++++++++++++++++------------------ 5 files changed, 58 insertions(+), 39 deletions(-) diff --git a/crops/barley.lua b/crops/barley.lua index 9c8a9df..0097fe6 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -8,15 +8,16 @@ minetest.register_node("farming:seed_barley", { inventory_image = "farming_barley_seed.png", wield_image = "farming_barley_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, + groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, sunlight_propagates = true, + next_plant = "farming:barley_1", selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:barley_1") - end +-- on_place = function(itemstack, placer, pointed_thing) +-- return farming.place_seed(itemstack, placer, pointed_thing, "farming:barley_1") +-- end }) -- harvested barley diff --git a/crops/cotton.lua b/crops/cotton.lua index 6679333..d8e2f12 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -34,15 +34,16 @@ minetest.register_node("farming:seed_cotton", { inventory_image = "farming_cotton_seed.png", wield_image = "farming_cotton_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4}, + groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, sunlight_propagates = true, selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1") - end + next_plant = "farming:cotton_1", +-- on_place = function(itemstack, placer, pointed_thing) +-- return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1") +-- end }) -- cotton diff --git a/crops/hemp.lua b/crops/hemp.lua index b5b86d2..4e91999 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -8,15 +8,16 @@ minetest.register_node("farming:seed_hemp", { inventory_image = "farming_hemp_seed.png", wield_image = "farming_hemp_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1}, + groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, sunlight_propagates = true, selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:hemp_1") - end + next_plant = "farming:hemp_1", +-- on_place = function(itemstack, placer, pointed_thing) +-- return farming.place_seed(itemstack, placer, pointed_thing, "farming:hemp_1") +-- end }) -- harvested hemp diff --git a/crops/wheat.lua b/crops/wheat.lua index 3bb0b7a..6320aa7 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -8,15 +8,16 @@ minetest.register_node("farming:seed_wheat", { inventory_image = "farming_wheat_seed.png", wield_image = "farming_wheat_seed.png", drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4}, + groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, sunlight_propagates = true, selection_box = farming.select, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:wheat_1") - end + next_plant = "farming:wheat_1", +-- on_place = function(itemstack, placer, pointed_thing) +-- return farming.place_seed(itemstack, placer, pointed_thing, "farming:wheat_1") +-- end }) -- harvested wheat diff --git a/init.lua b/init.lua index 88f5c3c..5497afb 100644 --- a/init.lua +++ b/init.lua @@ -7,7 +7,7 @@ farming = { mod = "redo", - version = "20230122", + version = "20230407", path = minetest.get_modpath("farming"), select = { type = "fixed", @@ -198,30 +198,30 @@ local function reg_plant_stages(plant_name, stage, force_last) local old_constr = node_def.on_construct local old_destr = node_def.on_destruct - minetest.override_item(node_name, - { - on_construct = function(pos) + minetest.override_item(node_name, { - if old_constr then - old_constr(pos) - end + on_construct = function(pos) - farming.handle_growth(pos) - end, + if old_constr then + old_constr(pos) + end - on_destruct = function(pos) + farming.handle_growth(pos) + end, - minetest.get_node_timer(pos):stop() + on_destruct = function(pos) - if old_destr then - old_destr(pos) - end - end, + minetest.get_node_timer(pos):stop() - on_timer = function(pos, elapsed) - return farming.plant_growth_timer(pos, elapsed, node_name) - end, - }) + if old_destr then + old_destr(pos) + end + end, + + on_timer = function(pos, elapsed) + return farming.plant_growth_timer(pos, elapsed, node_name) + end, + }) end elseif force_last then @@ -313,7 +313,22 @@ minetest.register_abm({ chance = 1, catch_up = false, action = function(pos, node) - farming.handle_growth(pos, node) + + -- check if group:growing node is a seed + local def = minetest.registered_nodes[node.name] + + if def.groups and def.groups.seed then + + local next_stage = def.next_plant + local p2 = def.place_param2 + + -- change seed to stage_1 or crop + if next_stage then + minetest.set_node(pos, {name = next_stage, param2 = p2}) + end + else + farming.handle_growth(pos, node) + end end }) @@ -542,7 +557,7 @@ farming.register_plant = function(name, def) inventory_image = def.inventory_image, wield_image = def.inventory_image, drawtype = "signlike", - groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 2}, + groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 2, growing = 1}, paramtype = "light", paramtype2 = "wallmounted", walkable = false, @@ -552,8 +567,8 @@ farming.register_plant = function(name, def) next_plant = mname .. ":" .. pname .. "_1", on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, - pointed_thing, mname .. ":" .. pname .. "_1") + return farming.place_seed(itemstack, placer, pointed_thing, + mname .. ":" .. pname .. "_1") end }) From 03fce8b65f6e35460a5dc3ebe9334fd2688bd138 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 8 Apr 2023 07:41:03 +0100 Subject: [PATCH 41/50] seeds made with register_plant function are placed in world and germinate into stage_1 of crop. --- init.lua | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/init.lua b/init.lua index 5497afb..653a4b2 100644 --- a/init.lua +++ b/init.lua @@ -317,13 +317,17 @@ minetest.register_abm({ -- check if group:growing node is a seed local def = minetest.registered_nodes[node.name] - if def.groups and def.groups.seed then + if def and def.groups and def.groups.seed then local next_stage = def.next_plant - local p2 = def.place_param2 + + def = minetest.registered_nodes[next_stage] -- change seed to stage_1 or crop - if next_stage then + if def then + + local p2 = def.place_param2 or 1 + minetest.set_node(pos, {name = next_stage, param2 = p2}) end else @@ -563,12 +567,12 @@ farming.register_plant = function(name, def) walkable = false, sunlight_propagates = true, selection_box = farming.select, - place_param2 = def.place_param2 or nil, + place_param2 = 1, -- place seed flat next_plant = mname .. ":" .. pname .. "_1", on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, - mname .. ":" .. pname .. "_1") + mname .. ":seed_" .. pname) end }) From 2446f3d76c948df37b101433f66a3d8567c66405 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 9 Apr 2023 08:57:36 +0100 Subject: [PATCH 42/50] use farming seed placer function --- crops/barley.lua | 6 +++--- crops/cotton.lua | 6 +++--- crops/hemp.lua | 6 +++--- crops/wheat.lua | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crops/barley.lua b/crops/barley.lua index 0097fe6..9f3d2ba 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -15,9 +15,9 @@ minetest.register_node("farming:seed_barley", { sunlight_propagates = true, next_plant = "farming:barley_1", selection_box = farming.select, --- on_place = function(itemstack, placer, pointed_thing) --- return farming.place_seed(itemstack, placer, pointed_thing, "farming:barley_1") --- end + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_barley") + end }) -- harvested barley diff --git a/crops/cotton.lua b/crops/cotton.lua index d8e2f12..1ea85bf 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -41,9 +41,9 @@ minetest.register_node("farming:seed_cotton", { sunlight_propagates = true, selection_box = farming.select, next_plant = "farming:cotton_1", --- on_place = function(itemstack, placer, pointed_thing) --- return farming.place_seed(itemstack, placer, pointed_thing, "farming:cotton_1") --- end + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_cotton") + end }) -- cotton diff --git a/crops/hemp.lua b/crops/hemp.lua index 4e91999..9d19784 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -15,9 +15,9 @@ minetest.register_node("farming:seed_hemp", { sunlight_propagates = true, selection_box = farming.select, next_plant = "farming:hemp_1", --- on_place = function(itemstack, placer, pointed_thing) --- return farming.place_seed(itemstack, placer, pointed_thing, "farming:hemp_1") --- end + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_hemp") + end }) -- harvested hemp diff --git a/crops/wheat.lua b/crops/wheat.lua index 6320aa7..252403e 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -15,9 +15,9 @@ minetest.register_node("farming:seed_wheat", { sunlight_propagates = true, selection_box = farming.select, next_plant = "farming:wheat_1", --- on_place = function(itemstack, placer, pointed_thing) --- return farming.place_seed(itemstack, placer, pointed_thing, "farming:wheat_1") --- end + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_wheat") + end }) -- harvested wheat From ad9b0dc255328e93dbb316851d5f9ee95cf780d5 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 18 Apr 2023 08:37:47 +0100 Subject: [PATCH 43/50] return to default wet soil behaviour (within 3 nodes all axis) tweak wet soil > dry soil behaviour to run better --- soil.lua | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/soil.lua b/soil.lua index 5ffda3b..b24a9b5 100644 --- a/soil.lua +++ b/soil.lua @@ -165,8 +165,11 @@ minetest.register_abm({ -- what's on top of soil, if solid/not plant change soil to dirt if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].walkable - and minetest.get_item_group(nn, "plant") == 0 then + and minetest.get_item_group(nn, "plant") == 0 + and minetest.get_item_group(nn, "growing") == 0 then + minetest.set_node(pos, {name = ndef.soil.base}) + return end @@ -175,19 +178,21 @@ minetest.register_abm({ return end - -- check if water is within 3 nodes horizontally and 1 below - if #minetest.find_nodes_in_area( - {x = pos.x + 3, y = pos.y - 1, z = pos.z + 3}, - {x = pos.x - 3, y = pos.y , z = pos.z - 3}, - {"group:water"}) > 0 then + -- check if water is within 3 nodes + if minetest.find_node_near(pos, 3, {"group:water"}) then - minetest.set_node(pos, {name = ndef.soil.wet}) + -- only change if it's not already wet soil + if node.name ~= ndef.soil.wet then + minetest.set_node(pos, {name = ndef.soil.wet}) + end elseif node.name == ndef.soil.wet then minetest.set_node(pos, {name = ndef.soil.dry}) + -- if crop or seed found don't turn to dry soil elseif node.name == ndef.soil.dry - and minetest.get_item_group(nn, "plant") == 0 then + and minetest.get_item_group(nn, "plant") == 0 + and minetest.get_item_group(nn, "growing") == 0 then minetest.set_node(pos, {name = ndef.soil.base}) end end From 31c7b589c15f2e21a21d892ff5e4904f2ff4866e Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 23 Apr 2023 08:54:22 +0100 Subject: [PATCH 44/50] tweak soil dry abm --- soil.lua | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/soil.lua b/soil.lua index b24a9b5..ed557ee 100644 --- a/soil.lua +++ b/soil.lua @@ -173,11 +173,6 @@ minetest.register_abm({ return end - -- if map around soil not loaded then skip until loaded - if minetest.find_node_near(pos, 3, {"ignore"}) then - return - end - -- check if water is within 3 nodes if minetest.find_node_near(pos, 3, {"group:water"}) then @@ -186,14 +181,18 @@ minetest.register_abm({ minetest.set_node(pos, {name = ndef.soil.wet}) end - elseif node.name == ndef.soil.wet then - minetest.set_node(pos, {name = ndef.soil.dry}) + -- only dry out soil if no unloaded blocks nearby, just incase + elseif not minetest.find_node_near(pos, 3, {"ignore"}) then - -- if crop or seed found don't turn to dry soil - elseif node.name == ndef.soil.dry - and minetest.get_item_group(nn, "plant") == 0 - and minetest.get_item_group(nn, "growing") == 0 then - minetest.set_node(pos, {name = ndef.soil.base}) + if node.name == ndef.soil.wet then + minetest.set_node(pos, {name = ndef.soil.dry}) + + -- if crop or seed found don't turn to dry soil + elseif node.name == ndef.soil.dry + and minetest.get_item_group(nn, "plant") == 0 + and minetest.get_item_group(nn, "growing") == 0 then + minetest.set_node(pos, {name = ndef.soil.base}) + end end end }) From c218d5aada4130221a8864e84c76445784b1aa50 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sun, 23 Apr 2023 15:40:03 +0100 Subject: [PATCH 45/50] add new burger texture (thanks Shadall) --- license.txt | 5 ++++- textures/farming_burger.png | Bin 480 -> 422 bytes 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/license.txt b/license.txt index 797b0fd..a44cef2 100644 --- a/license.txt +++ b/license.txt @@ -23,6 +23,10 @@ THE SOFTWARE. License of media (textures): ---------------------------- + +Created by Shadall (CC0): + farming_burger.png + Created by PilzAdam (License: CC BY 3.0): farming_bread.png farming_soil.png @@ -161,7 +165,6 @@ Created by OgelGames (CC BY-SA 4.0) Created by Felfa (CC0) farming_blackberry*.png farming_lettuce*.png - farming_burger.png farming_soy*.png farming_vanilla*.png farming_artichoke*.png diff --git a/textures/farming_burger.png b/textures/farming_burger.png index c39f7c0a602a81a8d3a2b1bbe8611a615710cd75..43ab6d499fcae75ea97be86bb20415f93fa7368e 100644 GIT binary patch literal 422 zcmV;X0a^ZuP)!&+3TGD>bL&;^=u2_Q2+n{0d!JMQvg8b*k%9#0S`$;K~y-)y;IAQgdhwY$43Bh zP*DE=Q>O!n#4Y!*hizl1vYVDbc)k7=y5fO#&IK1ZermL~&bo|HG=jJGq+!C67^A-N zwy?<~Mxkg8@07*qoM6N<$f^wm>1ONa4 literal 480 zcmV<60U!Q}P)z^JS;Zfg4I&avlS&~V+E`lJXbMpX5>knUjRdw48!aLhq85TF6hv** zQtU(xsTWf%7?L6pbyjEB$vDou6k(scJ7bf^Q{8tt=e&1+9y~RasAP7pUjU%SiK{L# zGmWa5yzE^F@s&tnmAD+$M#^L2YLuImo2VgXgc!gJbey6EK;SzvA1ei$X%DZUV&DH_ z(8r_U`dqCJ@eAZOcHzK^xjLEAtU%l84O*EC9;-qTa1!r=GM5kc@Ulz>#I1Wjv@ zajH3^RP!A|4BfnQ6p}A)Y0g&~*dX{ljhX0)U$Q z0RaA8LGFPp!FCfQ)jK@&t;O+={x0000 Date: Fri, 28 Apr 2023 08:56:10 +0100 Subject: [PATCH 46/50] placable mint and sunflower seeds, added waving to most crops --- crops/artichoke.lua | 1 + crops/asparagus.lua | 1 + crops/barley.lua | 1 + crops/carrot.lua | 1 + crops/chili.lua | 1 + crops/coffee.lua | 1 + crops/corn.lua | 1 + crops/cotton.lua | 1 + crops/eggplant.lua | 1 + crops/garlic.lua | 2 +- crops/ginger.lua | 1 + crops/hemp.lua | 1 + crops/mint.lua | 17 +++++++++++++---- crops/onion.lua | 1 + crops/parsley.lua | 1 + crops/pineapple.lua | 1 + crops/rhubarb.lua | 1 + crops/rice.lua | 1 + crops/sunflower.lua | 17 ++++++++++++++--- crops/tomato.lua | 1 + crops/vanilla.lua | 1 + crops/wheat.lua | 1 + 22 files changed, 47 insertions(+), 8 deletions(-) diff --git a/crops/artichoke.lua b/crops/artichoke.lua index c42384f..2dc5deb 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -20,6 +20,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/asparagus.lua b/crops/asparagus.lua index 0a826dc..5924037 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -23,6 +23,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/barley.lua b/crops/barley.lua index 9f3d2ba..cf2d932 100644 --- a/crops/barley.lua +++ b/crops/barley.lua @@ -48,6 +48,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/carrot.lua b/crops/carrot.lua index da81fb5..0f53c87 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -58,6 +58,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/chili.lua b/crops/chili.lua index 9e52870..21aa371 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -58,6 +58,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 4, plant = 1, attached_node = 1, diff --git a/crops/coffee.lua b/crops/coffee.lua index 728d307..64d4e13 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -52,6 +52,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/corn.lua b/crops/corn.lua index 602e545..b124e19 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -113,6 +113,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/cotton.lua b/crops/cotton.lua index 1ea85bf..f231f24 100644 --- a/crops/cotton.lua +++ b/crops/cotton.lua @@ -100,6 +100,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 4, plant = 1, attached_node = 1, diff --git a/crops/eggplant.lua b/crops/eggplant.lua index 818b490..7b6a8f3 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -22,6 +22,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/garlic.lua b/crops/garlic.lua index 3366924..ca2005a 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -7,7 +7,7 @@ local S = farming.intllib --- potato +-- garlic clove minetest.register_craftitem("farming:garlic_clove", { description = S("Garlic clove"), inventory_image = "crops_garlic_clove.png", diff --git a/crops/ginger.lua b/crops/ginger.lua index 4098987..7cfbd05 100644 --- a/crops/ginger.lua +++ b/crops/ginger.lua @@ -21,6 +21,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/hemp.lua b/crops/hemp.lua index 9d19784..da5d568 100644 --- a/crops/hemp.lua +++ b/crops/hemp.lua @@ -192,6 +192,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/mint.lua b/crops/mint.lua index 53546ba..a0057a5 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -2,13 +2,21 @@ local S = farming.intllib -- mint seed -minetest.register_craftitem("farming:seed_mint", { +minetest.register_node("farming:seed_mint", { description = S("Mint Seeds"), + tiles = {"farming_mint_seeds.png"}, inventory_image = "farming_mint_seeds.png", - groups = {seed = 2, flammable = 2}, + wield_image = "farming_mint_seeds.png", + drawtype = "signlike", + groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1, flammable = 2}, + paramtype = "light", + paramtype2 = "wallmounted", + walkable = false, + sunlight_propagates = true, + selection_box = farming.select, + next_plant = "farming:mint_1", on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed( - itemstack, placer, pointed_thing, "farming:mint_1") + return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_mint") end }) @@ -47,6 +55,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/onion.lua b/crops/onion.lua index af002ec..2b6fd91 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -54,6 +54,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 3, plant = 1, attached_node = 1, diff --git a/crops/parsley.lua b/crops/parsley.lua index 3399cfc..e2dab3e 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -19,6 +19,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/pineapple.lua b/crops/pineapple.lua index e8a09b9..73cd6bc 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -85,6 +85,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index b8734de..989b72b 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -38,6 +38,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/rice.lua b/crops/rice.lua index 3b87003..44a451b 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -54,6 +54,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 4, plant = 1, attached_node = 1, diff --git a/crops/sunflower.lua b/crops/sunflower.lua index 03604c4..c3cb6b1 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -8,12 +8,22 @@ minetest.register_craftitem("farming:sunflower", { }) -- sunflower seeds -minetest.register_craftitem("farming:seed_sunflower", { +minetest.register_node("farming:seed_sunflower", { description = S("Sunflower Seeds"), + tiles = {"farming_sunflower_seeds.png"}, inventory_image = "farming_sunflower_seeds.png", - groups = {seed = 2, food_sunflower_seeds = 1, flammable = 2}, + wield_image = "farming_sunflower_seeds.png", + drawtype = "signlike", + groups = {seed = 1, snappy = 3, attached_node = 1, growing = 1, + food_sunflower_seeds = 1, flammable = 2}, + paramtype = "light", + paramtype2 = "wallmounted", + walkable = false, + sunlight_propagates = true, + selection_box = farming.select, + next_plant = "farming:sunflower_1", on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:sunflower_1") + return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_sunflower") end }) @@ -98,6 +108,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/tomato.lua b/crops/tomato.lua index 8362c68..5541067 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -43,6 +43,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/vanilla.lua b/crops/vanilla.lua index 4e048e1..c5304e9 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -20,6 +20,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 2, plant = 1, attached_node = 1, diff --git a/crops/wheat.lua b/crops/wheat.lua index 252403e..d59e7e0 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -159,6 +159,7 @@ local def = { walkable = false, buildable_to = true, drop = "", + waving = 1, selection_box = farming.select, groups = { snappy = 3, flammable = 4, plant = 1, attached_node = 1, From 607105ed37d976d2dc597af1b527f0505e5913fb Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 28 Apr 2023 09:18:54 +0100 Subject: [PATCH 47/50] re-add rice seeds and recipe to dry into edible rice --- crops/rice.lua | 42 +++++++++++++++++++++++++-------- textures/farming_rice_seed.png | Bin 0 -> 165 bytes 2 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 textures/farming_rice_seed.png diff --git a/crops/rice.lua b/crops/rice.lua index 44a451b..2323e86 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -1,19 +1,41 @@ local S = farming.intllib +-- rice seed +minetest.register_node("farming:seed_rice", { + description = S("Rice Seed"), + tiles = {"farming_rice_seed.png"}, + inventory_image = "farming_rice_seed.png", + wield_image = "farming_rice_seed.png", + drawtype = "signlike", + groups = {seed = 1, snappy = 3, attached_node = 1, flammable = 4, growing = 1}, + paramtype = "light", + paramtype2 = "wallmounted", + walkable = false, + sunlight_propagates = true, + selection_box = farming.select, + next_plant = "farming:rice_1", + on_place = function(itemstack, placer, pointed_thing) + return farming.place_seed(itemstack, placer, pointed_thing, "farming:seed_rice") + end +}) + -- rice minetest.register_craftitem("farming:rice", { description = S("Rice"), inventory_image = "farming_rice.png", groups = {seed = 2, food_rice = 1, flammable = 2}, - on_place = function(itemstack, placer, pointed_thing) - return farming.place_seed(itemstack, placer, pointed_thing, "farming:rice_1") - end }) --- replacement for rice seeds that was removed -minetest.register_alias("farming:seed_rice", "farming:rice") +-- dry rice seed to give edible rice +minetest.register_craft({ + type = "cooking", + cooktime = 1, + output = "farming:rice", + recipe = "farming:seed_rice" +}) +-- rice flour and bread minetest.register_craftitem("farming:rice_bread", { description = S("Rice Bread"), inventory_image = "farming_rice_bread.png", @@ -100,8 +122,8 @@ minetest.register_node("farming:rice_6", table.copy(def)) def.tiles = {"farming_rice_7.png"} def.drop = { items = { - {items = {"farming:rice"}, rarity = 1}, - {items = {"farming:rice"}, rarity = 3} + {items = {"farming:seed_rice"}, rarity = 1}, + {items = {"farming:seed_rice"}, rarity = 3} } } minetest.register_node("farming:rice_7", table.copy(def)) @@ -112,8 +134,8 @@ def.groups.growing = nil def.selection_box = farming.select_final def.drop = { items = { - {items = {"farming:rice 2"}, rarity = 1}, - {items = {"farming:rice"}, rarity = 2} + {items = {"farming:seed_rice 2"}, rarity = 1}, + {items = {"farming:seed_rice"}, rarity = 2} } } minetest.register_node("farming:rice_8", table.copy(def)) @@ -121,7 +143,7 @@ minetest.register_node("farming:rice_8", table.copy(def)) -- add to registered_plants farming.registered_plants["farming:rice"] = { crop = "farming:rice", - seed = "farming:rice", + seed = "farming:seed_rice", minlight = farming.min_light, maxlight = farming.max_light, steps = 8 diff --git a/textures/farming_rice_seed.png b/textures/farming_rice_seed.png new file mode 100644 index 0000000000000000000000000000000000000000..8a84f58d063488a2a4b276e7cfd55a0bd19e7ce9 GIT binary patch literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ1=7!NZhLWO_p5vR-#;OXk; Jvd$@?2>?=mHJJba literal 0 HcmV?d00001 From 7e544333cd4e3ba2c28ecf07d3a76fce11c0805e Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 28 Apr 2023 09:25:26 +0100 Subject: [PATCH 48/50] rice crop has chance of giving more --- crops/rice.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crops/rice.lua b/crops/rice.lua index 2323e86..892278d 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -123,6 +123,7 @@ def.tiles = {"farming_rice_7.png"} def.drop = { items = { {items = {"farming:seed_rice"}, rarity = 1}, + {items = {"farming:seed_rice"}, rarity = 2}, {items = {"farming:seed_rice"}, rarity = 3} } } @@ -135,7 +136,8 @@ def.selection_box = farming.select_final def.drop = { items = { {items = {"farming:seed_rice 2"}, rarity = 1}, - {items = {"farming:seed_rice"}, rarity = 2} + {items = {"farming:seed_rice 2"}, rarity = 2}, + {items = {"farming:seed_rice"}, rarity = 3} } } minetest.register_node("farming:rice_8", table.copy(def)) From a02be7f987761352c304c405f9d917762afe1001 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 1 May 2023 08:11:13 +0100 Subject: [PATCH 49/50] junglegrass drops rice seed instead of rice food --- grass.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grass.lua b/grass.lua index a52ace9..86e7ac5 100644 --- a/grass.lua +++ b/grass.lua @@ -39,7 +39,7 @@ minetest.override_item("default:junglegrass", { max_items = 1, items = { {items = {"farming:seed_cotton"}, rarity = 8}, - {items = {"farming:rice"},rarity = 8}, + {items = {"farming:seed_rice"},rarity = 8}, {items = {"default:junglegrass"}} } } From 50009ded2a8a1f5444dcf8f7d12a5560864c9605 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 20 May 2023 06:47:32 +0100 Subject: [PATCH 50/50] fix turkish delight recipe (thx kiedtl) --- food.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/food.lua b/food.lua index f182bb1..ca1ed16 100644 --- a/food.lua +++ b/food.lua @@ -257,6 +257,7 @@ minetest.register_craft({ {"group:food_sugar", "dye:pink", "group:food_sugar"} }, replacements = { + {"group:food_cornstarch", "farming:bowl"}, {"group:food_cornstarch", "farming:bowl"}, {"group:food_rose_water", "vessels:glass_bottle"} }