Rename Anima Charged to Charged

Charged combo points are still a thing, but they're no longer called "Anima-charged" or relate to Kyrian.
This commit is contained in:
Parnic
2022-09-18 15:21:51 -05:00
parent 1f54f7d41d
commit 3017b5dd18
2 changed files with 13 additions and 11 deletions

View File

@ -21,7 +21,7 @@ function ComboPoints.prototype:init()
if AnticipationExists then if AnticipationExists then
self:SetDefaultColor("AnticipationPoints", 1, 0, 1) self:SetDefaultColor("AnticipationPoints", 1, 0, 1)
end end
self:SetDefaultColor("KyrianAnimaComboPoint", 0.3137254901960784, 0.3725490196078432, 1) self:SetDefaultColor("ChargedComboPoint", 0.3137254901960784, 0.3725490196078432, 1)
self.scalingEnabled = true self.scalingEnabled = true
end end
@ -222,16 +222,16 @@ function ComboPoints.prototype:GetOptions()
order = 35 order = 35
} }
opts["bShowAnimaCharged"] = { opts["bShowCharged"] = {
type = 'toggle', type = 'toggle',
width = 'double', width = 'double',
name = L["Show Anima-charged points"], name = L["Show 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 a charged combo point a separate color. Set the ChargedComboPoint color to the color you would like it to be."],
get = function() get = function()
return self.moduleSettings.bShowAnimaCharged return self.moduleSettings.bShowCharged
end, end,
set = function(info, v) set = function(info, v)
self.moduleSettings.bShowAnimaCharged = v self.moduleSettings.bShowCharged = v
self:UpdateChargedComboPoints() self:UpdateChargedComboPoints()
end, end,
disabled = function() disabled = function()
@ -261,7 +261,7 @@ function ComboPoints.prototype:GetDefaultSettings()
defaults["comboGap"] = 0 defaults["comboGap"] = 0
defaults["showAnticipation"] = true defaults["showAnticipation"] = true
defaults["bShowWithNoTarget"] = true defaults["bShowWithNoTarget"] = true
defaults["bShowAnimaCharged"] = true defaults["bShowCharged"] = true
return defaults return defaults
end end
@ -440,8 +440,8 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
g = g - ((1 / maxComboPoints)*i) g = g - ((1 / maxComboPoints)*i)
end end
if self.moduleSettings.bShowAnimaCharged and self:IsAnimaChargedPoint(i) then if self.moduleSettings.bShowCharged and self:IsChargedPoint(i) then
self.frame.graphical[i].texture:SetVertexColor(self:GetColor("KyrianAnimaComboPoint")) self.frame.graphical[i].texture:SetVertexColor(self:GetColor("ChargedComboPoint"))
else else
self.frame.graphical[i].texture:SetVertexColor(r, g, b) self.frame.graphical[i].texture:SetVertexColor(r, g, b)
end end
@ -489,7 +489,7 @@ function ComboPoints.prototype:CreateComboFrame(forceTextureUpdate)
end end
end end
function ComboPoints.prototype:IsAnimaChargedPoint(point) function ComboPoints.prototype:IsChargedPoint(point)
if not self.chargedPowerPoints then if not self.chargedPowerPoints then
return false return false
end end

View File

@ -142,7 +142,9 @@ function ComboPointsBar.prototype:UpdateComboPoints(...)
end end
self:SetBottomText1(points or "0") self:SetBottomText1(points or "0")
self:SetBottomText2(self.chargedPowerPointIndex) if self.chargedPowerPointIndex then
self:SetBottomText2(self.chargedPowerPointIndex)
end
end end
function ComboPointsBar.prototype:Update() function ComboPointsBar.prototype:Update()