From 8dee2510fafce9e981dab45d22a669be91937829 Mon Sep 17 00:00:00 2001
From: Cooldude2606 <cooldude260607@gmail.com>
Date: Tue, 6 Mar 2018 18:43:54 +0000
Subject: [PATCH] Less Lag On health Popup

---
 StandAlone/health.lua | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/StandAlone/health.lua b/StandAlone/health.lua
index 3ce961db..fbba642a 100644
--- a/StandAlone/health.lua
+++ b/StandAlone/health.lua
@@ -3,28 +3,27 @@
 -- https://mods.factorio.com/mods/chocolateTthunder/Show_Health
 -- edits include: tick limit to avoid lag, only shows health when it is lost
 
-
-Event.register(defines.events.on_tick, function(event)
-	if not (event.tick % 15 == 0) then return end
-  	for _,player in pairs(game.connected_players) do
-		if player.character then
-			if player.character.health == nil then return end
-			local index = player.index
-			local health = math.ceil(player.character.health)
-			if global.player_health == nil then global.player_health = {} end
-			if global.player_health[index] == nil then global.player_health[index] = health end
-			if global.player_health[index] ~= health then
-				if health < global.player_health[index] then
-					if health > 200 then
-						player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=(health), position= {player.position.x, player.position.y-2}}
-					elseif health > 100 then
-						player.surface.create_entity{name="flying-text", color={r = 1, g = 1, b = 0}, text=(health), position= {player.position.x, player.position.y-2}}
-					else
-						player.surface.create_entity{name="flying-text", color={b = 0.1, r= 1, g = 0, a = 0.8}, text=(health), position= {player.position.x, player.position.y-2}}
-					end
+Event.register(defines.events.on_entity_damaged, function(event)
+	if event.entity.name ~= 'player' then return end
+  	local player = Game.get_player(event.entity.player)
+	if player.character then
+		if player.character.health == nil then return end
+		local index = player.index
+		local health = math.ceil(player.character.health)
+		if global.player_health == nil then global.player_health = {} end
+		if global.player_health[index] == nil then global.player_health[index] = health end
+		if global.player_health[index] ~= health then
+			if health < global.player_health[index] then
+				local text = health..' (-'..event.final_damage_amount..')'
+				if health > 200 then
+					player.surface.create_entity{name="flying-text", color={b = 0.2, r= 0.1, g = 1, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}}
+				elseif health > 100 then
+					player.surface.create_entity{name="flying-text", color={r = 1, g = 1, b = 0}, text=text, position= {player.position.x, player.position.y-2}}
+				else
+					player.surface.create_entity{name="flying-text", color={b = 0.1, r= 1, g = 0, a = 0.8}, text=text, position= {player.position.x, player.position.y-2}}
 				end
-				global.player_health[index] = health
 			end
-    	end
-  	end
+			global.player_health[index] = health
+		end
+    end
 end)
\ No newline at end of file