From 6953a11279c7a18f045679ab4de0481319d18943 Mon Sep 17 00:00:00 2001
From: Jean-Patrick Guerrero <jeanpatrick.guerrero@gmail.com>
Date: Sat, 1 Apr 2023 18:13:21 +0200
Subject: [PATCH] Improve notification look

---
 init.lua                 |   2 +-
 src/hud.lua              |  53 ++++++++++++++++++++-------------------
 textures/i3_bg_notif.png | Bin 0 -> 5636 bytes
 3 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 textures/i3_bg_notif.png

diff --git a/init.lua b/init.lua
index 9829f2d..328327c 100644
--- a/init.lua
+++ b/init.lua
@@ -33,7 +33,7 @@ i3 = {
 		wielditem_fade_after = 3,
 		save_interval = 600, -- Player data save interval (in seconds)
 
-		hud_speed = 1,
+		hud_speed = 3,
 		hud_timer_max = 3,
 
 		damage_enabled = core.settings:get_bool"enable_damage",
diff --git a/src/hud.lua b/src/hud.lua
index 5bb0951..e5f0b5a 100644
--- a/src/hud.lua
+++ b/src/hud.lua
@@ -16,17 +16,17 @@ local function init_hud(player)
 		bg = player:hud_add {
 			hud_elem_type = "image",
 			position      = {x = 1,    y = 1},
-			offset        = {x = -320, y = 0},
+			offset        = {x = -330, y = 0},
 			alignment     = {x = 1,    y = 1},
-			scale         = {x = 300,  y = 105},
-			text          = "i3_bg.png",
+			scale         = {x = 0.6,  y = 0.6},
+			text          = "i3_bg_notif.png",
 			z_index       = 0xDEAD,
 		},
 
 		img = player:hud_add {
 			hud_elem_type = "image",
 			position      = {x = 1,    y = 1},
-			offset        = {x = -310, y = 20},
+			offset        = {x = -320, y = 20},
 			alignment     = {x = 1,    y = 1},
 			scale         = {x = 1,    y = 1},
 			text          = "",
@@ -36,7 +36,7 @@ local function init_hud(player)
 		text = player:hud_add {
 			hud_elem_type = "text",
 			position      = {x = 1,    y = 1},
-			offset        = {x = -235, y = 40},
+			offset        = {x = -245, y = 40},
 			alignment     = {x = 1,    y = 1},
 			number        = 0xffffff,
 			text          = "",
@@ -57,13 +57,16 @@ local function init_hud(player)
 	}
 end
 
-local function show_hud(player, data)
+local function show_hud(player, data, dt)
 	local hud_info_bg = player:hud_get(data.hud.bg)
-	local dt = 0.016
 	local offset_y = hud_info_bg.offset.y
-	local speed = 5 * i3.settings.hud_speed
 
-	if offset_y < -100 then
+	local max_y = -120
+	local progress = offset_y * (1 / (max_y - 5))
+	      progress = 1 - (progress ^ 4)
+	local speed = i3.settings.hud_speed * (100 * progress) * dt
+
+	if offset_y < max_y then
 		data.show_hud = false
 		data.hud_timer = (data.hud_timer or 0) + dt
 	end
@@ -85,25 +88,23 @@ local function show_hud(player, data)
 				})
 			end
 		end
-	elseif data.show_hud == false then
-		if data.hud_timer >= i3.settings.hud_timer_max then
-			for name, def in pairs(data.hud) do
-				if name ~= "wielditem" then
-					local hud_info = player:hud_get(def)
+	elseif data.show_hud == false and data.hud_timer >= i3.settings.hud_timer_max then
+		for name, def in pairs(data.hud) do
+			if name ~= "wielditem" then
+				local hud_info = player:hud_get(def)
 
-					player:hud_change(def, "offset", {
-						x = hud_info.offset.x,
-						y = hud_info.offset.y + speed
-					})
-				end
+				player:hud_change(def, "offset", {
+					x = hud_info.offset.x,
+					y = hud_info.offset.y + speed
+				})
 			end
+		end
 
-			if offset_y > 0 then
-				data.show_hud  = nil
-				data.hud_timer = nil
-				data.hud_msg   = nil
-				data.hud_img   = nil
-			end
+		if offset_y > 0 then
+			data.show_hud  = nil
+			data.hud_timer = nil
+			data.hud_msg   = nil
+			data.hud_img   = nil
 		end
 	end
 end
@@ -119,7 +120,7 @@ core.register_globalstep(function(dt)
 		if not data then return end
 
 		if data.show_hud ~= nil then
-			show_hud(player, data)
+			show_hud(player, data, dt)
 		end
 
 		local has_text = player:hud_get(data.hud.wielditem).text ~= ""
diff --git a/textures/i3_bg_notif.png b/textures/i3_bg_notif.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9e3b3da260db0be6aee0279f6e28ca0fe1db520
GIT binary patch
literal 5636
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

literal 0
HcmV?d00001