Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-30 06:21:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Tweak hunger/health mechanics:' (#2361) from hunger_patches into master

Browse source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2361
Reviewed-by: cora <cora@noreply.git.minetest.land>
This commit is contained in:
cora 2022-06-25 09:17:59 +00:00
commit 679309d20c
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mods/PLAYER/mcl_hunger/api.lua
View file

@ -67,7 +67,7 @@ if mcl_hunger.active then
local satuchanged = false local satuchanged = false
local s = mcl_hunger.get_saturation(player) local s = mcl_hunger.get_saturation(player)
if s > 0 then if s > 0 then
mcl_hunger.set_saturation(player, math.max(s - 1.0, 0)) mcl_hunger.set_saturation(player, math.max(s - 1.5, 0))
satuchanged = true satuchanged = true
elseif s <= 0.0001 then elseif s <= 0.0001 then
h = mcl_hunger.get_hunger(player) h = mcl_hunger.get_hunger(player)

11
mods/PLAYER/mcl_hunger/init.lua
View file

@ -28,6 +28,7 @@ mcl_hunger.EXHAUST_SWIM = 10 -- player movement in water
mcl_hunger.EXHAUST_SPRINT = 100 -- sprint (per node) mcl_hunger.EXHAUST_SPRINT = 100 -- sprint (per node)
mcl_hunger.EXHAUST_DAMAGE = 100 -- taking damage (protected by armor) mcl_hunger.EXHAUST_DAMAGE = 100 -- taking damage (protected by armor)
mcl_hunger.EXHAUST_REGEN = 6000 -- Regenerate 1 HP mcl_hunger.EXHAUST_REGEN = 6000 -- Regenerate 1 HP
mcl_hunger.EXHAUST_HUNGER = 5 -- Hunger status effect at base level.
mcl_hunger.EXHAUST_LVL = 4000 -- at what exhaustion player saturation gets lowered mcl_hunger.EXHAUST_LVL = 4000 -- at what exhaustion player saturation gets lowered
mcl_hunger.SATURATION_INIT = 5 -- Initial saturation for new/respawning players mcl_hunger.SATURATION_INIT = 5 -- Initial saturation for new/respawning players
@ -147,7 +148,13 @@ minetest.register_globalstep(function(dtime)
if food_tick_timer > 4.0 then if food_tick_timer > 4.0 then
food_tick_timer = 0 food_tick_timer = 0
if food_level >= 18 then -- slow regenration -- let hunger work always
if player_health > 0 and player_health <= 20 then
--mcl_hunger.exhaust(player_name, mcl_hunger.EXHAUST_HUNGER) -- later for hunger status effect
mcl_hunger.update_exhaustion_hud(player, mcl_hunger.get_exhaustion(player))
end
if food_level >= 18 then -- slow regeneration
if player_health > 0 and player_health < 20 then if player_health > 0 and player_health < 20 then
player:set_hp(player_health+1) player:set_hp(player_health+1)
mcl_hunger.exhaust(player_name, mcl_hunger.EXHAUST_REGEN) mcl_hunger.exhaust(player_name, mcl_hunger.EXHAUST_REGEN)
@ -164,7 +171,7 @@ minetest.register_globalstep(function(dtime)
end end
end end
elseif food_tick_timer > 0.5 and food_level == 20 and food_saturation_level >= 6 then -- fast regeneration elseif food_tick_timer > 0.5 and food_level == 20 and food_saturation_level > 0 then -- fast regeneration
if player_health > 0 and player_health < 20 then if player_health > 0 and player_health < 20 then
food_tick_timer = 0 food_tick_timer = 0
player:set_hp(player_health+1) player:set_hp(player_health+1)