Fix Charged combo points feature flag

This commit is contained in:
Parnic
2022-09-18 22:35:19 -05:00
parent 0af47119e3
commit 9fc90551e2
2 changed files with 30 additions and 39 deletions

View File

@ -13,13 +13,6 @@ if Enum and Enum.PowerType then
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
end end
local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
if not GetUnitChargedPowerPoints then
GetUnitChargedPowerPoints = function()
return nil
end
end
-- Constructor -- -- Constructor --
function ComboPoints.prototype:init() function ComboPoints.prototype:init()
ComboPoints.super.prototype.init(self, "ComboPoints") ComboPoints.super.prototype.init(self, "ComboPoints")
@ -229,25 +222,26 @@ function ComboPoints.prototype:GetOptions()
order = 35 order = 35
} }
if GetUnitChargedPowerPoints then opts["bShowAnimaCharged"] = {
opts["bShowAnimaCharged"] = { type = 'toggle',
type = 'toggle', width = 'double',
width = 'double', name = L["Show Anima-charged points"],
name = L["Show Anima-charged points"], desc = L["Whether or not to color an anima-charged combo point a separate color. Set the KyrianAnimaComboPoint color to the color you would like it to be."],
desc = L["Whether or not to color an anima-charged combo point a separate color. Set the KyrianAnimaComboPoint color to the color you would like it to be."], get = function()
get = function() return self.moduleSettings.bShowAnimaCharged
return self.moduleSettings.bShowAnimaCharged end,
end, set = function(info, v)
set = function(info, v) self.moduleSettings.bShowAnimaCharged = v
self.moduleSettings.bShowAnimaCharged = v self:UpdateChargedComboPoints()
self:UpdateChargedComboPoints() end,
end, disabled = function()
disabled = function() return not self.moduleSettings.enabled
return not self.moduleSettings.enabled end,
end, hidden = function()
order = 36 return not GetUnitChargedPowerPoints
} end,
end order = 36
}
return opts return opts
end end
@ -330,9 +324,11 @@ function ComboPoints.prototype:UpdateMaxComboPoints(event, unit, powerType)
end end
function ComboPoints.prototype:UpdateChargedComboPoints() function ComboPoints.prototype:UpdateChargedComboPoints()
self.chargedPowerPoints = GetUnitChargedPowerPoints("player") if GetUnitChargedPowerPoints then
self:CreateComboFrame() self.chargedPowerPoints = GetUnitChargedPowerPoints("player")
self:UpdateComboPoints() self:CreateComboFrame()
self:UpdateComboPoints()
end
end end
-- 'Protected' methods -------------------------------------------------------- -- 'Protected' methods --------------------------------------------------------

View File

@ -6,13 +6,6 @@ if Enum and Enum.PowerType then
SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints SPELL_POWER_COMBO_POINTS = Enum.PowerType.ComboPoints
end end
local GetUnitChargedPowerPoints = GetUnitChargedPowerPoints
if not GetUnitChargedPowerPoints then
GetUnitChargedPowerPoints = function()
return nil
end
end
function ComboPointsBar.prototype:init() function ComboPointsBar.prototype:init()
ComboPointsBar.super.prototype.init(self, "ComboPointsBar") ComboPointsBar.super.prototype.init(self, "ComboPointsBar")
@ -98,9 +91,11 @@ function ComboPointsBar.prototype:Enable(core)
end end
function ComboPointsBar.prototype:UpdateChargedComboPoints() function ComboPointsBar.prototype:UpdateChargedComboPoints()
local chargedPowerPoints = GetUnitChargedPowerPoints("player") if GetUnitChargedPowerPoints then
self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1] local chargedPowerPoints = GetUnitChargedPowerPoints("player")
self:UpdateComboPoints() self.chargedPowerPointIndex = chargedPowerPoints and chargedPowerPoints[1]
self:UpdateComboPoints()
end
end end
function ComboPointsBar.prototype:CreateFrame() function ComboPointsBar.prototype:CreateFrame()