sync player nil checks; add settings for stamina speed, jump and drain
* add settings for stamina speed, jump and drain * Merge branch 'master' of https://notabug.org/TenPlus1/stamina into main-sync * Fix https://notabug.org/TenPlus1/stamina/issues/14 extra end at line 16 * property dont update hud/hunger if damage not enabled * added more nil player checks due constant loop codes inside functions * sync license and replace sip sound with licensed one
This commit is contained in:
commit
41bd87405d
@ -55,6 +55,7 @@ TenPlus1 Additions:
|
||||
- Added Pipeworks checks for fake players
|
||||
- Added 60 second drunk effect when foods have {alcohol=1} group (eat 4 or more)
|
||||
- Moved exhaustion and hud_id to player table instead of player attributes
|
||||
- Added 4 lucky block effects
|
||||
|
||||
|
||||
License:
|
||||
|
||||
@ -2,3 +2,4 @@ default
|
||||
3d_armor?
|
||||
player_monoids?
|
||||
pova?
|
||||
lucky_block?
|
||||
|
||||
764
init.lua
764
init.lua
@ -24,9 +24,17 @@ STAMINA_STARVE_LVL = 3 -- level of staturation that causes starving
|
||||
|
||||
STAMINA_VISUAL_MAX = 20 -- hud bar extends only to 20
|
||||
|
||||
SPRINT_SPEED = 0.3 -- how much faster player can run if satiated
|
||||
SPRINT_JUMP = 0.1 -- how much higher player can jump if satiated
|
||||
SPRINT_DRAIN = 0.35 -- how fast to drain satation while sprinting (0-1)
|
||||
|
||||
local function clamp(val, minval, maxval)
|
||||
return math.max(math.min(val, maxval), minval)
|
||||
end
|
||||
|
||||
-- how much faster players can run if satiated.
|
||||
SPRINT_SPEED = clamp(tonumber(minetest.settings:get("stamina_sprint_speed")) or 0.3, 0.0, 1.0)
|
||||
-- how much higher player can jump if satiated
|
||||
SPRINT_JUMP = clamp(tonumber(minetest.settings:get("stamina_sprint_jump")) or 0.1, 0.0, 1.0)
|
||||
-- how fast to drain satation while sprinting (0-1)
|
||||
SPRINT_DRAIN = clamp(tonumber(minetest.settings:get("stamina_sprint_drain")) or 0.35, 0.0, 1.0)
|
||||
|
||||
|
||||
local function get_int_attribute(player)
|
||||
@ -48,6 +56,8 @@ end
|
||||
|
||||
|
||||
local stamina_enabled = minetest.settings:get_bool("enable_stamina") ~= false
|
||||
local damage_enabled = minetest.settings:get_bool("enable_damage")
|
||||
|
||||
|
||||
local function stamina_update_level(player, level)
|
||||
|
||||
@ -84,7 +94,7 @@ stamina.change = function(player, change)
|
||||
|
||||
local name = player:get_player_name()
|
||||
|
||||
if not name or not change or change == 0 then
|
||||
if not damage_enabled or not name or not change or change == 0 then
|
||||
return false
|
||||
end
|
||||
|
||||
@ -141,67 +151,65 @@ local pova_mod = minetest.get_modpath("pova")
|
||||
|
||||
local function set_sprinting(name, sprinting)
|
||||
|
||||
local player = minetest.get_player_by_name(name)
|
||||
local player = minetest.get_player_by_name(name) ; if not player then return end
|
||||
|
||||
if player then
|
||||
-- get player physics
|
||||
local def = player:get_physics_override()
|
||||
-- get player physics
|
||||
local def = player:get_physics_override()
|
||||
|
||||
--print ("---", def.speed, def.jump)
|
||||
--print ("---", def.speed, def.jump)
|
||||
|
||||
if sprinting == true and not stamina.players[name].sprint then
|
||||
if sprinting == true and not stamina.players[name].sprint then
|
||||
|
||||
if monoids then
|
||||
if monoids then
|
||||
|
||||
stamina.players[name].sprint = player_monoids.speed:add_change(
|
||||
player, def.speed + SPRINT_SPEED)
|
||||
stamina.players[name].sprint = player_monoids.speed:add_change(
|
||||
player, def.speed + SPRINT_SPEED)
|
||||
|
||||
stamina.players[name].jump = player_monoids.jump:add_change(
|
||||
player, def.jump + SPRINT_JUMP)
|
||||
stamina.players[name].jump = player_monoids.jump:add_change(
|
||||
player, def.jump + SPRINT_JUMP)
|
||||
|
||||
elseif pova_mod then
|
||||
elseif pova_mod then
|
||||
|
||||
pova.add_override(name, "sprint",
|
||||
{speed = SPRINT_SPEED, jump = SPRINT_JUMP})
|
||||
pova.add_override(name, "sprint",
|
||||
{speed = SPRINT_SPEED, jump = SPRINT_JUMP})
|
||||
|
||||
pova.do_override(player)
|
||||
pova.do_override(player)
|
||||
|
||||
stamina.players[name].sprint = true
|
||||
else
|
||||
player:set_physics_override({
|
||||
speed = def.speed + SPRINT_SPEED,
|
||||
jump = def.jump + SPRINT_JUMP,
|
||||
})
|
||||
stamina.players[name].sprint = true
|
||||
else
|
||||
player:set_physics_override({
|
||||
speed = def.speed + SPRINT_SPEED,
|
||||
jump = def.jump + SPRINT_JUMP,
|
||||
})
|
||||
|
||||
stamina.players[name].sprint = true
|
||||
end
|
||||
stamina.players[name].sprint = true
|
||||
end
|
||||
|
||||
elseif sprinting == false
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].sprint then
|
||||
elseif sprinting == false
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].sprint then
|
||||
|
||||
if monoids then
|
||||
if monoids then
|
||||
|
||||
player_monoids.speed:del_change(player, stamina.players[name].sprint)
|
||||
player_monoids.jump:del_change(player, stamina.players[name].jump)
|
||||
player_monoids.speed:del_change(player, stamina.players[name].sprint)
|
||||
player_monoids.jump:del_change(player, stamina.players[name].jump)
|
||||
|
||||
stamina.players[name].sprint = nil
|
||||
stamina.players[name].jump = nil
|
||||
stamina.players[name].sprint = nil
|
||||
stamina.players[name].jump = nil
|
||||
|
||||
elseif pova_mod then
|
||||
elseif pova_mod then
|
||||
|
||||
pova.del_override(name, "sprint")
|
||||
pova.do_override(player)
|
||||
pova.del_override(name, "sprint")
|
||||
pova.do_override(player)
|
||||
|
||||
stamina.players[name].sprint = nil
|
||||
else
|
||||
player:set_physics_override({
|
||||
speed = def.speed - SPRINT_SPEED,
|
||||
jump = def.jump - SPRINT_JUMP,
|
||||
})
|
||||
stamina.players[name].sprint = nil
|
||||
else
|
||||
player:set_physics_override({
|
||||
speed = def.speed - SPRINT_SPEED,
|
||||
jump = def.jump - SPRINT_JUMP,
|
||||
})
|
||||
|
||||
stamina.players[name].sprint = nil
|
||||
end
|
||||
stamina.players[name].sprint = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -209,79 +217,76 @@ end
|
||||
|
||||
local function head_particle(player, texture)
|
||||
|
||||
if player then
|
||||
local prop = player:get_properties()
|
||||
local eye_height = prop.eye_height or 1.23
|
||||
local pos = player:get_pos() ; pos.y = pos.y + eye_height -- mouth level
|
||||
local dir = player:get_look_dir()
|
||||
if not player then return end
|
||||
|
||||
local prop = player:get_properties()
|
||||
local eye_height = prop.eye_height or 1.23
|
||||
local pos = player:get_pos() ; pos.y = pos.y + eye_height -- mouth level
|
||||
local dir = player:get_look_dir()
|
||||
|
||||
|
||||
minetest.add_particlespawner({
|
||||
amount = 5,
|
||||
time = 0.1,
|
||||
minpos = pos,
|
||||
maxpos = pos,
|
||||
minvel = {x = dir.x - 1, y = dir.y, z = dir.z - 1},
|
||||
maxvel = {x = dir.x + 1, y = dir.y, z = dir.z + 1},
|
||||
minacc = {x = 0, y = -5, z = 0},
|
||||
maxacc = {x = 0, y = -9, z = 0},
|
||||
minexptime = 1,
|
||||
maxexptime = 1,
|
||||
minsize = 1,
|
||||
maxsize = 2,
|
||||
texture = texture
|
||||
})
|
||||
end
|
||||
minetest.add_particlespawner({
|
||||
amount = 5,
|
||||
time = 0.1,
|
||||
minpos = pos,
|
||||
maxpos = pos,
|
||||
minvel = {x = dir.x - 1, y = dir.y, z = dir.z - 1},
|
||||
maxvel = {x = dir.x + 1, y = dir.y, z = dir.z + 1},
|
||||
minacc = {x = 0, y = -5, z = 0},
|
||||
maxacc = {x = 0, y = -9, z = 0},
|
||||
minexptime = 1,
|
||||
maxexptime = 1,
|
||||
minsize = 1,
|
||||
maxsize = 2,
|
||||
texture = texture
|
||||
})
|
||||
end
|
||||
|
||||
local function drunk_tick()
|
||||
|
||||
for _,player in ipairs(minetest.get_connected_players()) do
|
||||
|
||||
if player then
|
||||
if not player then return end
|
||||
|
||||
local name = player:get_player_name()
|
||||
local name = player:get_player_name()
|
||||
|
||||
if name
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].drunk then
|
||||
if name
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].drunk then
|
||||
|
||||
-- play burp sound every 20 seconds when drunk
|
||||
local num = stamina.players[name].drunk
|
||||
-- play burp sound every 20 seconds when drunk
|
||||
local num = stamina.players[name].drunk
|
||||
|
||||
if num and num > 0 and math.floor(num / 20) == num / 20 then
|
||||
if num and num > 0 and math.floor(num / 20) == num / 20 then
|
||||
|
||||
head_particle(player, "bubble.png")
|
||||
head_particle(player, "bubble.png")
|
||||
|
||||
minetest.sound_play("stamina_burp",
|
||||
{to_player = name, gain = 0.7}, true)
|
||||
end
|
||||
minetest.sound_play("stamina_burp",
|
||||
{to_player = name, gain = 0.7}, true)
|
||||
end
|
||||
|
||||
stamina.players[name].drunk = stamina.players[name].drunk - 1
|
||||
stamina.players[name].drunk = stamina.players[name].drunk - 1
|
||||
|
||||
if stamina.players[name].drunk < 1 then
|
||||
if stamina.players[name].drunk < 1 then
|
||||
|
||||
stamina.players[name].drunk = nil
|
||||
stamina.players[name].units = 0
|
||||
stamina.players[name].drunk = nil
|
||||
stamina.players[name].units = 0
|
||||
|
||||
if not stamina.players[name].poisoned then
|
||||
if not stamina.players[name].poisoned then
|
||||
|
||||
player:hud_change(stamina.players[name].hud_id,
|
||||
"text", "stamina_hud_fg.png")
|
||||
end
|
||||
end
|
||||
|
||||
-- effect only works when not riding boat/cart/horse etc.
|
||||
if not player:get_attach() then
|
||||
|
||||
local yaw = player:get_look_horizontal() + math.random(-0.5, 0.5)
|
||||
|
||||
player:set_look_horizontal(yaw)
|
||||
player:hud_change(stamina.players[name].hud_id,
|
||||
"text", "stamina_hud_fg.png")
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
-- effect only works when not riding boat/cart/horse etc.
|
||||
if not player:get_attach() then
|
||||
|
||||
local yaw = player:get_look_horizontal() + math.random(-0.5, 0.5)
|
||||
|
||||
player:set_look_horizontal(yaw)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -290,32 +295,32 @@ local function health_tick()
|
||||
|
||||
for _,player in ipairs(minetest.get_connected_players()) do
|
||||
|
||||
if player then
|
||||
if not player then return end
|
||||
|
||||
local name = player:get_player_name()
|
||||
|
||||
if name then
|
||||
|
||||
local air = player:get_breath() or 0
|
||||
local hp = player:get_hp()
|
||||
local h = get_int_attribute(player)
|
||||
local name = player:get_player_name()
|
||||
|
||||
if name then
|
||||
-- damage player by 1 hp if saturation is < 2
|
||||
if h and h < STAMINA_STARVE_LVL
|
||||
and hp > 0 then
|
||||
player:set_hp(hp - STAMINA_STARVE, {hunger = true})
|
||||
end
|
||||
|
||||
-- damage player by 1 hp if saturation is < 2
|
||||
if h and h < STAMINA_STARVE_LVL
|
||||
and hp > 0 then
|
||||
player:set_hp(hp - STAMINA_STARVE, {hunger = true})
|
||||
end
|
||||
-- don't heal if drowning or dead or poisoned
|
||||
if h and h >= STAMINA_HEAL_LVL
|
||||
and h >= hp
|
||||
and hp > 0
|
||||
and air > 0
|
||||
and not stamina.players[name].poisoned then
|
||||
|
||||
-- don't heal if drowning or dead or poisoned
|
||||
if h and h >= STAMINA_HEAL_LVL
|
||||
and h >= hp
|
||||
and hp > 0
|
||||
and air > 0
|
||||
and not stamina.players[name].poisoned then
|
||||
player:set_hp(hp + STAMINA_HEAL)
|
||||
|
||||
player:set_hp(hp + STAMINA_HEAL)
|
||||
|
||||
stamina_update_level(player, h - 1)
|
||||
end
|
||||
stamina_update_level(player, h - 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -326,85 +331,84 @@ local function action_tick()
|
||||
|
||||
for _,player in ipairs(minetest.get_connected_players()) do
|
||||
|
||||
if player then
|
||||
if not player then return end
|
||||
local controls = player:get_player_control()
|
||||
|
||||
local controls = player and player:get_player_control()
|
||||
-- Determine if the player is walking or jumping
|
||||
if controls then
|
||||
|
||||
-- Determine if the player is walking or jumping
|
||||
if controls then
|
||||
if controls.jump then
|
||||
exhaust_player(player, STAMINA_EXHAUST_JUMP)
|
||||
|
||||
if controls.jump then
|
||||
exhaust_player(player, STAMINA_EXHAUST_JUMP)
|
||||
|
||||
elseif controls.up
|
||||
or controls.down
|
||||
or controls.left
|
||||
or controls.right then
|
||||
exhaust_player(player, STAMINA_EXHAUST_MOVE)
|
||||
end
|
||||
elseif controls.up
|
||||
or controls.down
|
||||
or controls.left
|
||||
or controls.right then
|
||||
exhaust_player(player, STAMINA_EXHAUST_MOVE)
|
||||
end
|
||||
end
|
||||
|
||||
--- START sprint
|
||||
if enable_sprint then
|
||||
--- START sprint
|
||||
if enable_sprint then
|
||||
|
||||
local name = player and player:get_player_name()
|
||||
if not player then return end
|
||||
local name = player:get_player_name()
|
||||
|
||||
-- check if player can sprint (stamina must be over 6 points)
|
||||
if name
|
||||
and stamina.players[name]
|
||||
and not stamina.players[name].poisoned
|
||||
and not stamina.players[name].drunk
|
||||
and controls and controls.aux1 and controls.up
|
||||
and not minetest.check_player_privs(player, {fast = true})
|
||||
and get_int_attribute(player) > 6 then
|
||||
-- check if player can sprint (stamina must be over 6 points)
|
||||
if name
|
||||
and stamina.players[name]
|
||||
and not stamina.players[name].poisoned
|
||||
and not stamina.players[name].drunk
|
||||
and controls and controls.aux1 and controls.up
|
||||
and not minetest.check_player_privs(player, {fast = true})
|
||||
and get_int_attribute(player) > 6 then
|
||||
|
||||
set_sprinting(name, true)
|
||||
set_sprinting(name, true)
|
||||
|
||||
-- create particles behind player when sprinting
|
||||
if enable_sprint_particles then
|
||||
-- create particles behind player when sprinting
|
||||
if enable_sprint_particles then
|
||||
|
||||
local pos = player:get_pos()
|
||||
local node = minetest.get_node({
|
||||
x = pos.x,
|
||||
y = pos.y - 1,
|
||||
z = pos.z
|
||||
local pos = player:get_pos()
|
||||
local node = minetest.get_node({
|
||||
x = pos.x,
|
||||
y = pos.y - 1,
|
||||
z = pos.z
|
||||
})
|
||||
|
||||
if node.name ~= "air" then
|
||||
|
||||
minetest.add_particlespawner({
|
||||
amount = 5,
|
||||
time = 0.01,
|
||||
minpos = {x = pos.x - 0.25, y = pos.y + 0.1, z = pos.z - 0.25},
|
||||
maxpos = {x = pos.x + 0.25, y = pos.y + 0.1, z = pos.z + 0.25},
|
||||
minvel = {x = -0.5, y = 1, z = -0.5},
|
||||
maxvel = {x = 0.5, y = 2, z = 0.5},
|
||||
minacc = {x = 0, y = -5, z = 0},
|
||||
maxacc = {x = 0, y = -12, z = 0},
|
||||
minexptime = 0.25,
|
||||
maxexptime = 0.5,
|
||||
minsize = 0.5,
|
||||
maxsize = 1.0,
|
||||
vertical = false,
|
||||
collisiondetection = false,
|
||||
texture = "default_dirt.png"
|
||||
})
|
||||
|
||||
if node.name ~= "air" then
|
||||
|
||||
minetest.add_particlespawner({
|
||||
amount = 5,
|
||||
time = 0.01,
|
||||
minpos = {x = pos.x - 0.25, y = pos.y + 0.1, z = pos.z - 0.25},
|
||||
maxpos = {x = pos.x + 0.25, y = pos.y + 0.1, z = pos.z + 0.25},
|
||||
minvel = {x = -0.5, y = 1, z = -0.5},
|
||||
maxvel = {x = 0.5, y = 2, z = 0.5},
|
||||
minacc = {x = 0, y = -5, z = 0},
|
||||
maxacc = {x = 0, y = -12, z = 0},
|
||||
minexptime = 0.25,
|
||||
maxexptime = 0.5,
|
||||
minsize = 0.5,
|
||||
maxsize = 1.0,
|
||||
vertical = false,
|
||||
collisiondetection = false,
|
||||
texture = "default_dirt.png"
|
||||
})
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
-- Lower the player's stamina when sprinting
|
||||
local level = get_int_attribute(player)
|
||||
|
||||
stamina_update_level(player,
|
||||
level - (SPRINT_DRAIN * STAMINA_MOVE_TICK))
|
||||
|
||||
elseif name then
|
||||
set_sprinting(name, false)
|
||||
end
|
||||
|
||||
-- Lower the player's stamina when sprinting
|
||||
local level = get_int_attribute(player)
|
||||
|
||||
stamina_update_level(player,
|
||||
level - (SPRINT_DRAIN * STAMINA_MOVE_TICK))
|
||||
|
||||
elseif name then
|
||||
set_sprinting(name, false)
|
||||
end
|
||||
-- END sprint
|
||||
end
|
||||
-- END sprint
|
||||
end
|
||||
end
|
||||
|
||||
@ -413,38 +417,37 @@ local function poison_tick()
|
||||
|
||||
for _,player in ipairs(minetest.get_connected_players()) do
|
||||
|
||||
if player then
|
||||
if not player then return end
|
||||
|
||||
local name = player:get_player_name()
|
||||
local name = player:get_player_name()
|
||||
|
||||
if name
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].poisoned
|
||||
and stamina.players[name].poisoned > 0 then
|
||||
if name
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].poisoned
|
||||
and stamina.players[name].poisoned > 0 then
|
||||
|
||||
stamina.players[name].poisoned =
|
||||
stamina.players[name].poisoned - 1
|
||||
stamina.players[name].poisoned =
|
||||
stamina.players[name].poisoned - 1
|
||||
|
||||
local hp = player:get_hp() - 1
|
||||
local hp = player:get_hp() - 1
|
||||
|
||||
head_particle(player, "stamina_poison_particle.png")
|
||||
head_particle(player, "stamina_poison_particle.png")
|
||||
|
||||
if hp > 0 then
|
||||
player:set_hp(hp, {poison = true})
|
||||
end
|
||||
|
||||
elseif name
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].poisoned then
|
||||
|
||||
if not stamina.players[name].drunk then
|
||||
|
||||
player:hud_change(stamina.players[name].hud_id,
|
||||
"text", "stamina_hud_fg.png")
|
||||
end
|
||||
|
||||
stamina.players[name].poisoned = nil
|
||||
if hp > 0 then
|
||||
player:set_hp(hp, {poison = true})
|
||||
end
|
||||
|
||||
elseif name
|
||||
and stamina.players[name]
|
||||
and stamina.players[name].poisoned then
|
||||
|
||||
if not stamina.players[name].drunk then
|
||||
|
||||
player:hud_change(stamina.players[name].hud_id,
|
||||
"text", "stamina_hud_fg.png")
|
||||
end
|
||||
|
||||
stamina.players[name].poisoned = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -454,16 +457,13 @@ local function stamina_tick()
|
||||
|
||||
for _,player in ipairs(minetest.get_connected_players()) do
|
||||
|
||||
if player then
|
||||
if not player then return end
|
||||
|
||||
local h = get_int_attribute(player)
|
||||
|
||||
if h and h > STAMINA_TICK_MIN then
|
||||
stamina_update_level(player, h - 1)
|
||||
end
|
||||
local h = get_int_attribute(player)
|
||||
|
||||
if h and h > STAMINA_TICK_MIN then
|
||||
stamina_update_level(player, h - 1)
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
@ -506,189 +506,186 @@ local function stamina_globaltimer(dtime)
|
||||
end
|
||||
|
||||
|
||||
-- override core.do_item_eat() so we can redirect hp_change to stamina
|
||||
core.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
-- stamina and eating functions disabled if damage is disabled
|
||||
if damage_enabled and minetest.settings:get_bool("enable_stamina") ~= false then
|
||||
|
||||
if user.is_fake_player then
|
||||
return -- abort if called by fake player (eg. pipeworks-wielder)
|
||||
end
|
||||
-- override core.do_item_eat() so we can redirect hp_change to stamina
|
||||
core.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
|
||||
local old_itemstack = itemstack
|
||||
|
||||
itemstack = stamina.eat(
|
||||
hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
|
||||
for _, callback in pairs(core.registered_on_item_eats) do
|
||||
|
||||
local result = callback(hp_change, replace_with_item, itemstack, user,
|
||||
pointed_thing, old_itemstack)
|
||||
|
||||
if result then
|
||||
return result
|
||||
if user.is_fake_player then
|
||||
return -- abort if called by fake player (eg. pipeworks-wielder)
|
||||
end
|
||||
end
|
||||
|
||||
return itemstack
|
||||
end
|
||||
local old_itemstack = itemstack
|
||||
|
||||
itemstack = stamina.eat(
|
||||
hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
|
||||
-- not local since it's called from within core context
|
||||
function stamina.eat(hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
for _, callback in pairs(core.registered_on_item_eats) do
|
||||
|
||||
if not itemstack or not user then
|
||||
return itemstack
|
||||
end
|
||||
local result = callback(hp_change, replace_with_item, itemstack, user,
|
||||
pointed_thing, old_itemstack)
|
||||
|
||||
local level = get_int_attribute(user) or 0
|
||||
|
||||
if level >= STAMINA_VISUAL_MAX then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local name = user:get_player_name()
|
||||
|
||||
if hp_change > 0 then
|
||||
|
||||
stamina_update_level(user, level + hp_change)
|
||||
|
||||
elseif hp_change < 0 then
|
||||
|
||||
-- assume hp_change < 0
|
||||
user:hud_change(stamina.players[name].hud_id, "text", "stamina_hud_poison.png")
|
||||
|
||||
stamina.players[name].poisoned = -hp_change
|
||||
end
|
||||
|
||||
-- if {drink=1} group set then use sip sound instead of default eat
|
||||
local snd = "stamina_eat"
|
||||
local itemname = itemstack:get_name()
|
||||
local def = minetest.registered_items[itemname]
|
||||
|
||||
if def and def.groups and def.groups.drink then
|
||||
snd = "stamina_sip"
|
||||
end
|
||||
|
||||
minetest.sound_play(snd, {to_player = name, gain = 0.7}, true)
|
||||
|
||||
-- particle effect when eating
|
||||
local texture = minetest.registered_items[itemname].inventory_image
|
||||
|
||||
head_particle(user, texture)
|
||||
|
||||
-- if player drinks milk then stop poison and being drunk
|
||||
local item_name = itemstack:get_name() or ""
|
||||
if item_name == "mobs:bucket_milk"
|
||||
or item_name == "mobs:glass_milk"
|
||||
or item_name == "farming:soy_milk" then
|
||||
|
||||
stamina.players[name].poisoned = 0
|
||||
stamina.players[name].drunk = 0
|
||||
end
|
||||
|
||||
itemstack:take_item()
|
||||
|
||||
if replace_with_item then
|
||||
|
||||
if itemstack:is_empty() then
|
||||
itemstack:add_item(replace_with_item)
|
||||
else
|
||||
local inv = user:get_inventory()
|
||||
|
||||
if inv:room_for_item("main", {name = replace_with_item}) then
|
||||
inv:add_item("main", replace_with_item)
|
||||
else
|
||||
local pos = user:get_pos()
|
||||
|
||||
if pos then core.add_item(pos, replace_with_item) end
|
||||
if result then
|
||||
return result
|
||||
end
|
||||
end
|
||||
|
||||
return itemstack
|
||||
end
|
||||
|
||||
-- check for alcohol
|
||||
local units = minetest.registered_items[itemname].groups
|
||||
and minetest.registered_items[itemname].groups.alcohol or 0
|
||||
-- not local since it's called from within core context
|
||||
function stamina.eat(hp_change, replace_with_item, itemstack, user, pointed_thing)
|
||||
|
||||
if units > 0 then
|
||||
|
||||
stamina.players[name].units = (stamina.players[name].units or 0) + 1
|
||||
|
||||
if stamina.players[name].units > 3 then
|
||||
|
||||
stamina.players[name].drunk = 60
|
||||
stamina.players[name].units = 0
|
||||
|
||||
user:hud_change(stamina.players[name].hud_id, "text",
|
||||
"stamina_hud_poison.png")
|
||||
|
||||
minetest.chat_send_player(name,
|
||||
minetest.get_color_escape_sequence("#1eff00")
|
||||
.. "You suddenly feel tipsy!")
|
||||
if not itemstack or not user then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local level = get_int_attribute(user) or 0
|
||||
|
||||
if level >= STAMINA_VISUAL_MAX then
|
||||
return itemstack
|
||||
end
|
||||
|
||||
local name = user:get_player_name()
|
||||
|
||||
if hp_change > 0 then
|
||||
|
||||
stamina_update_level(user, level + hp_change)
|
||||
|
||||
elseif hp_change < 0 then
|
||||
|
||||
-- assume hp_change < 0
|
||||
user:hud_change(stamina.players[name].hud_id, "text", "stamina_hud_poison.png")
|
||||
|
||||
stamina.players[name].poisoned = -hp_change
|
||||
end
|
||||
|
||||
-- if {drink=1} group set then use sip sound instead of default eat
|
||||
local snd = "stamina_eat"
|
||||
local itemname = itemstack:get_name()
|
||||
local def = minetest.registered_items[itemname]
|
||||
|
||||
if def and def.groups and def.groups.drink then
|
||||
snd = "stamina_sip"
|
||||
end
|
||||
|
||||
minetest.sound_play(snd, {to_player = name, gain = 0.7}, true)
|
||||
|
||||
-- particle effect when eating
|
||||
local texture = minetest.registered_items[itemname].inventory_image
|
||||
|
||||
texture = texture or minetest.registered_items[itemname].wield_image
|
||||
|
||||
head_particle(user, texture)
|
||||
|
||||
-- if player drinks milk then stop poison and being drunk
|
||||
local item_name = itemstack:get_name() or ""
|
||||
if item_name == "mobs:bucket_milk"
|
||||
or item_name == "mobs:glass_milk"
|
||||
or item_name == "farming:soy_milk" then
|
||||
|
||||
stamina.players[name].poisoned = 0
|
||||
stamina.players[name].drunk = 0
|
||||
end
|
||||
|
||||
itemstack:take_item()
|
||||
|
||||
if replace_with_item then
|
||||
|
||||
if itemstack:is_empty() then
|
||||
itemstack:add_item(replace_with_item)
|
||||
else
|
||||
local inv = user:get_inventory()
|
||||
|
||||
if inv:room_for_item("main", {name = replace_with_item}) then
|
||||
inv:add_item("main", replace_with_item)
|
||||
else
|
||||
local pos = user:get_pos()
|
||||
|
||||
if pos then core.add_item(pos, replace_with_item) end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- check for alcohol
|
||||
local units = minetest.registered_items[itemname].groups
|
||||
and minetest.registered_items[itemname].groups.alcohol or 0
|
||||
|
||||
if units > 0 then
|
||||
|
||||
stamina.players[name].units = (stamina.players[name].units or 0) + 1
|
||||
|
||||
if stamina.players[name].units > 3 then
|
||||
|
||||
stamina.players[name].drunk = 60
|
||||
stamina.players[name].units = 0
|
||||
|
||||
user:hud_change(stamina.players[name].hud_id, "text",
|
||||
"stamina_hud_poison.png")
|
||||
|
||||
minetest.chat_send_player(name,
|
||||
minetest.get_color_escape_sequence("#1eff00")
|
||||
.. "You suddenly feel tipsy!")
|
||||
end
|
||||
end
|
||||
|
||||
return itemstack
|
||||
end
|
||||
|
||||
return itemstack
|
||||
end
|
||||
|
||||
|
||||
-- stamina is disabled if damage is disabled
|
||||
if minetest.settings:get_bool("enable_damage")
|
||||
and minetest.settings:get_bool("enable_stamina") ~= false then
|
||||
|
||||
minetest.register_on_joinplayer(function(player)
|
||||
|
||||
if not player then return end
|
||||
|
||||
local level = STAMINA_VISUAL_MAX -- TODO
|
||||
|
||||
if player then
|
||||
if get_int_attribute(player) then
|
||||
if get_int_attribute(player) then
|
||||
|
||||
level = math.min(get_int_attribute(player), STAMINA_VISUAL_MAX)
|
||||
else
|
||||
local meta = player:get_meta()
|
||||
level = math.min(get_int_attribute(player), STAMINA_VISUAL_MAX)
|
||||
else
|
||||
local meta = player:get_meta()
|
||||
|
||||
meta:set_string("stamina:level", level)
|
||||
end
|
||||
|
||||
local name = player:get_player_name()
|
||||
|
||||
local id = player:hud_add({
|
||||
name = "stamina",
|
||||
hud_elem_type = "statbar",
|
||||
position = {x = 0.5, y = 1},
|
||||
size = {x = 24, y = 24},
|
||||
text = "stamina_hud_fg.png",
|
||||
number = level,
|
||||
alignment = {x = -1, y = -1},
|
||||
offset = {x = -266, y = -110},
|
||||
max = 0
|
||||
})
|
||||
|
||||
stamina.players[name] = {
|
||||
hud_id = id,
|
||||
exhaustion = 0,
|
||||
poisoned = nil,
|
||||
drunk = nil,
|
||||
sprint = nil
|
||||
}
|
||||
meta:set_string("stamina:level", level)
|
||||
end
|
||||
|
||||
local name = player:get_player_name()
|
||||
|
||||
local id = player:hud_add({
|
||||
name = "stamina",
|
||||
hud_elem_type = "statbar",
|
||||
position = {x = 0.5, y = 1},
|
||||
size = {x = 24, y = 24},
|
||||
text = "stamina_hud_fg.png",
|
||||
number = level,
|
||||
alignment = {x = -1, y = -1},
|
||||
offset = {x = -266, y = -110},
|
||||
max = 0
|
||||
})
|
||||
|
||||
stamina.players[name] = {
|
||||
hud_id = id,
|
||||
exhaustion = 0,
|
||||
poisoned = nil,
|
||||
drunk = nil,
|
||||
sprint = nil
|
||||
}
|
||||
end)
|
||||
|
||||
minetest.register_on_respawnplayer(function(player)
|
||||
|
||||
if player then
|
||||
local name = player:get_player_name()
|
||||
local name = player:get_player_name() ; if not name then return end
|
||||
|
||||
if stamina.players[name].poisoned
|
||||
or stamina.players[name].drunk then
|
||||
player:hud_change(stamina.players[name].hud_id, "text", "stamina_hud_fg.png")
|
||||
end
|
||||
|
||||
stamina.players[name].exhaustion = 0
|
||||
stamina.players[name].poisoned = nil
|
||||
stamina.players[name].drunk = nil
|
||||
stamina.players[name].sprint = nil
|
||||
|
||||
stamina_update_level(player, STAMINA_VISUAL_MAX)
|
||||
if stamina.players[name].poisoned
|
||||
or stamina.players[name].drunk then
|
||||
player:hud_change(stamina.players[name].hud_id, "text", "stamina_hud_fg.png")
|
||||
end
|
||||
|
||||
stamina.players[name].exhaustion = 0
|
||||
stamina.players[name].poisoned = nil
|
||||
stamina.players[name].drunk = nil
|
||||
stamina.players[name].sprint = nil
|
||||
|
||||
stamina_update_level(player, STAMINA_VISUAL_MAX)
|
||||
end)
|
||||
|
||||
minetest.register_globalstep(stamina_globaltimer)
|
||||
@ -729,44 +726,15 @@ minetest.register_on_leaveplayer(function(player)
|
||||
end)
|
||||
|
||||
|
||||
--lucky blocks (if damage and stamina active)
|
||||
-- add lucky blocks (if damage and stamina active)
|
||||
if minetest.get_modpath("lucky_block")
|
||||
and minetest.settings:get_bool("enable_damage")
|
||||
and minetest.settings:get_bool("enable_stamina") ~= false then
|
||||
|
||||
local effect_me = function(pos, player, def)
|
||||
local MP = minetest.get_modpath(minetest.get_current_modname())
|
||||
|
||||
local green = minetest.get_color_escape_sequence("#bada55")
|
||||
if player then
|
||||
local name = player:get_player_name()
|
||||
|
||||
if def.poison or def.drunk then
|
||||
|
||||
player:hud_change(stamina.players[name].hud_id,
|
||||
"text", "stamina_hud_poison.png")
|
||||
end
|
||||
|
||||
if def.poison and def.poison > 0 then
|
||||
|
||||
stamina.players[name].poisoned = def.poison
|
||||
|
||||
minetest.chat_send_player(name,
|
||||
green .. "Seems you have been poisoned!")
|
||||
|
||||
elseif def.drunk and def.drunk > 0 then
|
||||
|
||||
stamina.players[name].drunk = def.drunk
|
||||
|
||||
minetest.chat_send_player(name,
|
||||
green .. "You seem a little tipsy!")
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
lucky_block:add_blocks({
|
||||
{"cus", effect_me, {poison = 5} },
|
||||
{"cus", effect_me, {poison = 10} },
|
||||
{"cus", effect_me, {drunk = 30} },
|
||||
})
|
||||
dofile(MP .. "/lucky_block.lua")
|
||||
end
|
||||
|
||||
|
||||
print("[MOD] Stamina loaded")
|
||||
|
||||
28
license.txt
Normal file
28
license.txt
Normal file
@ -0,0 +1,28 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
|
||||
Version 2.1, February 1999
|
||||
|
||||
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
[This is the first released version of the Lesser GPL. It also counts
|
||||
as the successor of the GNU Library Public License, version 2, hence
|
||||
the version number 2.1.]
|
||||
|
||||
|
||||
Code:
|
||||
- all code LGPL-2.1+
|
||||
|
||||
Textures:
|
||||
- stamina_hud_poison.png - BlockMen (CC-BY 3.0)
|
||||
- stamina_hud_fg.png - PilzAdam (WTFPL), modified by BlockMen
|
||||
- stamina_hud_bg.png - PilzAdam (WTFPL), modified by BlockMen
|
||||
|
||||
Sounds (CC-BY-3.0):
|
||||
- stamina_eat.*.ogg - http://www.freesound.org/people/sonictechtonic/sounds/242215/
|
||||
- stamina_burp.ogg - https://www.freesfx.co.uk/sfx/burp (small burp)
|
||||
|
||||
Sounds (Attribution 3.0):
|
||||
- stamina_sip.ogg - https://freesound.org/people/Stevious42/sounds/259640/
|
||||
45
lucky_block.lua
Normal file
45
lucky_block.lua
Normal file
@ -0,0 +1,45 @@
|
||||
local green = minetest.get_color_escape_sequence("#bada55")
|
||||
local green2 = minetest.get_color_escape_sequence("#33ff55")
|
||||
|
||||
-- poison and drunk effects function
|
||||
local effect_me = function(pos, player, def)
|
||||
|
||||
local name = player:get_player_name() ; if not name then return end
|
||||
|
||||
if def.poison or def.drunk then
|
||||
|
||||
player:hud_change(stamina.players[name].hud_id, "text", "stamina_hud_poison.png")
|
||||
end
|
||||
|
||||
if def.poison and def.poison > 0 then
|
||||
|
||||
stamina.players[name].poisoned = def.poison
|
||||
|
||||
minetest.chat_send_player(name, green .. "Seems you have been poisoned!")
|
||||
|
||||
elseif def.drunk and def.drunk > 0 then
|
||||
|
||||
stamina.players[name].drunk = def.drunk
|
||||
|
||||
minetest.chat_send_player(name, green .. "You seem a little tipsy!")
|
||||
end
|
||||
|
||||
|
||||
-- restore stamina function
|
||||
local full_stamina = function(pos, player, def)
|
||||
|
||||
local name = player:get_player_name() ; if not name then return end
|
||||
|
||||
stamina.change(player, 100) -- set to 100 incase of default stamina increase
|
||||
|
||||
minetest.chat_send_player(name, green2 .. "You suddenly feel full!")
|
||||
end
|
||||
|
||||
|
||||
-- add lucky blocks
|
||||
lucky_block:add_blocks({
|
||||
{"cus", effect_me, {poison = 5}},
|
||||
{"cus", effect_me, {poison = 10}},
|
||||
{"cus", effect_me, {drunk = 30}},
|
||||
{"cus", full_stamina}
|
||||
})
|
||||
@ -5,3 +5,9 @@ sprint_particles (Enable sprint particles) bool true
|
||||
enable_stamina (Enable stamina/hunger) bool true
|
||||
|
||||
stamina_tick (Time in seconds after which 1 saturation point is taken) float 800
|
||||
|
||||
stamina_sprint_speed (Extra sprint speed - 0.0 to 1.0) float 0.3
|
||||
|
||||
stamina_sprint_jump (Extra sprint jump height - 0.0 to 1.0) float 0.1
|
||||
|
||||
stamina_sprint_drain (Sprint stamina drain - 0.0 to 1.0) float 0.35
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user