From 0640bd5281e385933c63776e60000f4679a2e286 Mon Sep 17 00:00:00 2001 From: "A. Demant" Date: Sun, 30 Dec 2018 19:59:20 +0100 Subject: [PATCH] drinking outsourcing to physio_stress mod --- api.lua | 7 ------- food.lua | 12 +++--------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/api.lua b/api.lua index abffba0..a1a6de6 100644 --- a/api.lua +++ b/api.lua @@ -1,9 +1,2 @@ -- function to drink item on use with fallback to eat if thirsty mod not available -local drink_or_eat = function(hp_change,replace_with_item,itemstack,user,pointed_thing) - if minetest.get_modpath("thirsty") ~= nil then - thirsty.drink(user,3*hp_change) - else - minetest.do_item_eat(hp_change,replace_with_item,itemstack,user,pointed_thing) - end -end diff --git a/food.lua b/food.lua index a293f09..8c33e25 100644 --- a/food.lua +++ b/food.lua @@ -232,17 +232,13 @@ if basic_functions.has_value(modlist,"vessels") and basic_functions.has_value(mo minetest.register_craftitem(":farming:grain_coffee_cup", { description = "Grain Coffee", inventory_image = "farming_coffee_cup.png", - on_use = function(itemstack,user,pointed_thing) - drink_or_eat(2,"vessels:drinking_glass",itemstack,user,pointed_thing) - end, + on_use = minetest.item_eat(2,"vessels:drinking_glass"), groups = {coffee = 1, flammable = 1, beverage=1}, }) minetest.register_craftitem(":farming:grain_coffee_cup_hot", { description = "Grain Coffee hot", inventory_image = "farming_coffee_cup_hot.png", - on_use = function(itemstack,user,pointed_thing) - drink_or_eat(4,"vessels:drinking_glass",itemstack,user,pointed_thing) - end, + on_use = minetest.item_eat(4,"vessels:drinking_glass"), groups = {coffee = 2, flammable = 1, beverage=2}, }) minetest.register_craft({ @@ -254,9 +250,7 @@ if basic_functions.has_value(modlist,"vessels") and basic_functions.has_value(mo minetest.register_craftitem(":farming:grain_milk", { description = "Grain Milk", inventory_image = "farming_grain_milk.png", - on_use = function(itemstack,user,pointed_thing) - drink_or_eat(5,"vessels:drinking_glass",itemstack,user,pointed_thing) - end, + on_use = minetest.item_eat(5,"vessels:drinking_glass"), groups = {flammable = 1, beverage=1}, }) minetest.register_craft( {