From e2ec7d707e131f6d7b2a05c3c32b916e80d843c4 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 26 Jul 2024 13:56:45 +0100 Subject: [PATCH] added {eatable} group to food items and tooltip HP info --- README.md | 1 + compatibility.lua | 12 +++-- crops/artichoke.lua | 6 ++- crops/asparagus.lua | 6 ++- crops/beans.lua | 4 +- crops/beetroot.lua | 10 ++-- crops/blackberry.lua | 4 +- crops/blueberry.lua | 12 ++--- crops/cabbage.lua | 6 ++- crops/carrot.lua | 15 +++--- crops/chili.lua | 10 ++-- crops/cocoa.lua | 10 ++-- crops/coffee.lua | 4 +- crops/corn.lua | 14 +++--- crops/cucumber.lua | 6 ++- crops/eggplant.lua | 6 ++- crops/garlic.lua | 4 +- crops/ginger.lua | 6 ++- crops/grapes.lua | 6 ++- crops/lettuce.lua | 6 ++- crops/melon.lua | 6 ++- crops/mint.lua | 4 +- crops/onion.lua | 10 ++-- crops/parsley.lua | 9 ++-- crops/peas.lua | 9 ++-- crops/pepper.lua | 12 ++--- crops/pineapple.lua | 8 ++-- crops/potato.lua | 14 +++--- crops/pumpkin.lua | 10 ++-- crops/raspberry.lua | 12 +++-- crops/rhubarb.lua | 10 ++-- crops/rice.lua | 4 +- crops/ryeoatrice.lua | 4 +- crops/soy.lua | 14 +++--- crops/spinach.lua | 6 ++- crops/strawberry.lua | 5 +- crops/sunflower.lua | 10 ++-- crops/tomato.lua | 8 ++-- crops/vanilla.lua | 6 ++- crops/wheat.lua | 4 +- food.lua | 111 +++++++++++++++++++++---------------------- 41 files changed, 240 insertions(+), 184 deletions(-) diff --git a/README.md b/README.md index 712dd62..0f1359a 100644 --- a/README.md +++ b/README.md @@ -217,6 +217,7 @@ on an older map are enabled and growing properly. ### Changelog: +- 1.49 - Added {eatable=1} groups to food items with the value giving HP when eaten, added HP info to food tooltips. - 1.48 - added 'farming_use_utensils' setting to enable/disable utensils in recipes, added mayonnaise (thx felfa), added gingerbread man, Added MineClone2 compatibility - 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) diff --git a/compatibility.lua b/compatibility.lua index 687eee0..bd12fc9 100644 --- a/compatibility.lua +++ b/compatibility.lua @@ -17,7 +17,7 @@ if eth then alias("farming_plus:banana", "ethereal:banana") else minetest.register_node(":ethereal:banana", { - description = S("Banana"), + description = S("Banana") .. " (♥2)", drawtype = "torchlike", tiles = {"farming_banana_single.png"}, inventory_image = "farming_banana_single.png", @@ -29,7 +29,9 @@ else type = "fixed", fixed = {-0.2, -0.5, -0.2, 0.2, 0.2, 0.2} }, - groups = {food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2}, + groups = { + food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2, eatable = 2 + }, is_ground_content = false, on_use = minetest.item_eat(2), sounds = farming.sounds.node_sound_leaves_defaults() @@ -77,7 +79,7 @@ if eth then alias("farming_plus:orange_seed", "ethereal:orange_tree_sapling") else minetest.register_node(":ethereal:orange", { - description = S("Orange"), + description = S("Orange") .. " (♥4)", drawtype = "plantlike", tiles = {"farming_orange.png"}, inventory_image = "farming_orange.png", @@ -89,7 +91,9 @@ else type = "fixed", fixed = {-0.2, -0.3, -0.2, 0.2, 0.2, 0.2} }, - groups = {food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2}, + groups = { + food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2, eatable = 4 + }, is_ground_content = false, on_use = minetest.item_eat(4), sounds = farming.sounds.node_sound_leaves_defaults() diff --git a/crops/artichoke.lua b/crops/artichoke.lua index 7b5f037..a366300 100644 --- a/crops/artichoke.lua +++ b/crops/artichoke.lua @@ -3,9 +3,11 @@ local S = farming.translate -- item definition minetest.register_craftitem("farming:artichoke", { - description = S("Artichoke"), + description = S("Artichoke") .. " (♥4)", inventory_image = "farming_artichoke.png", - groups = {compostability = 48, seed = 2, food_artichoke = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_artichoke = 1, flammable = 2, eatable = 4 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:artichoke_1") end, diff --git a/crops/asparagus.lua b/crops/asparagus.lua index ed4f74f..ddba6a7 100644 --- a/crops/asparagus.lua +++ b/crops/asparagus.lua @@ -3,9 +3,11 @@ local S = farming.translate -- asparagus minetest.register_craftitem("farming:asparagus", { - description = S("Asparagus"), + description = S("Asparagus") .. " (♥1)", inventory_image = "farming_asparagus.png", - groups = {compostability = 48, seed = 2, food_asparagus = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_asparagus = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:asparagus_1") end, diff --git a/crops/beans.lua b/crops/beans.lua index d36eb9b..61ec21a 100644 --- a/crops/beans.lua +++ b/crops/beans.lua @@ -70,9 +70,9 @@ end -- beans minetest.register_craftitem("farming:beans", { - description = S("Green Beans"), + description = S("Green Beans" .. " (♥1)"), inventory_image = "farming_beans.png", - groups = {compostability = 48, seed = 2, food_beans = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_beans = 1, flammable = 2, eatable = 1}, on_use = minetest.item_eat(1), on_place = function(itemstack, placer, pointed_thing) return place_beans(itemstack, placer, pointed_thing, "farming:beanpole_1") diff --git a/crops/beetroot.lua b/crops/beetroot.lua index d13bdd1..23e10b9 100644 --- a/crops/beetroot.lua +++ b/crops/beetroot.lua @@ -4,9 +4,11 @@ local a = farming.recipe_items -- beetroot minetest.register_craftitem("farming:beetroot", { - description = S("Beetroot"), + description = S("Beetroot") .. " (♥1)", inventory_image = "farming_beetroot.png", - groups = {compostability = 48, seed = 2, food_beetroot = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_beetroot = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:beetroot_1") end, @@ -15,9 +17,9 @@ minetest.register_craftitem("farming:beetroot", { -- beetroot soup minetest.register_craftitem("farming:beetroot_soup", { - description = S("Beetroot Soup"), + description = S("Beetroot Soup") .. " (♥6)", inventory_image = "farming_beetroot_soup.png", - groups = {flammable = 2}, + groups = {flammable = 2, eatable = 6}, on_use = minetest.item_eat(6, "farming:bowl") }) diff --git a/crops/blackberry.lua b/crops/blackberry.lua index 5fa761d..c90e956 100644 --- a/crops/blackberry.lua +++ b/crops/blackberry.lua @@ -3,11 +3,11 @@ local S = farming.translate -- blackberries minetest.register_craftitem("farming:blackberry", { - description = S("Blackberries"), + description = S("Blackberries" .. " (♥1)"), inventory_image = "farming_blackberry.png", groups = { compostability = 48, seed = 2, food_blackberries = 1, food_blackberry = 1, - food_berry = 1, flammable = 2 + food_berry = 1, flammable = 2, eatable = 1 }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:blackberry_1") diff --git a/crops/blueberry.lua b/crops/blueberry.lua index 3e51086..11708e0 100644 --- a/crops/blueberry.lua +++ b/crops/blueberry.lua @@ -4,11 +4,11 @@ local a = farming.recipe_items -- blueberries minetest.register_craftitem("farming:blueberries", { - description = S("Wild Blueberries"), + description = S("Wild Blueberries") .. " (♥1)", inventory_image = "farming_blueberries.png", groups = { compostability = 48,seed = 2, food_blueberries = 1, food_blueberry = 1, - food_berry = 1, flammable = 2 + food_berry = 1, flammable = 2, eatable = 1 }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:blueberry_1") @@ -18,10 +18,10 @@ minetest.register_craftitem("farming:blueberries", { -- blueberry muffin (thanks to sosogirl123 @ deviantart.com for muffin image) minetest.register_craftitem("farming:muffin_blueberry", { - description = S("Blueberry Muffin"), + description = S("Blueberry Muffin") .. " (♥2)", inventory_image = "farming_blueberry_muffin.png", on_use = minetest.item_eat(2), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 2} }) minetest.register_craft({ @@ -33,10 +33,10 @@ minetest.register_craft({ -- Blueberry Pie minetest.register_craftitem("farming:blueberry_pie", { - description = S("Blueberry Pie"), + description = S("Blueberry Pie") .. " (♥6)", inventory_image = "farming_blueberry_pie.png", on_use = minetest.item_eat(6), - groups = {compostability = 75} + groups = {compostability = 75, eatable = 6} }) minetest.register_craft({ diff --git a/crops/cabbage.lua b/crops/cabbage.lua index 8df4390..8bec347 100644 --- a/crops/cabbage.lua +++ b/crops/cabbage.lua @@ -3,9 +3,11 @@ local S = farming.translate -- cabbage minetest.register_craftitem("farming:cabbage", { - description = S("Cabbage"), + description = S("Cabbage") .. " (♥1)", inventory_image = "farming_cabbage.png", - groups = {compostability = 48, seed = 2, food_cabbage = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_cabbage = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:cabbage_1") end, diff --git a/crops/carrot.lua b/crops/carrot.lua index 505be22..7313010 100644 --- a/crops/carrot.lua +++ b/crops/carrot.lua @@ -9,9 +9,11 @@ local a = farming.recipe_items -- carrot minetest.register_craftitem("farming:carrot", { - description = S("Carrot"), + description = S("Carrot") .. " (♥4)", inventory_image = "farming_carrot.png", - groups = {compostability = 48, seed = 2, food_carrot = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_carrot = 1, flammable = 2, eatable = 4 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:carrot_1") end, @@ -20,10 +22,10 @@ minetest.register_craftitem("farming:carrot", { -- carrot juice minetest.register_craftitem("farming:carrot_juice", { - description = S("Carrot Juice"), + description = S("Carrot Juice") .. " (♥4)", inventory_image = "farming_carrot_juice.png", on_use = minetest.item_eat(4, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1} + groups = {vessel = 1, drink = 1, eatable = 4} }) minetest.register_craft({ @@ -40,9 +42,10 @@ minetest.register_craft({ -- golden carrot minetest.register_craftitem("farming:carrot_gold", { - description = S("Golden Carrot"), + description = S("Golden Carrot") .. " (♥10)", inventory_image = "farming_carrot_gold.png", - on_use = minetest.item_eat(10) + on_use = minetest.item_eat(10), + groups = {eatable = 10} }) minetest.register_craft({ diff --git a/crops/chili.lua b/crops/chili.lua index db6764e..d8484e5 100644 --- a/crops/chili.lua +++ b/crops/chili.lua @@ -4,9 +4,11 @@ local a = farming.recipe_items -- chili pepper minetest.register_craftitem("farming:chili_pepper", { - description = S("Chili Pepper"), + description = S("Chili Pepper") .. " (♥2)", inventory_image = "farming_chili_pepper.png", - groups = {compostability = 48, seed = 2, food_chili_pepper = 1, flammable = 4}, + groups = { + compostability = 48, seed = 2, food_chili_pepper = 1, flammable = 4, eatable = 2 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:chili_1") end, @@ -15,10 +17,10 @@ minetest.register_craftitem("farming:chili_pepper", { -- bowl of chili minetest.register_craftitem("farming:chili_bowl", { - description = S("Bowl of Chili"), + description = S("Bowl of Chili") .. " (♥8)", inventory_image = "farming_chili_bowl.png", on_use = minetest.item_eat(8, a.bowl), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 8} }) minetest.register_craft({ diff --git a/crops/cocoa.lua b/crops/cocoa.lua index b252c55..75abbed 100644 --- a/crops/cocoa.lua +++ b/crops/cocoa.lua @@ -94,9 +94,10 @@ minetest.register_craft( { -- chocolate cookie minetest.register_craftitem("farming:cookie", { - description = S("Cookie"), + description = S("Cookie") .. " (♥2)", inventory_image = "farming_cookie.png", - on_use = minetest.item_eat(2) + on_use = minetest.item_eat(2), + groups = {eatable = 2} }) minetest.register_craft( { @@ -108,9 +109,10 @@ minetest.register_craft( { -- bar of dark chocolate (thanks to Ice Pandora for her deviantart.com chocolate tutorial) minetest.register_craftitem("farming:chocolate_dark", { - description = S("Bar of Dark Chocolate"), + description = S("Bar of Dark Chocolate") .. " (♥3)", inventory_image = "farming_chocolate_dark.png", - on_use = minetest.item_eat(3) + on_use = minetest.item_eat(3), + groups = {eatable = 3} }) minetest.register_craft( { diff --git a/crops/coffee.lua b/crops/coffee.lua index 460fefb..9c04236 100644 --- a/crops/coffee.lua +++ b/crops/coffee.lua @@ -14,7 +14,7 @@ minetest.register_craftitem("farming:coffee_beans", { -- cup of coffee minetest.register_node("farming:coffee_cup", { - description = S("Cup of Coffee"), + description = S("Cup of Coffee") .. " (♥2)", drawtype = "torchlike", tiles = {"farming_coffee_cup.png"}, inventory_image = "farming_coffee_cup.png", @@ -25,7 +25,7 @@ minetest.register_node("farming:coffee_cup", { type = "fixed", fixed = {-0.25, -0.5, -0.25, 0.25, 0.25, 0.25} }, - groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1}, + groups = {vessel = 1, dig_immediate = 3, attached_node = 1, drink = 1, eatable = 2}, is_ground_content = false, on_use = minetest.item_eat(2, "vessels:drinking_glass"), sounds = farming.sounds.node_sound_glass_defaults() diff --git a/crops/corn.lua b/crops/corn.lua index 302e42b..f5a87be 100644 --- a/crops/corn.lua +++ b/crops/corn.lua @@ -9,9 +9,11 @@ local a = farming.recipe_items -- corn minetest.register_craftitem("farming:corn", { - description = S("Corn"), + description = S("Corn") .. " (♥3)", inventory_image = "farming_corn.png", - groups = {compostability = 45, seed = 2, food_corn = 1, flammable = 2}, + groups = { + compostability = 45, seed = 2, food_corn = 1, flammable = 2, eatable = 3 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:corn_1") end, @@ -20,9 +22,9 @@ minetest.register_craftitem("farming:corn", { -- corn on the cob (texture by TenPlus1) minetest.register_craftitem("farming:corn_cob", { - description = S("Corn on the Cob"), + description = S("Corn on the Cob") .. " (♥5)", inventory_image = "farming_corn_cob.png", - groups = {compostability = 65, food_corn_cooked = 1, flammable = 2}, + groups = {compostability = 65, food_corn_cooked = 1, flammable = 2, eatable = 5}, on_use = minetest.item_eat(5) }) @@ -35,9 +37,9 @@ minetest.register_craft({ -- popcorn minetest.register_craftitem("farming:popcorn", { - description = S("Popcorn"), + description = S("Popcorn") .. " (♥4)", inventory_image = "farming_popcorn.png", - groups = {compostability = 55, food_popcorn = 1, flammable = 2}, + groups = {compostability = 55, food_popcorn = 1, flammable = 2, eatable = 4}, on_use = minetest.item_eat(4) }) diff --git a/crops/cucumber.lua b/crops/cucumber.lua index a9b5b80..f207395 100644 --- a/crops/cucumber.lua +++ b/crops/cucumber.lua @@ -8,9 +8,11 @@ local S = farming.translate -- cucumber minetest.register_craftitem("farming:cucumber", { - description = S("Cucumber"), + description = S("Cucumber") .. " (♥4)", inventory_image = "farming_cucumber.png", - groups = {compostability = 48, seed = 2, food_cucumber = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_cucumber = 1, flammable = 2, eatable = 4 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:cucumber_1") end, diff --git a/crops/eggplant.lua b/crops/eggplant.lua index 29279a4..c923772 100644 --- a/crops/eggplant.lua +++ b/crops/eggplant.lua @@ -3,9 +3,11 @@ local S = farming.translate -- eggplant minetest.register_craftitem("farming:eggplant", { - description = S("Eggplant"), + description = S("Eggplant") .. " (♥3)", inventory_image = "farming_eggplant.png", - groups = {compostability = 48, seed = 2, food_eggplant = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_eggplant = 1, flammable = 2, eatable = 3 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:eggplant_1") end, diff --git a/crops/garlic.lua b/crops/garlic.lua index 81d94de..ce76922 100644 --- a/crops/garlic.lua +++ b/crops/garlic.lua @@ -13,10 +13,10 @@ minetest.register_craftitem("farming:garlic_clove", { -- garlic bulb minetest.register_craftitem("farming:garlic", { - description = S("Garlic"), + description = S("Garlic") .. " (♥1)", inventory_image = "crops_garlic.png", on_use = minetest.item_eat(1), - groups = {food_garlic = 1, flammable = 3, compostability = 55} + groups = {food_garlic = 1, flammable = 3, compostability = 55, eatable = 1} }) minetest.register_craft({ diff --git a/crops/ginger.lua b/crops/ginger.lua index 3534314..e161c7a 100644 --- a/crops/ginger.lua +++ b/crops/ginger.lua @@ -3,9 +3,11 @@ local S = farming.translate -- ginger minetest.register_craftitem("farming:ginger", { - description = S("Ginger"), + description = S("Ginger") .. " (♥1)", inventory_image = "farming_ginger.png", - groups = {compostability = 48, seed = 2, food_ginger = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_ginger = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:ginger_1") end, diff --git a/crops/grapes.lua b/crops/grapes.lua index f13226e..6445323 100644 --- a/crops/grapes.lua +++ b/crops/grapes.lua @@ -65,10 +65,12 @@ end -- grapes minetest.register_craftitem("farming:grapes", { - description = S("Grapes"), + description = S("Grapes") .. " (♥2)", inventory_image = "farming_grapes.png", on_use = minetest.item_eat(2), - groups = {compostability = 48, seed = 2, food_grapes = 1, flammable = 3}, + groups = { + compostability = 48, seed = 2, food_grapes = 1, flammable = 3, eatable = 2 + }, on_place = function(itemstack, placer, pointed_thing) return place_grapes(itemstack, placer, pointed_thing, "farming:grapes_1") end diff --git a/crops/lettuce.lua b/crops/lettuce.lua index 92b1b9e..268cca1 100644 --- a/crops/lettuce.lua +++ b/crops/lettuce.lua @@ -3,9 +3,11 @@ local S = farming.translate -- lettuce minetest.register_craftitem("farming:lettuce", { - description = S("Lettuce"), + description = S("Lettuce") .. " (♥2)", inventory_image = "farming_lettuce.png", - groups = {compostability = 48, seed = 2, food_lettuce = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_lettuce = 1, flammable = 2, eatable = 2 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:lettuce_1") end, diff --git a/crops/melon.lua b/crops/melon.lua index a3d31ea..8e16e50 100644 --- a/crops/melon.lua +++ b/crops/melon.lua @@ -4,9 +4,11 @@ local a = farming.recipe_items -- melon minetest.register_craftitem("farming:melon_slice", { - description = S("Melon Slice"), + description = S("Melon Slice") .. " (♥2)", inventory_image = "farming_melon_slice.png", - groups = {compostability = 48, seed = 2, food_melon_slice = 1, flammable = 3}, + groups = { + compostability = 48, seed = 2, food_melon_slice = 1, flammable = 3, eatable = 2 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:melon_1") end, diff --git a/crops/mint.lua b/crops/mint.lua index 9c0ff2d..da39cc2 100644 --- a/crops/mint.lua +++ b/crops/mint.lua @@ -38,10 +38,10 @@ minetest.register_craftitem("farming:mint_leaf", { -- mint tea minetest.register_craftitem("farming:mint_tea", { - description = S("Mint Tea"), + description = S("Mint Tea") .. " (♥2)", inventory_image = "farming_mint_tea.png", on_use = minetest.item_eat(2, a.drinking_glass), - groups = {flammable = 4} + groups = {flammable = 4, eatable = 2} }) minetest.register_craft({ diff --git a/crops/onion.lua b/crops/onion.lua index 9042aab..c849b31 100644 --- a/crops/onion.lua +++ b/crops/onion.lua @@ -10,9 +10,11 @@ local a = farming.recipe_items -- onion minetest.register_craftitem("farming:onion", { - description = S("Onion"), + description = S("Onion") .. " (♥1)", inventory_image = "crops_onion.png", - groups = {compostability = 48, seed = 2, food_onion = 1, flammable = 3}, + groups = { + compostability = 48, seed = 2, food_onion = 1, flammable = 3, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:onion_1") end, @@ -21,9 +23,9 @@ minetest.register_craftitem("farming:onion", { -- onion soup minetest.register_craftitem("farming:onion_soup", { - description = S("Onion Soup"), + description = S("Onion Soup") .. " (♥6)", inventory_image = "farming_onion_soup.png", - groups = {flammable = 2, compostability = 65}, + groups = {flammable = 2, compostability = 65, eatable = 6}, on_use = minetest.item_eat(6, a.bowl) }) diff --git a/crops/parsley.lua b/crops/parsley.lua index 58cb572..beb92f4 100644 --- a/crops/parsley.lua +++ b/crops/parsley.lua @@ -3,12 +3,15 @@ local S = farming.translate -- item definition minetest.register_craftitem("farming:parsley", { - description = S("Parsley"), + description = S("Parsley") .. " (♥1)", inventory_image = "farming_parsley.png", - groups = {compostability = 48, seed = 2, food_parsley = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_parsley = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:parsley_1") - end + end, + on_use = minetest.item_eat(1) }) -- crop definition diff --git a/crops/peas.lua b/crops/peas.lua index 511037d..c242abe 100644 --- a/crops/peas.lua +++ b/crops/peas.lua @@ -6,10 +6,11 @@ local a = farming.recipe_items -- pea pod minetest.register_craftitem("farming:pea_pod", { - description = S("Pea Pod"), + description = S("Pea Pod") .. " (♥1)", inventory_image = "farming_pea_pod.png", groups = { - compostability = 48, seed = 2, food_peas = 1, food_pea_pod = 1, flammable = 2 + compostability = 48, seed = 2, food_peas = 1, food_pea_pod = 1, flammable = 2, + eatable = 1 }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pea_1") @@ -22,9 +23,9 @@ minetest.register_alias("farming:peas", "farming:pea_pod") -- pea soup minetest.register_craftitem("farming:pea_soup", { - description = S("Pea Soup"), + description = S("Pea Soup") .. " (♥4)", inventory_image = "farming_pea_soup.png", - groups = {flammable = 2, compostability = 65}, + groups = {flammable = 2, compostability = 65, eatable = 4}, on_use = minetest.item_eat(4, a.bowl) }) diff --git a/crops/pepper.lua b/crops/pepper.lua index 7e99fc7..4b187c5 100644 --- a/crops/pepper.lua +++ b/crops/pepper.lua @@ -20,26 +20,26 @@ minetest.register_craftitem("farming:peppercorn", { -- green pepper minetest.register_craftitem("farming:pepper", { - description = S("Green Pepper"), + description = S("Green Pepper") .. " (♥2)", inventory_image = "crops_pepper.png", on_use = minetest.item_eat(2), - groups = {food_pepper = 1, flammable = 3, compostability = 55} + groups = {food_pepper = 1, flammable = 3, compostability = 55, eatable = 2} }) -- yellow pepper minetest.register_craftitem("farming:pepper_yellow", { - description = S("Yellow Pepper"), + description = S("Yellow Pepper") .. " (♥3)", inventory_image = "crops_pepper_yellow.png", on_use = minetest.item_eat(3), - groups = {food_pepper = 1, flammable = 3, compostability = 55} + groups = {food_pepper = 1, flammable = 3, compostability = 55, eatable = 3} }) -- red pepper minetest.register_craftitem("farming:pepper_red", { - description = S("Red Pepper"), + description = S("Red Pepper") .. " (♥3)", inventory_image = "crops_pepper_red.png", on_use = minetest.item_eat(4), - groups = {food_pepper = 1, flammable = 3, compostability = 55} + groups = {food_pepper = 1, flammable = 3, compostability = 55, eatable = 3} }) minetest.register_craft({ diff --git a/crops/pineapple.lua b/crops/pineapple.lua index 5a5f9a4..b7f94f0 100644 --- a/crops/pineapple.lua +++ b/crops/pineapple.lua @@ -36,9 +36,9 @@ minetest.register_node("farming:pineapple", { -- pineapple minetest.register_craftitem("farming:pineapple_ring", { - description = S("Pineapple Ring"), + description = S("Pineapple Ring") .. " (♥1)", inventory_image = "farming_pineapple_ring.png", - groups = {food_pineapple_ring = 1, flammable = 2, compostability = 45}, + groups = {food_pineapple_ring = 1, flammable = 2, compostability = 45, eatable = 1}, on_use = minetest.item_eat(1) }) @@ -50,10 +50,10 @@ minetest.register_craft( { -- pineapple juice minetest.register_craftitem("farming:pineapple_juice", { - description = S("Pineapple Juice"), + description = S("Pineapple Juice") .. " (♥4)", inventory_image = "farming_pineapple_juice.png", on_use = minetest.item_eat(4, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1, compostability = 35} + groups = {vessel = 1, drink = 1, compostability = 35, eatable = 4} }) minetest.register_craft({ diff --git a/crops/potato.lua b/crops/potato.lua index 3de9678..2fa137d 100644 --- a/crops/potato.lua +++ b/crops/potato.lua @@ -8,9 +8,9 @@ local S = farming.translate -- potato minetest.register_craftitem("farming:potato", { - description = S("Potato"), + description = S("Potato") .. " (♥1)", inventory_image = "farming_potato.png", - groups = {compostability = 48, seed = 2, food_potato = 1, flammable = 2}, + groups = {compostability = 48, seed = 2, food_potato = 1, flammable = 2, eatable = 1}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:potato_1") end, @@ -28,9 +28,10 @@ minetest.register_craftitem("farming:potato", { -- baked potato minetest.register_craftitem("farming:baked_potato", { - description = S("Baked Potato"), + description = S("Baked Potato") .. " (♥6)", inventory_image = "farming_baked_potato.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {eatable = 6} }) minetest.register_craft({ @@ -42,9 +43,10 @@ minetest.register_craft({ -- Potato and cucumber Salad minetest.register_craftitem("farming:potato_salad", { - description = S("Cucumber and Potato Salad"), + description = S("Cucumber and Potato Salad") .. " (♥10)", inventory_image = "farming_potato_salad.png", - on_use = minetest.item_eat(10, "farming:bowl") + on_use = minetest.item_eat(10, "farming:bowl"), + groups = {eatable = 10} }) minetest.register_craft({ diff --git a/crops/pumpkin.lua b/crops/pumpkin.lua index 26611c8..437864b 100644 --- a/crops/pumpkin.lua +++ b/crops/pumpkin.lua @@ -3,9 +3,11 @@ local S = farming.translate -- pumpkin slice minetest.register_craftitem("farming:pumpkin_slice", { - description = S("Pumpkin Slice"), + description = S("Pumpkin Slice") .. " (♥2)", inventory_image = "farming_pumpkin_slice.png", - groups = {compostability = 48, seed = 2, food_pumpkin_slice = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_pumpkin_slice = 1, flammable = 2, eatable = 2 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:pumpkin_1") end, @@ -123,10 +125,10 @@ minetest.register_craft({ -- pumpkin bread minetest.register_craftitem("farming:pumpkin_bread", { - description = S("Pumpkin Bread"), + description = S("Pumpkin Bread") .. " (♥8)", inventory_image = "farming_pumpkin_bread.png", on_use = minetest.item_eat(8), - groups = {food_bread = 1, flammable = 2} + groups = {food_bread = 1, flammable = 2, eatable = 8} }) minetest.register_craftitem("farming:pumpkin_dough", { diff --git a/crops/raspberry.lua b/crops/raspberry.lua index 3bf543c..bae2ac1 100644 --- a/crops/raspberry.lua +++ b/crops/raspberry.lua @@ -4,10 +4,12 @@ local a = farming.recipe_items -- raspberries minetest.register_craftitem("farming:raspberries", { - description = S("Raspberries"), + description = S("Raspberries") .. " (♥1)", inventory_image = "farming_raspberries.png", - groups = {compostability = 48, seed = 2, food_raspberries = 1, food_raspberry = 1, - food_berry = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_raspberries = 1, food_raspberry = 1, + food_berry = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:raspberry_1") end, @@ -16,10 +18,10 @@ minetest.register_craftitem("farming:raspberries", { -- raspberry smoothie minetest.register_craftitem("farming:smoothie_raspberry", { - description = S("Raspberry Smoothie"), + description = S("Raspberry Smoothie") .. " (♥2)", inventory_image = "farming_raspberry_smoothie.png", on_use = minetest.item_eat(2, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1, compostability = 65} + groups = {vessel = 1, drink = 1, compostability = 65, eatable = 2} }) minetest.register_craft({ diff --git a/crops/rhubarb.lua b/crops/rhubarb.lua index 8933b3f..65e7cb0 100644 --- a/crops/rhubarb.lua +++ b/crops/rhubarb.lua @@ -4,9 +4,11 @@ local a = farming.recipe_items -- rhubarb minetest.register_craftitem("farming:rhubarb", { - description = S("Rhubarb"), + description = S("Rhubarb") .. " (♥1)", inventory_image = "farming_rhubarb.png", - groups = {compostability = 48, seed = 2, food_rhubarb = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_rhubarb = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:rhubarb_1") end, @@ -15,10 +17,10 @@ minetest.register_craftitem("farming:rhubarb", { -- rhubarb pie minetest.register_craftitem("farming:rhubarb_pie", { - description = S("Rhubarb Pie"), + description = S("Rhubarb Pie") .. " (♥6)", inventory_image = "farming_rhubarb_pie.png", on_use = minetest.item_eat(6), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ diff --git a/crops/rice.lua b/crops/rice.lua index b6bc098..5952d18 100644 --- a/crops/rice.lua +++ b/crops/rice.lua @@ -46,10 +46,10 @@ minetest.register_craft({ -- rice flour and bread minetest.register_craftitem("farming:rice_bread", { - description = S("Rice Bread"), + description = S("Rice Bread") .. " (♥5)", inventory_image = "farming_rice_bread.png", on_use = minetest.item_eat(5), - groups = {food_rice_bread = 1, flammable = 2, compostability = 65} + groups = {food_rice_bread = 1, flammable = 2, compostability = 65, eatable = 5} }) minetest.register_craftitem("farming:rice_flour", { diff --git a/crops/ryeoatrice.lua b/crops/ryeoatrice.lua index 90dfda9..4b63983 100644 --- a/crops/ryeoatrice.lua +++ b/crops/ryeoatrice.lua @@ -81,10 +81,10 @@ minetest.register_craft({ -- Multigrain bread minetest.register_craftitem("farming:bread_multigrain", { - description = S("Multigrain Bread"), + description = S("Multigrain Bread") .. " (♥7)", inventory_image = "farming_bread_multigrain.png", on_use = minetest.item_eat(7), - groups = {food_bread = 1, flammable = 2, compostability = 65} + groups = {food_bread = 1, flammable = 2, compostability = 65, eatable = 7} }) minetest.register_craft({ diff --git a/crops/soy.lua b/crops/soy.lua index babc65a..d8300ca 100644 --- a/crops/soy.lua +++ b/crops/soy.lua @@ -51,7 +51,7 @@ minetest.register_craft( { -- soy milk minetest.register_node("farming:soy_milk", { - description = S("Soy Milk"), + description = S("Soy Milk") .. " (♥2)", drawtype = "plantlike", tiles = {"farming_soy_milk_glass.png"}, inventory_image = "farming_soy_milk_glass.png", @@ -64,7 +64,7 @@ minetest.register_node("farming:soy_milk", { }, on_use = minetest.item_eat(2, "vessels:drinking_glass"), groups = { - vessel = 1, food_milk_glass = 1, dig_immediate = 3, + vessel = 1, food_milk_glass = 1, dig_immediate = 3, eatable = 2, attached_node = 1, drink = 1, compostability = 65 }, is_ground_content = false, @@ -85,9 +85,11 @@ minetest.register_craft( { -- tofu minetest.register_craftitem("farming:tofu", { - description = S("Tofu"), + description = S("Tofu") .. " (♥3)", inventory_image = "farming_tofu.png", - groups = {food_tofu = 1, food_meat_raw = 1, flammable = 2, compostability = 65}, + groups = { + food_tofu = 1, food_meat_raw = 1, flammable = 2, compostability = 65, eatable = 3 + }, on_use = minetest.item_eat(3) }) @@ -102,9 +104,9 @@ minetest.register_craft({ -- cooked tofu minetest.register_craftitem("farming:tofu_cooked", { - description = S("Cooked Tofu"), + description = S("Cooked Tofu") .. " (♥6)", inventory_image = "farming_tofu_cooked.png", - groups = {food_meat = 1, flammable = 2, compostability = 65}, + groups = {food_meat = 1, flammable = 2, compostability = 65, eatable = 6}, on_use = minetest.item_eat(6) }) diff --git a/crops/spinach.lua b/crops/spinach.lua index e58a764..fd611b9 100644 --- a/crops/spinach.lua +++ b/crops/spinach.lua @@ -3,9 +3,11 @@ local S = farming.translate -- spinach minetest.register_craftitem("farming:spinach", { - description = S("Spinach"), + description = S("Spinach") .. " (♥1)", inventory_image = "farming_spinach.png", - groups = {compostability = 48, seed = 2, food_spinach = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_spinach = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:spinach_1") end, diff --git a/crops/strawberry.lua b/crops/strawberry.lua index a31d063..a763c4b 100644 --- a/crops/strawberry.lua +++ b/crops/strawberry.lua @@ -3,10 +3,11 @@ local S = farming.translate -- Strawberry (can also be planted as seed) minetest.register_craftitem(":ethereal:strawberry", { - description = S("Strawberry"), + description = S("Strawberry") .. " (♥1)", inventory_image = "ethereal_strawberry.png", groups = { - compostability = 48, seed = 2, food_strawberry = 1, food_berry = 1, flammable = 2 + compostability = 48, seed = 2, food_strawberry = 1, food_berry = 1, + flammable = 2, eatable = 1 }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:strawberry_1") diff --git a/crops/sunflower.lua b/crops/sunflower.lua index 7c46afb..c21e3bc 100644 --- a/crops/sunflower.lua +++ b/crops/sunflower.lua @@ -45,9 +45,11 @@ minetest.register_craft({ -- sunflower seeds (toasted) minetest.register_craftitem("farming:sunflower_seeds_toasted", { - description = S("Toasted Sunflower Seeds"), + description = S("Toasted Sunflower Seeds") .. " (♥1)", inventory_image = "farming_sunflower_seeds_toasted.png", - groups = {food_sunflower_seeds_toasted = 1, flammable = 2, compostability = 65}, + groups = { + food_sunflower_seeds_toasted = 1, flammable = 2, compostability = 65, eatable = 1 + }, on_use = minetest.item_eat(1) }) @@ -97,10 +99,10 @@ minetest.register_craft({ -- sunflower seed bread minetest.register_craftitem("farming:sunflower_bread", { - description = S("Sunflower Seed Bread"), + description = S("Sunflower Seed Bread") .. " (♥8)", inventory_image = "farming_sunflower_bread.png", on_use = minetest.item_eat(8), - groups = {food_bread = 1, flammable = 2} + groups = {food_bread = 1, flammable = 2, eatable = 8} }) minetest.register_craft({ diff --git a/crops/tomato.lua b/crops/tomato.lua index 0bcddea..51cad19 100644 --- a/crops/tomato.lua +++ b/crops/tomato.lua @@ -8,9 +8,9 @@ local S = farming.translate -- tomato minetest.register_craftitem("farming:tomato", { - description = S("Tomato"), + description = S("Tomato") .. " (♥4)", inventory_image = "farming_tomato.png", - groups = {compostability = 45, seed = 2, food_tomato = 1, flammable = 2}, + groups = {compostability = 45, seed = 2, food_tomato = 1, flammable = 2, eatable = 4}, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:tomato_1") end, @@ -19,9 +19,9 @@ minetest.register_craftitem("farming:tomato", { -- tomato soup minetest.register_craftitem("farming:tomato_soup", { - description = S("Tomato Soup"), + description = S("Tomato Soup") .. " (♥8)", inventory_image = "farming_tomato_soup.png", - groups = {flammable = 2, compostability = 65}, + groups = {flammable = 2, compostability = 65, eatable = 8}, on_use = minetest.item_eat(8, "farming:bowl") }) diff --git a/crops/vanilla.lua b/crops/vanilla.lua index 0f557ce..a18136d 100644 --- a/crops/vanilla.lua +++ b/crops/vanilla.lua @@ -4,9 +4,11 @@ local a = farming.recipe_items -- vanilla minetest.register_craftitem("farming:vanilla", { - description = S("Vanilla"), + description = S("Vanilla") .. " (♥1)", inventory_image = "farming_vanilla.png", - groups = {compostability = 48, seed = 2, food_vanilla = 1, flammable = 2}, + groups = { + compostability = 48, seed = 2, food_vanilla = 1, flammable = 2, eatable = 1 + }, on_place = function(itemstack, placer, pointed_thing) return farming.place_seed(itemstack, placer, pointed_thing, "farming:vanilla_1") end, diff --git a/crops/wheat.lua b/crops/wheat.lua index 0566ced..c344062 100644 --- a/crops/wheat.lua +++ b/crops/wheat.lua @@ -99,10 +99,10 @@ minetest.register_craft({ -- bread minetest.register_craftitem("farming:bread", { - description = S("Bread"), + description = S("Bread") .. " (♥5)", inventory_image = "farming_bread.png", on_use = minetest.item_eat(5), - groups = {food_bread = 1, flammable = 2} + groups = {food_bread = 1, flammable = 2, eatable = 5} }) minetest.register_craft({ diff --git a/food.lua b/food.lua index fa1da47..45c048e 100644 --- a/food.lua +++ b/food.lua @@ -5,10 +5,10 @@ local a = farming.recipe_items -- sliced bread minetest.register_craftitem("farming:bread_slice", { - description = S("Sliced Bread"), + description = S("Sliced Bread") .. " (♥1)", inventory_image = "farming_bread_slice.png", on_use = minetest.item_eat(1), - groups = {food_bread_slice = 1, flammable = 2, compostability = 65} + groups = {food_bread_slice = 1, flammable = 2, compostability = 65, eatable = 1} }) minetest.register_craft({ @@ -20,10 +20,10 @@ minetest.register_craft({ -- toast minetest.register_craftitem("farming:toast", { - description = S("Toast"), + description = S("Toast") .. " (♥1)", inventory_image = "farming_toast.png", on_use = minetest.item_eat(1), - groups = {food_toast = 1, flammable = 2, compostability = 65} + groups = {food_toast = 1, flammable = 2, compostability = 65, eatable = 1} }) minetest.register_craft({ @@ -36,10 +36,10 @@ minetest.register_craft({ -- toast sandwich minetest.register_craftitem("farming:toast_sandwich", { - description = S("Toast Sandwich"), + description = S("Toast Sandwich") .. " (♥4)", inventory_image = "farming_toast_sandwich.png", on_use = minetest.item_eat(4), - groups = {flammable = 2, compostability = 85} + groups = {flammable = 2, compostability = 85, eatable = 4} }) minetest.register_craft({ @@ -182,8 +182,7 @@ minetest.register_node("farming:salt", { visual_scale = 0.8, paramtype = "light", tiles = {"farming_salt.png"}, - groups = {food_salt = 1, vessel = 1, dig_immediate = 3, - attached_node = 1}, + groups = {food_salt = 1, vessel = 1, dig_immediate = 3, attached_node = 1}, is_ground_content = false, sounds = farming.sounds.node_sound_defaults(), selection_box = { @@ -349,9 +348,9 @@ minetest.register_craft({ -- Turkish Delight minetest.register_craftitem("farming:turkish_delight", { - description = S("Turkish Delight"), + description = S("Turkish Delight") .. " (♥2)", inventory_image = "farming_turkish_delight.png", - groups = {flammable = 3, compostability = 85}, + groups = {flammable = 3, compostability = 85, eatable = 2}, on_use = minetest.item_eat(2) }) @@ -372,9 +371,9 @@ minetest.register_craft({ -- Garlic Bread minetest.register_craftitem("farming:garlic_bread", { - description = S("Garlic Bread"), + description = S("Garlic Bread") .. " (♥2)", inventory_image = "farming_garlic_bread.png", - groups = {flammable = 3, compostability = 65}, + groups = {flammable = 3, compostability = 65, eatable = 2}, on_use = minetest.item_eat(2) }) @@ -388,10 +387,10 @@ minetest.register_craft({ -- Donuts (thanks to Bockwurst for making the donut images) minetest.register_craftitem("farming:donut", { - description = S("Donut"), + description = S("Donut") .. " (♥4)", inventory_image = "farming_donut.png", on_use = minetest.item_eat(4), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 4} }) minetest.register_craft({ @@ -404,10 +403,10 @@ minetest.register_craft({ }) minetest.register_craftitem("farming:donut_chocolate", { - description = S("Chocolate Donut"), + description = S("Chocolate Donut") .. " (♥6)", inventory_image = "farming_donut_chocolate.png", on_use = minetest.item_eat(6), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -419,10 +418,10 @@ minetest.register_craft({ }) minetest.register_craftitem("farming:donut_apple", { - description = S("Apple Donut"), + description = S("Apple Donut") .. " (♥6)", inventory_image = "farming_donut_apple.png", on_use = minetest.item_eat(6), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -436,10 +435,10 @@ minetest.register_craft({ -- Porridge Oats minetest.register_craftitem("farming:porridge", { - description = S("Porridge"), + description = S("Porridge") .. " (♥6)", inventory_image = "farming_porridge.png", on_use = minetest.item_eat(6, a.bowl), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -457,10 +456,10 @@ minetest.register_craft({ -- Jaffa Cake minetest.register_craftitem("farming:jaffa_cake", { - description = S("Jaffa Cake"), + description = S("Jaffa Cake") .. " (♥6)", inventory_image = "farming_jaffa_cake.png", on_use = minetest.item_eat(6), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -481,10 +480,10 @@ minetest.register_craft({ -- Apple Pie minetest.register_craftitem("farming:apple_pie", { - description = S("Apple Pie"), + description = S("Apple Pie") .. " (♥6)", inventory_image = "farming_apple_pie.png", on_use = minetest.item_eat(6), - groups = {compostability = 75} + groups = {compostability = 75, eatable = 6} }) minetest.register_craft({ @@ -499,9 +498,9 @@ minetest.register_craft({ -- Cactus Juice minetest.register_craftitem("farming:cactus_juice", { - description = S("Cactus Juice"), + description = S("Cactus Juice") .. " (♥1)", inventory_image = "farming_cactus_juice.png", - groups = {vessel = 1, drink = 1, compostability = 55}, + groups = {vessel = 1, drink = 1, compostability = 55, eatable = 1}, on_use = function(itemstack, user, pointed_thing) @@ -557,10 +556,10 @@ minetest.register_craft({ -- Mac & Cheese minetest.register_craftitem("farming:mac_and_cheese", { - description = S("Mac & Cheese"), + description = S("Mac & Cheese") .. " (♥6)", inventory_image = "farming_mac_and_cheese.png", on_use = minetest.item_eat(6, a.bowl), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -573,10 +572,10 @@ minetest.register_craft({ -- Spaghetti minetest.register_craftitem("farming:spaghetti", { - description = S("Spaghetti"), + description = S("Spaghetti") .. " (♥8)", inventory_image = "farming_spaghetti.png", on_use = minetest.item_eat(8), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 8} }) minetest.register_craft({ @@ -591,10 +590,10 @@ minetest.register_craft({ -- Korean Bibimbap minetest.register_craftitem("farming:bibimbap", { - description = S("Bibimbap"), + description = S("Bibimbap") .. " (♥8)", inventory_image = "farming_bibimbap.png", on_use = minetest.item_eat(8, a.bowl), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 8} }) minetest.register_craft({ @@ -621,10 +620,10 @@ minetest.register_craft({ -- Burger minetest.register_craftitem("farming:burger", { - description = S("Burger"), + description = S("Burger") .. " (♥16)", inventory_image = "farming_burger.png", on_use = minetest.item_eat(16), - groups = {compostability = 95} + groups = {compostability = 95, eatable = 16} }) minetest.register_craft({ @@ -639,10 +638,10 @@ minetest.register_craft({ -- Salad minetest.register_craftitem("farming:salad", { - description = S("Salad"), + description = S("Salad") .. " (♥8)", inventory_image = "farming_salad.png", on_use = minetest.item_eat(8, a.bowl), - groups = {compostability = 45} + groups = {compostability = 45, eatable = 8} }) minetest.register_craft({ @@ -657,10 +656,10 @@ minetest.register_craft({ -- Triple Berry Smoothie minetest.register_craftitem("farming:smoothie_berry", { - description = S("Triple Berry Smoothie"), + description = S("Triple Berry Smoothie") .. " (♥6)", inventory_image = "farming_berry_smoothie.png", on_use = minetest.item_eat(6, "vessels:drinking_glass"), - groups = {vessel = 1, drink = 1, compostability = 65} + groups = {vessel = 1, drink = 1, compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -676,10 +675,10 @@ minetest.register_craft({ -- Patatas a la importancia minetest.register_craftitem("farming:spanish_potatoes", { - description = S("Spanish Potatoes"), + description = S("Spanish Potatoes") .. " (♥8)", inventory_image = "farming_spanish_potatoes.png", on_use = minetest.item_eat(8, a.bowl), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 8} }) minetest.register_craft({ @@ -695,10 +694,10 @@ minetest.register_craft({ -- Potato omelet minetest.register_craftitem("farming:potato_omelet", { - description = S("Potato omelet"), + description = S("Potato omelet") .. " (♥6)", inventory_image = "farming_potato_omelet.png", on_use = minetest.item_eat(6, a.bowl), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -713,10 +712,10 @@ minetest.register_craft({ -- Paella minetest.register_craftitem("farming:paella", { - description = S("Paella"), + description = S("Paella") .. " (♥8)", inventory_image = "farming_paella.png", on_use = minetest.item_eat(8, a.bowl), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 8} }) minetest.register_craft({ @@ -732,10 +731,10 @@ minetest.register_craft({ -- Flan minetest.register_craftitem("farming:flan", { - description = S("Vanilla Flan"), + description = S("Vanilla Flan") .. " (♥8)", inventory_image = "farming_vanilla_flan.png", on_use = minetest.item_eat(6), - groups = {compostability = 65} + groups = {compostability = 65, eatable = 6} }) minetest.register_craft({ @@ -755,10 +754,10 @@ minetest.register_craft({ -- Vegan Cheese minetest.register_craftitem("farming:cheese_vegan", { - description = S("Vegan Cheese"), + description = S("Vegan Cheese") .. " (♥2)", inventory_image = "farming_cheese_vegan.png", on_use = minetest.item_eat(2), - groups = {compostability = 65, food_cheese = 1, flammable = 2} + groups = {compostability = 65, food_cheese = 1, flammable = 2, eatable = 2} }) minetest.register_craft({ @@ -791,10 +790,10 @@ minetest.register_craft({ -- Onigiri minetest.register_craftitem("farming:onigiri", { - description = S("Onigiri"), + description = S("Onigiri") .. " (♥2)", inventory_image = "farming_onigiri.png", on_use = minetest.item_eat(2), - groups = {flammable = 2, compostability = 65} + groups = {flammable = 2, compostability = 65, eatable = 2} }) minetest.register_craft({ @@ -808,10 +807,10 @@ minetest.register_craft({ -- Gyoza minetest.register_craftitem("farming:gyoza", { - description = S("Gyoza"), + description = S("Gyoza") .. " (♥4)", inventory_image = "farming_gyoza.png", on_use = minetest.item_eat(4), - groups = {flammable = 2, compostability = 65} + groups = {flammable = 2, compostability = 65, eatable = 4} }) minetest.register_craft({ @@ -830,10 +829,10 @@ minetest.register_craft({ -- Mochi minetest.register_craftitem("farming:mochi", { - description = S("Mochi"), + description = S("Mochi") .. " (♥4)", inventory_image = "farming_mochi.png", on_use = minetest.item_eat(3), - groups = {flammable = 2, compostability = 65} + groups = {flammable = 2, compostability = 65, eatable = 3} }) minetest.register_craft({ @@ -852,10 +851,10 @@ minetest.register_craft({ -- Gingerbread Man minetest.register_craftitem("farming:gingerbread_man", { - description = S("Gingerbread Man"), + description = S("Gingerbread Man") .. " (♥2)", inventory_image = "farming_gingerbread_man.png", on_use = minetest.item_eat(2), - groups = {compostability = 85} + groups = {compostability = 85, eatable = 2} }) minetest.register_craft({