mirror of
https://github.com/parnic/ice-hud.git
synced 2025-06-16 14:50:13 -05:00
- fixed SnD bar (and potential duration bar) to show and hide much more reliably. previously it would sometimes not display the potential duration or the entire module would be visible when it shouldn't be
- fixed SnD duration bonus from glyph (to 6 seconds from 3)
This commit is contained in:
@ -12,7 +12,7 @@ local GlyphSpellId = 56810
|
|||||||
local baseTime = 9
|
local baseTime = 9
|
||||||
local gapPerComboPoint = 3
|
local gapPerComboPoint = 3
|
||||||
local netherbladeBonus = 3
|
local netherbladeBonus = 3
|
||||||
local glyphBonusSec = 3
|
local glyphBonusSec = 6
|
||||||
local impSndTalentPage = 2
|
local impSndTalentPage = 2
|
||||||
local impSndTalentIdx = 4
|
local impSndTalentIdx = 4
|
||||||
local impSndBonusPerRank = 0.25
|
local impSndBonusPerRank = 0.25
|
||||||
@ -43,20 +43,20 @@ end
|
|||||||
function SliceAndDice.prototype:Enable(core)
|
function SliceAndDice.prototype:Enable(core)
|
||||||
SliceAndDice.super.prototype.Enable(self, core)
|
SliceAndDice.super.prototype.Enable(self, core)
|
||||||
|
|
||||||
self:RegisterEvent("PLAYER_TARGET_CHANGED", "TargetChanged")
|
|
||||||
self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice")
|
self:RegisterEvent("UNIT_AURA", "UpdateSliceAndDice")
|
||||||
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateDurationBar")
|
self:RegisterEvent("UNIT_COMBO_POINTS", "UpdateDurationBar")
|
||||||
|
|
||||||
if not self.moduleSettings.alwaysFullAlpha then
|
if not self.moduleSettings.alwaysFullAlpha then
|
||||||
self:Show(false)
|
self:Show(false)
|
||||||
else
|
else
|
||||||
self:UpdateSliceAndDice(nil, self.unit)
|
self:UpdateSliceAndDice()
|
||||||
end
|
end
|
||||||
|
|
||||||
self:SetBottomText1("")
|
self:SetBottomText1("")
|
||||||
end
|
end
|
||||||
|
|
||||||
function SliceAndDice.prototype:TargetChanged()
|
function SliceAndDice.prototype:TargetChanged()
|
||||||
|
SliceAndDice.super.prototype.TargetChanged(self)
|
||||||
self:UpdateDurationBar()
|
self:UpdateDurationBar()
|
||||||
self:UpdateSliceAndDice()
|
self:UpdateSliceAndDice()
|
||||||
end
|
end
|
||||||
@ -145,7 +145,7 @@ function SliceAndDice.prototype:CreateDurationBar()
|
|||||||
-- Rokiyo: Do we need to call this here?
|
-- Rokiyo: Do we need to call this here?
|
||||||
self.CurrScale = 0
|
self.CurrScale = 0
|
||||||
|
|
||||||
self.durationFrame.bar:SetVertexColor(self:GetColor("SliceAndDicePotential", self.alpha * self.moduleSettings.durationAlpha))
|
self.durationFrame.bar:SetVertexColor(self:GetColor("SliceAndDicePotential", self.moduleSettings.durationAlpha))
|
||||||
self.durationFrame.bar:SetHeight(0)
|
self.durationFrame.bar:SetHeight(0)
|
||||||
|
|
||||||
self:UpdateBar(1, "undef")
|
self:UpdateBar(1, "undef")
|
||||||
@ -205,6 +205,9 @@ function SliceAndDice.prototype:MyOnUpdate()
|
|||||||
if self.bUpdateSnd then
|
if self.bUpdateSnd then
|
||||||
self:UpdateSliceAndDice(nil, self.unit, true)
|
self:UpdateSliceAndDice(nil, self.unit, true)
|
||||||
end
|
end
|
||||||
|
if self.target then
|
||||||
|
self:UpdateDurationBar()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
|
function SliceAndDice.prototype:UpdateSliceAndDice(event, unit, fromUpdate)
|
||||||
@ -274,8 +277,12 @@ function SliceAndDice.prototype:UpdateDurationBar(event, unit)
|
|||||||
-- first, set the cached upper limit of SnD duration
|
-- first, set the cached upper limit of SnD duration
|
||||||
CurrMaxSnDDuration = self:GetMaxBuffTime(maxComboPoints)
|
CurrMaxSnDDuration = self:GetMaxBuffTime(maxComboPoints)
|
||||||
|
|
||||||
|
if event then
|
||||||
|
self:UpdateSliceAndDice()
|
||||||
|
end
|
||||||
|
|
||||||
-- player doesn't want to show the percent of max or the alpha is zeroed out, so don't bother with the duration bar
|
-- player doesn't want to show the percent of max or the alpha is zeroed out, so don't bother with the duration bar
|
||||||
if not self.moduleSettings.showAsPercentOfMax or self.moduleSettings.durationAlpha == 0 then
|
if not self.moduleSettings.showAsPercentOfMax or self.moduleSettings.durationAlpha == 0 or (points == 0 and not self:IsVisible()) then
|
||||||
self.durationFrame:Hide()
|
self.durationFrame:Hide()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
@ -296,7 +303,7 @@ function SliceAndDice.prototype:UpdateDurationBar(event, unit)
|
|||||||
scale = 1 - scale
|
scale = 1 - scale
|
||||||
end
|
end
|
||||||
|
|
||||||
self.durationFrame.bar:SetVertexColor(self:GetColor("SliceAndDicePotential", self.alpha * self.moduleSettings.durationAlpha))
|
self.durationFrame.bar:SetVertexColor(self:GetColor("SliceAndDicePotential", self.moduleSettings.durationAlpha))
|
||||||
self:SetBarCoord(self.durationFrame, scale)
|
self:SetBarCoord(self.durationFrame, scale)
|
||||||
|
|
||||||
if sndEndTime < GetTime() then
|
if sndEndTime < GetTime() then
|
||||||
|
Reference in New Issue
Block a user