Remove some more syncs. Stuff should be localized by now and i don't like using excessive syncing just to work around unlocalized strings. I prefer cleaner more memory efficient code and less addon 2 addon traffic if we don't need it. Only using syncing for boss whispers, or brand new mods, or bosses with phasing/split raid teams.
@@ -204,30 +204,15 @@
Burrowed = true
timerAdds:Cancel()
warnAdds:Cancel()
- self:SendSync("Burrow")
+ warnSubmerge:Show()
+ warnEmergeSoon:Schedule(55)
+ timerEmerge:Start()
+ timerFreezingSlash:Stop()
elseif msg and msg:find(L.Emerge) then
Burrowed = false
timerAdds:Start(5)
warnAdds:Schedule(5)
self:ScheduleMethod(5, "Adds")
- self:SendSync("Emerge")
- end
-end
-
-function mod:RemoveBuffs()
- CancelUnitBuff("player", (GetSpellInfo(47440))) -- Commanding Shout
- CancelUnitBuff("player", (GetSpellInfo(48161))) -- Power Word: Fortitude
- CancelUnitBuff("player", (GetSpellInfo(48162))) -- Prayer of Fortitude
- CancelUnitBuff("player", (GetSpellInfo(69377))) -- Runescroll of Fortitude
-end
-
-function mod:OnSync(msg, arg)
- if msg == "Burrow" then
- warnSubmerge:Show()
- warnEmergeSoon:Schedule(55)
- timerEmerge:Start()
- timerFreezingSlash:Stop()
- elseif msg == "Emerge" then
warnEmerge:Show()
warnSubmergeSoon:Schedule(65)
specWarnSubmergeSoon:Schedule(65)
@@ -241,3 +226,10 @@
end
end
+function mod:RemoveBuffs()
+ CancelUnitBuff("player", (GetSpellInfo(47440))) -- Commanding Shout
+ CancelUnitBuff("player", (GetSpellInfo(48161))) -- Power Word: Fortitude
+ CancelUnitBuff("player", (GetSpellInfo(48162))) -- Prayer of Fortitude
+ CancelUnitBuff("player", (GetSpellInfo(69377))) -- Runescroll of Fortitude
+end
+
@@ -227,12 +227,6 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if msg == L.FirstPull or msg:find(L.FirstPull) then
- self:SendSync("FirstPull")
- end
-end
-
-function mod:OnSync(msg, arg)
- if msg == "FirstPull" then
timerCombatStart:Start()
end
end
\ No newline at end of file
@@ -302,11 +302,26 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if msg == L.Phase2 or msg:find(L.Phase2) then
- self:SendSync("Phase2")
+ self:ScheduleMethod(17, "WormsEmerge")
+ timerCombatStart:Show(15)
+ updateHealthFrame(2)
+ if self.Options.RangeFrame then
+ DBM.RangeCheck:Show(10)
+ end
elseif msg == L.Phase3 or msg:find(L.Phase3) then
- self:SendSync("Phase3")
+ updateHealthFrame(3)
+ if self:IsDifficulty("heroic10", "heroic25") then
+ enrageTimer:Start()
end
+ self:UnscheduleMethod("WormsSubmerge")
+ timerNextCrash:Start(45)
+ timerNextBoss:Cancel()
+ timerSubmerge:Cancel()
+ if self.Options.RangeFrame then
+ DBM.RangeCheck:Hide()
end
+ end
+end
function mod:UNIT_DIED(args)
local cid = self:GetCIDFromGUID(args.destGUID)
@@ -345,26 +360,3 @@
end
end
end
-
-function mod:OnSync(msg, arg)
- if msg == "Phase2" then
- self:ScheduleMethod(17, "WormsEmerge")
- timerCombatStart:Show(15)
- updateHealthFrame(2)
- if self.Options.RangeFrame then
- DBM.RangeCheck:Show(10)
- end
- elseif msg == "Phase3" then
- updateHealthFrame(3)
- if self:IsDifficulty("heroic10", "heroic25") then
- enrageTimer:Start()
- end
- self:UnscheduleMethod("WormsSubmerge")
- timerNextCrash:Start(45)
- timerNextBoss:Cancel()
- timerSubmerge:Cancel()
- if self.Options.RangeFrame then
- DBM.RangeCheck:Hide()
- end
- end
-end
\ No newline at end of file
@@ -10,7 +10,6 @@
mod:RegisterEvents(
"SPELL_CAST_START",
- "CHAT_MSG_MONSTER_YELL",
"SPELL_AURA_APPLIED",
"SPELL_AURA_REMOVED"
)
@@ -220,14 +220,6 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if msg == L.YellAirphase or msg:find(L.YellAirphase) then
- self:SendSync("Airphase")
- elseif msg == L.YellPhase2 or msg:find(L.YellPhase2) then
- self:SendSync("Phase2")
- end
-end
-
-function mod:OnSync(msg, arg)
- if msg == "Airphase" then
warnAirphase:Show()
timerNextFrostBreath:Cancel()
timerNextBlisteringCold:Start(84)--Not exact anywhere from 85-110seconds after airphase begin
@@ -237,7 +229,7 @@
if self.Options.ClearIconsOnAirphase then
self:ClearIcons()
end
- elseif msg == "Phase2" then
+ elseif msg == L.YellPhase2 or msg:find(L.YellPhase2) then
warnPhase2:Show()
timerNextAirphase:Cancel()
timerNextGroundphase:Cancel()
@@ -220,7 +220,7 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if msg == L.YellReanimatedFanatic or msg:find(L.YellReanimatedFanatic) then
- self:SendSync("ReanimatedFanatic")
+ warnReanimating:Show()
end
end
@@ -228,10 +228,4 @@
if empoweredAdherent or deformedFanatic then
self:TrySetTarget()
end
-end
-
-function mod:OnSync(msg, arg)
- if msg == "ReanimatedFanatic" then
- warnReanimating:Show()
- end
end
\ No newline at end of file
@@ -74,12 +74,6 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if msg == L.WarderTrap1 or msg == L.WarderTrap2 or msg == L.WarderTrap3 then
- self:SendSync("WarderTrap")
- end
-end
-
-function mod:OnSync(msg, arg)
- if msg == "WarderTrap" then
specWarnTrap:Show()
end
-end
\ No newline at end of file
+end
@@ -76,12 +76,7 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if msg == L.FleshreaperTrap1 or msg == L.FleshreaperTrap2 or msg == L.FleshreaperTrap3 then
- self:SendSync("FleshreaperTrap")
- end
-end
-
-function mod:OnSync(msg, arg)
- if msg == "FleshreaperTrap" then
specWarnTrap:Show()
end
end
+
@@ -124,6 +124,8 @@
end
end
+mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
+
function mod:SPELL_AURA_REMOVED(args)
if args:IsSpellID(69674, 71224, 73022, 73023) then
timerMutatedInfection:Cancel(args.destName)
@@ -148,14 +150,6 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if (msg == L.YellSlimePipes1 or msg:find(L.YellSlimePipes1)) or (msg == L.YellSlimePipes2 or msg:find(L.YellSlimePipes2)) then
- self:SendSync("PoisonSlimePipes")
- end
-end
-
-function mod:OnSync(msg, arg)
- if msg == "PoisonSlimePipes" then
self:WallSlime()
end
end
-
-mod.SPELL_AURA_APPLIED_DOSE = mod.SPELL_AURA_APPLIED
@@ -61,9 +61,27 @@
function mod:CHAT_MSG_MONSTER_YELL(msg)
if msg == L.YellP2 or msg:find(L.YellP2) then
- self:SendSync("Phase2")
+ phase = 2
+ warnPhase2:Show()
+-- preWarnDeepBreath:Schedule(72) -- Pre-Warn Deep Breath
+ timerNextDeepBreath:Start(77)
+ timerAchieveWhelps:Start()
+ timerNextFlameBreath:Cancel()
+ self:ScheduleMethod(5, "Whelps")
+ sndFunny:Schedule(10, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
+ sndFunny:Schedule(17, "Interface\\AddOns\\DBM-Onyxia\\sounds\\whelps-left-side-even-side-handle-it.mp3")
elseif msg == L.YellP3 or msg:find(L.YellP3) then
- self:SendSync("Phase3")
+ phase = 3
+ warnPhase3:Show()
+ self:UnscheduleMethod("Whelps")
+ timerWhelps:Stop()
+ timerNextDeepBreath:Stop()
+ warnWhelpsSoon:Cancel()
+-- preWarnDeepBreath:Cancel()
+ sndFunny:Schedule(20, "Interface\\AddOns\\DBM-Onyxia\\sounds\\now-hit-it-very-hard-and-fast.mp3")
+ sndFunny:Schedule(35, "Interface\\AddOns\\DBM-Onyxia\\sounds\\i-dont-see-enough-dots.mp3")
+ sndFunny:Schedule(50, "Interface\\AddOns\\DBM-Onyxia\\sounds\\hit-it-like-you-mean-it.mp3")
+ sndFunny:Schedule(65, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
end
end
@@ -102,30 +120,4 @@
warned_preP3 = true
warnPhase3Soon:Show()
end
-end
-
-function mod:OnSync(msg)
- if msg == "Phase2" then
- phase = 2
- warnPhase2:Show()
--- preWarnDeepBreath:Schedule(72) -- Pre-Warn Deep Breath
- timerNextDeepBreath:Start(77)
- timerAchieveWhelps:Start()
- timerNextFlameBreath:Cancel()
- self:ScheduleMethod(5, "Whelps")
- sndFunny:Schedule(10, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
- sndFunny:Schedule(17, "Interface\\AddOns\\DBM-Onyxia\\sounds\\whelps-left-side-even-side-handle-it.mp3")
- elseif msg == "Phase3" then
- phase = 3
- warnPhase3:Show()
- self:UnscheduleMethod("Whelps")
- timerWhelps:Stop()
- timerNextDeepBreath:Stop()
- warnWhelpsSoon:Cancel()
--- preWarnDeepBreath:Cancel()
- sndFunny:Schedule(20, "Interface\\AddOns\\DBM-Onyxia\\sounds\\now-hit-it-very-hard-and-fast.mp3")
- sndFunny:Schedule(35, "Interface\\AddOns\\DBM-Onyxia\\sounds\\i-dont-see-enough-dots.mp3")
- sndFunny:Schedule(50, "Interface\\AddOns\\DBM-Onyxia\\sounds\\hit-it-like-you-mean-it.mp3")
- sndFunny:Schedule(65, "Interface\\AddOns\\DBM-Onyxia\\sounds\\throw-more-dots.mp3")
- end
end
\ No newline at end of file
@@ -33,7 +33,7 @@
local announceCosmicSmash = mod:NewAnnounce("WarningCosmicSmash", 3, 62311)
local announcePhasePunch = mod:NewAnnounce("WarningPhasePunch", 4, 65108, mod:IsHealer() or mod:IsTank())
-local specwarnStarLow = mod:NewSpecialWarning("warnStarLow", mod:IsHealer())
+local specwarnStarLow = mod:NewSpecialWarning("warnStarLow", mod:IsHealer() or mod:IsTank())
local specWarnPhasePunch = mod:NewSpecialWarningStack(64412, nil, 4)
local specWarnBigBang = mod:NewSpecialWarningSpell(64584)
local specWarnCosmicSmash = mod:NewSpecialWarningSpell(64598)
@@ -12,7 +12,6 @@
"SPELL_AURA_APPLIED_DOSE",
"SPELL_AURA_REMOVED",
"SPELL_DAMAGE",
--- "CHAT_MSG_MONSTER_YELL",
"CHAT_MSG_RAID_BOSS_WHISPER",
"UNIT_DIED"
)