Mercurial > wow > kbf
comparison KBF.lua @ 79:8c8416ec4aca tip
merge in mop branch with nomial raid buff support
| author | Chris Mellon <arkanes@gmail.com> |
|---|---|
| date | Sat, 01 Dec 2012 15:46:30 -0600 |
| parents | 2acabfca1305 |
| children |
comparison
equal
deleted
inserted
replaced
| 78:814974be3fec | 79:8c8416ec4aca |
|---|---|
| 123 if ( GameTooltip:IsOwned(frame) ) then | 123 if ( GameTooltip:IsOwned(frame) ) then |
| 124 self:OnEnter(frame) | 124 self:OnEnter(frame) |
| 125 end | 125 end |
| 126 end | 126 end |
| 127 buffCount = buffCount+1 | 127 buffCount = buffCount+1 |
| 128 if self.dirty then | |
| 129 -- update raid buff text | |
| 130 local numBufs = 0 | |
| 131 local buffmask, buffcount = GetRaidBuffInfo(); | |
| 132 if not (buffmask == nil) then | |
| 133 mask = 1; | |
| 134 for i=1,NUM_LE_RAID_BUFF_TYPES do | |
| 135 local name, rank, texture, duration, expiration, spellId, slot = GetRaidBuffTrayAuraInfo(i); | |
| 136 if name then | |
| 137 numBufs = numBufs + 1; | |
| 138 end | |
| 139 mask = bit.lshift(mask, 1); | |
| 140 end | |
| 141 self.consolidateProxy.text:SetText("Raid Buffs "..numBufs.."/"..max(numBufs,buffcount)); | |
| 142 end | |
| 143 end | |
| 128 end | 144 end |
| 129 | 145 |
| 130 -- SAH correctly binds the weapon enchant templates now, but when temp enchants | 146 -- SAH correctly binds the weapon enchant templates now, but when temp enchants |
| 131 -- are present and used, it seems that it doesn't correctly hide un-bound | 147 -- are present and used, it seems that it doesn't correctly hide un-bound |
| 132 -- buff frames, which breaks all the layout and so forth. | 148 -- buff frames, which breaks all the layout and so forth. |
| 463 consolidateProxy:SetFrameStrata("HIGH") | 479 consolidateProxy:SetFrameStrata("HIGH") |
| 464 consolidateProxy:SetNormalTexture("Interface\\TargetingFrame\\UI-StatusBar") | 480 consolidateProxy:SetNormalTexture("Interface\\TargetingFrame\\UI-StatusBar") |
| 465 consolidateProxy:SetWidth(200 +16) | 481 consolidateProxy:SetWidth(200 +16) |
| 466 consolidateProxy:SetHeight(16) | 482 consolidateProxy:SetHeight(16) |
| 467 secureHeader:SetAttribute("consolidateProxy", consolidateProxy) | 483 secureHeader:SetAttribute("consolidateProxy", consolidateProxy) |
| 484 -- text for showing raid buffs | |
| 485 consolidateProxy.text = consolidateProxy:CreateFontString(nil, "OVERLAY") | |
| 486 consolidateProxy.text:SetFontObject(GameFontHighlight) | |
| 487 consolidateProxy.text:SetFont(GameFontHighlight:GetFont()) | |
| 488 consolidateProxy.text:SetPoint("LEFT", consolidateProxy, "LEFT", 2, 0) | |
| 489 consolidateProxy.text:SetJustifyH("LEFT") | |
| 490 consolidateProxy.text:SetText("raidbuffs") | |
| 491 consolidateProxy.text:SetTextColor(1,1,1,1) | |
| 492 | |
| 468 --secureHeader:SetFrameRef("proxy", consolidateProxy) | 493 --secureHeader:SetFrameRef("proxy", consolidateProxy) |
| 469 | 494 |
| 470 | 495 |
| 471 -- this is the equivilent of the secureHeader for the consolidated buffs | 496 -- this is the equivilent of the secureHeader for the consolidated buffs |
| 472 -- pre-creating again, so we can customize/size/position it | 497 -- pre-creating again, so we can customize/size/position it |