wow/buffalo2: Modules/ArtifactPower.lua comparison

comparison Modules/ArtifactPower.lua @ 101:f32b63c93275

- implement caching to reduce the number of tooltip queries made for each scan prompt

author	Nenue
date	Sat, 21 Jan 2017 20:12:17 -0500
parents	74d6d97a2d24
children	1e511e9aaca5

comparison

equal deleted inserted replaced

-:6bf83e41b08c
+:f32b63c93275
 local print = DEVIAN_WORKSPACE and function(...) print('VnAP', ...) end or nop
 VeneerArtifactPowerMixin = {
 numItems = 0,
 Tokens = {},
+cache = {},
+fishingCache = {},
+scanQueue = {},
 ItemButtons = {},
 anchorPoint = 'TOP',
 anchorFrom = 'TOP',
+}
+local defaultSettings = {
+firstUse = true,
+autoHide = true,
 }
 local ap = VeneerArtifactPowerMixin
 local BAGS_TO_SCAN = {BACKPACK_CONTAINER }
 local TOOLTIP_NAME = 'VeneerAPScanner'
 local POINT_COSTS = {
 function ap:Setup()
 print(self:GetName()..':Setup()')
 local guid = UnitGUID('player')
 VeneerData.ArtifactPower = VeneerData.ArtifactPower or defaultSettings
-VeneerData.ArtifactPower[guid] = VeneerData.ArtifactPower[guid] or {}
+self.db = VeneerData.ArtifactPower
-self.profile = VeneerData.ArtifactPower[guid]
+self.db[guid] = self.db[guid] or {}
+self.db.cache = self.db.cache or {}
+self.db.fishingCache = self.db.fishingCache or {}
+for i, data in pairs(self.cache) do
+-- bring in anything found before player data is active
+self.db.cache[i] = data
+end
+for i, data in pairs(self.fishingCache) do
+self.db.fishingCache[i] = data
+end
+self.cache = self.db.cache
+self.profile = self.db[guid]
 self.profile.bagslots = self.profile.bagslots or {}
 self.profile.artifacts = self.profile.artifacts or {}
 self.updateSummary = true
+VeneerArtifactPowerTimer:SetScript('OnUpdate', function()
+self:OnUpdate()
+end)
 local DoTryToShow = function()
 self:TryToShow()
 end
 hooksecurefunc("OpenBackpack", DoTryToShow)
 hooksecurefunc(frame, name, DoTryToShow)
 end
 end
 end
 end
+if self.db.firstUse then
+self.db.firstUse = nil
+end
 end
 local UNDERLIGHT_ANGLER_ID = 133755
 function ap:SetArtifact(itemID, name, texture, currentXP, pointsSpent)
 print('|cFF00FF00SetArtifact()|r')
 if not self.profile then
 return
 end
 local artifacts = self.profile.artifacts
+local multi = C_ArtifactUI.GetArtifactKnowledgeMultiplier()
+self.profile.knowledgeMultiplier = multi or self.profile.knowledgeMultiplier
+print('multiplier:', multi)
 if itemID then
 self.currentEquipped = itemID
 elseif event == 'PLAYER_REGEN_DISABLED' then
 self:Hide()
 end
 end
+function ap:OnUpdate()
+if #self.scanQueue >= 1 then
+local scanInfo = tremove(self.scanQueue, 1)
+end
+end
 function ap:OnMouseDown()
 self.enabled = nil
 self:Hide()
 end
 return
 end
 print('|cFF00FFFFUpdate()|r')
 local bankText, bagText
-if not (self.bankAP and self.bagAP) then
+if not self.profile.knowledgeMultiplier then
+bankText = '|cFF00FF00Shift-Right-Click an artifact weapon to start building data.'
+elseif not (self.bankAP and self.bagAP) then
 bankText = '|cFFFF0000Open bank frame to count all AP|r '
 else
 if (self.bagAP + self.bankAP) == 0 then
 bankText = '|cFFFF4400No Artifact Power tokens on hand|r'
 else
 if self.fishingAP and self.fishingAP >= 1 then
 bankText = (bankText and (bankText .. ' ') or '') .. '|cFF0088FF' .. tostring(self.fishingAP) .. ' fishing AP|r'
 end
 self.SummaryHeader:SetText(bankText)
+local numButtons = 0
+local contentsHeight = 64
+if self.profile.knowledgeMultiplier then
+numButtons = self:UpdateArtifactButtons()
+contentsHeight = contentsHeight + self:UpdateItemButtons()
+end
+self:SetWidth(64*numButtons + 4 * (numButtons+1))
+self:SetHeight(16 + self.SummaryHeader:GetHeight() + contentsHeight)
+self:Reanchor()
+end
+function ap:UpdateArtifactButtons()
 -- Artifact icons, in no particular order
 self.equippedID = C_ArtifactUI.GetEquippedArtifactInfo()
 local numButtons = 0
 local lastFrame = self
 for i = numButtons+ 1, #self.Artifact do
 print('hide', i)
 self.Artifact[i]:Hide()
 end
-self:UpdateItemButtons()
+return numButtons
-self:SetWidth(64*numButtons + 4 * (numButtons+1))
-self:SetHeight(12 + self.SummaryHeader:GetHeight() + 64)
-self:Reanchor()
 end
 function ap:UpdateItemButtons()
 print('|cFF00FFFFUpdateItemButtons()|r')
 local lastFrame, upFrame
 local numButtons = 0
+local buttonsHeight = 0
+local buttonWidth = 0
 for index, button in ipairs(self.Tokens) do
 if button.numItems >= 1 then
 if button.itemName then
 self:SetItemAction(button)
 end
 button:ClearAllPoints()
 numButtons = numButtons + 1
 print(index, button:GetID(), button.Icon:GetTexture())
 if numButtons == 1 then
-button:SetPoint('TOPLEFT', self, 'BOTTOMLEFT', 0, -2)
+button:SetPoint('TOPLEFT', self, 'TOPLEFT', 4, -76)
 upFrame = button
+buttonsHeight = 52
 elseif mod(numButtons,8) == 1 then
 button:SetPoint('TOPLEFT', upFrame, 'BOTTOMLEFT', 0, -2)
 upFrame = button
+buttonsHeight = buttonsHeight + 52
 else
 button:SetPoint('TOPLEFT', lastFrame, 'TOPRIGHT', 2, 0)
 end
 button.Count:SetText(button.numItems)
 lastFrame = button
 button:Show()
 else
 button:Hide()
 end
+end
-end
+return buttonsHeight
 end
 function ap:SetItemAction(button, name)
 name = name or self.itemName
 if InCombatLockdown() then
 end
 function ap:GetItemButton(itemID, texture, itemAP)
 print('|cFF00FFFFGetItemButton()|r', itemID, texture, itemAP)
 local button = self.ItemButtons[itemID]
 if not button then
 button = CreateFrame('Button', 'VeneerAPToken'..itemID, self, 'VeneerItemButton')
+button.baseAP = itemAP
 button:SetPushedTexture([[Interface\Buttons\UI-Quickslot-Depress]])
 button:SetHighlightTexture([[Interface\Buttons\ButtonHilight-Square]],"ADD")
 button:SetID(itemID)
 button.numItems = 0
 button.Icon:SetTexture(texture)
-button.Label:SetText(itemAP)
 button:RegisterForClicks("AnyUp")
 self:SetItemAction(button, GetItemInfo(itemID))
 print('  created')
 self.ItemButtons[itemID] = button
 self.numItems = self.numItems +  1
 end
+local itemAPtext = itemAP * self.profile.knowledgeMultiplier
+if itemAPtext >= 100000 then
+itemAPtext = floor(itemAPtext/1000) .. 'k'
+elseif itemAPtext >= 1000 then
+itemAPtext = (floor(itemAPtext/100)/10 ) .. 'k'
+end
+button.Label:SetText(itemAPtext)
 button.numItems = button.numItems + 1
 return button
+end
+function ap:GetItemAP(itemID, itemLink, bagData)
+if not self.cache[itemID] then
+print('doing tooltip scan')
+self.tooltip:SetOwner(self, 'ANCHOR_NONE')
+self.tooltip:SetHyperlink(itemLink)
+self.tooltip:Show()
+local numLines = self.tooltip:NumLines()
+if numLines >= 3 then
+local subText = _G[TOOLTIP_NAME .. 'TextLeft2']:GetText()
+if subText and subText:match(ARTIFACT_POWER) then
+for i = 3, numLines do
+local text = _G[TOOLTIP_NAME .. 'TextLeft'.. i]:GetText()
+if text and text:match(ARTIFACT_POWER) then
+text = text:gsub('[,%D]', '')
+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()
+if fishingText and fishingText:match('fishing artifact') then
+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
+end
+end
+return self.cache[itemID], self.fishingCache[itemID]
 end
 function ap:ScanBag(id)
 print('|cFF00FFFFScanBag()|r', id, IsBagOpen(id), GetContainerNumSlots(id))
 local numSlots = GetContainerNumSlots(id)
 bagData.items = bagData.items or {}
 table.wipe(bagData.items)
 for slotID = 1, numSlots do
 local texture, count, locked, quality, readable, lootable, link = GetContainerItemInfo(id, slotID)
-local itemID = GetContainerItemID(id, slotID)
 if link then
-self.tooltip:SetOwner(self, 'ANCHOR_NONE')
+local itemID = GetContainerItemID(id, slotID)
-self.tooltip:SetHyperlink(link)
+local name, _, quality, iLevel, reqLevel, class, subclass = GetItemInfo(link)
-self.tooltip:Show()
-local numLines = self.tooltip:NumLines()
+if class == 'Consumable' and subclass == 'Other' then
-if numLines >= 3 then
+print(GetItemInfo(link))
-local subText = _G[TOOLTIP_NAME .. 'TextLeft2']:GetText()
+local itemAP, isFishingAP = self:GetItemAP(itemID, link)
-if subText and subText:match(ARTIFACT_POWER) then
+print(itemAP, isFishingAP)
-for i = 3, numLines do
+if itemAP > 0 then
-local text = _G[TOOLTIP_NAME .. 'TextLeft'.. i]:GetText()
+if isFishingAP then
-if text and text:match(ARTIFACT_POWER) then
+bagData.fishingItems = (bagData.fishingItems or 0) + 1
-text = text:gsub('[,%D]', '')
+bagData.fishingAP = (bagData.fishingAP or 0) + itemAP
-print(link, '-', tonumber(text))
+else
-local itemAP = tonumber(text)
-if itemAP then
+bagData.numItems = (bagData.numItems or 0) + 1
-requiresUpdate = true
+bagData.totalAP = (bagData.totalAP or 0) + itemAP
-bagData.numItems = (bagData.numItems or 0) + 1
-bagData.totalAP = (bagData.totalAP or 0) + itemAP
-bagData.items[itemID] = (bagData.items[itemID] or 0) + 1
-local itemButton = self:GetItemButton(itemID, texture, itemAP)
-end
-end
 end
+bagData.items[itemID] = (bagData.items[itemID] or 0) + 1
+local itemButton = self:GetItemButton(itemID, texture, itemAP)
 end
-local fishingText = _G[TOOLTIP_NAME .. 'TextLeft3']:GetText()
+elseif self.profile.artifacts[itemID] then
-if fishingText and fishingText:match('fishing artifact') then
+print('artfiact weapon', itemID, link, id, slotID)
-local fishingAP = fishingText:match("%d+")
+self.profile.artifacts[itemID].containerID = id
-fishingAP = tonumber(fishingAP)
+self.profile.artifacts[itemID].slotID = slotID
-if fishingAP then
+end
-bagData.fishingItems = (bagData.fishingItems or 0) + 1
-bagData.fishingAP = (bagData.fishingAP or 0) + fishingAP
-bagData.items[itemID] = (bagData.items[itemID] or 0) + 1
-local itemButton = self:GetItemButton(itemID, texture, fishingAP)
-print(fishingAP, bagData.fishingAP)
-end
-end
-end
-end
-if 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
 end
 end
 function ap:ScanAllBags()
 if InCombatLockdown() then
 self.queuedScan = true
 return
 end
+if not self.profile.knowledgeMultiplier then
+print('need to get knowledge level')
+return
+end
 self.queuedScan = nil
-print('|cFFFF0088ScanAllBags()|r')
+print('|cFFFF0088ScanAllBags()|r', self.profile.knowledgeMultiplier)
 for _, button in ipairs(self.Tokens) do
 button.numItems = 0
 end
 if self.level <= 53 then
 self.CurrentProgress.animateFrom = self.CurrentProgress:GetHeight() or 1
 self.CurrentProgress.animateTo = currentProgress * self:GetHeight()
 self.CurrentProgress:Show()
+self.ProgressLine:Show()
 else
 self.CurrentProgress:Hide()
+self.ProgressLine:Hide()
 end
 if self.potentialXP > self.currentXP then
 local projectedProgress = (self.potentialAdjustedXP < self.potentialCost) and (self.potentialXP / self.potentialCost) or 1
 end
 print('show potential', currentProgress, projectedProgress)
 self.AdjustedProgress.animateFrom = self.AdjustedProgress:GetHeight() or 1
 self.AdjustedProgress.animateTo = projectedProgress * self:GetHeight()
+self.AdjustedLine:Show()
 self.AdjustedProgress:Show()
 else
 self.AdjustedProgress:Hide()
+self.AdjustedLine:Hide()
 end
 self.Icon:SetTexture(self.texture)
 self:SetSize(64,64)

Mercurial > wow > buffalo2

comparison Modules/ArtifactPower.lua @ 101:f32b63c93275