Skip to content

Commit

Permalink
Fixed several alerts across all instances that weren't giving count (…
Browse files Browse the repository at this point in the history
…but should be)

Fixed incorrect voice pack object usage on Twin Ogron
Removed some useless "near you" warnings that no longer function due to distance check restrictions
  • Loading branch information
MysticalOS committed Jul 14, 2024
1 parent 18f0911 commit 1dfdbfa
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 19 deletions.
5 changes: 0 additions & 5 deletions DBM-Draenor/Tarlna.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ local warnSavageVines = mod:NewTargetAnnounce(176004, 2)
local specWarnColossalBlow = mod:NewSpecialWarningDodge(175973, nil, nil, nil, 2, 2)
local specWarnGenesis = mod:NewSpecialWarningSpell(175979, nil, nil, nil, nil, 12)--Everyone. "Switch" is closest generic to "run around stomping flowers". Might need custom message
local specWarnSavageVines = mod:NewSpecialWarningYou(176004)
local specWarnSavageVinesNear = mod:NewSpecialWarningClose(176004)
local specWarnGrowUntamedMandragora = mod:NewSpecialWarningSwitch(176013, "-Healer", nil, nil, nil, 2)
local specWarnNoxiousSpit = mod:NewSpecialWarningMove(176037)

Expand Down Expand Up @@ -89,10 +88,6 @@ function mod:SPELL_AURA_APPLIED(args)
warnSavageVines:CombinedShow(0.5, targetName)
if args:IsPlayer() then
specWarnSavageVines:Show()
else
if self:CheckNearby(8, targetName) then
specWarnSavageVinesNear:Show(targetName)
end
end
if self.Options.RangeFrame then
if DBM:UnitDebuff("player", debuffName) then
Expand Down
4 changes: 0 additions & 4 deletions DBM-Raids-WoD/BlackrockFoundry/BlastFurnace.lua
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ local yellRupture = mod:NewYell(156932)
--Phase 2
local specWarnFixate = mod:NewSpecialWarningYou(155196, nil, nil, nil, 1, 2)
local specWarnMeltYou = mod:NewSpecialWarningYou(155225, nil, nil, nil, 1, 2)
local specWarnMeltNear = mod:NewSpecialWarningClose(155225, false, nil, nil, 1, 2)
local specWarnMelt = mod:NewSpecialWarningMove(155223, nil, nil, nil, 1, 2)
local yellMelt = mod:NewYell(155223)
local specWarnCauterizeWounds = mod:NewSpecialWarningInterrupt(155186, "-Healer", nil, nil, 1, 2)
Expand Down Expand Up @@ -511,9 +510,6 @@ function mod:SPELL_AURA_APPLIED(args)
specWarnMeltYou:Show()
yellMelt:Schedule(5)--yell after 5 sec to warn nearby player (aoe actually after 6 sec). like expel magic: fel
specWarnMeltYou:Play("runout")
elseif self:CheckNearby(8, args.destName) then
specWarnMeltNear:Show()
specWarnMeltNear:Play("runaway")
end
elseif spellId == 156934 then
--Increase to 50 should fix any rare issues not get timer if on same area as boss.
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoD/BlackrockFoundry/Gruul.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ local warnCrumblingRoar = mod:NewSpellAnnounce(155730, 3, nil, false)--Cave i
local warnInfernoSlice = mod:NewCountAnnounce(155080, 4)
local warnPetrifyingSlam = mod:NewTargetAnnounce(155326, 4)--non mythic only. in mythic, applied to all, so target list only spam

local specWarnInfernoSlice = mod:NewSpecialWarningCount(155080, "Tank|Healer", nil, nil, nil, 2)
local specWarnInfernoSlice = mod:NewSpecialWarningTarget(155080, "Tank|Healer", DBM_CORE_L.AUTO_SPEC_WARN_OPTIONS.count:format(155080), nil, nil, 2)
local specWarnRampage = mod:NewSpecialWarningSpell(155539, nil, nil, nil, 2, 2)
local specWarnRampageEnded = mod:NewSpecialWarningEnd(155539, nil, nil, nil, 2, 2)
local specWarnOverheadSmash = mod:NewSpecialWarningCount(155301, nil, nil, nil, 2, 2)
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoD/BlackrockFoundry/IronMaidens.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ local specWarnConvulsiveShadows = mod:NewSpecialWarningMoveAway(156214, nil, n
local specWarnConvulsiveShadowsOther = mod:NewSpecialWarningTargetCount(156214, false)
local yellConvulsiveShadows = mod:NewYell(156214, nil, false)
local specWarnDarkHunt = mod:NewSpecialWarningYou(158315, nil, nil, nil, 1, 2)
local specWarnDarkHuntOther = mod:NewSpecialWarningTarget(158315, false)--Healer may want this, or raid leader
local specWarnDarkHuntOther = mod:NewSpecialWarningTargetCount(158315, false)--Healer may want this, or raid leader
----Marak the Blooded
local specWarnBloodRitual = mod:NewSpecialWarningYou(158078, nil, nil, nil, 1, 2)
local specWarnBloodRitualOther = mod:NewSpecialWarningTargetCount(158078, "Tank", nil, nil, 1, 2)
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoD/HellfireCitadel/Kormrok.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ local specWarnSwat = mod:NewSpecialWarningCount(181305, "Tank", nil, nil, 1,
local specWarnExplosiveBurst = mod:NewSpecialWarningYouCount(181306)
local yellExplosiveBurst = mod:NewYell(181306)
local specWarnExplosiveBurstNear = mod:NewSpecialWarningClose(181306, nil, nil, nil, 3, 2)
local specWarnFoulCrush = mod:NewSpecialWarningSwitch(181307, "Dps|Tank")--Tweak it as needed once can figure out how to detect what tank it's on
local specWarnFoulCrush = mod:NewSpecialWarningSwitchCount(181307, "Dps|Tank")--Tweak it as needed once can figure out how to detect what tank it's on
local specWarnFelOutpouring = mod:NewSpecialWarningDodge(181292, nil, nil, nil, 2, 2)
local specWarnExplosiveRunes = mod:NewSpecialWarningSpell(181296, "-Tank")--Leaving as a spell warning, MoveTo gives misleading info that everyone just runs toward them, only a few do who know what to do
local specWarnGraspingHands = mod:NewSpecialWarningSwitch(181299)
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoD/HellfireCitadel/Mannoroth.lua
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ function mod:SPELL_AURA_APPLIED(args)
self:Schedule(2, breakDoom, self)--3 targets, pretty slowly. I've seen at least 1.2, so make this 2
end
if args:IsPlayer() then
specWarnMarkOfDoom:Show(self:IconNumToString(count))
specWarnMarkOfDoom:Show()
if self:IsMythic() then
specWarnMarkOfDoom:Play("mm"..count)
else
Expand Down
3 changes: 2 additions & 1 deletion DBM-Raids-WoD/HellfireCitadel/Velhari.lua
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ function mod:SPELL_AURA_APPLIED(args)
self.vb.touchofHarmCount = self.vb.touchofHarmCount + 1
timerTouchofHarmCD:Start(nil, self.vb.touchofHarmCount+1)
if self.Options.SpecWarn180166target then
specWarnTouchofHarm:Show(0.3, args.destName)--Only one target, but combined show in case you do something crazy like mass dispel or something and trigger a bunch of jumps
specWarnTouchofHarm:CombinedShow(0.3, args.destName)--Only one target, but combined show in case you do something crazy like mass dispel or something and trigger a bunch of jumps
else
warnTouchofHarm:CombinedShow(0.3, args.destName)
end
Expand Down Expand Up @@ -374,6 +374,7 @@ function mod:UNIT_SPELLCAST_START(uId, _, spellId)
if self.vb.interruptCount == 2 then self.vb.interruptCount = 0 end
self.vb.interruptCount = self.vb.interruptCount + 1
local count = self.vb.interruptCount
---@diagnostic disable-next-line: param-type-mismatch
specWarnHarbingersMending:Show(AncientHarbinger, self.vb.interruptCount)
timerHarbingersMendingCD:Start()
if count == 1 then
Expand Down
1 change: 1 addition & 0 deletions DBM-Raids-WoD/HellfireCitadel/Zakuun.lua
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ local function warnSeeds(self)
local targetName = seedsTargets[i]
if targetName == playerName then
if self.Options.SpecWarn181508you then
---@diagnostic disable-next-line: param-type-mismatch
specWarnSeedPosition:Show(currentType[i])
end
if self.Options.Yell181508 then
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoD/Highmaul/Brackenspore.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ local specWarnExplodingFungus = mod:NewSpecialWarningDodge(163794, nil, nil, ni
local specWarnWaves = mod:NewSpecialWarningDodge(160425, nil, nil, nil, 2, 2)
--Adds
local specWarnSporeShooter = mod:NewSpecialWarningSwitch(163594, "RangedDps", nil, 2, nil, 12)
local specWarnFungalFlesheater = mod:NewSpecialWarningSwitch("ej9995", "-Healer", nil, nil, nil, 12)
local specWarnFungalFlesheater = mod:NewSpecialWarningSwitchCount("ej9995", "-Healer", nil, nil, nil, 12)
local specWarnMindFungus = mod:NewSpecialWarningSwitch(163141, "Dps", nil, nil, nil, 12)

local timerInfestingSporesCD = mod:NewCDCountTimer(57, 159996, nil, nil, nil, 2, nil, nil, nil, 1, 4)--57-63 variation
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoD/Highmaul/Koragh.lua
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function mod:OnCombatEnd()
end

function mod:ArcaneTarget()
local targetName, uId = self:GetBossTarget(79015)
local targetName = self:GetBossTarget(79015) or DBM_COMMON_L.UNKNOWN
local tanking, status = UnitDetailedThreatSituation("player", "boss1")
if tanking or (status == 3) then--Player is current target
specWarnExpelMagicArcaneYou:Show()--So show tank warning
Expand Down
4 changes: 2 additions & 2 deletions DBM-Raids-WoD/Highmaul/Margok.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ local specWarnKickToTheFaceOther = mod:NewSpecialWarningTaunt(158563)
--Mythic
local specWarnGaze = mod:NewSpecialWarningStack(165595, nil, 1)--, nil, nil, 1, 6
local yellGaze = mod:NewYell(165595, L.GazeYell)
local specWarnEnvelopingNight = mod:NewSpecialWarningSpell(165876, nil, nil, nil, 2, 2)
local specWarnEnvelopingNight = mod:NewSpecialWarningCount(165876, nil, nil, nil, 2, 2)
local specWarnGrowingDarkness = mod:NewSpecialWarningMove(176533, nil, nil, nil, nil, 2)
local specWarnDarkStar = mod:NewSpecialWarningSpell(178607, nil, nil, nil, 2)--Change to target/near warning if targetscanning or any other method to detect target possible.

Expand Down Expand Up @@ -442,7 +442,7 @@ function mod:SPELL_CAST_START(args)
timerSummonArcaneAberrationCD:Start(nil, self.vb.arcaneAdd+1)
specWarnAberration:Play("killmob")
elseif args:IsSpellID(158605, 164176, 164178, 164191) then
local targetName, uId = self:GetBossTarget(77428)
local targetName = self:GetBossTarget(77428) or DBM_COMMON_L.UNKNOWN
local tanking, status = UnitDetailedThreatSituation("player", "boss1")
self.vb.noTaunt = true
timerMarkOfChaosCD:Start()
Expand Down
2 changes: 1 addition & 1 deletion DBM-Raids-WoD/Highmaul/TwinOgron.lua
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ function mod:SPELL_CAST_SUCCESS(args)
self.vb.PulverizeRadar = true
self.vb.PulverizeCount = 0
specWarnPulverize:Show()
specWarnPulverize:Show("scatter")
specWarnPulverize:Play("scatter")
timerShieldChargeCD:Start(polEnergyRate)--Next Special
if self.Options.RangeFrame and not DBM:UnitDebuff("player", arcaneDebuff) then--Show range 3 for everyone, unless have arcane debuff, then you already have range 8 showing everyone that's more important
DBM.RangeCheck:Show(3, nil)
Expand Down

0 comments on commit 1dfdbfa

Please sign in to comment.