mtcontrib
/
minetest_hbhunger
mirror of git://repo.or.cz/minetest_hbhunger.git
1
0
Fork 2
Code Issues Releases Wiki Activity

Change global variable names to fit the mod

This commit is contained in:
Wuzzy 2015-02-23 23:21:10 +01:00
parent 80bc9d2b78
commit ee92b518ea
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
hunger.lua
View File

@ -1,9 +1,9 @@
-- Keep these for backwards compatibility -- Keep these for backwards compatibility
function hud.save_hunger(player) function hunger.save_hunger(player)
hud.set_hunger(player) hunger.set_hunger(player)
end end
function hud.load_hunger(player) function hunger.load_hunger(player)
hud.get_hunger(player) hunger.get_hunger(player)
end end
-- Poison player -- Poison player
@ -20,19 +20,19 @@ local function poisenp(tick, time, time_left, player)
end end
function hud.item_eat(hunger_change, replace_with_item, poisen, heal) function hunger.item_eat(hunger_change, replace_with_item, poisen, heal)
return function(itemstack, user, pointed_thing) return function(itemstack, user, pointed_thing)
if itemstack:take_item() ~= nil and user ~= nil then if itemstack:take_item() ~= nil and user ~= nil then
local name = user:get_player_name() local name = user:get_player_name()
local h = tonumber(hud.hunger[name]) local h = tonumber(hunger.hunger[name])
local hp = user:get_hp() local hp = user:get_hp()
-- Saturation -- Saturation
if h < 30 and hunger_change then if h < 30 and hunger_change then
h = h + hunger_change h = h + hunger_change
if h > 30 then h = 30 end if h > 30 then h = 30 end
hud.hunger[name] = h hunger.hunger[name] = h
hud.set_hunger(user) hunger.set_hunger(user)
end end
-- Healing -- Healing
if hp < 20 and heal then if hp < 20 and heal then
@ -56,7 +56,7 @@ end
local function overwrite(name, hunger_change, replace_with_item, poisen, heal) local function overwrite(name, hunger_change, replace_with_item, poisen, heal)
local tab = minetest.registered_items[name] local tab = minetest.registered_items[name]
if tab == nil then return end if tab == nil then return end
tab.on_use = hud.item_eat(hunger_change, replace_with_item, poisen, heal) tab.on_use = hunger.item_eat(hunger_change, replace_with_item, poisen, heal)
minetest.registered_items[name] = tab minetest.registered_items[name] = tab
end end
@ -330,32 +330,32 @@ if minetest.get_modpath("cooking") ~= nil then
end end
-- player-action based hunger changes -- player-action based hunger changes
function hud.handle_node_actions(pos, oldnode, player, ext) function hunger.handle_node_actions(pos, oldnode, player, ext)
if not player or not player:is_player() then if not player or not player:is_player() then
return return
end end
local name = player:get_player_name() local name = player:get_player_name()
local exhaus = hud.exhaustion[name] local exhaus = hunger.exhaustion[name]
local new = HUD_HUNGER_EXHAUST_PLACE local new = HUNGER_EXHAUST_PLACE
-- placenode event -- placenode event
if not ext then if not ext then
new = HUD_HUNGER_EXHAUST_DIG new = HUNGER_EXHAUST_DIG
end end
-- assume its send by main timer when movement detected -- assume its send by main timer when movement detected
if not pos and not oldnode then if not pos and not oldnode then
new = HUD_HUNGER_EXHAUST_MOVE new = HUNGER_EXHAUST_MOVE
end end
exhaus = exhaus + new exhaus = exhaus + new
if exhaus > HUD_HUNGER_EXHAUST_LVL then if exhaus > HUNGER_EXHAUST_LVL then
exhaus = 0 exhaus = 0
local h = tonumber(hud.hunger[name]) local h = tonumber(hunger.hunger[name])
h = h - 1 h = h - 1
if h < 0 then h = 0 end if h < 0 then h = 0 end
hud.hunger[name] = h hunger.hunger[name] = h
hud.set_hunger(player) hunger.set_hunger(player)
end end
hud.exhaustion[name] = exhaus hunger.exhaustion[name] = exhaus
end end
minetest.register_on_placenode(hud.handle_node_actions) minetest.register_on_placenode(hunger.handle_node_actions)
minetest.register_on_dignode(hud.handle_node_actions) minetest.register_on_dignode(hunger.handle_node_actions)

70
init.lua
View File

@ -1,28 +1,28 @@
hud = {} hunger = {}
-- HUD statbar values -- HUD statbar values
hud.hunger = {} hunger.hunger = {}
hud.hunger_out = {} hunger.hunger_out = {}
-- HUD item ids -- HUD item ids
local hunger_hud = {} local hunger_hud = {}
HUD_TICK = 0.1 HUNGER_HUD_TICK = 0.1
--Some hunger settings --Some hunger settings
hud.exhaustion = {} -- Exhaustion is experimental! hunger.exhaustion = {} -- Exhaustion is experimental!
HUD_HUNGER_TICK = 800 -- time in seconds after that 1 hunger point is taken HUNGER_HUNGER_TICK = 800 -- time in seconds after that 1 hunger point is taken
HUD_HUNGER_EXHAUST_DIG = 3 -- exhaustion increased this value after digged node HUNGER_EXHAUST_DIG = 3 -- exhaustion increased this value after digged node
HUD_HUNGER_EXHAUST_PLACE = 1 -- exhaustion increased this value after placed HUNGER_EXHAUST_PLACE = 1 -- exhaustion increased this value after placed
HUD_HUNGER_EXHAUST_MOVE = 0.3 -- exhaustion increased this value if player movement detected HUNGER_EXHAUST_MOVE = 0.3 -- exhaustion increased this value if player movement detected
HUD_HUNGER_EXHAUST_LVL = 160 -- at what exhaustion player saturation gets lowerd HUNGER_EXHAUST_LVL = 160 -- at what exhaustion player saturation gets lowerd
--load custom settings --load custom settings
local set = io.open(minetest.get_modpath("hunger").."/hud.conf", "r") local set = io.open(minetest.get_modpath("hunger").."/hunger.conf", "r")
if set then if set then
dofile(minetest.get_modpath("hunger").."/hud.conf") dofile(minetest.get_modpath("hunger").."/hunger.conf")
set:close() set:close()
end end
@ -40,7 +40,7 @@ local function custom_hud(player)
alignment = {x=-1,y=-1}, alignment = {x=-1,y=-1},
offset = HUD_HUNGER_OFFSET, offset = HUD_HUNGER_OFFSET,
}) })
local h = hud.hunger[name] local h = hunger.hunger[name]
if h == nil or h > 20 then h = 20 end if h == nil or h > 20 then h = 20 end
hunger_hud[name] = player:hud_add({ hunger_hud[name] = player:hud_add({
hud_elem_type = "statbar", hud_elem_type = "statbar",
@ -60,17 +60,17 @@ dofile(minetest.get_modpath("hunger").."/hunger.lua")
local function update_hud(player) local function update_hud(player)
local name = player:get_player_name() local name = player:get_player_name()
--hunger --hunger
local h_out = tonumber(hud.hunger_out[name]) local h_out = tonumber(hunger.hunger_out[name])
local h = tonumber(hud.hunger[name]) local h = tonumber(hunger.hunger[name])
if h_out ~= h then if h_out ~= h then
hud.hunger_out[name] = h hunger.hunger_out[name] = h
-- bar should not have more than 10 icons -- bar should not have more than 10 icons
if h>20 then h=20 end if h>20 then h=20 end
player:hud_change(hunger_hud[name], "number", h) player:hud_change(hunger_hud[name], "number", h)
end end
end end
hud.get_hunger = function(player) hunger.get_hunger = function(player)
local inv = player:get_inventory() local inv = player:get_inventory()
if not inv then return nil end if not inv then return nil end
local hgp = inv:get_stack("hunger", 1):get_count() local hgp = inv:get_stack("hunger", 1):get_count()
@ -83,10 +83,10 @@ hud.get_hunger = function(player)
return hgp-1 return hgp-1
end end
hud.set_hunger = function(player) hunger.set_hunger = function(player)
local inv = player:get_inventory() local inv = player:get_inventory()
local name = player:get_player_name() local name = player:get_player_name()
local value = hud.hunger[name] local value = hunger.hunger[name]
if not inv or not value then return nil end if not inv or not value then return nil end
if value > 30 then value = 30 end if value > 30 then value = 30 end
if value < 0 then value = 0 end if value < 0 then value = 0 end
@ -100,19 +100,19 @@ minetest.register_on_joinplayer(function(player)
local name = player:get_player_name() local name = player:get_player_name()
local inv = player:get_inventory() local inv = player:get_inventory()
inv:set_size("hunger",1) inv:set_size("hunger",1)
hud.hunger[name] = hud.get_hunger(player) hunger.hunger[name] = hunger.get_hunger(player)
hud.hunger_out[name] = hud.hunger[name] hunger.hunger_out[name] = hunger.hunger[name]
hud.exhaustion[name] = 0 hunger.exhaustion[name] = 0
custom_hud(player) custom_hud(player)
hud.set_hunger(player) hunger.set_hunger(player)
end) end)
minetest.register_on_respawnplayer(function(player) minetest.register_on_respawnplayer(function(player)
-- reset hunger (and save) -- reset hunger (and save)
local name = player:get_player_name() local name = player:get_player_name()
hud.hunger[name] = 20 hunger.hunger[name] = 20
hud.set_hunger(player) hunger.set_hunger(player)
hud.exhaustion[name] = 0 hunger.exhaustion[name] = 0
end) end)
local main_timer = 0 local main_timer = 0
@ -123,16 +123,16 @@ minetest.after(2.5, function()
main_timer = main_timer + dtime main_timer = main_timer + dtime
timer = timer + dtime timer = timer + dtime
timer2 = timer2 + dtime timer2 = timer2 + dtime
if main_timer > HUD_TICK or timer > 4 or timer2 > HUD_HUNGER_TICK then if main_timer > HUNGER_HUD_TICK or timer > 4 or timer2 > HUNGER_HUNGER_TICK then
if main_timer > HUD_TICK then main_timer = 0 end if main_timer > HUNGER_HUD_TICK then main_timer = 0 end
for _,player in ipairs(minetest.get_connected_players()) do for _,player in ipairs(minetest.get_connected_players()) do
local name = player:get_player_name() local name = player:get_player_name()
-- only proceed if damage is enabled -- only proceed if damage is enabled
if minetest.setting_getbool("enable_damage") then if minetest.setting_getbool("enable_damage") then
local h = tonumber(hud.hunger[name]) local h = tonumber(hunger.hunger[name])
local hp = player:get_hp() local hp = player:get_hp()
if HUD_ENABLE_HUNGER and timer > 4 then if timer > 4 then
-- heal player by 1 hp if not dead and saturation is > 15 (of 30) -- heal player by 1 hp if not dead and saturation is > 15 (of 30)
if h > 15 and hp > 0 and player:get_breath() > 0 then if h > 15 and hp > 0 and player:get_breath() > 0 then
player:set_hp(hp+1) player:set_hp(hp+1)
@ -142,11 +142,11 @@ minetest.after(2.5, function()
end end
end end
-- lower saturation by 1 point after xx seconds -- lower saturation by 1 point after xx seconds
if timer2 > HUD_HUNGER_TICK then if timer2 > HUNGER_HUNGER_TICK then
if h > 0 then if h > 0 then
h = h-1 h = h-1
hud.hunger[name] = h hunger.hunger[name] = h
hud.set_hunger(player) hunger.set_hunger(player)
end end
end end
@ -156,13 +156,13 @@ minetest.after(2.5, function()
local controls = player:get_player_control() local controls = player:get_player_control()
-- Determine if the player is walking -- Determine if the player is walking
if controls.up or controls.down or controls.left or controls.right then if controls.up or controls.down or controls.left or controls.right then
hud.handle_node_actions(nil, nil, player) hunger.handle_node_actions(nil, nil, player)
end end
end end
end end
end end
if timer > 4 then timer = 0 end if timer > 4 then timer = 0 end
if timer2 > HUD_HUNGER_TICK then timer2 = 0 end if timer2 > HUNGER_HUNGER_TICK then timer2 = 0 end
end) end)
end) end)