From 6408f6b64cffb907f96b428ca8e2d892789d5585 Mon Sep 17 00:00:00 2001 From: FaceDeer Date: Sat, 13 Aug 2022 01:25:30 -0600 Subject: [PATCH] eatable group for edibles --- df_farming/cave_wheat.lua | 2 +- df_farming/cooking.lua | 2 +- df_farming/plump_helmet.lua | 21 ++++++++++++++++----- df_primordial_items/edibles.lua | 4 ++-- df_primordial_items/jungle_mushroom.lua | 2 +- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/df_farming/cave_wheat.lua b/df_farming/cave_wheat.lua index bb41053..0571d21 100644 --- a/df_farming/cave_wheat.lua +++ b/df_farming/cave_wheat.lua @@ -123,7 +123,7 @@ minetest.register_craftitem("df_farming:cave_bread", { sound = {eat = {name = "df_farming_chomp_crunch", gain = 1.0}}, on_use = minetest.item_eat(5), _hunger_ng = {satiates = 5}, - groups = {flammable = 2, food = 5}, + groups = {flammable = 2, food = 5, eatable=5}, }) local recipe_registered = false diff --git a/df_farming/cooking.lua b/df_farming/cooking.lua index dca3488..5c5e452 100644 --- a/df_farming/cooking.lua +++ b/df_farming/cooking.lua @@ -96,7 +96,7 @@ for _, def in pairs(recipes) do inventory_image = def.image, sound = def.sound, on_use = minetest.item_eat(recipe_type.value), - groups = {food = recipe_type.value}, + groups = {food = recipe_type.value, eatable=recipe_type.value}, _hunger_ng = {satiates = recipe_type.value}, }) diff --git a/df_farming/plump_helmet.lua b/df_farming/plump_helmet.lua index bf7b79e..8c3d4e3 100644 --- a/df_farming/plump_helmet.lua +++ b/df_farming/plump_helmet.lua @@ -98,7 +98,16 @@ minetest.register_node("df_farming:plump_helmet_spawn", { end, }) -local plump_helmet_groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, dfcaverns_cookable = 1, plump_helmet = 1, food = 1, digtron_on_place=1, flora = 1, fire_encouragement=60,fire_flammability=100,destroy_by_lava_flow=1,dig_by_piston=1,compostability=65} +local plump_helmet_groups = {snappy = 3, flammable = 2, plant = 1, not_in_creative_inventory = 1, attached_node = 1, light_sensitive_fungus = 11, dfcaverns_cookable = 1, plump_helmet = 1, digtron_on_place=1, flora = 1, fire_encouragement=30,fire_flammability=100,destroy_by_lava_flow=1,dig_by_piston=1,compostability=65} +local get_plump_helmet_groups = function(eatable) + local ret = {} + for key, val in pairs(plump_helmet_groups) do + ret[key]=val + end + ret.eatable = eatable + ret.food = eatable + return ret +end minetest.register_node("df_farming:plump_helmet_1", { description = S("Plump Helmet"), @@ -109,7 +118,7 @@ minetest.register_node("df_farming:plump_helmet_1", { "dfcaverns_plump_helmet_cap.png", "dfcaverns_plump_helmet_cap.png^[lowpart:5:dfcaverns_plump_helmet_stem.png", }, - groups = plump_helmet_groups, + groups = get_plump_helmet_groups(1), _dfcaverns_next_stage = "df_farming:plump_helmet_2", _dfcaverns_next_stage_time = plump_helmet_grow_time, drawtype = "nodebox", @@ -152,7 +161,7 @@ minetest.register_node("df_farming:plump_helmet_2", { "dfcaverns_plump_helmet_cap.png", "dfcaverns_plump_helmet_cap.png^[lowpart:15:dfcaverns_plump_helmet_stem.png", }, - groups = plump_helmet_groups, + groups = get_plump_helmet_groups(2), _dfcaverns_next_stage = "df_farming:plump_helmet_3", _dfcaverns_next_stage_time = plump_helmet_grow_time, drawtype = "nodebox", @@ -194,7 +203,7 @@ minetest.register_node("df_farming:plump_helmet_3", { "dfcaverns_plump_helmet_cap.png", "dfcaverns_plump_helmet_cap.png^[lowpart:35:dfcaverns_plump_helmet_stem.png", }, - groups = plump_helmet_groups, + groups = get_plump_helmet_groups(3), _dfcaverns_next_stage = "df_farming:plump_helmet_4", _dfcaverns_next_stage_time = plump_helmet_grow_time, drawtype = "nodebox", @@ -236,7 +245,7 @@ minetest.register_node("df_farming:plump_helmet_4", { "dfcaverns_plump_helmet_cap.png", "dfcaverns_plump_helmet_cap.png^[lowpart:40:dfcaverns_plump_helmet_stem.png", }, - groups = plump_helmet_groups, + groups = get_plump_helmet_groups(4), drawtype = "nodebox", paramtype = "light", paramtype2 = "facedir", @@ -288,6 +297,8 @@ minetest.register_node("df_farming:plump_helmet_4", { local picked_groups = {} for key, val in pairs(plump_helmet_groups) do picked_groups[key]=val + picked_groups.eatable=4 + picked_groups.food=4 end picked_groups.not_in_creative_inventory = nil -- Need a separate picked type to prevent it from giving infinite spawn by just placing and re-harvesting diff --git a/df_primordial_items/edibles.lua b/df_primordial_items/edibles.lua index d57c6d6..d99fd92 100644 --- a/df_primordial_items/edibles.lua +++ b/df_primordial_items/edibles.lua @@ -5,7 +5,7 @@ minetest.register_craftitem("df_primordial_items:primordial_fruit", { _doc_items_longdesc = df_primordial_items.doc.primordial_fruit_desc, _doc_items_usagehelp = df_primordial_items.doc.primordial_fruit_usage, inventory_image = "dfcaverns_primordial_fruit.png", - groups = {food = 8}, + groups = {food = 8, eatable=8, plant=1}, sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, on_use = minetest.item_eat(8), _hunger_ng = {heals = 8}, @@ -17,7 +17,7 @@ minetest.register_craftitem("df_primordial_items:glowtato", { _doc_items_usagehelp = df_primordial_items.doc.glowtato_usage, inventory_image = "dfcaverns_glowtato.png", sound = {eat = {name = "df_farming_chomp_crunch", gain = 1.0}}, - groups = {food = 8, dfcaverns_cookable = 1}, + groups = {food = 8, dfcaverns_cookable = 1, eatable=8, plant=1}, on_use = minetest.item_eat(8), _hunger_ng = {satiates = 8}, }) diff --git a/df_primordial_items/jungle_mushroom.lua b/df_primordial_items/jungle_mushroom.lua index 7323ab7..9eb9871 100644 --- a/df_primordial_items/jungle_mushroom.lua +++ b/df_primordial_items/jungle_mushroom.lua @@ -74,7 +74,7 @@ minetest.register_craftitem("df_primordial_items:diced_mushroom", { _doc_items_longdesc = df_primordial_items.doc.big_mushroom_desc, _doc_items_usagehelp = df_primordial_items.doc.big_mushroom_usage, inventory_image = "dfcaverns_mush_diced_giant_mushroom.png", - groups = {food = 1, dfcaverns_cookable = 1}, + groups = {food = 1, dfcaverns_cookable = 1, eatable=1, plant=1}, sound = {eat = {name = "df_farming_gummy_chew", gain = 1.0}}, on_use = minetest.item_eat(1), _hunger_ng = {satiates = 1},