Fix player castbar flashes

There are controls on the player castbar module for flashing when a spell succeeds or fails, and separate controls for flashing when an instant cast completes. Those were broken (flashing never happened), but now work again.

UpdateBar() was necessary in MyOnUpdate() in the event that no other spell has been cast (in order to set the alpha so that the bottom text displays). The spellId is being passed along so that spells that aren't currently being cast can have their name and icon displayed appropriately, and so the early-out for "no known spell" doesn't trigger (which allows the Flash to actually work). The self.current reset fixes instant casts after a normal cast (we were only clearing the "current" spell conditionally when we only meant to filter StopBar, so if it wasn't cleared, future successful casts thought they were for a different spell than was currently being cast.
This commit is contained in:
Parnic
2022-11-16 13:09:58 -06:00
parent 60d44601d1
commit 7d32b6d8c6
3 changed files with 23 additions and 8 deletions

View File

@ -393,6 +393,8 @@ function IceCastBar.prototype:MyOnUpdate()
return return
end end
self:UpdateBar(1, self:GetCurrentCastingColor())
if (self.action == IceCastBar.Actions.Failure) then if (self.action == IceCastBar.Actions.Failure) then
self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail") self:FlashBar("CastFail", 1-scale, self.actionMessage, "CastFail")
else else
@ -478,7 +480,7 @@ function IceCastBar.prototype:FlashBar(color, alpha, text, textColor)
end end
function IceCastBar.prototype:StartBar(action, message) function IceCastBar.prototype:StartBar(action, message, spellId)
local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, numStages local spell, rank, displayName, icon, startTime, endTime, isTradeSkill, numStages
if IceHUD.SpellFunctionsReturnRank then if IceHUD.SpellFunctionsReturnRank then
spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit) spell, rank, displayName, icon, startTime, endTime, isTradeSkill = UnitCastingInfo(self.unit)
@ -493,6 +495,10 @@ function IceCastBar.prototype:StartBar(action, message)
end end
end end
if spellId and not spell then
spell, rank, icon = GetSpellInfo(spellId)
end
local isChargeSpell = numStages and numStages > 0 local isChargeSpell = numStages and numStages > 0
if isChargeSpell then if isChargeSpell then
self.NumStages = numStages self.NumStages = numStages
@ -590,7 +596,7 @@ function IceCastBar.prototype:SpellCastStart(event, unit, castGuid, spellId)
IceHUD:Debug("SpellCastStart", unit, castGuid, spellId) IceHUD:Debug("SpellCastStart", unit, castGuid, spellId)
--UnitCastingInfo(unit) --UnitCastingInfo(unit)
self:StartBar(IceCastBar.Actions.Cast) self:StartBar(IceCastBar.Actions.Cast, nil, spellId)
self.current = castGuid self.current = castGuid
end end
@ -609,8 +615,9 @@ function IceCastBar.prototype:SpellCastStop(event, unit, castGuid, spellId)
self.action ~= IceCastBar.Actions.ReverseChannel) self.action ~= IceCastBar.Actions.ReverseChannel)
then then
self:StopBar() self:StopBar()
self.current = nil
end end
self.current = nil
end end
@ -639,7 +646,7 @@ function IceCastBar.prototype:SpellCastFailed(event, unit, castGuid, spellId)
end end
end end
self:StartBar(IceCastBar.Actions.Failure, "Failed") self:StartBar(IceCastBar.Actions.Failure, "Failed", nil, spellId)
end end
function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId) function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellId)
@ -653,7 +660,7 @@ function IceCastBar.prototype:SpellCastInterrupted(event, unit, castGuid, spellI
self.current = nil self.current = nil
self:StartBar(IceCastBar.Actions.Failure, "Interrupted") self:StartBar(IceCastBar.Actions.Failure, "Interrupted", spellId)
end end
function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId) function IceCastBar.prototype:SpellCastDelayed(event, unit, castGuid, spellId)
@ -687,7 +694,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
-- show after normal successfull cast -- show after normal successfull cast
if (self.action == IceCastBar.Actions.Cast) then if (self.action == IceCastBar.Actions.Cast) then
self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank)) self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank), spellId)
return return
end end
@ -700,7 +707,7 @@ function IceCastBar.prototype:SpellCastSucceeded(event, unit, castGuid, spellId)
end end
end end
self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank)) self:StartBar(IceCastBar.Actions.Success, spell.. self:GetShortRank(rank), spellId)
end end

View File

@ -1,5 +1,9 @@
# Changelog # Changelog
v1.14.5:
- Fix castbar flashing. There are controls on the player castbar module for flashing when a spell succeeds or fails, and separate controls for flashing when an instant cast completes. Those were broken, but now work again.
v1.14.4: v1.14.4:
- Update TOC for 10.0.2 - Update TOC for 10.0.2

View File

@ -1,5 +1,9 @@
# Changelog # Changelog
v1.14.5:
- Fix castbar flashing. There are controls on the player castbar module for flashing when a spell succeeds or fails, and separate controls for flashing when an instant cast completes. Those were broken, but now work again.
v1.14.4: v1.14.4:
- Update TOC for 10.0.2 - Update TOC for 10.0.2