Merge branch 'master' of yunohost.local:minetest-mods/gauges into nalc-1.2-dev

- Place à nouveau la barre au dessus de la tête du joueur.

CHANGELOG.md

@@ -1,14 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## 1.0.0 - 2020-01-01
-
-- Initial versioned release.
-
-[Unreleased]: https://github.com/minetest-mods/gauges/compare/v1.0.0...HEAD

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright © 2014-2020 4aiman, Hugo Locurcio and contributors
+Copyright © 2014-2019 4aiman, Hugo Locurcio and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -60,13 +60,11 @@ on that line.
 
 ## Version compatibility
 
-Gauges is currently primarily tested with Minetest 5.1.0. It may or may not work
-with newer or older versions. Issues arising in versions older than 5.0.0
-will generally not be fixed.
+Gauges requires Minetest 5.0.0 or newer to work as expected.
 
 ## License
 
-Copyright © 2014-2020 4aiman, Hugo Locurcio and contributors
+Copyright © 2014-2019 4aiman, Hugo Locurcio and contributors
 
 - Code is licensed under the MIT license, see
   [`LICENSE.md`](LICENSE.md) for details.

init.lua

@@ -1,54 +1,66 @@
 -- gauges: Adds health/breath bars above players
 --
--- Copyright © 2014-2020 4aiman, Hugo Locurcio and contributors - MIT License
+-- Copyright © 2014-2019 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
-
-minetest.register_entity("gauges:hp_bar", {
-	visual = "sprite",
-	visual_size = {x=1, y=1/16, z = 1},
-	-- The texture is changed later in the code
-	textures = {"blank.png"},
-	collisionbox = {0},
+local hp_bar = {
 	physical = false,
+	collisionbox = {x = 0, y = 0, z = 0},
+	visual = "sprite",
+	textures = {"20.png"}, -- The texture is changed later in the code
+	visual_size = {x = 1.5, y = 0.09375, z = 1.5}, -- Y value is (1 / 16) * 1.5
+	wielder = nil,
+}
 
-	on_step = function(self)
-		local player = self.wielder
-
-		if not player or
-				not minetest.is_player(player) or
-				vector.distance(player:get_pos(), self.object:get_pos()) > 3
-		then
-			self.object:remove()
-			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
-
-		if self.hp ~= hp or self.breath ~= breath then
-			self.object:set_properties({
-				textures = {
-					"health_"..tostring(hp)..".png^"..
-					"breath_"..tostring(breath)..".png"
-				}
-			})
-			self.hp = hp
-			self.breath = breath
-		end
-	end
-})
-
-local function add_gauge(player)
-	local entity = minetest.add_entity(player:get_pos(), "gauges:hp_bar")
-
-	entity:set_attach(player, "", {x=0, y=19, z=0}, {x=0, y=0, z=0})
-	entity:get_luaentity().wielder = player
+function vector.sqdist(a, b)
+	local dx = a.x - b.x
+	local dy = a.y - b.y
+	local dz = a.z - b.z
+	return dx * dx + dy * dy + dz * dz
 end
 
-minetest.register_on_joinplayer(function(player)
-	minetest.after(1, add_gauge, player)
-end)
+function hp_bar:on_step(dtime)
+	local wielder = self.wielder and minetest.get_player_by_name(self.wielder)
+
+	if
+		wielder == nil or
+		vector.sqdist(wielder:get_pos(), self.object:get_pos()) > 3
+	then
+		self.object:remove()
+		return
+	end
+
+	local hp = wielder:get_hp()
+	local breath = wielder:get_breath()
+
+	self.object:set_properties({
+		textures = {
+			"health_" .. tostring(hp) .. ".png^breath_" .. tostring(breath) .. ".png",
+		},
+	})
+end
+
+minetest.register_entity("gauges:hp_bar", hp_bar)
+
+local function add_HP_gauge(name)
+	local player = minetest.get_player_by_name(name)
+	local pos = player:get_pos()
+	local ent = minetest.add_entity(pos, "gauges:hp_bar")
+
+	if ent ~= nil then
+		ent:set_attach(player, "", {x = 0, y = 19, z = 0}, {x = 0, y = 0, z = 0})
+		ent = ent:get_luaentity()
+		ent.wielder = player:get_player_name()
+	end
+end
+
+if
+	minetest.settings:get_bool("enable_damage") and
+	minetest.settings:get_bool("health_bars") ~= false
+then
+	minetest.register_on_joinplayer(function(player)
+		minetest.after(1, add_HP_gauge, player:get_player_name())
+	end)
+end
+
+minetest.log("action", "[gauges] loaded.")