From 04018c504d155fa0faf9618ae8a8d645e0167a49 Mon Sep 17 00:00:00 2001 From: Maksim Date: Sun, 27 Sep 2020 19:14:49 +0200 Subject: [PATCH 1/2] Remove unused entities on settings change (#8) Also add Minetest 5.3 support for 10/11 maximal breath. --- CHANGELOG.md | 10 +++++++- init.lua | 54 +++++++++++++++++++++++++---------------- textures/breath_11.png | Bin 68 -> 0 bytes textures/health_0.png | Bin 68 -> 0 bytes 4 files changed, 42 insertions(+), 22 deletions(-) delete mode 100644 textures/breath_11.png delete mode 100644 textures/health_0.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 709aa15..94bbe37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [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 ### Fixed @@ -37,7 +44,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - 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.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 diff --git a/init.lua b/init.lua index 62636dd..8cc1224 100644 --- a/init.lua +++ b/init.lua @@ -3,25 +3,26 @@ -- Copyright © 2014-2020 4aiman, Hugo Locurcio and contributors - MIT License -- See `LICENSE.md` included in the source distribution for details. -if minetest.settings:get_bool("health_bars") == false or - not minetest.settings:get_bool("enable_damage") -then return end +local enabled = minetest.settings:get_bool("health_bars") ~= false +if enabled then + 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 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) if player and player:is_player() then 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 - -- (The entity height offset was changed in Minetest 5.0.0.) - local version = tonumber(minetest.get_version().string:sub(1, 1)) - if version and version < 5 then - height = 9 - end + -- Check Minetest version and set required entity heigh + -- (The entity height offset was changed in Minetest 5.0.0) + local height = mt_5 and 19 or 9 entity:set_attach(player, "", {x=0, y=height, z=0}, {x=0, y=0, z=0}) entity:get_luaentity().wielder = player @@ -39,7 +40,8 @@ minetest.register_entity("gauges:hp_bar", { local player = self.wielder 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() return elseif vector_distance(player:get_pos(), gauge:get_pos()) > 3 then @@ -48,15 +50,23 @@ minetest.register_entity("gauges:hp_bar", { return end - local hp = player:get_hp() <= 20 and player:get_hp() or 20 - local breath = player:get_breath() <= 10 and player:get_breath() or 11 + local hp = min(player:get_hp(), 20) + local breath = min(player:get_breath(), max_breath) 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({ - textures = { - "health_"..hp..".png^".. - "breath_"..breath..".png" - } + textures = {health_t.."^"..breath_t} }) self.hp = hp self.breath = breath @@ -64,6 +74,8 @@ minetest.register_entity("gauges:hp_bar", { end }) -minetest.register_on_joinplayer(function(player) - minetest.after(1, add_gauge, player) -end) +if enabled then + minetest.register_on_joinplayer(function(player) + minetest.after(1, add_gauge, player) + end) +end diff --git a/textures/breath_11.png b/textures/breath_11.png deleted file mode 100644 index 4b5b3029265a4ef9b9c654442d56c7f198ffdeb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-5DwYogajamnSs&YgKIsI O#o+1c=d#Wzp$Pyq!wQA~ diff --git a/textures/health_0.png b/textures/health_0.png deleted file mode 100644 index 4b5b3029265a4ef9b9c654442d56c7f198ffdeb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-5DwYogajamnSs&YgKIsI O#o+1c=d#Wzp$Pyq!wQA~ From 622e31394ea37a156eb5570be6683f24390db46c Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Sun, 27 Sep 2020 22:56:26 +0200 Subject: [PATCH 2/2] Bump to version 1.0.4 --- CHANGELOG.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94bbe37..3b53fc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -## [1.0.4] - 2020-09-23 +## [1.0.4] - 2020-09-27 + +### Added + +- Support for Minetest 5.3 and improved Minetest version definitions. ### Changed -- Gauges entities will be removed when disable or change server mode. -- Added support for Minetest 5.3 and improved Minetest version definitions. +- Gauge entities are now removed when the mod is disabled or when the server switches to creative mode. ## [1.0.3] - 2020-02-15