tph/Repixture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Localize some hunger vars

Browse Source
This commit is contained in:
Wuzzy 2022-05-25 18:45:21 +02:00
parent 2f12750cfa
commit a35a2473c1
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
mods/rp_hunger/init.lua
View File

@ -38,7 +38,7 @@ local EATING_SPEED_DURATION = 2.0
-- Per-player userdata -- Per-player userdata
hunger.userdata = {} local userdata = {}
local particlespawners = {} local particlespawners = {}
local player_step = {} local player_step = {}
@ -58,7 +58,7 @@ local timer = 0
local function save_hunger() local function save_hunger()
local f = io.open(hunger_file, "w") local f = io.open(hunger_file, "w")
for name, data in pairs(hunger.userdata) do for name, data in pairs(userdata) do
f:write(data.hunger .. " " .. data.saturation .. " " .. name .. "\n") f:write(data.hunger .. " " .. data.saturation .. " " .. name .. "\n")
end end
@ -89,8 +89,8 @@ local function load_hunger()
name = name:sub(2) name = name:sub(2)
if not hunger.userdata[name] then if not userdata[name] then
hunger.userdata[name] = { userdata[name] = {
hunger = MAX_HUNGER, hunger = MAX_HUNGER,
active = 0, active = 0,
moving = 0, moving = 0,
@ -99,10 +99,10 @@ local function load_hunger()
end end
if hnger then if hnger then
hunger.userdata[name].hunger = hnger userdata[name].hunger = hnger
end end
if sat then if sat then
hunger.userdata[name].saturation = sat userdata[name].saturation = sat
end end
until f:read(0) == nil until f:read(0) == nil
@ -120,7 +120,7 @@ local function on_shutdown()
save_hunger() save_hunger()
end end
function hunger.update_bar(player) local function update_bar(player)
if not player then if not player then
return return
end end
@ -131,10 +131,10 @@ function hunger.update_bar(player)
if player_debughud[name] then if player_debughud[name] then
local text = "Hunger Debug:\n" local text = "Hunger Debug:\n"
if minetest.settings:get_bool("hunger_enable", true) then if minetest.settings:get_bool("hunger_enable", true) then
text = text .. "hunger = " .. tostring(hunger.userdata[name].hunger) .. "\n" text = text .. "hunger = " .. tostring(userdata[name].hunger) .. "\n"
text = text .. "saturation = " .. tostring(hunger.userdata[name].saturation) .. "\n" text = text .. "saturation = " .. tostring(userdata[name].saturation) .. "\n"
text = text .. "moving = " .. tostring(hunger.userdata[name].moving) .. "\n" text = text .. "moving = " .. tostring(userdata[name].moving) .. "\n"
text = text .. "active = " .. tostring(hunger.userdata[name].active) .. "\n" text = text .. "active = " .. tostring(userdata[name].active) .. "\n"
text = text .. "step = " .. tostring(player_step[name]) .. "\n" text = text .. "step = " .. tostring(player_step[name]) .. "\n"
else else
text = text .. "<hunger disabled>\n" text = text .. "<hunger disabled>\n"
@ -161,7 +161,7 @@ function hunger.update_bar(player)
end end
if player_bar[name] then if player_bar[name] then
player:hud_change(player_bar[name], "number", hunger.userdata[name].hunger) player:hud_change(player_bar[name], "number", userdata[name].hunger)
else else
player_bar[name] = player:hud_add( player_bar[name] = player:hud_add(
{ {
@ -169,7 +169,7 @@ function hunger.update_bar(player)
position = {x=0.5,y=1.0}, position = {x=0.5,y=1.0},
text = "hunger.png", text = "hunger.png",
text2 = "hunger.png^[colorize:#666666:255", text2 = "hunger.png^[colorize:#666666:255",
number = hunger.userdata[name].hunger, number = userdata[name].hunger,
item = MAX_HUNGER, item = MAX_HUNGER,
dir = 0, dir = 0,
size = {x=24, y=24}, size = {x=24, y=24},
@ -185,12 +185,12 @@ local function on_dignode(pos, oldnode, player)
end end
local name = player:get_player_name() local name = player:get_player_name()
if not hunger.userdata[name] then if not userdata[name] then
return return
end end
hunger.userdata[name].active = hunger.userdata[name].active + 2 userdata[name].active = userdata[name].active + 2
if HUNGER_DEBUG then if HUNGER_DEBUG then
hunger.update_bar(player) update_bar(player)
end end
end end
@ -201,17 +201,17 @@ local function on_placenode(pos, node, player)
local name = player:get_player_name() local name = player:get_player_name()
hunger.userdata[name].active = hunger.userdata[name].active + 2 userdata[name].active = userdata[name].active + 2
if HUNGER_DEBUG then if HUNGER_DEBUG then
hunger.update_bar(player) update_bar(player)
end end
end end
local function on_joinplayer(player) local function on_joinplayer(player)
local name = player:get_player_name() local name = player:get_player_name()
if not hunger.userdata[name] then if not userdata[name] then
hunger.userdata[name] = { userdata[name] = {
hunger = MAX_HUNGER, hunger = MAX_HUNGER,
active = 0, active = 0,
moving = 0, moving = 0,
@ -219,7 +219,7 @@ local function on_joinplayer(player)
} }
end end
hunger.update_bar(player) update_bar(player)
end end
local function on_leaveplayer(player) local function on_leaveplayer(player)
@ -227,19 +227,19 @@ local function on_leaveplayer(player)
player_bar[name] = nil player_bar[name] = nil
player_debughud[name] = nil player_debughud[name] = nil
hunger.userdata[name] = nil userdata[name] = nil
end end
local function on_respawnplayer(player) local function on_respawnplayer(player)
local name = player:get_player_name() local name = player:get_player_name()
hunger.userdata[name].hunger = MAX_HUNGER userdata[name].hunger = MAX_HUNGER
hunger.userdata[name].saturation = 0 userdata[name].saturation = 0
hunger.userdata[name].active = 0 userdata[name].active = 0
hunger.userdata[name].moving = 0 userdata[name].moving = 0
player_step[name] = 0 player_step[name] = 0
player_health_step[name] = 0 player_health_step[name] = 0
hunger.update_bar(player) update_bar(player)
delayed_save() delayed_save()
end end
@ -249,7 +249,7 @@ local function on_respawnplayer_nohunger(player)
player_health_step[name] = 0 player_health_step[name] = 0
if HUNGER_DEBUG then if HUNGER_DEBUG then
hunger.update_bar(player) update_bar(player)
end end
end end
@ -270,11 +270,11 @@ local function on_item_eat(hpdata, replace_with_item, itemstack,
local name = player:get_player_name() local name = player:get_player_name()
hunger.userdata[name].hunger = hunger.userdata[name].hunger + hp_change userdata[name].hunger = userdata[name].hunger + hp_change
hunger.userdata[name].hunger = math.min(MAX_HUNGER, hunger.userdata[name].hunger) userdata[name].hunger = math.min(MAX_HUNGER, userdata[name].hunger)
hunger.userdata[name].saturation = math.min(MAX_SATURATION, hunger.userdata[name].saturation userdata[name].saturation = math.min(MAX_SATURATION, userdata[name].saturation
+ saturation) + saturation)
local headpos = player:get_pos() local headpos = player:get_pos()
@ -307,7 +307,7 @@ local function on_item_eat(hpdata, replace_with_item, itemstack,
player_effects.apply_effect(player, "hunger_eating") player_effects.apply_effect(player, "hunger_eating")
hunger.update_bar(player) update_bar(player)
delayed_save() delayed_save()
if not minetest.is_creative_enabled(name) then if not minetest.is_creative_enabled(name) then
@ -370,15 +370,15 @@ local function on_globalstep(dtime)
moving = moving + 3 moving = moving + 3
end end
hunger.userdata[name].moving = math.max(0, moving) userdata[name].moving = math.max(0, moving)
end 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()
local hp = player:get_hp() local hp = player:get_hp()
if hunger.userdata[name] == nil then if userdata[name] == nil then
hunger.userdata[name] = { userdata[name] = {
hunger = MAX_HUNGER, hunger = MAX_HUNGER,
active = 0, active = 0,
moving = 0, moving = 0,
@ -390,27 +390,27 @@ local function on_globalstep(dtime)
player_step[name] = 0 player_step[name] = 0
end end
hunger.userdata[name].active = hunger.userdata[name].active + userdata[name].active = userdata[name].active +
hunger.userdata[name].moving userdata[name].moving
player_step[name] = player_step[name] + hunger.userdata[name].active + 1 player_step[name] = player_step[name] + userdata[name].active + 1
hunger.userdata[name].saturation = hunger.userdata[name].saturation - 1 userdata[name].saturation = userdata[name].saturation - 1
if hunger.userdata[name].saturation <= 0 then if userdata[name].saturation <= 0 then
hunger.userdata[name].saturation = 0 userdata[name].saturation = 0
if player_step[name] >= 24 then -- how much the player has been active if player_step[name] >= 24 then -- how much the player has been active
player_step[name] = 0 player_step[name] = 0
local oldhng = hunger.userdata[name].hunger local oldhng = userdata[name].hunger
hunger.userdata[name].hunger = hunger.userdata[name].hunger - 1 userdata[name].hunger = userdata[name].hunger - 1
if (oldhng == HUNGER_WARNING_1 or oldhng == HUNGER_WARNING_2) and hp >= 0 then if (oldhng == HUNGER_WARNING_1 or oldhng == HUNGER_WARNING_2) and hp >= 0 then
minetest.chat_send_player(name, minetest.colorize("#ff0", S("You are hungry."))) minetest.chat_send_player(name, minetest.colorize("#ff0", S("You are hungry.")))
local pos_sound = player:get_pos() local pos_sound = player:get_pos()
minetest.sound_play({name="hunger_hungry"}, {pos=pos_sound, max_hear_distance=3, object=player}, true) minetest.sound_play({name="hunger_hungry"}, {pos=pos_sound, max_hear_distance=3, object=player}, true)
end end
if hunger.userdata[name].hunger <= HUNGER_STARVE_LEVEL and hp >= 0 then if userdata[name].hunger <= HUNGER_STARVE_LEVEL and hp >= 0 then
player:set_hp(hp - 1) player:set_hp(hp - 1)
hunger.userdata[name].hunger = 0 userdata[name].hunger = 0
if hp > 1 then if hp > 1 then
minetest.chat_send_player(name, minetest.colorize("#f00", S("You are starving."))) minetest.chat_send_player(name, minetest.colorize("#f00", S("You are starving.")))
else else
@ -420,11 +420,11 @@ local function on_globalstep(dtime)
end end
end end
hunger.userdata[name].active = 0 userdata[name].active = 0
health_step(player, hunger.userdata[name].hunger) health_step(player, userdata[name].hunger)
hunger.update_bar(player) update_bar(player)
end end
delayed_save() delayed_save()
@ -461,7 +461,7 @@ local function on_globalstep_nohunger(dtime)
for _,player in ipairs(minetest.get_connected_players()) do for _,player in ipairs(minetest.get_connected_players()) do
health_step(player, nil) health_step(player, nil)
if HUNGER_DEBUG then if HUNGER_DEBUG then
hunger.update_bar(player) update_bar(player)
end end
end end
end end