From b9715e972cfeb387b17a12bfafc08575c67320c6 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Wed, 4 Nov 2020 15:31:49 +0100 Subject: [PATCH] Update hbhunger (1.1.0) --- mods/hbhunger/README.md | 7 +- mods/hbhunger/hunger.lua | 662 ++++++--------------- mods/hbhunger/init.lua | 54 +- mods/hbhunger/locale/hbhunger.de.tr | 5 + .../locale/{template.txt => hbhunger.fr.tr} | 2 +- mods/hbhunger/locale/template.txt | 5 + mods/hbhunger/{hunger.lua => register_foods.lua} | 277 ++------- 7 files changed, 282 insertions(+), 730 deletions(-) rewrite mods/hbhunger/hunger.lua (74%) copy mods/hbhunger/locale/{template.txt => hbhunger.fr.tr} (52%) copy mods/hbhunger/{hunger.lua => register_foods.lua} (57%) diff --git a/mods/hbhunger/README.md b/mods/hbhunger/README.md index 38fd1e3..794cfcb 100644 --- a/mods/hbhunger/README.md +++ b/mods/hbhunger/README.md @@ -1,6 +1,6 @@ # Hunger with HUD bar [`hbhunger`] -* Version: 1.0.1 +* Version: 1.1.0 ## Using the mod @@ -39,7 +39,7 @@ All mods which add food through standard measures (`minetest.item_eat`) are alre supported automatically. Poisoned food needs special support. ### Known supported food mods -* Apple from Minetest Game [`default`] +* Apple and Blueberries from Minetest Game [`default`] * Red and brown mushroom from Minetest Game [`flowers`] * Bread from Minetest Game [`farming`] * [`animalmaterials`] (Mob Framework (`mobf` modpack)) @@ -72,10 +72,9 @@ supported automatically. Poisoned food needs special support. * Food ([`food`], [`food_basic`]) * Sweet Foods [`food_sweet`] -### Examples +### Example * Eating an apple (from Minetest Game) increases your satiation by 2; -* eating a bread (from Minetest Game) increases your satiation by 4. ## Licensing This mod is free software. diff --git a/mods/hbhunger/hunger.lua b/mods/hbhunger/hunger.lua dissimilarity index 74% index db012fd..4a68ca5 100644 --- a/mods/hbhunger/hunger.lua +++ b/mods/hbhunger/hunger.lua @@ -1,496 +1,166 @@ --- Keep these for backwards compatibility -function hbhunger.save_hunger(player) - hbhunger.set_hunger_raw(player) -end -function hbhunger.load_hunger(player) - hbhunger.get_hunger_raw(player) -end - --- wrapper for minetest.item_eat (this way we make sure other mods can't break this one) -local org_eat = core.do_item_eat -core.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing) - local old_itemstack = itemstack - itemstack = hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing) - for _, callback in pairs(core.registered_on_item_eats) do - local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing, old_itemstack) - if result then - return result - end - end - return itemstack -end - --- food functions -local food = hbhunger.food - -function hbhunger.register_food(name, hunger_change, replace_with_item, poisen, heal, sound) - food[name] = {} - food[name].saturation = hunger_change -- hunger points added - food[name].replace = replace_with_item -- what item is given back after eating - food[name].poisen = poisen -- time its poisening - food[name].healing = heal -- amount of HP - food[name].sound = sound -- special sound that is played when eating -end - -function hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing) - local item = itemstack:get_name() - local def = food[item] - if not def then - def = {} - if type(hp_change) ~= "number" then - hp_change = 1 - core.log("error", "Wrong on_use() definition for item '" .. item .. "'") - end - def.saturation = hp_change * 1.3 - def.replace = replace_with_item - end - local sound = def.sound - if not sound then - if minetest.get_item_group(item, "food") == 3 then - sound = "survival_thirst_drink" - elseif not sound then - sound = "hbhunger_eat_generic" - end - end - local func = hbhunger.item_eat(def.saturation, def.replace, def.poisen, def.healing, sound) - return func(itemstack, user, pointed_thing) -end - --- Poison player -local function poisenp(tick, time, time_left, player) - -- First check if player is still there - if not player:is_player() then - return - end - time_left = time_left + tick - if time_left < time then - minetest.after(tick, poisenp, tick, time, time_left, player) - else - hbhunger.poisonings[player:get_player_name()] = hbhunger.poisonings[player:get_player_name()] - 1 - if hbhunger.poisonings[player:get_player_name()] <= 0 then - -- Reset HUD bar color - hb.change_hudbar(player, "health", nil, nil, "hudbars_icon_health.png", nil, "hudbars_bar_health.png") - end - end - if player:get_hp()-1 > 0 then - player:set_hp(player:get_hp()-1) - end - -end - -function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound) - return function(itemstack, user, pointed_thing) - if itemstack:take_item() ~= nil and user ~= nil then - local name = user:get_player_name() - local h = tonumber(hbhunger.hunger[name]) - local hp = user:get_hp() - if h == nil or hp == nil then - return - end - minetest.sound_play( - {name = sound or "hbhunger_eat_generic", - gain = 1}, - {object=user, - max_hear_distance = 16, - pitch = 1 + math.random(-10, 10)*0.005,}, - true - ) - - -- Saturation - if h < 30 and hunger_change then - h = h + hunger_change - if h > 30 then h = 30 end - hbhunger.hunger[name] = h - hbhunger.set_hunger_raw(user) - end - -- Healing - if hp < 20 and heal then - hp = hp + heal - if hp > 20 then hp = 20 end - user:set_hp(hp) - end - -- Poison - if poisen then - -- Set poison bar - hb.change_hudbar(user, "health", nil, nil, "hbhunger_icon_health_poison.png", nil, "hbhunger_bar_health_poison.png") - hbhunger.poisonings[name] = hbhunger.poisonings[name] + 1 - poisenp(1, poisen, 0, user) - end - - if itemstack:get_count() == 0 then - itemstack:add_item(replace_with_item) - else - local inv = user:get_inventory() - if inv:room_for_item("main", replace_with_item) then - inv:add_item("main", replace_with_item) - else - minetest.add_item(user:get_pos(), replace_with_item) - end - end - end - return itemstack - end -end - -if minetest.get_modpath("hades_trees") ~= nil then - hbhunger.register_food("hades_trees:apple", 2) -end -if minetest.get_modpath("flowers") ~= nil then - hbhunger.register_food("flowers:mushroom_brown", 1) - hbhunger.register_food("flowers:mushroom_red", 1, "", 3) -end -if minetest.get_modpath("farming") ~= nil then - hbhunger.register_food("farming:bread", 4) -end - -if minetest.get_modpath("mobs") ~= nil then - if mobs.mod ~= nil and mobs.mod == "redo" then - hbhunger.register_food("mobs:cheese", 4) - hbhunger.register_food("mobs:meat", 8) - hbhunger.register_food("mobs:meat_raw", 4) - hbhunger.register_food("mobs:rat_cooked", 4) - hbhunger.register_food("mobs:honey", 2) - hbhunger.register_food("mobs:pork_raw", 3, "", 3) - hbhunger.register_food("mobs:pork_cooked", 8) - hbhunger.register_food("mobs:chicken_cooked", 6) - hbhunger.register_food("mobs:chicken_raw", 2, "", 3) - hbhunger.register_food("mobs:chicken_egg_fried", 2) - if minetest.get_modpath("bucket") then - hbhunger.register_food("mobs:bucket_milk", 3, "bucket:bucket_empty") - end - else - hbhunger.register_food("mobs:meat", 6) - hbhunger.register_food("mobs:meat_raw", 3) - hbhunger.register_food("mobs:rat_cooked", 5) - end -end - -if minetest.get_modpath("moretrees") ~= nil then - hbhunger.register_food("moretrees:coconut_milk", 1) - hbhunger.register_food("moretrees:raw_coconut", 2) - hbhunger.register_food("moretrees:acorn_muffin", 3) - hbhunger.register_food("moretrees:spruce_nuts", 1) - hbhunger.register_food("moretrees:pine_nuts", 1) - hbhunger.register_food("moretrees:fir_nuts", 1) -end - -if minetest.get_modpath("dwarves") ~= nil then - hbhunger.register_food("dwarves:beer", 2) - hbhunger.register_food("dwarves:apple_cider", 1) - hbhunger.register_food("dwarves:midus", 2) - hbhunger.register_food("dwarves:tequila", 2) - hbhunger.register_food("dwarves:tequila_with_lime", 2) - hbhunger.register_food("dwarves:sake", 2) -end - -if minetest.get_modpath("animalmaterials") ~= nil then - hbhunger.register_food("animalmaterials:milk", 2) - hbhunger.register_food("animalmaterials:meat_raw", 3) - hbhunger.register_food("animalmaterials:meat_pork", 3) - hbhunger.register_food("animalmaterials:meat_beef", 3) - hbhunger.register_food("animalmaterials:meat_chicken", 3) - hbhunger.register_food("animalmaterials:meat_lamb", 3) - hbhunger.register_food("animalmaterials:meat_venison", 3) - hbhunger.register_food("animalmaterials:meat_undead", 3, "", 3) - hbhunger.register_food("animalmaterials:meat_toxic", 3, "", 5) - hbhunger.register_food("animalmaterials:meat_ostrich", 3) - hbhunger.register_food("animalmaterials:fish_bluewhite", 2) - hbhunger.register_food("animalmaterials:fish_clownfish", 2) -end - -if minetest.get_modpath("fishing") ~= nil then - hbhunger.register_food("fishing:fish_raw", 2) - hbhunger.register_food("fishing:fish_cooked", 5) - hbhunger.register_food("fishing:sushi", 6) - hbhunger.register_food("fishing:shark", 4) - hbhunger.register_food("fishing:shark_cooked", 8) - hbhunger.register_food("fishing:pike", 4) - hbhunger.register_food("fishing:pike_cooked", 8) -end - -if minetest.get_modpath("glooptest") ~= nil then - hbhunger.register_food("glooptest:kalite_lump", 1) -end - -if minetest.get_modpath("bushes") ~= nil then - hbhunger.register_food("bushes:sugar", 1) - hbhunger.register_food("bushes:strawberry", 2) - hbhunger.register_food("bushes:berry_pie_raw", 3) - hbhunger.register_food("bushes:berry_pie_cooked", 4) - hbhunger.register_food("bushes:basket_pies", 15) -end - -if minetest.get_modpath("bushes_classic") then - -- bushes_classic mod, as found in the plantlife modpack - local berries = { - "strawberry", - "blackberry", - "blueberry", - "raspberry", - "gooseberry", - "mixed_berry"} - for _, berry in ipairs(berries) do - if berry ~= "mixed_berry" then - hbhunger.register_food("bushes:"..berry, 1) - end - hbhunger.register_food("bushes:"..berry.."_pie_raw", 2) - hbhunger.register_food("bushes:"..berry.."_pie_cooked", 5) - hbhunger.register_food("bushes:basket_"..berry, 15) - end -end - -if minetest.get_modpath("mushroom") ~= nil then - hbhunger.register_food("mushroom:brown", 1) - hbhunger.register_food("mushroom:red", 1, "", 3) - -- mushroom potions: red = strong poison, brown = light restorative - if minetest.get_modpath("vessels") then - hbhunger.register_food("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4) - hbhunger.register_food("mushroom:poison", 1, "vessels:glass_bottle", 10) - end -end - -if minetest.get_modpath("docfarming") ~= nil then - hbhunger.register_food("docfarming:carrot", 3) - hbhunger.register_food("docfarming:cucumber", 2) - hbhunger.register_food("docfarming:corn", 3) - hbhunger.register_food("docfarming:potato", 4) - hbhunger.register_food("docfarming:bakedpotato", 5) - hbhunger.register_food("docfarming:raspberry", 3) -end - -if minetest.get_modpath("farming_plus") ~= nil then - hbhunger.register_food("farming_plus:carrot_item", 3) - hbhunger.register_food("farming_plus:banana", 2) - hbhunger.register_food("farming_plus:orange_item", 2) - hbhunger.register_food("farming:pumpkin_bread", 4) - hbhunger.register_food("farming_plus:strawberry_item", 2) - hbhunger.register_food("farming_plus:tomato_item", 2) - hbhunger.register_food("farming_plus:potato_item", 4) - hbhunger.register_food("farming_plus:rhubarb_item", 2) -end - -if minetest.get_modpath("mtfoods") ~= nil then - hbhunger.register_food("mtfoods:dandelion_milk", 1) - hbhunger.register_food("mtfoods:sugar", 1) - hbhunger.register_food("mtfoods:short_bread", 4) - hbhunger.register_food("mtfoods:cream", 1) - hbhunger.register_food("mtfoods:chocolate", 2) - hbhunger.register_food("mtfoods:cupcake", 2) - hbhunger.register_food("mtfoods:strawberry_shortcake", 2) - hbhunger.register_food("mtfoods:cake", 3) - hbhunger.register_food("mtfoods:chocolate_cake", 3) - hbhunger.register_food("mtfoods:carrot_cake", 3) - hbhunger.register_food("mtfoods:pie_crust", 3) - hbhunger.register_food("mtfoods:apple_pie", 3) - hbhunger.register_food("mtfoods:rhubarb_pie", 2) - hbhunger.register_food("mtfoods:banana_pie", 3) - hbhunger.register_food("mtfoods:pumpkin_pie", 3) - hbhunger.register_food("mtfoods:cookies", 2) - hbhunger.register_food("mtfoods:mlt_burger", 5) - hbhunger.register_food("mtfoods:potato_slices", 2) - hbhunger.register_food("mtfoods:potato_chips", 3) - --mtfoods:medicine - hbhunger.register_food("mtfoods:casserole", 3) - hbhunger.register_food("mtfoods:glass_flute", 2) - hbhunger.register_food("mtfoods:orange_juice", 2) - hbhunger.register_food("mtfoods:apple_juice", 2) - hbhunger.register_food("mtfoods:apple_cider", 2) - hbhunger.register_food("mtfoods:cider_rack", 2) -end - -if minetest.get_modpath("fruit") ~= nil then - hbhunger.register_food("fruit:apple", 2) - hbhunger.register_food("fruit:pear", 2) - hbhunger.register_food("fruit:bananna", 3) - hbhunger.register_food("fruit:orange", 2) -end - -if minetest.get_modpath("mush45") ~= nil then - hbhunger.register_food("mush45:meal", 4) -end - -if minetest.get_modpath("seaplants") ~= nil then - hbhunger.register_food("seaplants:kelpgreen", 1) - hbhunger.register_food("seaplants:kelpbrown", 1) - hbhunger.register_food("seaplants:seagrassgreen", 1) - hbhunger.register_food("seaplants:seagrassred", 1) - hbhunger.register_food("seaplants:seasaladmix", 6) - hbhunger.register_food("seaplants:kelpgreensalad", 1) - hbhunger.register_food("seaplants:kelpbrownsalad", 1) - hbhunger.register_food("seaplants:seagrassgreensalad", 1) - hbhunger.register_food("seaplants:seagrassgreensalad", 1) -end - -if minetest.get_modpath("mobfcooking") ~= nil then - hbhunger.register_food("mobfcooking:cooked_pork", 6) - hbhunger.register_food("mobfcooking:cooked_ostrich", 6) - hbhunger.register_food("mobfcooking:cooked_beef", 6) - hbhunger.register_food("mobfcooking:cooked_chicken", 6) - hbhunger.register_food("mobfcooking:cooked_lamb", 6) - hbhunger.register_food("mobfcooking:cooked_venison", 6) - hbhunger.register_food("mobfcooking:cooked_fish", 6) -end - -if minetest.get_modpath("creatures") ~= nil then - hbhunger.register_food("creatures:meat", 6) - hbhunger.register_food("creatures:flesh", 3) - hbhunger.register_food("creatures:rotten_flesh", 3, "", 3) -end - -if minetest.get_modpath("ethereal") then - hbhunger.register_food("ethereal:strawberry", 1) - hbhunger.register_food("ethereal:banana", 4) - hbhunger.register_food("ethereal:pine_nuts", 1) - hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3) - hbhunger.register_food("ethereal:fern_tubers", 1) - hbhunger.register_food("ethereal:banana_bread", 7) - hbhunger.register_food("ethereal:mushroom_plant", 2) - hbhunger.register_food("ethereal:coconut_slice", 2) - hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10) - hbhunger.register_food("ethereal:wild_onion_plant", 2) - hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl") - hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl") - hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl", 3) - hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl") - if minetest.get_modpath("bucket") then - hbhunger.register_food("ethereal:bucket_cactus", 2, "bucket:bucket_empty") - end - hbhunger.register_food("ethereal:fish_raw", 2) - hbhunger.register_food("ethereal:fish_cooked", 5) - hbhunger.register_food("ethereal:seaweed", 1) - hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1) - hbhunger.register_food("ethereal:sashimi", 4) - hbhunger.register_food("ethereal:orange", 2) -end - -if minetest.get_modpath("farming") and farming.mod == "redo" then - hbhunger.register_food("farming:bread", 6) - hbhunger.register_food("farming:potato", 1) - hbhunger.register_food("farming:baked_potato", 6) - hbhunger.register_food("farming:cucumber", 4) - hbhunger.register_food("farming:tomato", 4) - hbhunger.register_food("farming:carrot", 3) - hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8) - hbhunger.register_food("farming:corn", 3) - hbhunger.register_food("farming:corn_cob", 5) - hbhunger.register_food("farming:melon_slice", 2) - hbhunger.register_food("farming:pumpkin_slice", 1) - hbhunger.register_food("farming:pumpkin_bread", 9) - hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup") - hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) - hbhunger.register_food("farming:cookie", 2) - hbhunger.register_food("farming:chocolate_dark", 3) - hbhunger.register_food("farming:donut", 4) - hbhunger.register_food("farming:donut_chocolate", 6) - hbhunger.register_food("farming:donut_apple", 6) - hbhunger.register_food("farming:raspberries", 1) - hbhunger.register_food("farming:blueberries", 1) - hbhunger.register_food("farming:muffin_blueberry", 4) - if minetest.get_modpath("vessels") then - hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass") - end - hbhunger.register_food("farming:rhubarb", 1) - hbhunger.register_food("farming:rhubarb_pie", 6) - hbhunger.register_food("farming:beans", 1) -end - -if minetest.get_modpath("kpgmobs") ~= nil then - hbhunger.register_food("kpgmobs:uley", 3) - hbhunger.register_food("kpgmobs:meat", 6) - hbhunger.register_food("kpgmobs:rat_cooked", 5) - hbhunger.register_food("kpgmobs:med_cooked", 4) - if minetest.get_modpath("bucket") then - hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty") - end -end - -if minetest.get_modpath("jkfarming") ~= nil then - hbhunger.register_food("jkfarming:carrot", 3) - hbhunger.register_food("jkfarming:corn", 3) - hbhunger.register_food("jkfarming:melon_part", 2) - hbhunger.register_food("jkfarming:cake", 3) -end - -if minetest.get_modpath("jkanimals") ~= nil then - hbhunger.register_food("jkanimals:meat", 6) -end - -if minetest.get_modpath("jkwine") ~= nil then - hbhunger.register_food("jkwine:grapes", 2) - hbhunger.register_food("jkwine:winebottle", 1) -end - -if minetest.get_modpath("cooking") ~= nil then - hbhunger.register_food("cooking:meat_beef_cooked", 4) - hbhunger.register_food("cooking:fish_bluewhite_cooked", 3) - hbhunger.register_food("cooking:fish_clownfish_cooked", 1) - hbhunger.register_food("cooking:meat_chicken_cooked", 2) - hbhunger.register_food("cooking:meat_cooked", 2) - hbhunger.register_food("cooking:meat_pork_cooked", 3) - hbhunger.register_food("cooking:meat_toxic_cooked", -3) - hbhunger.register_food("cooking:meat_venison_cooked", 3) - hbhunger.register_food("cooking:meat_undead_cooked", 1) -end - --- ferns mod of plantlife_modpack -if minetest.get_modpath("ferns") ~= nil then - hbhunger.register_food("ferns:fiddlehead", 1, "", 1) - hbhunger.register_food("ferns:fiddlehead_roasted", 3) - hbhunger.register_food("ferns:ferntuber_roasted", 3) - hbhunger.register_food("ferns:horsetail_01", 1) -end - -if minetest.get_modpath("pizza") ~= nil then - hbhunger.register_food("pizza:pizza", 30, "", nil, 30) - hbhunger.register_food("pizza:pizzaslice", 5, "", nil, 5) -end - -if minetest.get_modpath("nssm") then - hbhunger.register_food("nssm:werewolf_leg", 3) - hbhunger.register_food("nssm:heron_leg", 2) - hbhunger.register_food("nssm:chichibios_heron_leg", 4) - hbhunger.register_food("nssm:crocodile_tail", 3) - hbhunger.register_food("nssm:duck_legs", 1) - hbhunger.register_food("nssm:ant_leg", 1) - hbhunger.register_food("nssm:spider_leg", 1) - hbhunger.register_food("nssm:tentacle", 2) - hbhunger.register_food("nssm:worm_flesh", 2, "", 2) -- poisonous - hbhunger.register_food("nssm:amphibian_heart", 1) - hbhunger.register_food("nssm:raw_scrausics_wing", 1) - -- superfoods - hbhunger.register_food("nssm:phoenix_nuggets", 20, "", nil, 20) - hbhunger.register_food("nssm:phoenix_tear", 20, "", nil, 20) -end - --- player-action based hunger changes -function hbhunger.handle_node_actions(pos, oldnode, player, ext) - -- is_fake_player comes from the pipeworks, we are not interested in those - if not player or not player:is_player() or player.is_fake_player == true then - return - end - local name = player:get_player_name() - local exhaus = hbhunger.exhaustion[name] - if exhaus == nil then return end - local new = hbhunger.EXHAUST_PLACE - -- placenode event - if not ext then - new = hbhunger.EXHAUST_DIG - end - -- assume its send by main timer when movement detected - if not pos and not oldnode then - new = hbhunger.EXHAUST_MOVE - end - exhaus = exhaus + new - if exhaus > hbhunger.EXHAUST_LVL then - exhaus = 0 - local h = tonumber(hbhunger.hunger[name]) - h = h - 1 - if h < 0 then h = 0 end - hbhunger.hunger[name] = h - hbhunger.set_hunger_raw(player) - end - hbhunger.exhaustion[name] = exhaus -end - -minetest.register_on_placenode(hbhunger.handle_node_actions) -minetest.register_on_dignode(hbhunger.handle_node_actions) +-- Keep these for backwards compatibility +function hbhunger.save_hunger(player) + hbhunger.set_hunger_raw(player) +end +function hbhunger.load_hunger(player) + hbhunger.get_hunger_raw(player) +end + +-- wrapper for minetest.item_eat (this way we make sure other mods can't break this one) +local org_eat = minetest.do_item_eat +minetest.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing) + local old_itemstack = itemstack + itemstack = hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing) + for _, callback in pairs(minetest.registered_on_item_eats) do + local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing, old_itemstack) + if result then + return result + end + end + return itemstack +end + +-- food functions +local food = hbhunger.food + +function hbhunger.register_food(name, hunger_change, replace_with_item, poisen, heal, sound) + food[name] = {} + food[name].saturation = hunger_change -- hunger points added + food[name].replace = replace_with_item -- what item is given back after eating + food[name].poisen = poisen -- time its poisening + food[name].healing = heal -- amount of HP + food[name].sound = sound -- special sound that is played when eating +end + +function hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing) + local item = itemstack:get_name() + local def = food[item] + if not def then + def = {} + if type(hp_change) ~= "number" then + hp_change = 1 + minetest.log("error", "Wrong on_use() definition for item '" .. item .. "'") + end + def.saturation = hp_change * 1.3 + def.replace = replace_with_item + end + local sound = def.sound + if not sound then + if minetest.get_item_group(item, "food") == 3 then + sound = "survival_thirst_drink" + elseif not sound then + sound = "hbhunger_eat_generic" + end + end + local func = hbhunger.item_eat(def.saturation, def.replace, def.poisen, def.healing, sound) + return func(itemstack, user, pointed_thing) +end + +-- Poison player +local function poisenp(tick, time, time_left, player) + -- First check if player is still there + if not player:is_player() then + return + end + time_left = time_left + tick + if time_left < time then + minetest.after(tick, poisenp, tick, time, time_left, player) + else + hbhunger.poisonings[player:get_player_name()] = hbhunger.poisonings[player:get_player_name()] - 1 + if hbhunger.poisonings[player:get_player_name()] <= 0 then + -- Reset HUD bar color + hb.change_hudbar(player, "health", nil, nil, "hudbars_icon_health.png", nil, "hudbars_bar_health.png") + end + end + if player:get_hp()-1 > 0 then + player:set_hp(player:get_hp()-1) + end + +end + +function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound) + return function(itemstack, user, pointed_thing) + if itemstack:take_item() ~= nil and user ~= nil then + local name = user:get_player_name() + local h = tonumber(hbhunger.hunger[name]) + local hp = user:get_hp() + if h == nil or hp == nil then + return + end + minetest.sound_play( + {name = sound or "hbhunger_eat_generic", + gain = 1}, + {object=user, + max_hear_distance = 16, + pitch = 1 + math.random(-10, 10)*0.005,}, + true + ) + + -- Saturation + if h < hbhunger.SAT_MAX and hunger_change then + h = h + hunger_change + if h > hbhunger.SAT_MAX then h = hbhunger.SAT_MAX end + hbhunger.hunger[name] = h + hbhunger.set_hunger_raw(user) + end + -- Healing + if hp < 20 and heal then + hp = hp + heal + if hp > 20 then hp = 20 end + user:set_hp(hp) + end + -- Poison + if poisen then + -- Set poison bar + hb.change_hudbar(user, "health", nil, nil, "hbhunger_icon_health_poison.png", nil, "hbhunger_bar_health_poison.png") + hbhunger.poisonings[name] = hbhunger.poisonings[name] + 1 + poisenp(1, poisen, 0, user) + end + + if itemstack:get_count() == 0 then + itemstack:add_item(replace_with_item) + else + local inv = user:get_inventory() + if inv:room_for_item("main", replace_with_item) then + inv:add_item("main", replace_with_item) + else + minetest.add_item(user:get_pos(), replace_with_item) + end + end + end + return itemstack + end +end + +-- player-action based hunger changes +function hbhunger.handle_node_actions(pos, oldnode, player, ext) + -- is_fake_player comes from the pipeworks, we are not interested in those + if not player or not player:is_player() or player.is_fake_player == true then + return + end + local name = player:get_player_name() + local exhaus = hbhunger.exhaustion[name] + if exhaus == nil then return end + local new = hbhunger.EXHAUST_PLACE + -- placenode event + if not ext then + new = hbhunger.EXHAUST_DIG + end + -- assume its send by main timer when movement detected + if not pos and not oldnode then + new = hbhunger.EXHAUST_MOVE + end + exhaus = exhaus + new + if exhaus > hbhunger.EXHAUST_LVL then + exhaus = 0 + local h = tonumber(hbhunger.hunger[name]) + h = h - 1 + if h < 0 then h = 0 end + hbhunger.hunger[name] = h + hbhunger.set_hunger_raw(player) + end + hbhunger.exhaustion[name] = exhaus +end + +minetest.register_on_placenode(hbhunger.handle_node_actions) +minetest.register_on_dignode(hbhunger.handle_node_actions) diff --git a/mods/hbhunger/init.lua b/mods/hbhunger/init.lua index 1faa0e3..26ff399 100644 --- a/mods/hbhunger/init.lua +++ b/mods/hbhunger/init.lua @@ -25,6 +25,9 @@ hbhunger.EXHAUST_DIG = 3 -- exhaustion increased this value after digged node hbhunger.EXHAUST_PLACE = 1 -- exhaustion increased this value after placed hbhunger.EXHAUST_MOVE = 0.3 -- exhaustion increased this value if player movement detected hbhunger.EXHAUST_LVL = 160 -- at what exhaustion player satiation gets lowerd +hbhunger.SAT_MAX = 20 -- maximum satiation points +hbhunger.SAT_INIT = 20 -- initial satiation points +hbhunger.SAT_HEAL = 15 -- required satiation points to start healing --load custom settings @@ -35,13 +38,14 @@ if set then end local function custom_hud(player) - hb.init_hudbar(player, "satiation", math.min(20, hbhunger.get_hunger_raw(player))) + hb.init_hudbar(player, "satiation", hbhunger.get_hunger_raw(player)) end dofile(minetest.get_modpath("hbhunger").."/hunger.lua") +dofile(minetest.get_modpath("hbhunger").."/register_foods.lua") -- register satiation hudbar -hb.register_hudbar("satiation", 0xFFFFFF, S("Satiation"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png", bar = "hbhunger_bar.png" }, 20, 20, false, nil, { format_value = "%.1f", format_max_value = "%d" }) +hb.register_hudbar("satiation", 0xFFFFFF, S("Satiation"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png", bar = "hbhunger_bar.png" }, hbhunger.SAT_INIT, hbhunger.SAT_MAX, false, nil, { format_value = "%.1f", format_max_value = "%d" }) -- update hud elemtens if value has changed local function update_hud(player) @@ -51,7 +55,7 @@ local function update_hud(player) local h = tonumber(hbhunger.hunger[name]) if h_out ~= h then hbhunger.hunger_out[name] = h - hb.change_hudbar(player, "satiation", math.min(20, h)) + hb.change_hudbar(player, "satiation", h) end end @@ -73,7 +77,7 @@ hbhunger.set_hunger_raw = function(player) local name = player:get_player_name() local value = hbhunger.hunger[name] if not inv or not value then return nil end - if value > 30 then value = 30 end + if value > hbhunger.SAT_MAX then value = hbhunger.SAT_MAX end if value < 0 then value = 0 end inv:set_stack("hunger", 1, ItemStack({name=":", count=value+1})) @@ -96,7 +100,7 @@ end) minetest.register_on_respawnplayer(function(player) -- reset hunger (and save) local name = player:get_player_name() - hbhunger.hunger[name] = 20 + hbhunger.hunger[name] = hbhunger.SAT_INIT hbhunger.set_hunger_raw(player) hbhunger.exhaustion[name] = 0 end) @@ -116,10 +120,10 @@ minetest.register_globalstep(function(dtime) local h = tonumber(hbhunger.hunger[name]) local hp = player:get_hp() if timer > 4 then - -- heal player by 1 hp if not dead and satiation is > 15 (of 30) - if h > 15 and hp > 0 and player:get_breath() > 0 then + -- heal player by 1 hp if not dead and satiation is > hbhunger.SAT_HEAL + if h > hbhunger.SAT_HEAL and hp > 0 and player:get_breath() > 0 then player:set_hp(hp+1) - -- or damage player by 1 hp if satiation is < 2 (of 30) + -- or damage player by 1 hp if satiation is < 2 elseif h <= 1 then if hp-1 >= 0 then player:set_hp(hp-1) end end @@ -147,4 +151,38 @@ minetest.register_globalstep(function(dtime) if timer2 > hbhunger.HUNGER_TICK then timer2 = 0 end end) +minetest.register_chatcommand("satiation", { + privs = {["server"]=true}, + params = S("[] "), + description = S("Set satiation of player or yourself"), + func = function(name, param) + if minetest.settings:get_bool("enable_damage") == false then + return false, S("Not possible, damage is disabled.") + end + local targetname, satiation = string.match(param, "(%S+) (%S+)") + if not targetname then + satiation = param + end + satiation = tonumber(satiation) + if not satiation then + return false, S("Invalid satiation!") + end + if not targetname then + targetname = name + end + local target = minetest.get_player_by_name(targetname) + if target == nil then + return false, S("Player @1 does not exist.", targetname) + end + if satiation > hbhunger.SAT_MAX then + satiation = hbhunger.SAT_MAX + elseif satiation < 0 then + satiation = 0 + end + hbhunger.hunger[targetname] = satiation + hbhunger.set_hunger_raw(target) + return true + end, +}) + end diff --git a/mods/hbhunger/locale/hbhunger.de.tr b/mods/hbhunger/locale/hbhunger.de.tr index 4223564..988b457 100644 --- a/mods/hbhunger/locale/hbhunger.de.tr +++ b/mods/hbhunger/locale/hbhunger.de.tr @@ -1,2 +1,7 @@ # textdomain:hbhunger Satiation=Sättigung +Set satiation of player or yourself=Sättigung von Spieler oder Ihnen selbst setzen +Not possible, damage is disabled.=Nicht möglich, Schaden ist deaktiviert. +Invalid satiation!=Ungültige Sättigung! +Player @1 does not exist.=Spieler @1 existiert nicht. +[] =[] diff --git a/mods/hbhunger/locale/template.txt b/mods/hbhunger/locale/hbhunger.fr.tr similarity index 52% copy from mods/hbhunger/locale/template.txt copy to mods/hbhunger/locale/hbhunger.fr.tr index 84ad832..0a8a382 100644 --- a/mods/hbhunger/locale/template.txt +++ b/mods/hbhunger/locale/hbhunger.fr.tr @@ -1,2 +1,2 @@ # textdomain:hbhunger -Satiation= +Satiation=Satiété diff --git a/mods/hbhunger/locale/template.txt b/mods/hbhunger/locale/template.txt index 84ad832..507e005 100644 --- a/mods/hbhunger/locale/template.txt +++ b/mods/hbhunger/locale/template.txt @@ -1,2 +1,7 @@ # textdomain:hbhunger Satiation= +Set satiation of player or yourself= +Not possible, damage is disabled.= +Invalid satiation!= +Player @1 does not exist.= +[] = diff --git a/mods/hbhunger/hunger.lua b/mods/hbhunger/register_foods.lua similarity index 57% copy from mods/hbhunger/hunger.lua copy to mods/hbhunger/register_foods.lua index db012fd..e43c3a6 100644 --- a/mods/hbhunger/hunger.lua +++ b/mods/hbhunger/register_foods.lua @@ -1,146 +1,13 @@ --- Keep these for backwards compatibility -function hbhunger.save_hunger(player) - hbhunger.set_hunger_raw(player) -end -function hbhunger.load_hunger(player) - hbhunger.get_hunger_raw(player) -end - --- wrapper for minetest.item_eat (this way we make sure other mods can't break this one) -local org_eat = core.do_item_eat -core.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing) - local old_itemstack = itemstack - itemstack = hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing) - for _, callback in pairs(core.registered_on_item_eats) do - local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing, old_itemstack) - if result then - return result - end - end - return itemstack -end - --- food functions -local food = hbhunger.food - -function hbhunger.register_food(name, hunger_change, replace_with_item, poisen, heal, sound) - food[name] = {} - food[name].saturation = hunger_change -- hunger points added - food[name].replace = replace_with_item -- what item is given back after eating - food[name].poisen = poisen -- time its poisening - food[name].healing = heal -- amount of HP - food[name].sound = sound -- special sound that is played when eating -end - -function hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing) - local item = itemstack:get_name() - local def = food[item] - if not def then - def = {} - if type(hp_change) ~= "number" then - hp_change = 1 - core.log("error", "Wrong on_use() definition for item '" .. item .. "'") - end - def.saturation = hp_change * 1.3 - def.replace = replace_with_item - end - local sound = def.sound - if not sound then - if minetest.get_item_group(item, "food") == 3 then - sound = "survival_thirst_drink" - elseif not sound then - sound = "hbhunger_eat_generic" - end - end - local func = hbhunger.item_eat(def.saturation, def.replace, def.poisen, def.healing, sound) - return func(itemstack, user, pointed_thing) -end - --- Poison player -local function poisenp(tick, time, time_left, player) - -- First check if player is still there - if not player:is_player() then - return - end - time_left = time_left + tick - if time_left < time then - minetest.after(tick, poisenp, tick, time, time_left, player) - else - hbhunger.poisonings[player:get_player_name()] = hbhunger.poisonings[player:get_player_name()] - 1 - if hbhunger.poisonings[player:get_player_name()] <= 0 then - -- Reset HUD bar color - hb.change_hudbar(player, "health", nil, nil, "hudbars_icon_health.png", nil, "hudbars_bar_health.png") - end - end - if player:get_hp()-1 > 0 then - player:set_hp(player:get_hp()-1) - end - -end - -function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound) - return function(itemstack, user, pointed_thing) - if itemstack:take_item() ~= nil and user ~= nil then - local name = user:get_player_name() - local h = tonumber(hbhunger.hunger[name]) - local hp = user:get_hp() - if h == nil or hp == nil then - return - end - minetest.sound_play( - {name = sound or "hbhunger_eat_generic", - gain = 1}, - {object=user, - max_hear_distance = 16, - pitch = 1 + math.random(-10, 10)*0.005,}, - true - ) - - -- Saturation - if h < 30 and hunger_change then - h = h + hunger_change - if h > 30 then h = 30 end - hbhunger.hunger[name] = h - hbhunger.set_hunger_raw(user) - end - -- Healing - if hp < 20 and heal then - hp = hp + heal - if hp > 20 then hp = 20 end - user:set_hp(hp) - end - -- Poison - if poisen then - -- Set poison bar - hb.change_hudbar(user, "health", nil, nil, "hbhunger_icon_health_poison.png", nil, "hbhunger_bar_health_poison.png") - hbhunger.poisonings[name] = hbhunger.poisonings[name] + 1 - poisenp(1, poisen, 0, user) - end - - if itemstack:get_count() == 0 then - itemstack:add_item(replace_with_item) - else - local inv = user:get_inventory() - if inv:room_for_item("main", replace_with_item) then - inv:add_item("main", replace_with_item) - else - minetest.add_item(user:get_pos(), replace_with_item) - end - end - end - return itemstack - end -end - -if minetest.get_modpath("hades_trees") ~= nil then - hbhunger.register_food("hades_trees:apple", 2) +if minetest.get_modpath("default") ~= nil then + hbhunger.register_food("default:apple", 2) + hbhunger.register_food("default:blueberries", 2) end if minetest.get_modpath("flowers") ~= nil then hbhunger.register_food("flowers:mushroom_brown", 1) hbhunger.register_food("flowers:mushroom_red", 1, "", 3) end if minetest.get_modpath("farming") ~= nil then - hbhunger.register_food("farming:bread", 4) + hbhunger.register_food("farming:bread", 5) end if minetest.get_modpath("mobs") ~= nil then @@ -223,7 +90,7 @@ end if minetest.get_modpath("bushes_classic") then -- bushes_classic mod, as found in the plantlife modpack local berries = { - "strawberry", + "strawberry", "blackberry", "blueberry", "raspberry", @@ -338,60 +205,60 @@ if minetest.get_modpath("creatures") ~= nil then end if minetest.get_modpath("ethereal") then - hbhunger.register_food("ethereal:strawberry", 1) - hbhunger.register_food("ethereal:banana", 4) - hbhunger.register_food("ethereal:pine_nuts", 1) - hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3) - hbhunger.register_food("ethereal:fern_tubers", 1) - hbhunger.register_food("ethereal:banana_bread", 7) - hbhunger.register_food("ethereal:mushroom_plant", 2) - hbhunger.register_food("ethereal:coconut_slice", 2) - hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10) - hbhunger.register_food("ethereal:wild_onion_plant", 2) - hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl") - hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl") - hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl", 3) - hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl") - if minetest.get_modpath("bucket") then + hbhunger.register_food("ethereal:strawberry", 1) + hbhunger.register_food("ethereal:banana", 4) + hbhunger.register_food("ethereal:pine_nuts", 1) + hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3) + hbhunger.register_food("ethereal:fern_tubers", 1) + hbhunger.register_food("ethereal:banana_bread", 7) + hbhunger.register_food("ethereal:mushroom_plant", 2) + hbhunger.register_food("ethereal:coconut_slice", 2) + hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10) + hbhunger.register_food("ethereal:wild_onion_plant", 2) + hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl") + hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl") + hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl", 3) + hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl") + if minetest.get_modpath("bucket") then hbhunger.register_food("ethereal:bucket_cactus", 2, "bucket:bucket_empty") - end - hbhunger.register_food("ethereal:fish_raw", 2) - hbhunger.register_food("ethereal:fish_cooked", 5) - hbhunger.register_food("ethereal:seaweed", 1) - hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1) - hbhunger.register_food("ethereal:sashimi", 4) - hbhunger.register_food("ethereal:orange", 2) + end + hbhunger.register_food("ethereal:fish_raw", 2) + hbhunger.register_food("ethereal:fish_cooked", 5) + hbhunger.register_food("ethereal:seaweed", 1) + hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1) + hbhunger.register_food("ethereal:sashimi", 4) + hbhunger.register_food("ethereal:orange", 2) end if minetest.get_modpath("farming") and farming.mod == "redo" then - hbhunger.register_food("farming:bread", 6) - hbhunger.register_food("farming:potato", 1) - hbhunger.register_food("farming:baked_potato", 6) - hbhunger.register_food("farming:cucumber", 4) - hbhunger.register_food("farming:tomato", 4) - hbhunger.register_food("farming:carrot", 3) - hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8) - hbhunger.register_food("farming:corn", 3) - hbhunger.register_food("farming:corn_cob", 5) - hbhunger.register_food("farming:melon_slice", 2) - hbhunger.register_food("farming:pumpkin_slice", 1) - hbhunger.register_food("farming:pumpkin_bread", 9) - hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup") - hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) - hbhunger.register_food("farming:cookie", 2) - hbhunger.register_food("farming:chocolate_dark", 3) - hbhunger.register_food("farming:donut", 4) - hbhunger.register_food("farming:donut_chocolate", 6) - hbhunger.register_food("farming:donut_apple", 6) - hbhunger.register_food("farming:raspberries", 1) - hbhunger.register_food("farming:blueberries", 1) - hbhunger.register_food("farming:muffin_blueberry", 4) - if minetest.get_modpath("vessels") then - hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass") - end - hbhunger.register_food("farming:rhubarb", 1) - hbhunger.register_food("farming:rhubarb_pie", 6) - hbhunger.register_food("farming:beans", 1) + hbhunger.register_food("farming:bread", 6) + hbhunger.register_food("farming:potato", 1) + hbhunger.register_food("farming:baked_potato", 6) + hbhunger.register_food("farming:cucumber", 4) + hbhunger.register_food("farming:tomato", 4) + hbhunger.register_food("farming:carrot", 3) + hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8) + hbhunger.register_food("farming:corn", 3) + hbhunger.register_food("farming:corn_cob", 5) + hbhunger.register_food("farming:melon_slice", 2) + hbhunger.register_food("farming:pumpkin_slice", 1) + hbhunger.register_food("farming:pumpkin_bread", 9) + hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup") + hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) + hbhunger.register_food("farming:cookie", 2) + hbhunger.register_food("farming:chocolate_dark", 3) + hbhunger.register_food("farming:donut", 4) + hbhunger.register_food("farming:donut_chocolate", 6) + hbhunger.register_food("farming:donut_apple", 6) + hbhunger.register_food("farming:raspberries", 1) + hbhunger.register_food("farming:blueberries", 1) + hbhunger.register_food("farming:muffin_blueberry", 4) + if minetest.get_modpath("vessels") then + hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass") + end + hbhunger.register_food("farming:rhubarb", 1) + hbhunger.register_food("farming:rhubarb_pie", 6) + hbhunger.register_food("farming:beans", 1) end if minetest.get_modpath("kpgmobs") ~= nil then @@ -400,7 +267,7 @@ if minetest.get_modpath("kpgmobs") ~= nil then hbhunger.register_food("kpgmobs:rat_cooked", 5) hbhunger.register_food("kpgmobs:med_cooked", 4) if minetest.get_modpath("bucket") then - hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty") + hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty") end end @@ -462,35 +329,3 @@ if minetest.get_modpath("nssm") then hbhunger.register_food("nssm:phoenix_tear", 20, "", nil, 20) end --- player-action based hunger changes -function hbhunger.handle_node_actions(pos, oldnode, player, ext) - -- is_fake_player comes from the pipeworks, we are not interested in those - if not player or not player:is_player() or player.is_fake_player == true then - return - end - local name = player:get_player_name() - local exhaus = hbhunger.exhaustion[name] - if exhaus == nil then return end - local new = hbhunger.EXHAUST_PLACE - -- placenode event - if not ext then - new = hbhunger.EXHAUST_DIG - end - -- assume its send by main timer when movement detected - if not pos and not oldnode then - new = hbhunger.EXHAUST_MOVE - end - exhaus = exhaus + new - if exhaus > hbhunger.EXHAUST_LVL then - exhaus = 0 - local h = tonumber(hbhunger.hunger[name]) - h = h - 1 - if h < 0 then h = 0 end - hbhunger.hunger[name] = h - hbhunger.set_hunger_raw(player) - end - hbhunger.exhaustion[name] = exhaus -end - -minetest.register_on_placenode(hbhunger.handle_node_actions) -minetest.register_on_dignode(hbhunger.handle_node_actions) -- 2.11.4.GIT