# HG changeset patch # User Chris Mellon # Date 1354398390 21600 # Node ID 8c8416ec4acac8896778d8456604e6cd350c2324 # Parent 814974be3fec45c52c12b01fe9608d9b39bb0e92# Parent 2acabfca13056828a97ec396f7cfea6895c1bdff merge in mop branch with nomial raid buff support diff -r 814974be3fec -r 8c8416ec4aca KBF.lua --- a/KBF.lua Sat Dec 01 10:34:52 2012 -0600 +++ b/KBF.lua Sat Dec 01 15:46:30 2012 -0600 @@ -125,6 +125,22 @@ end end buffCount = buffCount+1 + if self.dirty then + -- update raid buff text + local numBufs = 0 + local buffmask, buffcount = GetRaidBuffInfo(); + if not (buffmask == nil) then + mask = 1; + for i=1,NUM_LE_RAID_BUFF_TYPES do + local name, rank, texture, duration, expiration, spellId, slot = GetRaidBuffTrayAuraInfo(i); + if name then + numBufs = numBufs + 1; + end + mask = bit.lshift(mask, 1); + end + self.consolidateProxy.text:SetText("Raid Buffs "..numBufs.."/"..max(numBufs,buffcount)); + end + end end -- SAH correctly binds the weapon enchant templates now, but when temp enchants @@ -465,6 +481,15 @@ consolidateProxy:SetWidth(200 +16) consolidateProxy:SetHeight(16) secureHeader:SetAttribute("consolidateProxy", consolidateProxy) + -- text for showing raid buffs + consolidateProxy.text = consolidateProxy:CreateFontString(nil, "OVERLAY") + consolidateProxy.text:SetFontObject(GameFontHighlight) + consolidateProxy.text:SetFont(GameFontHighlight:GetFont()) + consolidateProxy.text:SetPoint("LEFT", consolidateProxy, "LEFT", 2, 0) + consolidateProxy.text:SetJustifyH("LEFT") + consolidateProxy.text:SetText("raidbuffs") + consolidateProxy.text:SetTextColor(1,1,1,1) + --secureHeader:SetFrameRef("proxy", consolidateProxy)