Make Power tags use generic FormatText fn

Krealle · Feb 10, 2025 · 0257f1d · 0257f1d
1 parent 7e10da8
commit 0257f1d
Showing 1 changed file with 20 additions and 36 deletions.
diff --git a/Widgets/Texts/CustomFormats.lua b/Widgets/Texts/CustomFormats.lua
@@ -610,62 +610,46 @@ end, "Health", "40%")
 
 -- MARK: Power
 W:AddTag("curpp", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    return FormatNumber(power)
+    return FormatText(UnitPower(unit))
 end, "Power", "12000")
 W:AddTag("curpp:short", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    return FormatNumberShort(power)
+    return FormatText(UnitPower(unit), nil, false, true)
 end, "Power", "12K")
 W:AddTag("perpp", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatPercent(maxPower, power)
+    return FormatText(UnitPowerMax(unit), UnitPower(unit), true)
 end, "Power", "80.20%")
 W:AddTag("perpp:short", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatPercentShort(maxPower, power)
+    return FormatText(UnitPowerMax(unit), UnitPower(unit), true, true)
 end, "Power", "80%")
 
 W:AddTag("maxpp", "UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatNumber(maxPower)
+    return FormatText(UnitPowerMax(unit))
 end, "Power", "15000")
 W:AddTag("maxpp:short", "UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatNumberShort(maxPower)
+    return FormatText(UnitPowerMax(unit), nil, false, true)
 end, "Power", "15K")
 
 W:AddTag("defpp", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatNumberNoZeroes(power - maxPower)
+    local deficit = UnitPower(unit) - UnitPowerMax(unit)
+    if not deficit or deficit == 0 then return end
+    return FormatText(deficit)
 end, "Power", "-3000")
 W:AddTag("defpp:short", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatNumberShortNoZeroes(power - maxPower)
+    local deficit = UnitPower(unit) - UnitPowerMax(unit)
+    if not deficit or deficit == 0 then return end
+    return FormatText(deficit, nil, false, true)
 end, "Power", "-3K")
 W:AddTag("perdefpp", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatPercentNoZeroes(maxPower, (power - maxPower))
+    local max = UnitPowerMax(unit)
+    local deficit = UnitPower(unit) - max
+    if not deficit or deficit == 0 then return end
+    return FormatText(max, deficit, true)
 end, "Power", "-20.20%")
 W:AddTag("perdefpp:short", "UNIT_POWER_FREQUENT UNIT_DISPLAYPOWER UNIT_MAXPOWER", function(unit)
-    local powerType = UnitPowerType(unit)
-    local power = UnitPower(unit, powerType)
-    local maxPower = UnitPowerMax(unit, powerType)
-    return FormatPercentShortNoZeroes(maxPower, (power - maxPower))
+    local max = UnitPowerMax(unit)
+    local deficit = UnitPower(unit) - max
+    if not deficit or deficit == 0 then return end
+    return FormatText(max, deficit, true, true)
 end, "Power", "-20%")
 
 -- MARK: Group