xiconfjs/Gladdy-TBC
1
0
Fork 0
Code Issues 36 Pull Requests 2 Packages Projects Releases 30 Wiki Activity

Announcements throttle some messages, as they might be firing too often with unified ArenaUnit detection

Browse Source
This commit is contained in:
Sumsebrum 2022-08-01 20:25:24 +02:00
parent b2b4848ff4
commit bbe272bb48
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Modules/Announcements.lua
View File

@ -91,7 +91,7 @@ function Announcements:CAST_START(unit, spell)
end end
if (self.RES_SPELLS[spell]) then if (self.RES_SPELLS[spell]) then
self:Send(L["RESURRECTING: %s (%s)"]:format(button.name, button.classLoc), 3, RAID_CLASS_COLORS[button.class]) self:Send(L["RESURRECTING: %s (%s)"]:format(button.name, button.classLoc), 3, RAID_CLASS_COLORS[button.class], unit)
end end
end end
@ -105,7 +105,7 @@ function Announcements:ENEMY_SPOTTED(unit)
if button.name == "Unknown" then if button.name == "Unknown" then
button.name = UnitName(unit) button.name = UnitName(unit)
end end
self:Send("ENEMY SPOTTED:" .. ("%s (%s)"):format(button.name, button.classLoc), 0, RAID_CLASS_COLORS[button.class]) self:Send("ENEMY SPOTTED:" .. ("%s (%s)"):format(button.name, button.classLoc), 0, RAID_CLASS_COLORS[button.class], unit)
self.enemy[unit] = true self.enemy[unit] = true
end end
end end
@ -118,7 +118,7 @@ function Announcements:UNIT_SPEC(unit, spec)
if button.name == "Unknown" then if button.name == "Unknown" then
button.name = UnitName(unit) button.name = UnitName(unit)
end end
self:Send(L["SPEC DETECTED: %s - %s (%s)"]:format(button.name, spec, button.classLoc), 0, RAID_CLASS_COLORS[button.class]) self:Send(L["SPEC DETECTED: %s - %s (%s)"]:format(button.name, spec, button.classLoc), 1, RAID_CLASS_COLORS[button.class], unit)
end end
function Announcements:UNIT_HEALTH(unit, health, healthMax) function Announcements:UNIT_HEALTH(unit, health, healthMax)
@ -129,7 +129,7 @@ function Announcements:UNIT_HEALTH(unit, health, healthMax)
local healthPercent = floor(health * 100 / healthMax) local healthPercent = floor(health * 100 / healthMax)
if (healthPercent < Gladdy.db.announcements.healthThreshold) then if (healthPercent < Gladdy.db.announcements.healthThreshold) then
self:Send(L["LOW HEALTH: %s (%s)"]:format(button.name, button.classLoc), 10, RAID_CLASS_COLORS[button.class]) self:Send(L["LOW HEALTH: %s (%s)"]:format(button.name, button.classLoc), 10, RAID_CLASS_COLORS[button.class], unit)
end end
end end
@ -139,7 +139,7 @@ function Announcements:TRINKET_USED(unit)
return return
end end
self:Send(L["TRINKET USED: %s (%s)"]:format(button.name, button.classLoc), 0, RAID_CLASS_COLORS[button.class]) self:Send(L["TRINKET USED: %s (%s)"]:format(button.name, button.classLoc), 1, RAID_CLASS_COLORS[button.class], unit)
end end
function Announcements:TRINKET_READY(unit) function Announcements:TRINKET_READY(unit)
@ -148,15 +148,15 @@ function Announcements:TRINKET_READY(unit)
return return
end end
self:Send(L["TRINKET READY: %s (%s)"]:format(button.name, button.classLoc), 3, RAID_CLASS_COLORS[button.class]) self:Send(L["TRINKET READY: %s (%s)"]:format(button.name, button.classLoc), 1, RAID_CLASS_COLORS[button.class], unit)
end end
function Announcements:SPELL_INTERRUPT(destUnit,spellID,spellName,spellSchool,extraSpellId,extraSpellName,extraSpellSchool) function Announcements:SPELL_INTERRUPT(unit,spellID,spellName,spellSchool,extraSpellId,extraSpellName,extraSpellSchool)
local button = Gladdy.buttons[destUnit] local button = Gladdy.buttons[unit]
if (not button or not Gladdy.db.announcements.spellInterrupt) then if (not button or not Gladdy.db.announcements.spellInterrupt) then
return return
end end
self:Send(L["INTERRUPTED: %s (%s)"]:format(extraSpellName, button.name or ""), nil, RAID_CLASS_COLORS[button.class]) self:Send(L["INTERRUPTED: %s (%s)"]:format(extraSpellName, button.name or ""), nil, RAID_CLASS_COLORS[button.class], unit)
end end
function Announcements:AURA_GAIN(unit, auraType, spellID, spellName) function Announcements:AURA_GAIN(unit, auraType, spellID, spellName)
@ -166,7 +166,7 @@ function Announcements:AURA_GAIN(unit, auraType, spellID, spellName)
end end
if (spellName == self.DRINK_AURA) then if (spellName == self.DRINK_AURA) then
self:Send(L["DRINKING: %s (%s)"]:format(button.name, button.classLoc), 3, RAID_CLASS_COLORS[button.class]) self:Send(L["DRINKING: %s (%s)"]:format(button.name, button.classLoc), 3, RAID_CLASS_COLORS[button.class], unit)
end end
end end
@ -174,16 +174,17 @@ function Announcements:SHADOWSIGHT(msg)
self:Send(msg, 2) self:Send(msg, 2)
end end
function Announcements:Send(msg, throttle, color) function Announcements:Send(msg, throttle, color, unit)
if (throttle and throttle > 0) then if (throttle and throttle > 0) then
if (not self.throttled[msg]) then local throttledMsg = unit and msg .. unit or msg
self.throttled[msg] = GetTime() + throttle if (not self.throttled[throttledMsg]) then
Gladdy:Debug("INFO", msg, "- NOT THROTTLED -", self.throttled[msg]) self.throttled[throttledMsg] = GetTime() + throttle
elseif (self.throttled[msg] < GetTime()) then Gladdy:Debug("INFO", throttledMsg, "- NOT THROTTLED -", self.throttled[throttledMsg])
Gladdy:Debug("INFO", msg, "- THROTTLED OVER -", self.throttled[msg]) elseif (self.throttled[throttledMsg] < GetTime()) then
self.throttled[msg] = GetTime() + throttle Gladdy:Debug("INFO", throttledMsg, "- THROTTLED OVER -", self.throttled[throttledMsg])
self.throttled[throttledMsg] = GetTime() + throttle
else else
Gladdy:Debug("INFO", msg, "- THROTTLED -", self.throttled[msg]) Gladdy:Debug("INFO", throttledMsg, "- THROTTLED -", self.throttled[throttledMsg])
return return
end end
end end