diff --git a/Libs/DF/auras.lua b/Libs/DF/auras.lua index 4f1fba8a..fc01800d 100644 --- a/Libs/DF/auras.lua +++ b/Libs/DF/auras.lua @@ -10,7 +10,7 @@ local GetSpellInfo = GetSpellInfo local lower = string.lower local GetSpellBookItemInfo = GetSpellBookItemInfo -local CONST_MAX_SPELLS = 400000 +local CONST_MAX_SPELLS = 450000 function DF:GetAuraByName (unit, spellName, isDebuff) isDebuff = isDebuff and "HARMFUL|PLAYER" @@ -862,6 +862,7 @@ function DF:CreateAuraConfigPanel (parent, name, db, change_callback, options, t local title = DF:CreateLabel(parent, title) title.textcolor = "silver" + title.textsize = 10 title:SetPoint("bottomleft", scroll, "topleft", 0, 2) for i = 1, lineAmount do diff --git a/boot.lua b/boot.lua index 0344e2f2..e8c1cca8 100644 --- a/boot.lua +++ b/boot.lua @@ -6,8 +6,8 @@ local addonName, Details222 = ... local version, build, date, tocversion = GetBuildInfo() - _detalhes.build_counter = 10277 - _detalhes.alpha_build_counter = 10277 --if this is higher than the regular counter, use it instead + _detalhes.build_counter = 10278 + _detalhes.alpha_build_counter = 10278 --if this is higher than the regular counter, use it instead _detalhes.dont_open_news = true _detalhes.game_version = version _detalhes.userversion = version .. " " .. _detalhes.build_counter diff --git a/frames/window_aura_tracker.lua b/frames/window_aura_tracker.lua index 7bacc2b9..b1330f9b 100644 --- a/frames/window_aura_tracker.lua +++ b/frames/window_aura_tracker.lua @@ -30,8 +30,10 @@ local doFullAuraUpdate = function() wipe(Details.AuraTracker.buff) wipe(Details.AuraTracker.debuff) + local unitId = "player" + local function HandleAuraBuff(aura) - local auraInfo = C_UnitAuras.GetAuraDataByAuraInstanceID("player", aura.auraInstanceID) + local auraInfo = C_UnitAuras.GetAuraDataByAuraInstanceID(unitId, aura.auraInstanceID) local spellId = auraInfo.spellId local isBossAura = auraInfo.isBossAura --"] = false @@ -58,14 +60,18 @@ local doFullAuraUpdate = function() end local function HandleAuraDebuff(aura) - local auraInfo = C_UnitAuras.GetAuraDataByAuraInstanceID("player", aura.auraInstanceID) + local auraInfo = C_UnitAuras.GetAuraDataByAuraInstanceID(unitId, aura.auraInstanceID) Details.AuraTracker.debuff[aura.auraInstanceID] = auraInfo end local batchCount = nil local usePackedAura = true - AuraUtil.ForEachAura("player", "HELPFUL", batchCount, HandleAuraBuff, usePackedAura) - AuraUtil.ForEachAura("player", "HARMFUL", batchCount, HandleAuraDebuff, usePackedAura) + AuraUtil.ForEachAura(unitId, "HELPFUL", batchCount, HandleAuraBuff, usePackedAura) + AuraUtil.ForEachAura(unitId, "HARMFUL", batchCount, HandleAuraDebuff, usePackedAura) + + unitId = "pet" + AuraUtil.ForEachAura(unitId, "HELPFUL", batchCount, HandleAuraBuff, usePackedAura) + AuraUtil.ForEachAura(unitId, "HARMFUL", batchCount, HandleAuraDebuff, usePackedAura) Details.AuraTracker.RefreshScrollData() end @@ -305,21 +311,7 @@ function Details.AuraTracker.RefreshScrollData() end function Details.AuraTracker.OnUnitAuraEvent(self, event, unit, unitAuraUpdateInfo) - if (unitAuraUpdateInfo == nil or unitAuraUpdateInfo.isFullUpdate) then - doFullAuraUpdate() - else - if (unitAuraUpdateInfo.removedAuraInstanceIDs) then - doRemovedAuraUpdate(unitAuraUpdateInfo.removedAuraInstanceIDs) - end - - if (unitAuraUpdateInfo.updatedAuraInstanceIDs) then - doIncrementalAuraUpdate(unitAuraUpdateInfo.updatedAuraInstanceIDs) - end - - if (unitAuraUpdateInfo.addedAuras) then - doAddedAuraUpdate(unitAuraUpdateInfo.addedAuras) - end - end + doFullAuraUpdate() end function Details.AuraTracker.CreateScrollLine(self, lineId) diff --git a/frames/window_cdtracker.lua b/frames/window_cdtracker.lua index 0d6d4551..6fcd7e9e 100644 --- a/frames/window_cdtracker.lua +++ b/frames/window_cdtracker.lua @@ -272,7 +272,7 @@ end end local cooldownsOrganized = {} - for classId = 1, 12 do --12 classes + for classId = 1, 13 do --13 classes cooldownsOrganized[classId] = {} end @@ -309,7 +309,7 @@ end Details.CooldownTracking.ProcessUnitCooldowns("player", unitCooldowns, cooldownsOrganized) end - for classId = 1, 12 do --12 classes + for classId = 1, 13 do --13 classes table.sort(cooldownsOrganized[classId], function(t1, t2) return t1.spellId < t2.spellId end) end @@ -319,7 +319,7 @@ end local maxWidth = Details.ocd_tracker.width + 2 local cooldownFrameIndex = 1 - for classId = 1, 12 do + for classId = 1, 13 do local cooldownFrameList = cooldownsOrganized[classId] for index, cooldownFrame in ipairs(cooldownFrameList) do local cooldownInfo = cooldownFrame.cooldownInfo