From 2571df30527e428cc970fef3b2c7ce60e52b2712 Mon Sep 17 00:00:00 2001
From: Sumsebrum <kyle@xicon.de>
Date: Tue, 11 Jan 2022 03:00:57 +0100
Subject: [PATCH] cleanup

---
 Modules/Healthbar.lua | 42 ++++--------------------------------------
 Modules/Trinket.lua   |  1 -
 2 files changed, 4 insertions(+), 39 deletions(-)

diff --git a/Modules/Healthbar.lua b/Modules/Healthbar.lua
index bda54ef..8338a1a 100644
--- a/Modules/Healthbar.lua
+++ b/Modules/Healthbar.lua
@@ -129,7 +129,7 @@ function Healthbar.OnEvent(self, event, unit)
 end
 
 function Healthbar:SetHealthText(healthBar, health, healthMax)
-    local healthText
+    local healthText = ""
     local healthPercentage = floor(health * 100 / healthMax)
 
     if health == 0 and UnitExists(healthBar.unit) and UnitIsDeadOrGhost(healthBar.unit) then
@@ -137,25 +137,8 @@ function Healthbar:SetHealthText(healthBar, health, healthMax)
         return
     end
 
-    if (Gladdy.db.healthActual) then
-        healthText = healthMax > 999 and ("%.1fk"):format(health / 1000) or health
-    end
-
-    if (Gladdy.db.healthMax) then
-        local text = healthMax > 999 and ("%.1fk"):format(healthMax / 1000) or healthMax
-        if (healthText) then
-            healthText = ("%s/%s"):format(healthText, text)
-        else
-            healthText = text
-        end
-    end
-
     if (Gladdy.db.healthPercentage) then
-        if (healthText) then
-            healthText = ("%s (%d%%)"):format(healthText, healthPercentage)
-        else
-            healthText = ("%d%%"):format(healthPercentage)
-        end
+        healthText = ("%d%%"):format(healthPercentage)
     end
 
     healthBar.healthText:SetText(healthText)
@@ -271,27 +254,10 @@ function Healthbar:UNIT_HEALTH(unit, health, healthMax)
     Gladdy:SendMessage("UNIT_HEALTH", unit, health, healthMax)
 
     local healthPercentage = floor(health * 100 / healthMax)
-    local healthText
-
-    if (Gladdy.db.healthActual) then
-        healthText = healthMax > 999 and ("%.1fk"):format(health / 1000) or health
-    end
-
-    if (Gladdy.db.healthMax) then
-        local text = healthMax > 999 and ("%.1fk"):format(healthMax / 1000) or healthMax
-        if (healthText) then
-            healthText = ("%s/%s"):format(healthText, text)
-        else
-            healthText = text
-        end
-    end
+    local healthText = ""
 
     if (Gladdy.db.healthPercentage) then
-        if (healthText) then
-            healthText = ("%s (%d%%)"):format(healthText, healthPercentage)
-        else
-            healthText = ("%d%%"):format(healthPercentage)
-        end
+        healthText = ("%d%%"):format(healthPercentage)
     end
 
     healthBar.healthText:SetText(healthText)
diff --git a/Modules/Trinket.lua b/Modules/Trinket.lua
index d3a9911..928d30c 100644
--- a/Modules/Trinket.lua
+++ b/Modules/Trinket.lua
@@ -20,7 +20,6 @@ local Trinket = Gladdy:NewModule("Trinket", 80, {
     trinketXOffset = 0,
     trinketYOffset = 0,
 })
-LibStub("AceComm-3.0"):Embed(Trinket)
 
 function Trinket:Initialize()
     self.frames = {}