From ee92b518ea2e9ca686815d1c9009435a55a75413 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 23 Feb 2015 23:21:10 +0100 Subject: [PATCH] Change global variable names to fit the mod --- hunger.lua | 42 ++++++++++++++++---------------- init.lua | 70 +++++++++++++++++++++++++++--------------------------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/hunger.lua b/hunger.lua index 8c4e787..f108951 100644 --- a/hunger.lua +++ b/hunger.lua @@ -1,9 +1,9 @@ -- Keep these for backwards compatibility -function hud.save_hunger(player) - hud.set_hunger(player) +function hunger.save_hunger(player) + hunger.set_hunger(player) end -function hud.load_hunger(player) - hud.get_hunger(player) +function hunger.load_hunger(player) + hunger.get_hunger(player) end -- Poison player @@ -20,19 +20,19 @@ local function poisenp(tick, time, time_left, player) 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) if itemstack:take_item() ~= nil and user ~= nil then local name = user:get_player_name() - local h = tonumber(hud.hunger[name]) + local h = tonumber(hunger.hunger[name]) local hp = user:get_hp() -- Saturation if h < 30 and hunger_change then h = h + hunger_change if h > 30 then h = 30 end - hud.hunger[name] = h - hud.set_hunger(user) + hunger.hunger[name] = h + hunger.set_hunger(user) end -- Healing if hp < 20 and heal then @@ -56,7 +56,7 @@ end local function overwrite(name, hunger_change, replace_with_item, poisen, heal) local tab = minetest.registered_items[name] 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 end @@ -330,32 +330,32 @@ if minetest.get_modpath("cooking") ~= nil then end -- 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 return end local name = player:get_player_name() - local exhaus = hud.exhaustion[name] - local new = HUD_HUNGER_EXHAUST_PLACE + local exhaus = hunger.exhaustion[name] + local new = HUNGER_EXHAUST_PLACE -- placenode event if not ext then - new = HUD_HUNGER_EXHAUST_DIG + new = HUNGER_EXHAUST_DIG end -- assume its send by main timer when movement detected if not pos and not oldnode then - new = HUD_HUNGER_EXHAUST_MOVE + new = HUNGER_EXHAUST_MOVE end exhaus = exhaus + new - if exhaus > HUD_HUNGER_EXHAUST_LVL then + if exhaus > HUNGER_EXHAUST_LVL then exhaus = 0 - local h = tonumber(hud.hunger[name]) + local h = tonumber(hunger.hunger[name]) h = h - 1 if h < 0 then h = 0 end - hud.hunger[name] = h - hud.set_hunger(player) + hunger.hunger[name] = h + hunger.set_hunger(player) end - hud.exhaustion[name] = exhaus + hunger.exhaustion[name] = exhaus end -minetest.register_on_placenode(hud.handle_node_actions) -minetest.register_on_dignode(hud.handle_node_actions) +minetest.register_on_placenode(hunger.handle_node_actions) +minetest.register_on_dignode(hunger.handle_node_actions) diff --git a/init.lua b/init.lua index 027f01f..2926c36 100644 --- a/init.lua +++ b/init.lua @@ -1,28 +1,28 @@ -hud = {} +hunger = {} -- HUD statbar values -hud.hunger = {} -hud.hunger_out = {} +hunger.hunger = {} +hunger.hunger_out = {} -- HUD item ids local hunger_hud = {} -HUD_TICK = 0.1 +HUNGER_HUD_TICK = 0.1 --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 -HUD_HUNGER_EXHAUST_DIG = 3 -- exhaustion increased this value after digged node -HUD_HUNGER_EXHAUST_PLACE = 1 -- exhaustion increased this value after placed -HUD_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_HUNGER_TICK = 800 -- time in seconds after that 1 hunger point is taken +HUNGER_EXHAUST_DIG = 3 -- exhaustion increased this value after digged node +HUNGER_EXHAUST_PLACE = 1 -- exhaustion increased this value after placed +HUNGER_EXHAUST_MOVE = 0.3 -- exhaustion increased this value if player movement detected +HUNGER_EXHAUST_LVL = 160 -- at what exhaustion player saturation gets lowerd --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 - dofile(minetest.get_modpath("hunger").."/hud.conf") + dofile(minetest.get_modpath("hunger").."/hunger.conf") set:close() end @@ -40,7 +40,7 @@ local function custom_hud(player) alignment = {x=-1,y=-1}, offset = HUD_HUNGER_OFFSET, }) - local h = hud.hunger[name] + local h = hunger.hunger[name] if h == nil or h > 20 then h = 20 end hunger_hud[name] = player:hud_add({ hud_elem_type = "statbar", @@ -60,17 +60,17 @@ dofile(minetest.get_modpath("hunger").."/hunger.lua") local function update_hud(player) local name = player:get_player_name() --hunger - local h_out = tonumber(hud.hunger_out[name]) - local h = tonumber(hud.hunger[name]) + local h_out = tonumber(hunger.hunger_out[name]) + local h = tonumber(hunger.hunger[name]) if h_out ~= h then - hud.hunger_out[name] = h + hunger.hunger_out[name] = h -- bar should not have more than 10 icons if h>20 then h=20 end player:hud_change(hunger_hud[name], "number", h) end end -hud.get_hunger = function(player) +hunger.get_hunger = function(player) local inv = player:get_inventory() if not inv then return nil end local hgp = inv:get_stack("hunger", 1):get_count() @@ -83,10 +83,10 @@ hud.get_hunger = function(player) return hgp-1 end -hud.set_hunger = function(player) +hunger.set_hunger = function(player) local inv = player:get_inventory() 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 value > 30 then value = 30 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 inv = player:get_inventory() inv:set_size("hunger",1) - hud.hunger[name] = hud.get_hunger(player) - hud.hunger_out[name] = hud.hunger[name] - hud.exhaustion[name] = 0 + hunger.hunger[name] = hunger.get_hunger(player) + hunger.hunger_out[name] = hunger.hunger[name] + hunger.exhaustion[name] = 0 custom_hud(player) - hud.set_hunger(player) + hunger.set_hunger(player) end) minetest.register_on_respawnplayer(function(player) -- reset hunger (and save) local name = player:get_player_name() - hud.hunger[name] = 20 - hud.set_hunger(player) - hud.exhaustion[name] = 0 + hunger.hunger[name] = 20 + hunger.set_hunger(player) + hunger.exhaustion[name] = 0 end) local main_timer = 0 @@ -123,16 +123,16 @@ minetest.after(2.5, function() main_timer = main_timer + dtime timer = timer + dtime timer2 = timer2 + dtime - if main_timer > HUD_TICK or timer > 4 or timer2 > HUD_HUNGER_TICK then - if main_timer > HUD_TICK then main_timer = 0 end + if main_timer > HUNGER_HUD_TICK or timer > 4 or timer2 > HUNGER_HUNGER_TICK then + if main_timer > HUNGER_HUD_TICK then main_timer = 0 end for _,player in ipairs(minetest.get_connected_players()) do local name = player:get_player_name() -- only proceed if damage is enabled if minetest.setting_getbool("enable_damage") then - local h = tonumber(hud.hunger[name]) + local h = tonumber(hunger.hunger[name]) 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) if h > 15 and hp > 0 and player:get_breath() > 0 then player:set_hp(hp+1) @@ -142,11 +142,11 @@ minetest.after(2.5, function() end end -- lower saturation by 1 point after xx seconds - if timer2 > HUD_HUNGER_TICK then + if timer2 > HUNGER_HUNGER_TICK then if h > 0 then h = h-1 - hud.hunger[name] = h - hud.set_hunger(player) + hunger.hunger[name] = h + hunger.set_hunger(player) end end @@ -156,13 +156,13 @@ minetest.after(2.5, function() local controls = player:get_player_control() -- Determine if the player is walking 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 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)