Commit 3aa71a66 authored by crabman77's avatar crabman77

refactor code

added sound when player runs out of stamina
added timeout, unlocked on total regen
stamina regen divided by 2 if player walk
added new icon stamina
added from "playerplus" cactus hurts
parent cbd817ff
......@@ -12,12 +12,9 @@ local staminaHud = {}
minetest.register_on_joinplayer(function(player)
local playerName = player:get_player_name()
players[playerName] = {
sprinting = false,
timeOut = 0,
timeOut = false,
stamina = SPRINT_STAMINA,
shouldSprint = false,
}
if SPRINT_HUDBARS_USED then
hb.init_hudbar(player, "sprint")
......@@ -29,7 +26,7 @@ minetest.register_on_joinplayer(function(player)
text = "sprint_stamina_icon.png",
number = 20,
alignment = {x=0,y=1},
offset = {x=-263, y=-110},
offset = {x=-320, y=-186},
}
)
end
......@@ -38,88 +35,81 @@ minetest.register_on_leaveplayer(function(player)
local playerName = player:get_player_name()
players[playerName] = nil
end)
local gameTime = 0
minetest.register_globalstep(function(dtime)
--Get the gametime
local gameTime = minetest.get_gametime()
gameTime = gameTime + dtime
--Loop through all connected players
for playerName,playerInfo in pairs(players) do
local player = minetest.get_player_by_name(playerName)
if player ~= nil then
--Check if the player should be sprinting
if player:get_player_control()["aux1"] and player:get_player_control()["up"] then
players[playerName]["shouldSprint"] = true
else
players[playerName]["shouldSprint"] = false
end
--If the player is sprinting, create particles behind him/her
if playerInfo["sprinting"] == true and gameTime % 0.1 == 0 then
local numParticles = math.random(1, 2)
local playerPos = player:getpos()
local playerNode = minetest.get_node({x=playerPos["x"], y=playerPos["y"]-1, z=playerPos["z"]})
if playerNode["name"] ~= "air" then
for i=1, numParticles, 1 do
minetest.add_particle({
pos = {x=playerPos["x"]+math.random(-1,1)*math.random()/2,y=playerPos["y"]+0.1,z=playerPos["z"]+math.random(-1,1)*math.random()/2},
vel = {x=0, y=5, z=0},
acc = {x=0, y=-13, z=0},
expirationtime = math.random(),
size = math.random()+0.5,
collisiondetection = true,
vertical = false,
texture = "sprint_particle.png",
})
local playerPos = player:getpos()
--Check whether the player wants and can sprint
if player:get_player_control()["aux1"] and player:get_player_control()["up"] and playerInfo["stamina"] > 0 and playerInfo["timeOut"] == false then
player:set_physics_override({speed=SPRINT_SPEED,jump=SPRINT_JUMP})
if gameTime > 0.4 then
local numParticles = math.random(1, 2)
local playerNode = minetest.get_node({x=playerPos["x"], y=playerPos["y"]-1, z=playerPos["z"]})
if playerNode["name"] ~= "air" then
for i=1, numParticles, 1 do
minetest.add_particle({
pos = {x=playerPos["x"]+math.random(-1,1)*math.random()/2,y=playerPos["y"]+0.1,z=playerPos["z"]+math.random(-1,1)*math.random()/2},
vel = {x=0, y=5, z=0},
acc = {x=0, y=-13, z=0},
expirationtime = math.random(),
size = math.random()+0.5,
collisiondetection = true,
vertical = false,
texture = "sprint_particle.png",
})
end
end
end
end
--Adjust player states
if players[playerName]["shouldSprint"] == true then --Stopped
setSprinting(playerName, true)
elseif players[playerName]["shouldSprint"] == false then
setSprinting(playerName, false)
end
--Lower the player's stamina by dtime if he/she is sprinting and set his/her state to 0 if stamina is zero
if playerInfo["sprinting"] == true then
playerInfo["stamina"] = playerInfo["stamina"] - dtime
if playerInfo["stamina"] <= 0 then
--if empty stamina
if playerInfo["stamina"] < 0 then
playerInfo["stamina"] = 0
setSprinting(playerName, false)
playerInfo["timeOut"] = true
player:set_physics_override({speed=1.0,jump=1.0})
minetest.sound_play("default_breathless",{object=player})
end
else
if playerInfo["stamina"] < SPRINT_STAMINA then
--if player walk, stamina regen /2
if player:get_player_control()["up"] then
playerInfo["stamina"] = playerInfo["stamina"] + dtime/2
else
playerInfo["stamina"] = playerInfo["stamina"] + dtime
end
-- if stamina regenered
if playerInfo["stamina"] > SPRINT_STAMINA then
playerInfo["stamina"] = SPRINT_STAMINA
playerInfo["timeOut"] = false
end
end
--Increase player's stamina if he/she is not sprinting and his/her stamina is less than SPRINT_STAMINA
elseif playerInfo["sprinting"] == false and playerInfo["stamina"] < SPRINT_STAMINA then
playerInfo["stamina"] = playerInfo["stamina"] + dtime
end
-- Cap stamina at SPRINT_STAMINA
if playerInfo["stamina"] > SPRINT_STAMINA then
playerInfo["stamina"] = SPRINT_STAMINA
if gameTime > 0.4 then
-- From playerplus :
-- am I near a cactus?
playerPos.y = playerPos.y + 0.1
if minetest.find_node_near(playerPos, 1, "default:cactus") and player:get_hp() > 0 then
player:set_hp(player:get_hp()-1)
end
end
--Update the players's hud sprint stamina bar
if SPRINT_HUDBARS_USED then
hb.change_hudbar(player, "sprint", playerInfo["stamina"])
else
local numBars = (playerInfo["stamina"]/SPRINT_STAMINA)*20
player:hud_change(playerInfo["hud"], "number", numBars)
end
end
end
end
end)
function setSprinting(playerName, sprinting) --Sets the state of a player (0=stopped/moving, 1=sprinting)
local player = minetest.get_player_by_name(playerName)
if players[playerName] then
players[playerName]["sprinting"] = sprinting
if sprinting == true then
player:set_physics_override({speed=SPRINT_SPEED,jump=SPRINT_JUMP})
elseif sprinting == false then
player:set_physics_override({speed=1.0,jump=1.0})
end
return true
if gameTime > 0.4 then
gameTime = 0
end
return false
end
end)
......@@ -9,14 +9,14 @@ distributed without any warranty.
--Configuration variables, these are all explained in README.md
SPRINT_METHOD = 1
SPRINT_SPEED = 1.8
SPRINT_SPEED = 1.35
SPRINT_JUMP = 1.1
SPRINT_STAMINA = 20
SPRINT_STAMINA = 10
SPRINT_TIMEOUT = 0.5 --Only used if SPRINT_METHOD = 0
if minetest.get_modpath("hudbars") ~= nil then
hb.register_hudbar("sprint", 0xFFFFFF, "Stamina",
{ bar = "sprint_stamina_bar.png", icon = "sprint_stamina_icon.png" },
{ bar = "sprint_stamina_bar.png", icon = "stamina.png" },
SPRINT_STAMINA, SPRINT_STAMINA,
false, "%s: %.1f/%.1f")
SPRINT_HUDBARS_USED = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment