From c94510023702c68e5c8c00db75300c417b8fe5d0 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Sat, 10 Sep 2022 08:44:29 +0100 Subject: [PATCH] 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