From 6a15d63c27d316e950f3e9f6eee029e1ec28877f Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Fri, 26 Jul 2024 14:20:20 +0100 Subject: [PATCH] add {eatable} group to food items and hp infotext --- fishing.lua | 15 ++++--- food.lua | 115 +++++++++++++++++++++++++++---------------------- leaves.lua | 4 +- onion.lua | 4 +- plantlife.lua | 4 +- sealife.lua | 4 +- strawberry.lua | 4 +- 7 files changed, 82 insertions(+), 68 deletions(-) diff --git a/fishing.lua b/fishing.lua index 8061b2e..8318f2c 100644 --- a/fishing.lua +++ b/fishing.lua @@ -551,14 +551,16 @@ for n = 1, #fish do local usage local groups + local moredesc = "" if fish[n][3] > 0 then usage = minetest.item_eat(fish[n][3]) - groups = {food_fish_raw = 1, ethereal_fish = 1} + groups = {food_fish_raw = 1, ethereal_fish = 1, eatable = fish[n][3]} + moredesc = " (♥" .. fish[n][3] .. ")" end minetest.register_craftitem("ethereal:fish_" .. fish[n][2], { - description = S(fish[n][1]), + description = S(fish[n][1]) .. moredesc, inventory_image = "ethereal_fish_" .. fish[n][2] .. ".png", on_use = usage, groups = groups @@ -572,10 +574,10 @@ minetest.override_item("ethereal:fish_tetra", {light_source = 3}) -- cooked fish minetest.register_craftitem(":ethereal:fish_cooked", { - description = S("Cooked Fish"), + description = S("Cooked Fish") .. " (♥5)", inventory_image = "ethereal_fish_cooked.png", wield_image = "ethereal_fish_cooked.png", - groups = {food_fish = 1, flammable = 3}, + groups = {food_fish = 1, flammable = 3, eatable = 5}, on_use = minetest.item_eat(5) }) @@ -588,10 +590,11 @@ minetest.register_craft({ -- Sashimi minetest.register_craftitem("ethereal:sashimi", { - description = S("Sashimi"), + description = S("Sashimi") .. " (♥4)", inventory_image = "ethereal_sashimi.png", wield_image = "ethereal_sashimi.png", - on_use = minetest.item_eat(4) + on_use = minetest.item_eat(4), + groups = {eatable = 4} }) minetest.register_craft({ diff --git a/food.lua b/food.lua index 78152b5..bb0d854 100644 --- a/food.lua +++ b/food.lua @@ -4,7 +4,7 @@ local S = ethereal.translate -- Banana (Heals one heart when eaten) minetest.register_node("ethereal:banana", { - description = S("Banana"), + description = S("Banana") .. " (♥2)", drawtype = "torchlike", tiles = {"ethereal_banana_single.png"}, inventory_image = "ethereal_banana_single.png", @@ -17,7 +17,7 @@ minetest.register_node("ethereal:banana", { fixed = {-0.31, -0.5, -0.31, 0.31, 0.5, 0.31} }, groups = { - food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2, + food_banana = 1, fleshy = 3, dig_immediate = 3, flammable = 2, eatable = 2, leafdecay = 1, leafdecay_drop = 1 }, drop = "ethereal:banana", @@ -34,7 +34,7 @@ minetest.register_node("ethereal:banana", { -- Banana Bunch minetest.register_node("ethereal:banana_bunch", { - description = S("Banana Bunch"), + description = S("Banana Bunch") .. " (♥6)", drawtype = "torchlike", tiles = {"ethereal_banana_bunch.png"}, inventory_image = "ethereal_banana_bunch.png", @@ -47,7 +47,7 @@ minetest.register_node("ethereal:banana_bunch", { fixed = {-0.31, -0.5, -0.31, 0.31, 0.5, 0.31} }, groups = { - fleshy = 3, dig_immediate = 3, flammable = 2, + fleshy = 3, dig_immediate = 3, flammable = 2, eatable = 6, leafdecay = 1, leafdecay_drop = 1 }, drop = "ethereal:banana_bunch", @@ -93,7 +93,7 @@ minetest.register_craft({ -- Orange (Heals 2 hearts when eaten) minetest.register_node("ethereal:orange", { - description = S("Orange"), + description = S("Orange") .. " (♥4)", drawtype = "plantlike", tiles = {"farming_orange.png"}, inventory_image = "farming_orange.png", @@ -106,7 +106,7 @@ minetest.register_node("ethereal:orange", { fixed = {-0.27, -0.37, -0.27, 0.27, 0.44, 0.27} }, groups = { - food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2, + food_orange = 1, fleshy = 3, dig_immediate = 3, flammable = 2, eatable = 4, leafdecay = 3, leafdecay_drop = 1 }, drop = "ethereal:orange", @@ -124,19 +124,19 @@ minetest.register_node("ethereal:orange", { -- Pine Nuts (Heals 1/2 heart when eaten) minetest.register_craftitem("ethereal:pine_nuts", { - description = S("Pine Nuts"), + description = S("Pine Nuts") .. " (♥1)", inventory_image = "ethereal_pine_nuts.png", wield_image = "ethereal_pine_nuts.png", - groups = {food_pine_nuts = 1, flammable = 2}, + groups = {food_pine_nuts = 1, flammable = 2, eatable = 1}, on_use = minetest.item_eat(1) }) -- Banana Loaf (Heals 3 hearts when eaten) minetest.register_craftitem("ethereal:banana_bread", { - description = S("Banana Loaf"), + description = S("Banana Loaf") .. " (♥6)", inventory_image = "ethereal_banana_bread.png", wield_image = "ethereal_banana_bread.png", - groups = {food_bread = 1, flammable = 3}, + groups = {food_bread = 1, flammable = 3, eatable = 6}, on_use = minetest.item_eat(6) }) @@ -180,10 +180,10 @@ minetest.register_node("ethereal:coconut", { -- Coconut Slice (Heals half heart when eaten) minetest.register_craftitem("ethereal:coconut_slice", { - description = S("Coconut Slice"), + description = S("Coconut Slice") .. " (♥1)", inventory_image = "moretrees_coconut_slice.png", wield_image = "moretrees_coconut_slice.png", - groups = {food_coconut_slice = 1, flammable = 1}, + groups = {food_coconut_slice = 1, flammable = 1, eatable = 1}, on_use = minetest.item_eat(1) }) @@ -209,7 +209,7 @@ minetest.register_craft({ -- Golden Apple (Found on Healing Tree, heals all 10 hearts) minetest.register_node("ethereal:golden_apple", { - description = S("Golden Apple"), + description = S("Golden Apple") .. " (♥2)", drawtype = "plantlike", tiles = {"default_apple_gold.png"}, inventory_image = "default_apple_gold.png", @@ -222,8 +222,7 @@ minetest.register_node("ethereal:golden_apple", { fixed = {-0.2, -0.37, -0.2, 0.2, 0.31, 0.2} }, groups = { - fleshy = 3, dig_immediate = 3, - leafdecay = 3,leafdecay_drop = 1 + fleshy = 3, dig_immediate = 3, leafdecay = 3,leafdecay_drop = 1, eatable = 2 }, drop = "ethereal:golden_apple", sounds = default.node_sound_leaves_defaults(), @@ -248,10 +247,11 @@ minetest.register_node("ethereal:golden_apple", { -- Hearty Stew (Heals 5 hearts) minetest.register_craftitem("ethereal:hearty_stew", { - description = S("Hearty Stew"), + description = S("Hearty Stew") .. " (♥10)", inventory_image = "ethereal_hearty_stew.png", wield_image = "ethereal_hearty_stew.png", - on_use = minetest.item_eat(10, "ethereal:bowl") + on_use = minetest.item_eat(10, "ethereal:bowl"), + groups = {eatable = 10} }) minetest.register_craft({ @@ -279,11 +279,11 @@ end -- Bucket of Cactus Pulp minetest.register_craftitem("ethereal:bucket_cactus", { - description = S("Bucket of Cactus Pulp"), + description = S("Bucket of Cactus Pulp") .. " (♥2)", inventory_image = "bucket_cactus.png", wield_image = "bucket_cactus.png", stack_max = 1, - groups = {vessel = 1, drink = 1}, + groups = {vessel = 1, drink = 1, eatable = 2}, on_use = minetest.item_eat(2, "bucket:bucket_empty"), }) @@ -295,11 +295,11 @@ minetest.register_craft({ -- firethorn jelly minetest.register_craftitem("ethereal:firethorn_jelly", { - description = S("Firethorn Jelly"), + description = S("Firethorn Jelly") .. " (♥2)", inventory_image = "ethereal_firethorn_jelly.png", wield_image = "ethereal_firethorn_jelly.png", on_use = minetest.item_eat(2, "vessels:glass_bottle"), - groups = {vessel = 1} + groups = {vessel = 1, eatable = 2} }) if minetest.registered_items["farming:bowl"] then @@ -321,7 +321,7 @@ end -- Lemon minetest.register_node("ethereal:lemon", { - description = S("Lemon"), + description = S("Lemon") .. " (♥3)", drawtype = "plantlike", tiles = {"ethereal_lemon.png"}, inventory_image = "ethereal_lemon_fruit.png", @@ -335,7 +335,7 @@ minetest.register_node("ethereal:lemon", { }, groups = { food_lemon = 1, fleshy = 3, dig_immediate = 3, flammable = 2, - leafdecay = 3, leafdecay_drop = 1 + leafdecay = 3, leafdecay_drop = 1, eatable = 3 }, drop = "ethereal:lemon", on_use = minetest.item_eat(3), @@ -351,10 +351,10 @@ minetest.register_node("ethereal:lemon", { -- Candied Lemon minetest.register_craftitem("ethereal:candied_lemon", { - description = S("Candied Lemon"), + description = S("Candied Lemon") .. " (♥5)", inventory_image = "ethereal_candied_lemon.png", wield_image = "ethereal_candied_lemon.png", - groups = {food_candied_lemon = 1}, + groups = {food_candied_lemon = 1, eatable = 5}, on_use = minetest.item_eat(5) }) @@ -370,7 +370,7 @@ minetest.register_craft({ -- Lemonade minetest.register_node("ethereal:lemonade", { - description = S("Lemonade"), + description = S("Lemonade") .. " (♥5)", drawtype = "plantlike", tiles = {"ethereal_lemonade.png"}, inventory_image = "ethereal_lemonade.png", @@ -381,7 +381,7 @@ minetest.register_node("ethereal:lemonade", { 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 = 5}, on_use = minetest.item_eat(5, "vessels:drinking_glass"), sounds = default.node_sound_glass_defaults() }) @@ -400,7 +400,7 @@ minetest.register_craft({ -- Olive minetest.register_node("ethereal:olive", { - description = S("Olive"), + description = S("Olive") .. " (♥1)", drawtype = "plantlike", tiles = {"ethereal_olive.png"}, inventory_image = "ethereal_olive_fruit.png", @@ -414,7 +414,7 @@ minetest.register_node("ethereal:olive", { fixed = {-0.1, -0.5, -0.1, 0.1, -0.3, 0.1} }, groups = { - fleshy = 3, dig_immediate = 3, flammable = 2, + fleshy = 3, dig_immediate = 3, flammable = 2, eatable = 1, leafdecay = 3, leafdecay_drop = 1 }, drop = "ethereal:olive", @@ -452,9 +452,10 @@ minetest.register_craft({ -- Kappa Maki (sushi with cucumber) minetest.register_craftitem("ethereal:sushi_kappamaki", { - description = S("Kappa Maki Sushi"), + description = S("Kappa Maki Sushi") .. " (♥3)", inventory_image = "ethereal_sushi_kappa_maki.png", - on_use = minetest.item_eat(3) + on_use = minetest.item_eat(3), + groups = {eatable = 3} }) minetest.register_craft({ @@ -467,9 +468,10 @@ minetest.register_craft({ -- Nigiri (sushi with raw fish) minetest.register_craftitem("ethereal:sushi_nigiri", { - description = S("Nigiri Sushi"), + description = S("Nigiri Sushi") .. " (♥2)", inventory_image = "ethereal_sushi_nigiri.png", - on_use = minetest.item_eat(2) + on_use = minetest.item_eat(2), + groups = {eatable = 2} }) minetest.register_craft({ @@ -482,9 +484,10 @@ minetest.register_craft({ -- Tamago (sushi with sweet egg) minetest.register_craftitem("ethereal:sushi_tamago", { - description = S("Tamago Sushi"), + description = S("Tamago Sushi") .. " (♥2)", inventory_image = "ethereal_sushi_tamago.png", - on_use = minetest.item_eat(2) + on_use = minetest.item_eat(2), + groups = {eatable = 2} }) minetest.register_craft({ @@ -497,8 +500,9 @@ minetest.register_craft({ -- Fugu (prepared pufferfish) minetest.register_craftitem("ethereal:fugu", { - description = S("Fugusashi"), + description = S("Fugusashi") .. " (♥4)", inventory_image = "ethereal_fugu.png", + groups = {eatable = 4}, on_use = function(itemstack, user, pointed_thing) @@ -527,9 +531,10 @@ minetest.register_craft({ -- Teriyaki Chicken minetest.register_craftitem("ethereal:teriyaki_chicken", { - description = S("Teriyaki Chicken"), + description = S("Teriyaki Chicken") .. " (♥4)", inventory_image = "ethereal_teriyaki_chicken.png", - on_use = minetest.item_eat(4) + on_use = minetest.item_eat(4), + groups = {eatable = 4} }) minetest.register_craft({ @@ -547,9 +552,10 @@ minetest.register_craft({ -- Teriyaki Beef minetest.register_craftitem("ethereal:teriyaki_beef", { - description = S("Teriyaki Beef"), + description = S("Teriyaki Beef") .. " (♥12)", inventory_image = "ethereal_teriyaki_beef.png", - on_use = minetest.item_eat(12, "ethereal:bowl") + on_use = minetest.item_eat(12, "ethereal:bowl"), + groups = {eatable = 12} }) minetest.register_craft({ @@ -568,9 +574,9 @@ minetest.register_craft({ -- mushroom soup (Heals 1 heart) minetest.register_craftitem("ethereal:mushroom_soup", { - description = S("Mushroom Soup"), + description = S("Mushroom Soup") .. " (♥5)", inventory_image = "ethereal_mushroom_soup.png", - groups = {drink = 1}, + groups = {drink = 1, eatable = 5}, on_use = minetest.item_eat(5, "ethereal:bowl") }) @@ -586,9 +592,10 @@ minetest.register_craft({ -- boiled shrimp minetest.register_craftitem("ethereal:fish_shrimp_cooked", { - description = S("Boiled Shrimp"), + description = S("Boiled Shrimp") .. " (♥2)", inventory_image = "ethereal_fish_shrimp_cooked.png", - on_use = minetest.item_eat(2) + on_use = minetest.item_eat(2), + groups = {eatable = 2} }) minetest.register_craft({ @@ -606,9 +613,10 @@ minetest.register_craft({ -- garlic butter shrimp minetest.register_craftitem("ethereal:garlic_shrimp", { - description = S("Garlic Butter Shrimp"), + description = S("Garlic Butter Shrimp") .. " (♥6)", inventory_image = "ethereal_garlic_butter_shrimp.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {eatable = 6} }) minetest.register_craft({ @@ -623,9 +631,10 @@ minetest.register_craft({ -- jellyfish salad minetest.register_craftitem("ethereal:jellyfish_salad", { - description = S("Jellyfish Salad"), + description = S("Jellyfish Salad") .. " (♥4)", inventory_image = "ethereal_jellyfish_salad.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {eatable = 6} }) minetest.register_craft({ @@ -654,9 +663,10 @@ minetest.register_craft({ -- cooked calamari minetest.register_craftitem("ethereal:calamari_cooked", { - description = S("Calamari"), + description = S("Calamari") .. " (♥5)", inventory_image = "ethereal_calamari_cooked.png", - on_use = minetest.item_eat(5) + on_use = minetest.item_eat(5), + groups = {eatable = 5} }) minetest.register_craft({ @@ -669,9 +679,10 @@ minetest.register_craft({ -- fish & chips minetest.register_craftitem("ethereal:fish_n_chips", { - description = S("Fish & Chips"), + description = S("Fish & Chips") .. " (♥4)", inventory_image = "ethereal_fish_chips.png", - on_use = minetest.item_eat(6) + on_use = minetest.item_eat(6), + groups = {eatable = 6} }) minetest.register_craft({ diff --git a/leaves.lua b/leaves.lua index 2adbe13..95edfb9 100644 --- a/leaves.lua +++ b/leaves.lua @@ -164,7 +164,7 @@ minetest.register_node("ethereal:bananaleaves", { -- healing tree leaves minetest.register_node("ethereal:yellowleaves", { - description = S("Healing Tree Leaves"), + description = S("Healing Tree Leaves") .. " (♥1)", drawtype = leaftype, visual_scale = leafscale, tiles = {"ethereal_yellow_leaves.png"}, @@ -173,7 +173,7 @@ minetest.register_node("ethereal:yellowleaves", { paramtype = "light", walkable = ethereal.leafwalk, waving = 1, - groups = {snappy = 3, leafdecay = 3, leaves = 1}, + groups = {snappy = 3, leafdecay = 3, leaves = 1, eatable = 1}, drop = { max_items = 1, items = { diff --git a/onion.lua b/onion.lua index 7961dde..e6a87a0 100644 --- a/onion.lua +++ b/onion.lua @@ -4,10 +4,10 @@ local S = ethereal.translate -- wild onion minetest.register_craftitem("ethereal:wild_onion_plant", { - description = S("Wild Onion"), + description = S("Wild Onion") .. " (♥2)", inventory_image = "ethereal_wild_onion.png", wield_image = "ethereal_wild_onion.png", - groups = {food_onion = 1, flammable = 2}, + groups = {food_onion = 1, flammable = 2, eatable = 2}, on_use = minetest.item_eat(2), on_place = function(itemstack, placer, pointed_thing) diff --git a/plantlife.lua b/plantlife.lua index 353ee05..26f2443 100644 --- a/plantlife.lua +++ b/plantlife.lua @@ -187,9 +187,9 @@ minetest.register_node("ethereal:fern", { -- Boston Ferns sometimes drop edible Tubers (heals 1/2 heart when eaten) minetest.register_craftitem("ethereal:fern_tubers", { - description = S("Fern Tubers"), + description = S("Fern Tubers") .. " (♥1)", inventory_image = "ethereal_fern_tubers.png", - groups = {food_tuber = 1, flammable = 2}, + groups = {food_tuber = 1, flammable = 2, eatable = 1}, on_use = minetest.item_eat(1) }) diff --git a/sealife.lua b/sealife.lua index 7682d5d..06ecbef 100644 --- a/sealife.lua +++ b/sealife.lua @@ -4,7 +4,7 @@ local S = ethereal.translate -- Seaweed minetest.register_node("ethereal:seaweed", { - description = S("Seaweed"), + description = S("Seaweed") .. " (♥1)", drawtype = "plantlike", tiles = {"ethereal_seaweed.png"}, inventory_image = "ethereal_seaweed.png", @@ -18,7 +18,7 @@ minetest.register_node("ethereal:seaweed", { fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} }, post_effect_color = {a = 64, r = 100, g = 100, b = 200}, - groups = {food_seaweed = 1, snappy = 3, flammable = 3}, + groups = {food_seaweed = 1, snappy = 3, flammable = 3, eatable = 1}, on_use = minetest.item_eat(1), sounds = default.node_sound_leaves_defaults(), diff --git a/strawberry.lua b/strawberry.lua index 07fe3c0..3b59770 100644 --- a/strawberry.lua +++ b/strawberry.lua @@ -4,10 +4,10 @@ local S = ethereal.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", wield_image = "ethereal_strawberry.png", - groups = {food_strawberry = 1, food_berry = 1, flammable = 2}, + groups = {food_strawberry = 1, food_berry = 1, flammable = 2, eatable = 1}, on_use = minetest.item_eat(1), on_place = function(itemstack, placer, pointed_thing)