notYoosung
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Add hunger effect for poisonous foods

This commit is contained in:
Wuzzy 2017-05-21 00:01:39 +02:00
parent af4ef21675
commit aeff735b87
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,12 +25,13 @@ end
-- food functions -- food functions
local food = mcl_hunger.food local food = mcl_hunger.food
function mcl_hunger.register_food(name, hunger_change, replace_with_item, poison, heal, sound) function mcl_hunger.register_food(name, hunger_change, replace_with_item, poisontime, poison, exhaust, sound)
food[name] = {} food[name] = {}
food[name].saturation = hunger_change -- hunger points added food[name].saturation = hunger_change -- hunger points added
food[name].replace = replace_with_item -- what item is given back after eating food[name].replace = replace_with_item -- what item is given back after eating
food[name].poison = poison -- time its poisoning food[name].poisontime = poisontime -- time its poisoning
food[name].healing = heal -- amount of HP food[name].poison = poison -- poison damage per tick for poisonous food
food[name].exhaust = exhaust -- exhaustion per tick for poisonous food
food[name].sound = sound -- special sound that is played when eating food[name].sound = sound -- special sound that is played when eating
end end
@ -46,19 +47,19 @@ function mcl_hunger.eat(hp_change, replace_with_item, itemstack, user, pointed_t
def.saturation = hp_change def.saturation = hp_change
def.replace = replace_with_item def.replace = replace_with_item
end end
local func = mcl_hunger.item_eat(def.saturation, def.replace, def.poison, def.healing, def.sound) local func = mcl_hunger.item_eat(def.saturation, def.replace, def.poisontime, def.poison, def.exhaust, def.sound)
return func(itemstack, user, pointed_thing) return func(itemstack, user, pointed_thing)
end end
-- Poison player -- Poison player
local function poisonp(tick, time, time_left, player) local function poisonp(tick, time, time_left, damage, exhaustion, player)
-- First check if player is still there -- First check if player is still there
if not player:is_player() then if not player:is_player() then
return return
end end
time_left = time_left + tick time_left = time_left + tick
if time_left < time then if time_left < time then
minetest.after(tick, poisonp, tick, time, time_left, player) minetest.after(tick, poisonp, tick, time, time_left, damage, exhaustion, player)
else else
mcl_hunger.poisonings[player:get_player_name()] = mcl_hunger.poisonings[player:get_player_name()] - 1 mcl_hunger.poisonings[player:get_player_name()] = mcl_hunger.poisonings[player:get_player_name()] - 1
if mcl_hunger.poisonings[player:get_player_name()] <= 0 then if mcl_hunger.poisonings[player:get_player_name()] <= 0 then
@ -66,13 +67,16 @@ local function poisonp(tick, time, time_left, player)
hb.change_hudbar(player, "health", nil, nil, "hudbars_icon_health.png", nil, "hudbars_bar_health.png") hb.change_hudbar(player, "health", nil, nil, "hudbars_icon_health.png", nil, "hudbars_bar_health.png")
end end
end end
if player:get_hp()-1 > 0 then
player:set_hp(player:get_hp()-1) -- Deal damage and exhaust player
if player:get_hp()-damage > 0 then
player:set_hp(player:get_hp()-damage)
end end
mcl_hunger.exhaust(player:get_player_name(), exhaustion)
end end
function mcl_hunger.item_eat(hunger_change, replace_with_item, poison, heal, sound) function mcl_hunger.item_eat(hunger_change, replace_with_item, poisontime, poison, exhaust, sound)
return function(itemstack, user, pointed_thing) return function(itemstack, user, pointed_thing)
local itemname = itemstack:get_name() local itemname = itemstack:get_name()
if itemstack:take_item() ~= nil and user ~= nil then if itemstack:take_item() ~= nil and user ~= nil then
@ -155,7 +159,7 @@ function mcl_hunger.item_eat(hunger_change, replace_with_item, poison, heal, sou
-- Set poison bar -- Set poison bar
hb.change_hudbar(user, "health", nil, nil, "hbhunger_icon_health_poison.png", nil, "hbhunger_bar_health_poison.png") hb.change_hudbar(user, "health", nil, nil, "hbhunger_icon_health_poison.png", nil, "hbhunger_bar_health_poison.png")
mcl_hunger.poisonings[name] = mcl_hunger.poisonings[name] + 1 mcl_hunger.poisonings[name] = mcl_hunger.poisonings[name] + 1
poisonp(1, poison, 0, user) poisonp(1, poisontime, 0, poison, exhaust, user)
end end
--sound:eat --sound:eat
@ -179,12 +183,13 @@ end)
-- Apply simple poison effect as long there are no real status effect -- Apply simple poison effect as long there are no real status effect
-- TODO: Remove this when status effects are in place -- TODO: Remove this when status effects are in place
if minetest.get_modpath("mcl_farming") then if minetest.get_modpath("mcl_farming") then
mcl_hunger.register_food("mcl_farming:potato_item_poison", 1, "", 3) mcl_hunger.register_food("mcl_farming:potato_item_poison", 1, "", 4, 1, 0)
end end
if minetest.get_modpath("mcl_mobitems") then if minetest.get_modpath("mcl_mobitems") then
mcl_hunger.register_food("mcl_mobitems:rotten_flesh", 2, "", 8) mcl_hunger.register_food("mcl_mobitems:rotten_flesh", 2, "", 8, 1, 100)
mcl_hunger.register_food("mcl_mobitems:spider_eye", 0, "", 4) mcl_hunger.register_food("mcl_mobitems:chicken_raw", 2, "", 30, 0, 100)
mcl_hunger.register_food("mcl_mobitems:spider_eye", 0, "", 4, 1, 0)
end end
if minetest.get_modpath("mcl_fishing") then if minetest.get_modpath("mcl_fishing") then
mcl_hunger.register_food("mcl_fishing:pufferfish_raw", 0, "", 60) mcl_hunger.register_food("mcl_fishing:pufferfish_raw", 0, "", 60, 1, 300)
end end