wow/buffalo2: Modules/ArtifactPower.lua comparison

comparison Modules/ArtifactPower.lua @ 102:1e511e9aaca5

- clean up handler loading inconsistencies; exclude free frames from anchor cluster iterations, and remove extraneous PLAYER_LOGIN handling - added a Setup method to the handler template that creates and reconciles a SavedVariables table for that module

author	Nenue
date	Wed, 25 Jan 2017 23:11:27 -0500
parents	f32b63c93275
children	8df154a2bfd6

comparison

equal deleted inserted replaced

-:f32b63c93275
+:1e511e9aaca5
 tinsert(UISpecialFrames, self:GetName())
 end
+local IsBagnonOpen = function()
+return ((BagnonFramebank and BagnonFramebank:IsShown()) or (BagnonFrameinventory and BagnonFrameinventory:IsShown()))
+end
 local addonCompatibility = {
 ['Bagnon'] = {
 BagFrames = {'BagnonFrameinventory'},
 BankFrames = {'BagnonFramebank'},
+FrameMethods = {
+['HideFrame'] = IsBagnonOpen,
+['ShowFrame'] = IsBagnonOpen
+},
 PostHooks = {'ToggleAllBags', 'ToggleBackpack' },
 MethodClass = 'Bagnon',
-MethodHooks = {'BANK_OPENED', 'BANKFRAME_CLOSED'}
+MethodHooks = {'BANK_OPENED', 'BANKFRAME_CLOSED'},
 }
 }
+local function AddFrameHooks(frame, args)
+for funcName, func in pairs(args.FrameMethods) do
+print('binding', frame:GetName(), funcName, 'to', tostring(func))
+hooksecurefunc(frame, funcName, func)
+end
+end
+local PENDING_HOOKS = {}
+local function RegisterInventoryFrame(name, listType, args)
+print('register', name, 'as inventory frame type =', (listType == BAG_FRAMES) and 'bags' or 'bank')
+tinsert(FRAME_LIST, name)
+tinsert(listType, name)
+if _G[name] then
+AddFrameHooks(_G[name], args)
+else
+PENDING_HOOKS[name] = args
+end
+end
 function ap:Setup()
 print(self:GetName()..':Setup()')
 local guid = UnitGUID('player')
 -- Bagnon compatibility
 -- todo: ArkInventory, Elv, etc
 for addon, args in pairs(addonCompatibility) do
 if IsAddOnLoaded(addon) then
 for _, name in ipairs(args.BagFrames) do
-tinsert(FRAME_LIST, name)
+RegisterInventoryFrame(name, BAG_FRAMES, args)
-tinsert(BAG_FRAMES, name)
 end
 for _, name in ipairs(args.BankFrames) do
-tinsert(FRAME_LIST, name)
+RegisterInventoryFrame(name, BANK_FRAMES, args)
-tinsert(BAG_FRAMES, name)
+end
-end
+-- should only specify non-secure functions in this table
 for _, name in ipairs(args.PostHooks) do
 local oFunc = _G[name]
 _G[name] = function(...)
 print('|cFFFF0088' .. name .. '|r', ...)
 oFunc(...)
 end
 end
 function ap:OnShow()
 print('|cFFFFFF00OnShow()|r')
+for name, args in pairs(PENDING_HOOKS) do
+if _G[name] then
+AddFrameHooks(_G[name], args)
+PENDING_HOOKS[name] = nil
+end
+end
 self.enabled = true
 self:ScanAllBags()
 self:Reanchor()
-if not self.postShowSetup then
-self.postShowSetup = true
-hooksecurefunc("HideUIPanel", function() self:TryToShow() end)
-end
 end
 function ap:OnHide()
 print('|cFF88FF00OnHide()|r')
 self:Reanchor()
 end
 print(itemLink, '-', tonumber(text))
 local itemAP = tonumber(text)
 if itemAP then
 itemAP = itemAP / self.profile.knowledgeMultiplier
 self.cache[itemID] = itemAP
-return itemAP
 end
 end
 end
 end
 local fishingText = _G[TOOLTIP_NAME .. 'TextLeft3']:GetText()
 local fishingAP = fishingText:match("%d+")
 fishingAP = tonumber(fishingAP)
 if fishingAP then
 self.cache[itemID] = fishingAP
 self.fishingCache[itemID] = true
-return fishingAP, true
 end
 end
 else
 self.cache[itemID] = 0
 if link then
 local itemID = GetContainerItemID(id, slotID)
 local name, _, quality, iLevel, reqLevel, class, subclass = GetItemInfo(link)
 if class == 'Consumable' and subclass == 'Other' then
-print(GetItemInfo(link))
+--print(GetItemInfo(link))
 local itemAP, isFishingAP = self:GetItemAP(itemID, link)
-print(itemAP, isFishingAP)
+--print(itemAP, isFishingAP)
-if itemAP > 0 then
+if itemAP and (itemAP > 0) then
+local itemButton = self:GetItemButton(itemID, texture, itemAP)
 if isFishingAP then
 bagData.fishingItems = (bagData.fishingItems or 0) + 1
 bagData.fishingAP = (bagData.fishingAP or 0) + itemAP
 else
+itemAP = itemAP * self.profile.knowledgeMultiplier
 bagData.numItems = (bagData.numItems or 0) + 1
 bagData.totalAP = (bagData.totalAP or 0) + itemAP
 end
 bagData.items[itemID] = (bagData.items[itemID] or 0) + 1
-local itemButton = self:GetItemButton(itemID, texture, itemAP)
 end
 elseif self.profile.artifacts[itemID] then
 print('artfiact weapon', itemID, link, id, slotID)
 self.profile.artifacts[itemID].containerID = id
 self.profile.artifacts[itemID].slotID = slotID
 end
 self.potentialCost = potentialCost
 self.potentialLevel = potentialPoints
 self.potentialAdjustedXP = potentialXP
 if index ~= 1 then
 self:ClearAllPoints()
 self:SetPoint('TOPLEFT', self.relativeFrame, 'TOPRIGHT', 4, 0)
 else

Mercurial > wow > buffalo2

comparison Modules/ArtifactPower.lua @ 102:1e511e9aaca5