Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename food HUD Bar back to "hunger"

This commit is contained in:
Wuzzy 2017-05-20 23:26:54 +02:00
parent 7115cc28c4
commit 3dd4b0c522
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/PLAYER/mcl_hunger/hunger.lua
View File

@ -82,7 +82,7 @@ function mcl_hunger.item_eat(hunger_change, replace_with_item, poisen, heal, sou
local pos = user:getpos() local pos = user:getpos()
-- player height -- player height
pos.y = pos.y + 1.5 pos.y = pos.y + 1.5
local foodtype = minetest.get_item_group(itemname, "food") local foodtype = minetest.get_item_group(itemname, "hunger")
if foodtype == 3 then if foodtype == 3 then
-- Item is a drink, only play drinking sound (no particle) -- Item is a drink, only play drinking sound (no particle)
minetest.sound_play("survival_thirst_drink", { minetest.sound_play("survival_thirst_drink", {
@ -147,7 +147,7 @@ function mcl_hunger.item_eat(hunger_change, replace_with_item, poisen, heal, sou
mcl_hunger.set_hunger(user, h, false) mcl_hunger.set_hunger(user, h, false)
end end
hb.change_hudbar(user, "food", h) hb.change_hudbar(user, "hunger", h)
mcl_hunger.update_saturation_hud(user, mcl_hunger.get_saturation(user), h) mcl_hunger.update_saturation_hud(user, mcl_hunger.get_saturation(user), h)
end end
-- Poison -- Poison

8
mods/PLAYER/mcl_hunger/init.lua
View File

@ -56,7 +56,7 @@ if set then
end end
local function init_hud(player) local function init_hud(player)
hb.init_hudbar(player, "food", mcl_hunger.get_hunger(player)) hb.init_hudbar(player, "hunger", mcl_hunger.get_hunger(player))
if debug then if debug then
hb.init_hudbar(player, "saturation", mcl_hunger.get_saturation(player), mcl_hunger.get_hunger(player)*10) hb.init_hudbar(player, "saturation", mcl_hunger.get_saturation(player), mcl_hunger.get_hunger(player)*10)
hb.init_hudbar(player, "exhaustion", mcl_hunger.get_exhaustion(player)) hb.init_hudbar(player, "exhaustion", mcl_hunger.get_exhaustion(player))
@ -82,7 +82,7 @@ end
dofile(minetest.get_modpath("mcl_hunger").."/hunger.lua") dofile(minetest.get_modpath("mcl_hunger").."/hunger.lua")
-- register saturation hudbar -- register saturation hudbar
hb.register_hudbar("food", 0xFFFFFF, S("Food"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png", bar = "hbhunger_bar.png" }, 20, 20, false) hb.register_hudbar("hunger", 0xFFFFFF, S("Food"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png", bar = "hbhunger_bar.png" }, 20, 20, false)
if debug then if debug then
hb.register_hudbar("saturation", 0xFFFFFF, S("Saturation"), { icon = "mcl_hunger_icon_saturation.png", bgicon = "mcl_hunger_bgicon_saturation.png", bar = "mcl_hunger_bar_saturation.png" }, mcl_hunger.SATURATION_INIT, 200, false, S("%s: %d/%d")) hb.register_hudbar("saturation", 0xFFFFFF, S("Saturation"), { icon = "mcl_hunger_icon_saturation.png", bgicon = "mcl_hunger_bgicon_saturation.png", bar = "mcl_hunger_bar_saturation.png" }, mcl_hunger.SATURATION_INIT, 200, false, S("%s: %d/%d"))
hb.register_hudbar("exhaustion", 0xFFFFFF, S("Exhaust."), { icon = "mcl_hunger_icon_exhaustion.png", bgicon = "mcl_hunger_bgicon_exhaustion.png", bar = "mcl_hunger_bar_exhaustion.png" }, 0, mcl_hunger.EXHAUST_LVL, false, S("%s: %d/%d")) hb.register_hudbar("exhaustion", 0xFFFFFF, S("Exhaust."), { icon = "mcl_hunger_icon_exhaustion.png", bgicon = "mcl_hunger_bgicon_exhaustion.png", bar = "mcl_hunger_bar_exhaustion.png" }, 0, mcl_hunger.EXHAUST_LVL, false, S("%s: %d/%d"))
@ -130,7 +130,7 @@ mcl_hunger.set_hunger = function(player, hunger, update_hudbars)
if not ok then return false end if not ok then return false end
if update_hudbars ~= false then if update_hudbars ~= false then
hb.change_hudbar(player, "food", hunger) hb.change_hudbar(player, "hunger", hunger)
mcl_hunger.update_saturation_hud(player, nil, hunger) mcl_hunger.update_saturation_hud(player, nil, hunger)
end end
return true return true
@ -179,7 +179,7 @@ minetest.register_on_respawnplayer(function(player)
mcl_hunger.set_hunger(player, h, false) mcl_hunger.set_hunger(player, h, false)
mcl_hunger.set_saturation(player, s, false) mcl_hunger.set_saturation(player, s, false)
mcl_hunger.set_exhaustion(player, e, false) mcl_hunger.set_exhaustion(player, e, false)
hb.change_hudbar(player, "food", h) hb.change_hudbar(player, "hunger", h)
mcl_hunger.update_saturation_hud(player, s, h) mcl_hunger.update_saturation_hud(player, s, h)
mcl_hunger.update_exhaustion_hud(player, e) mcl_hunger.update_exhaustion_hud(player, e)
end) end)