Merge branch 'master' into settings

This commit is contained in:
texmex 2017-08-24 08:17:28 +02:00 committed by GitHub
commit 5074cb981c
4 changed files with 17 additions and 11 deletions

@ -1,9 +1,15 @@
# hbSprint # hbSprint
License: LGPLv2.1/CC BY-SA 3.0. Particle code: copyright (c) 2017 Elijah Duffy.
## Description ## Description
A flexible sprint mod supporting stamina, hunger and coexistance with other physics altering mods. A flexible sprint mod supporting stamina, hunger and coexistance with other physics altering mods.
## Licensing
- LGPLv2.1/CC BY-SA 3.0. Particle code: copyright (c) 2017 Elijah Duffy.
- sprint_stamina_\*icon textures:
- CC0
- Created by Jordan Irwin (AntumDeluge)
- Based on [Running man icon by manio1](https://openclipart.org/detail/254287)
## Notes ## Notes
hbSprint can be played with Minetest 0.4.16 or above. hbSprint can be played with Minetest 0.4.16 or above.
It has no dependencies, but it supports on [hudbars](http://repo.or.cz/w/minetest_hudbars.git), [hbhunger](http://repo.or.cz/w/minetest_hbhunger.git) and [player_monoids](https://github.com/minetest-mods/player_monoids). It has no dependencies, but it supports on [hudbars](http://repo.or.cz/w/minetest_hudbars.git), [hbhunger](http://repo.or.cz/w/minetest_hbhunger.git) and [player_monoids](https://github.com/minetest-mods/player_monoids).
@ -18,6 +24,7 @@ It has no dependencies, but it supports on [hudbars](http://repo.or.cz/w/minetes
- Particle spawning based on ground type (Thanks to [octacian](https://github.com/octacian/sprint/)) - Particle spawning based on ground type (Thanks to [octacian](https://github.com/octacian/sprint/))
- All variables customizable in Advanced settings or directly in minetest.conf - All variables customizable in Advanced settings or directly in minetest.conf
## Known issues ## Known issues
- Forward double tap support not implemented - Forward double tap support not implemented

@ -20,10 +20,8 @@ if breath ~= false then breath = true end
local sprint_timer_step = 0.5 local sprint_timer_step = 0.5
local sprint_timer = 0 local sprint_timer = 0
local player_stamina = 20
local stamina_timer = 0 local stamina_timer = 0
local breath_timer = 0 local breath_timer = 0
local sprinting = false
local hudbars = false local hudbars = false
local starve = false local starve = false
local monoids = false local monoids = false
@ -35,7 +33,7 @@ if minetest.get_modpath("player_monoids") ~= nil then monoids = true else monoid
-- Functions -- Functions
local function start_sprint(player) local function start_sprint(player)
if not sprinting then if player:get_attribute("sprinting") == "false" then
if monoids then if monoids then
player_monoids.speed:add_change(player, speed, "hbsprint:speed") player_monoids.speed:add_change(player, speed, "hbsprint:speed")
player_monoids.jump:add_change(player, jump, "hbsprint:jump") player_monoids.jump:add_change(player, jump, "hbsprint:jump")
@ -46,7 +44,7 @@ local function start_sprint(player)
end end
local function stop_sprint(player) local function stop_sprint(player)
if sprinting then if player:get_attribute("sprinting") == "true" then
if monoids then if monoids then
player_monoids.speed:del_change(player, "hbsprint:speed") player_monoids.speed:del_change(player, "hbsprint:speed")
player_monoids.jump:del_change(player, "hbsprint:jump") player_monoids.jump:del_change(player, "hbsprint:jump")
@ -57,7 +55,7 @@ local function stop_sprint(player)
end end
local function drain_stamina(player) local function drain_stamina(player)
player_stamina = tonumber(player:get_attribute("stamina")) local player_stamina = tonumber(player:get_attribute("stamina"))
if player_stamina > 0 then if player_stamina > 0 then
player:set_attribute("stamina", player_stamina - stamina_drain) player:set_attribute("stamina", player_stamina - stamina_drain)
end end
@ -68,7 +66,7 @@ local function drain_stamina(player)
end end
local function replenish_stamina(player) local function replenish_stamina(player)
player_stamina = tonumber(player:get_attribute("stamina")) local player_stamina = tonumber(player:get_attribute("stamina"))
if player_stamina < 20 then if player_stamina < 20 then
player:set_attribute("stamina", player_stamina + stamina_drain) player:set_attribute("stamina", player_stamina + stamina_drain)
end end
@ -122,7 +120,7 @@ if minetest.get_modpath("hudbars") ~= nil and stamina then
0xFFFFFF, 0xFFFFFF,
"Stamina", "Stamina",
{ bar = "sprint_stamina_bar.png", icon = "sprint_stamina_icon.png", bgicon = "sprint_stamina_bgicon.png" }, { bar = "sprint_stamina_bar.png", icon = "sprint_stamina_icon.png", bgicon = "sprint_stamina_bgicon.png" },
player_stamina, player_stamina, 20, 20,
false, "%s: %.1f/%.1f") false, "%s: %.1f/%.1f")
hudbars = true hudbars = true
if autohide then if autohide then
@ -161,6 +159,7 @@ minetest.register_globalstep(function(dtime)
local pos = player:get_pos() local pos = player:get_pos()
local ground = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z}) local ground = minetest.get_node_or_nil({x=pos.x, y=pos.y-1, z=pos.z})
local walkable = false local walkable = false
local player_stamina = tonumber(player:get_attribute("stamina"))
if starve then if starve then
hunger = tonumber(hbhunger.hunger[name]) hunger = tonumber(hbhunger.hunger[name])
end end
@ -169,7 +168,7 @@ minetest.register_globalstep(function(dtime)
end end
if player_stamina > 0 and hunger > 9 and walkable then if player_stamina > 0 and hunger > 9 and walkable then
start_sprint(player) start_sprint(player)
sprinting = true player:set_attribute("sprinting", "true")
if stamina then drain_stamina(player) end if stamina then drain_stamina(player) end
if starve then drain_hunger(player, hunger, name) end if starve then drain_hunger(player, hunger, name) end
if breath then if breath then
@ -181,11 +180,11 @@ minetest.register_globalstep(function(dtime)
if particles then create_particles(player, name, pos, ground) end if particles then create_particles(player, name, pos, ground) end
else else
stop_sprint(player) stop_sprint(player)
sprinting = false player:set_attribute("sprinting", "false")
end end
else else
stop_sprint(player) stop_sprint(player)
sprinting = false player:set_attribute("sprinting", "false")
if stamina_timer >= replenish then if stamina_timer >= replenish then
if stamina then replenish_stamina(player) end if stamina then replenish_stamina(player) end
stamina_timer = 0 stamina_timer = 0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 B

After

Width:  |  Height:  |  Size: 171 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 180 B

After

Width:  |  Height:  |  Size: 245 B