Merge pull request #1 from Dairyman/master

Adding GetRaidBuffInfo
This commit is contained in:
Sergio Álvarez 2014-12-29 16:33:26 +01:00
commit 8439462411
1 changed files with 58 additions and 41 deletions

View File

@ -1,4 +1,8 @@
-- Upvalues
local _G = _G
local bit, strsub, strlen, select, max = bit, strsub, strlen, select, max
local addonName, addonNS = ... local addonName, addonNS = ...
local LQT = LibStub('LibQTip-1.0') local LQT = LibStub('LibQTip-1.0')
local LDB = LibStub("LibDataBroker-1.1") local LDB = LibStub("LibDataBroker-1.1")
@ -19,8 +23,8 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[1] = { -- Stats [1] = { -- Stats
[1] = "Interface\\Icons\\spell_nature_regeneration", [1] = "Interface\\Icons\\spell_nature_regeneration",
[2] = { [2] = {
{LC["DRUID"], CC["DRUID"]}, {LC["DRUID"], CC["DRUID"]},
{LC["MONK"], CC["MONK"]}, {LC["MONK"], CC["MONK"]},
{LC["PALADIN"], CC["PALADIN"]} {LC["PALADIN"], CC["PALADIN"]}
}, },
[3] = {LCT["Dog"], LCT["Gorilla"], LCT["Shale Spider"], LCT["Worm"]} [3] = {LCT["Dog"], LCT["Gorilla"], LCT["Shale Spider"], LCT["Worm"]}
@ -28,8 +32,8 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[2] = { -- Stamina [2] = { -- Stamina
[1] = "Interface\\Icons\\spell_holy_wordfortitude", [1] = "Interface\\Icons\\spell_holy_wordfortitude",
[2] = { [2] = {
{LC["WARRIOR"], CC["WARRIOR"]}, {LC["WARRIOR"], CC["WARRIOR"]},
{LC["PRIEST"], CC["PRIEST"]}, {LC["PRIEST"], CC["PRIEST"]},
{LC["WARLOCK"], CC["WARLOCK"]} {LC["WARLOCK"], CC["WARLOCK"]}
}, },
[3] = {LCT["Bear"], LCT["Goat"], LCT["Rylak"], LCT["Silithid"]} [3] = {LCT["Bear"], LCT["Goat"], LCT["Rylak"], LCT["Silithid"]}
@ -37,8 +41,8 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[3] = { --Attack Power [3] = { --Attack Power
[1] = "Interface\\Icons\\ability_warrior_battleshout", [1] = "Interface\\Icons\\ability_warrior_battleshout",
[2] = { [2] = {
{LC["DEATHKNIGHT"], CC["DEATHKNIGHT"]}, {LC["DEATHKNIGHT"], CC["DEATHKNIGHT"]},
{LC["WARRIOR"], CC["WARRIOR"]}, {LC["WARRIOR"], CC["WARRIOR"]},
{LC["HUNTER"], CC["HUNTER"]} {LC["HUNTER"], CC["HUNTER"]}
}, },
[3] = {} [3] = {}
@ -46,9 +50,9 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[4] = { --Haste [4] = { --Haste
[1] = "Interface\\Icons\\spell_nature_bloodlust", [1] = "Interface\\Icons\\spell_nature_bloodlust",
[2] = { [2] = {
{LC["DEATHKNIGHT"].." "..STAT_DPS_SHORT, CC["DEATHKNIGHT"]}, {LC["DEATHKNIGHT"].." "..STAT_DPS_SHORT, CC["DEATHKNIGHT"]},
{LC["ROGUE"], CC["ROGUE"]}, {LC["ROGUE"], CC["ROGUE"]},
{LC["PRIEST"].." "..LTT["Shadow"], CC["PRIEST"]}, {LC["PRIEST"].." "..LTT["Shadow"], CC["PRIEST"]},
{LC["SHAMAN"], CC["SHAMAN"]} {LC["SHAMAN"], CC["SHAMAN"]}
}, },
[3] = {LCT["Hyena"], LCT["Rylak"], LCT["Sporebat"], LCT["Wasp"]} [3] = {LCT["Hyena"], LCT["Rylak"], LCT["Sporebat"], LCT["Wasp"]}
@ -56,7 +60,7 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[5] = { --Spell Power [5] = { --Spell Power
[1] = "Interface\\Icons\\spell_holy_magicalsentry", [1] = "Interface\\Icons\\spell_holy_magicalsentry",
[2] = { [2] = {
{LC["MAGE"], CC["MAGE"]}, {LC["MAGE"], CC["MAGE"]},
{LC["WARLOCK"], CC["WARLOCK"]} {LC["WARLOCK"], CC["WARLOCK"]}
}, },
[3] = {LCT["Serpent"], LCT["Silithid"], LCT["Water Strider"]} [3] = {LCT["Serpent"], LCT["Silithid"], LCT["Water Strider"]}
@ -64,8 +68,8 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[6] = { -- Critical Strike [6] = { -- Critical Strike
[1] = "Interface\\Icons\\spell_nature_unyeildingstamina", [1] = "Interface\\Icons\\spell_nature_unyeildingstamina",
[2] = { [2] = {
{LC["MAGE"], CC["MAGE"]}, {LC["MAGE"], CC["MAGE"]},
{LC["DRUID"].." "..LTT["Feral"], CC["DRUID"]}, {LC["DRUID"].." "..LTT["Feral"], CC["DRUID"]},
{LC["MONK"].." "..STAT_CATEGORY_MELEE, CC["MONK"]} {LC["MONK"].." "..STAT_CATEGORY_MELEE, CC["MONK"]}
}, },
[3] = {LCT["Devilsaur"], LCT["Quilen"], LCT["Raptor"], LCT["Shale Spider"], LCT["Water Strider"], LCT["Wolf"]} [3] = {LCT["Devilsaur"], LCT["Quilen"], LCT["Raptor"], LCT["Shale Spider"], LCT["Water Strider"], LCT["Wolf"]}
@ -73,9 +77,9 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[7] = { --Mastery [7] = { --Mastery
[1] = "Interface\\Icons\\spell_holy_greaterblessingofkings", [1] = "Interface\\Icons\\spell_holy_greaterblessingofkings",
[2] = { [2] = {
{LC["DEATHKNIGHT"].." "..LTT["Blood"], CC["DEATHKNIGHT"]}, {LC["DEATHKNIGHT"].." "..LTT["Blood"], CC["DEATHKNIGHT"]},
{LC["SHAMAN"], CC["SHAMAN"]}, {LC["SHAMAN"], CC["SHAMAN"]},
{LC["DRUID"].." "..LTT["Balance"], CC["DRUID"]}, {LC["DRUID"].." "..LTT["Balance"], CC["DRUID"]},
{LC["PALADIN"], CC["PALADIN"]} {LC["PALADIN"], CC["PALADIN"]}
}, },
[3] = {LCT["Cat"], LCT["Hydra"], LCT["Spirit Beast"], LCT["Tallstrider"]} [3] = {LCT["Cat"], LCT["Hydra"], LCT["Spirit Beast"], LCT["Tallstrider"]}
@ -83,9 +87,9 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[8] = { --Multistrike [8] = { --Multistrike
[1] = "Interface\\Icons\\inv_elemental_mote_air01", [1] = "Interface\\Icons\\inv_elemental_mote_air01",
[2] = { [2] = {
{LC["ROGUE"], CC["ROGUE"]}, {LC["ROGUE"], CC["ROGUE"]},
{LC["PRIEST"].." "..LTT["Shadow"], CC["PRIEST"]}, {LC["PRIEST"].." "..LTT["Shadow"], CC["PRIEST"]},
{LC["WARLOCK"], CC["WARLOCK"]}, {LC["WARLOCK"], CC["WARLOCK"]},
{LC["MONK"].." "..STAT_DPS_SHORT, CC["MONK"]} {LC["MONK"].." "..STAT_DPS_SHORT, CC["MONK"]}
}, },
[3] = {LCT["Bat"], LCT["Clefthoof"], LCT["Core Hound"], LCT["Dragonhawk"], LCT["Wind Serpent"]} [3] = {LCT["Bat"], LCT["Clefthoof"], LCT["Core Hound"], LCT["Dragonhawk"], LCT["Wind Serpent"]}
@ -93,9 +97,9 @@ local defaults = { -- http://www.wowhead.com/guide=1100/buffs-and-debuffs
[9] = { --Versatility [9] = { --Versatility
[1] = "Interface\\Icons\\spell_holy_mindvision", [1] = "Interface\\Icons\\spell_holy_mindvision",
[2] = { [2] = {
{LC["DEATHKNIGHT"].." "..STAT_DPS_SHORT, CC["DEATHKNIGHT"]}, {LC["DEATHKNIGHT"].." "..STAT_DPS_SHORT, CC["DEATHKNIGHT"]},
{LC["WARRIOR"].." "..STAT_DPS_SHORT, CC["WARRIOR"]}, {LC["WARRIOR"].." "..STAT_DPS_SHORT, CC["WARRIOR"]},
{LC["DRUID"], CC["DRUID"]}, {LC["DRUID"], CC["DRUID"]},
{LC["PALADIN"].." "..STAT_DPS_SHORT, CC["PALADIN"]} {LC["PALADIN"].." "..STAT_DPS_SHORT, CC["PALADIN"]}
}, },
[3] = {LCT["Bird of Prey"], LCT["Boar"], LCT["Clefthoof"], LCT["Porcupine"], LCT["Ravager"], LCT["Stag"], LCT["Worm"]} [3] = {LCT["Bird of Prey"], LCT["Boar"], LCT["Clefthoof"], LCT["Porcupine"], LCT["Ravager"], LCT["Stag"], LCT["Worm"]}
@ -109,8 +113,8 @@ end
local BrokerConsolidatedBuffs = LDB:NewDataObject("Broker_ConsolidatedBuffs", { local BrokerConsolidatedBuffs = LDB:NewDataObject("Broker_ConsolidatedBuffs", {
type = "data source", type = "data source",
text = "0/"..NUM_LE_RAID_BUFF_TYPES, text = "0/".._G.NUM_LE_RAID_BUFF_TYPES,
value = "0/"..NUM_LE_RAID_BUFF_TYPES, value = "0/".._G.NUM_LE_RAID_BUFF_TYPES,
icon = "Interface\\AddOns\\Broker_ConsolidatedBuffs\\BuffConsolidation", -- I can't use the default because is a combination texture :( icon = "Interface\\AddOns\\Broker_ConsolidatedBuffs\\BuffConsolidation", -- I can't use the default because is a combination texture :(
label = "ConsolidatedBuffs", label = "ConsolidatedBuffs",
@ -118,20 +122,26 @@ local BrokerConsolidatedBuffs = LDB:NewDataObject("Broker_ConsolidatedBuffs", {
local tooltip = LQT:Acquire("Broker_ConsolidatedBuffsTooltip", 3, "LEFT", "LEFT", "LEFT") local tooltip = LQT:Acquire("Broker_ConsolidatedBuffsTooltip", 3, "LEFT", "LEFT", "LEFT")
self.tooltip = tooltip self.tooltip = tooltip
tooltip:AddHeader(CONSOLIDATE_BUFFS_TEXT) tooltip:AddHeader(_G.CONSOLIDATE_BUFFS_TEXT)
tooltip:AddLine(" ") tooltip:AddLine(" ")
tooltip:AddHeader(STATISTICS, ALL_CLASSES, PETS)--CONSOLIDATE_BUFFS_TEXT) tooltip:AddHeader(_G.STATISTICS, _G.ALL_CLASSES, _G.PETS)--CONSOLIDATE_BUFFS_TEXT)
tooltip:AddSeparator() tooltip:AddSeparator()
--tooltip:AddLine(" ") --tooltip:AddLine(" ")
for i = 1, NUM_LE_RAID_BUFF_TYPES do local buffmask = _G.GetRaidBuffInfo() or 0
local name, rank, texture, duration, expiration, spellId, slot = GetRaidBuffTrayAuraInfo(i) local mask = 1
for i = 1, _G.NUM_LE_RAID_BUFF_TYPES do
local name, rank, texture, duration, expiration, spellId, slot = _G.GetRaidBuffTrayAuraInfo(i)
local c local c
if name then if name then
c = "FF00FF00" c = "FF00FF00"
else else
c = "FFFF0000" if bit.band(buffmask, mask) > 0 then
c = "FFFF0000"
else
c = "FF888888"
end
end end
local classes = "" local classes = ""
@ -143,14 +153,16 @@ local BrokerConsolidatedBuffs = LDB:NewDataObject("Broker_ConsolidatedBuffs", {
pets = pets ..", ".. defaults[i][3][ii] pets = pets ..", ".. defaults[i][3][ii]
end end
tooltip:AddLine( tooltip:AddLine(
"\124T"..defaults[i][1]..":0\124t \124c"..c.._G["RAID_BUFF_"..i].."\124r", "\124T"..defaults[i][1]..":0\124t \124c"..c.._G["RAID_BUFF_"..i]:gsub("-\n", "").."\124r",
strsub(classes, 2), strsub(classes, 2),
strsub(pets, 2) strsub(pets, 2)
) )
--tooltip:AddLine(" ") --tooltip:AddLine(" ")
--tooltip:AddLine("\124T"..defaults[i][1]..":0\124t \124c"..c.._G["RAID_BUFF_"..i].."\124r "..list) --tooltip:AddLine("\124T"..defaults[i][1]..":0\124t \124c"..c.._G["RAID_BUFF_"..i]:gsub("-\n", "").."\124r "..list)
--tooltip:AddLine(" "..list) --tooltip:AddLine(" "..list)
mask = bit.lshift(mask, 1)
end end
tooltip:SmartAnchorTo(self) tooltip:SmartAnchorTo(self)
@ -164,23 +176,26 @@ local BrokerConsolidatedBuffs = LDB:NewDataObject("Broker_ConsolidatedBuffs", {
OnClick = function(button) OnClick = function(button)
local missing = "" local missing = ""
local buffmask = _G.GetRaidBuffInfo() or 0
local mask = 1
for i = 1, NUM_LE_RAID_BUFF_TYPES do for i = 1, _G.NUM_LE_RAID_BUFF_TYPES do
if not GetRaidBuffTrayAuraInfo(i) then if not _G.GetRaidBuffTrayAuraInfo(i) and bit.band(buffmask, mask) > 0 then
missing = missing .. _G["RAID_BUFF_"..i] ..", " missing = missing .. _G["RAID_BUFF_"..i]:gsub("-\n", "") ..", "
end end
mask = bit.lshift(mask, 1)
end end
if missing ~= "" then if missing ~= "" then
local channel = "SAY" local channel = "SAY"
if IsInGroup(LE_PARTY_CATEGORY_INSTANCE) then if _G.IsInGroup(_G.LE_PARTY_CATEGORY_INSTANCE) then
channel = "INSTANCE_CHAT" channel = "INSTANCE_CHAT"
elseif IsInRaid() then elseif _G.IsInRaid() then
channel = "RAID" channel = "RAID"
elseif IsInGroup() then elseif _G.IsInGroup() then
channel = "PARTY" channel = "PARTY"
end end
SendChatMessage(ADDON_MISSING..": "..strsub(missing, 0, strlen(missing)-2), channel) _G.SendChatMessage(_G.ADDON_MISSING..": "..strsub(missing, 0, strlen(missing)-2), channel)
end end
end end
}) })
@ -189,14 +204,16 @@ local BrokerConsolidatedBuffs = LDB:NewDataObject("Broker_ConsolidatedBuffs", {
local function updateBuffs(self, event, unitID) local function updateBuffs(self, event, unitID)
if (unitID == "player" or event == "PLAYER_ENTERING_WORLD") then if (unitID == "player" or event == "PLAYER_ENTERING_WORLD") then
local c = 0 local c = 0
for i = 1, NUM_LE_RAID_BUFF_TYPES do for i = 1, _G.NUM_LE_RAID_BUFF_TYPES do
if GetRaidBuffTrayAuraInfo(i) then if _G.GetRaidBuffTrayAuraInfo(i) then
c = c + 1 c = c + 1
end end
end end
BrokerConsolidatedBuffs.text = c.."/"..NUM_LE_RAID_BUFF_TYPES local buffcount = select(2, _G.GetRaidBuffInfo())
BrokerConsolidatedBuffs.value = c.."/"..NUM_LE_RAID_BUFF_TYPES -- for ElvUI datatexts
BrokerConsolidatedBuffs.text = c.."/"..max(c, buffcount)
BrokerConsolidatedBuffs.value = c.."/"..max(c, buffcount) -- for ElvUI datatexts
end end
end end