Remove unused entities on settings change (#8)

Also add Minetest 5.3 support for 10/11 maximal breath.
This commit is contained in:
Maksim 2020-09-27 19:14:49 +02:00 committed by GitHub
parent 9b47fc7b4b
commit 04018c504d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 22 deletions

View File

@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [Unreleased] ## [Unreleased]
## [1.0.4] - 2020-09-23
### Changed
- Gauges entities will be removed when disable or change server mode.
- Added support for Minetest 5.3 and improved Minetest version definitions.
## [1.0.3] - 2020-02-15 ## [1.0.3] - 2020-02-15
### Fixed ### Fixed
@ -37,7 +44,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Initial versioned release. - Initial versioned release.
[Unreleased]: https://github.com/minetest-mods/gauges/compare/v1.0.3...HEAD [Unreleased]: https://github.com/minetest-mods/gauges/compare/v1.0.4...HEAD
[1.0.4]: https://github.com/minetest-mods/gauges/compare/v1.0.3...v1.0.4
[1.0.3]: https://github.com/minetest-mods/gauges/compare/v1.0.2...v1.0.3 [1.0.3]: https://github.com/minetest-mods/gauges/compare/v1.0.2...v1.0.3
[1.0.2]: https://github.com/minetest-mods/gauges/compare/v1.0.1...v1.0.2 [1.0.2]: https://github.com/minetest-mods/gauges/compare/v1.0.1...v1.0.2
[1.0.1]: https://github.com/minetest-mods/gauges/compare/v1.0.0...v1.0.1 [1.0.1]: https://github.com/minetest-mods/gauges/compare/v1.0.0...v1.0.1

View File

@ -3,25 +3,26 @@
-- Copyright © 2014-2020 4aiman, Hugo Locurcio and contributors - MIT License -- Copyright © 2014-2020 4aiman, Hugo Locurcio and contributors - MIT License
-- See `LICENSE.md` included in the source distribution for details. -- See `LICENSE.md` included in the source distribution for details.
if minetest.settings:get_bool("health_bars") == false or local enabled = minetest.settings:get_bool("health_bars") ~= false
not minetest.settings:get_bool("enable_damage") if enabled then
then return end enabled = minetest.settings:get_bool("enable_damage")
end
-- Localize the vector distance function for better performance, -- Localize this functions for better performance,
-- as it's called on every step -- as it's called on every step
local vector_distance = vector.distance local vector_distance = vector.distance
local min = math.min
local max_breath = minetest.PLAYER_MAX_BREATH_DEFAULT or 11
local mt_5 = minetest.features.object_independent_selectionbox
local function add_gauge(player) local function add_gauge(player)
if player and player:is_player() then if player and player:is_player() then
local entity = minetest.add_entity(player:get_pos(), "gauges:hp_bar") local entity = minetest.add_entity(player:get_pos(), "gauges:hp_bar")
local height = 19
-- Check for Minetest 0.4.17 and adjust the entity height if needed -- Check Minetest version and set required entity heigh
-- (The entity height offset was changed in Minetest 5.0.0.) -- (The entity height offset was changed in Minetest 5.0.0)
local version = tonumber(minetest.get_version().string:sub(1, 1)) local height = mt_5 and 19 or 9
if version and version < 5 then
height = 9
end
entity:set_attach(player, "", {x=0, y=height, z=0}, {x=0, y=0, z=0}) entity:set_attach(player, "", {x=0, y=height, z=0}, {x=0, y=0, z=0})
entity:get_luaentity().wielder = player entity:get_luaentity().wielder = player
@ -39,7 +40,8 @@ minetest.register_entity("gauges:hp_bar", {
local player = self.wielder local player = self.wielder
local gauge = self.object local gauge = self.object
if not player or not player:is_player() then if not enabled or
not player or not player:is_player() then
gauge:remove() gauge:remove()
return return
elseif vector_distance(player:get_pos(), gauge:get_pos()) > 3 then elseif vector_distance(player:get_pos(), gauge:get_pos()) > 3 then
@ -48,15 +50,23 @@ minetest.register_entity("gauges:hp_bar", {
return return
end end
local hp = player:get_hp() <= 20 and player:get_hp() or 20 local hp = min(player:get_hp(), 20)
local breath = player:get_breath() <= 10 and player:get_breath() or 11 local breath = min(player:get_breath(), max_breath)
if self.hp ~= hp or self.breath ~= breath then if self.hp ~= hp or self.breath ~= breath then
local health_t = "health_"..hp..".png"
local breath_t = "breath_"..breath..".png"
if hp == 0 then
health_t = "blank.png"
end
if breath == max_breath then
breath_t = "blank.png"
end
gauge:set_properties({ gauge:set_properties({
textures = { textures = {health_t.."^"..breath_t}
"health_"..hp..".png^"..
"breath_"..breath..".png"
}
}) })
self.hp = hp self.hp = hp
self.breath = breath self.breath = breath
@ -64,6 +74,8 @@ minetest.register_entity("gauges:hp_bar", {
end end
}) })
minetest.register_on_joinplayer(function(player) if enabled then
minetest.register_on_joinplayer(function(player)
minetest.after(1, add_gauge, player) minetest.after(1, add_gauge, player)
end) end)
end

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 B