xiconfjs/Gladdy-TBC
1
0
Fork 0
Code Issues 36 Pull Requests 2 Packages Projects Releases 30 Wiki Activity

cleanup

Browse Source
This commit is contained in:
Sumsebrum 2022-01-11 03:00:57 +01:00
parent 1c42523a2f
commit 2571df3052
2 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Modules/Healthbar.lua
View File

@ -129,7 +129,7 @@ function Healthbar.OnEvent(self, event, unit)
end end
function Healthbar:SetHealthText(healthBar, health, healthMax) function Healthbar:SetHealthText(healthBar, health, healthMax)
local healthText local healthText = ""
local healthPercentage = floor(health * 100 / healthMax) local healthPercentage = floor(health * 100 / healthMax)
if health == 0 and UnitExists(healthBar.unit) and UnitIsDeadOrGhost(healthBar.unit) then if health == 0 and UnitExists(healthBar.unit) and UnitIsDeadOrGhost(healthBar.unit) then
@ -137,26 +137,9 @@ function Healthbar:SetHealthText(healthBar, health, healthMax)
return return
end 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 (Gladdy.db.healthPercentage) then
if (healthText) then
healthText = ("%s (%d%%)"):format(healthText, healthPercentage)
else
healthText = ("%d%%"):format(healthPercentage) healthText = ("%d%%"):format(healthPercentage)
end end
end
healthBar.healthText:SetText(healthText) healthBar.healthText:SetText(healthText)
end end
@ -271,28 +254,11 @@ function Healthbar:UNIT_HEALTH(unit, health, healthMax)
Gladdy:SendMessage("UNIT_HEALTH", unit, health, healthMax) Gladdy:SendMessage("UNIT_HEALTH", unit, health, healthMax)
local healthPercentage = floor(health * 100 / healthMax) local healthPercentage = floor(health * 100 / healthMax)
local healthText 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
if (Gladdy.db.healthPercentage) then if (Gladdy.db.healthPercentage) then
if (healthText) then
healthText = ("%s (%d%%)"):format(healthText, healthPercentage)
else
healthText = ("%d%%"):format(healthPercentage) healthText = ("%d%%"):format(healthPercentage)
end end
end
healthBar.healthText:SetText(healthText) healthBar.healthText:SetText(healthText)
healthBar.hp:SetValue(healthPercentage) healthBar.hp:SetValue(healthPercentage)

1
Modules/Trinket.lua
View File

@ -20,7 +20,6 @@ local Trinket = Gladdy:NewModule("Trinket", 80, {
trinketXOffset = 0, trinketXOffset = 0,
trinketYOffset = 0, trinketYOffset = 0,
}) })
LibStub("AceComm-3.0"):Embed(Trinket)
function Trinket:Initialize() function Trinket:Initialize()
self.frames = {} self.frames = {}