wow/worldplan: QuestPOI.lua comparison

comparison QuestPOI.lua @ 65:02f1d3bce558

Update for Legion Patch 7.2 - Massively improved performance footprint via 7.2 API changes and some major optimization of POI update triggers - Removed AP token caching until reliable mechanisms for detecting AK shifts can be resolved.

author	Nenue
date	Wed, 29 Mar 2017 13:45:41 -0400
parents	876c3f0bfd0e
children	e43e10c5576b

comparison

equal deleted inserted replaced

-:876c3f0bfd0e
+:02f1d3bce558
 -- WorldPlan
 -- QuestPOI.lua
 -- Created: 10/1/2016 7:21 PM
 -- %file-revision%
+-- Big TODOs:
+-- -- generate frames using `WorldMap_GetOrCreateTaskPOI' to remove tainting issues
 --
 local _, db = ...
 local TQ_GetQuestInfoByQuestID = C_TaskQuest.GetQuestInfoByQuestID
 local TQ_GetQuestLocation = C_TaskQuest.GetQuestLocation
 local TQ_GetQuestTimeLeftMinutes = C_TaskQuest.GetQuestTimeLeftMinutes
 local GetQuestTagInfo, GetProfessionInfo = GetQuestTagInfo, GetProfessionInfo
 local GetNumQuestLogRewards, GetNumQuestLogRewardCurrencies, HaveQuestData = GetNumQuestLogRewards, GetNumQuestLogRewardCurrencies, HaveQuestData
 local GetQuestLogRewardMoney, GetQuestLogRewardCurrencyInfo, GetMoneyString = GetQuestLogRewardMoney, GetQuestLogRewardCurrencyInfo, GetMoneyString
 local SpellCanTargetQuest, GetCVarBool = SpellCanTargetQuest, GetCVarBool
 local SetSuperTrackedQuestID = SetSuperTrackedQuestID
+local HaveQuestRewardData = HaveQuestRewardData
 local pairs, ipairs, tinsert, unpack, select = pairs, ipairs, tinsert, unpack, select
 local floor, mod, tostring, tonumber, GetSuperTrackedQuestID = floor, mod, tostring, tonumber, GetSuperTrackedQuestID
 local GameTooltip = GameTooltip
 local GetItemIcon = GetItemIcon
 local REWARD_CASH = WORLD_QUEST_REWARD_TYPE_FLAG_GOLD
 local REWARD_ARTIFACT_POWER = WORLD_QUEST_REWARD_TYPE_FLAG_ARTIFACT_POWER
 local REWARD_GEAR = WORLD_QUEST_REWARD_TYPE_FLAG_EQUIPMENT
 local REWARD_CURRENCY = WORLD_QUEST_REWARD_TYPE_FLAG_ORDER_RESOURCES
 local REWARD_REAGENT = WORLD_QUEST_REWARD_TYPE_FLAG_MATERIALS
+local REWARD_HONOR = WORLD_QUEST_REWARD_TYPE_FLAG_HONOR
 local LE_QUEST_TAG_TYPE_PVP = LE_QUEST_TAG_TYPE_PVP
 local LE_QUEST_TAG_TYPE_PET_BATTLE = LE_QUEST_TAG_TYPE_PET_BATTLE
 local LE_QUEST_TAG_TYPE_DUNGEON = LE_QUEST_TAG_TYPE_DUNGEON
 local LE_QUEST_TAG_TYPE_PROFESSION = LE_QUEST_TAG_TYPE_PROFESSION
 local LE_QUEST_TAG_TYPE_PVP = LE_QUEST_TAG_TYPE_PVP
 local LE_QUEST_TAG_TYPE_PET_BATTLE = LE_QUEST_TAG_TYPE_PET_BATTLE
 local LE_QUEST_TAG_TYPE_DUNGEON = LE_QUEST_TAG_TYPE_DUNGEON
 local LE_QUEST_TAG_TYPE_PROFESSION = LE_QUEST_TAG_TYPE_PROFESSION
 local LE_QUEST_TAG_TYPE_NORMAL = LE_QUEST_TAG_TYPE_NORMAL
+local LE_ITEM_CLASS_WEAPON, LE_ITEM_CLASS_ARMOR, LE_ITEM_CLASS_GEM, LE_ITEM_GEM_ARTIFACTRELIC, LE_ITEM_CLASS_TRADEGOODS = LE_ITEM_CLASS_WEAPON, LE_ITEM_CLASS_ARMOR, LE_ITEM_CLASS_GEM, LE_ITEM_GEM_ARTIFACTRELIC, LE_ITEM_CLASS_TRADEGOODS
 local STYLE_TYPE_PENDING = 768
 -- Pin color/display variables
 if info.questID then
 GetQuestTooltipExtras(info)
 end
 end
 end
-WorldMap_AddQuestRewardsToTooltip(questID)
+GameTooltip_AddQuestRewardsToTooltip(WorldMapTooltip, questID)
 WorldMapTooltip:Show()
 --WorldMapTooltip.recalculatePadding = true;
 --print(WorldMapTooltip:GetParent())
 --print(WorldMapTooltip:IsVisible())
 end
 local questTitle, factionID, capped = TQ_GetQuestInfoByQuestID(questID)
 -- if the title is nil, then wait and try later
 if not questTitle then
-if not self.isPending then
+dprint('|cFFBB8844dataLoaded|r = false|cFF00FFFF', self.questId)
-C_TaskQuest.RequestPreloadRewardData(questID)
+return false
-self.isPending = true
-end
-dprint('|cFFBB8844isPending=true|r|cFF00FFFF', self.questId)
 else
 self.title, self.factionID, self.capped = questTitle, factionID, capped
-dprint('|cFFBB8844  data|r|cFF00FFFF', (self.isPending and '|cFFFF4400delayed|r' or '|cFF00FF00success|r'), self.title, '|r', self.factionID)
+dprint(questTitle, factionID, capped)
-if self.dataLoaded then
-dprint('  |cFFFF4400overwriting data|r')
-end
 -- set tag details
 local worldQuestType
 self.tagID, self.tagName, worldQuestType, self.rarity, self.isElite, self.tradeskillLineIndex = GetQuestTagInfo(questID);
 local tagAtlas
 if worldQuestType == LE_QUEST_TAG_TYPE_PET_BATTLE then
 tagAtlas = "worldquest-icon-dungeon"
 end
 self.worldQuestType = worldQuestType
 self.tagAtlas = tagAtlas
-self:SetRewardInfo()
+local dataLoaded, rewardType, itemName, itemTexture, itemNumber, quality = self:UpdateRewards()
+dprint('|cFFBB8844  dataLoaded|r =', dataLoaded, rewardType, itemName, itemTexture, itemNumber, quality)
--- force throttle on success
+if dataLoaded then
---qprint('  |cFF00FFFF'..questID..'|r hasUpdate:', hasUpdate, 'isPending:', isPending, 'isShown', self:IsShown())
+self.rewardType = rewardType
---qprint('  ', 'rewardType:', self.rewardType, 'tag:', self.tagID)
+self.itemName = itemName
-qprint('  ', tostring(self.title), " |T"..tostring(self.itemTexture)..":12:12|t", tostring(self.itemName))
+self.itemTexture = itemTexture
+self.itemNumber = itemNumber
-if self.itemTexture and self.itemName and self.title then
+self.itemQuality = quality
 self.dataLoaded = true
-self.isPending = nil
-self.throttle = 1
-self.updateRate = PIN_REFRESH_DELAY
 self.isStale = true
 end
 end
 self.isCriteria = WorldMapFrame.UIElementsFrame.BountyBoard:IsWorldQuestCriteriaForSelectedBounty(questID)
-return self.isStale, self.isPending
+return self.dataLoaded
 end
-function QuestPOI:SetRewardInfo()
+--- Returns true if data has changed (either from loading in or qualifications changed)
+function QuestPOI:UpdateRewards()
 local questID = self.questID
-if not HaveQuestData(questID) then
+if not HaveQuestRewardData(questID) then
-self.isPending = true
+C_TaskQuest.RequestPreloadRewardData(questID);
+return false;
 else
+local rewardMoney, rewardAP, rewardHonor
+local rewardItems, rewardCurrency = {}, {}
 local rewardIcon, rewardName, rewardCount, rewardStyle, rewardType, itemID, quantity, quality
--- set reward category
+local xpIcon, xpName, xpCount, xpType
+if (GetNumQuestLogRewardCurrencies(questID) > 0 or GetNumQuestLogRewards(questID) > 0 or GetQuestLogRewardMoney(questID) > 0 or GetQuestLogRewardArtifactXP(questID) > 0 or GetQuestLogRewardHonor(questID)) then
+local money = GetQuestLogRewardMoney(questID)
+if money > 0 then
+rewardMoney = money
+rewardIcon = ICON_MONEY
+rewardName = GetMoneyString(money)
+rewardCount = floor(money/10000)
+rewardType = REWARD_CASH
+end
+local artifactXP = GetQuestLogRewardArtifactXP(questID);
+if artifactXP > 0 then
+rewardAP = artifactXP
+rewardIcon = "Interface\\ICONS\\inv_7xp_inscription_talenttome01"
+rewardCount = artifactXP
+rewardType = REWARD_ARTIFACT_POWER
+qprint('  artifactXP', artifactXP)
+end
+local numQuestCurrencies = GetNumQuestLogRewardCurrencies(questID);
+for i = 1, numQuestCurrencies do
+local name, texture, numItems = GetQuestLogRewardCurrencyInfo(i, questID);
+local text = BONUS_OBJECTIVE_REWARD_WITH_COUNT_FORMAT:format(texture, numItems, name);
+tinsert(rewardCurrency, {
+name = name,
+texture = texture,
+numItems = numItems,
+text = text
+})
+qprint('  currency', i, name, " |T"..tostring(texture)..":12:12|t")
+rewardIcon = texture
+rewardCount = numItems
+rewardName = name
+rewardType = REWARD_CURRENCY
+end
+local honorAmount = GetQuestLogRewardHonor(questID);
+if honorAmount > 0 then
+xpIcon = "Interface\\ICONS\\Achievement_LegionPVPTier4"
+xpCount = honorAmount
+xpName = HONOR
+xpType = HONOR_CURRENCY
+end
+local numQuestRewards = GetNumQuestLogRewards(questID);
+if numQuestRewards > 0 then
+local foundPrimary
+for i = 1, numQuestRewards do
+local name, texture, numItems, quality, isUsable, itemID = GetQuestLogRewardInfo(i, questID)
+if itemID then
+local itemName, itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount, itemEquipLoc, itemTexture, sellPrice, classID, subclassID = GetItemInfo(itemID);
+if ( classID == LE_ITEM_CLASS_WEAPON or classID == LE_ITEM_CLASS_ARMOR or (classID == LE_ITEM_CLASS_GEM and subclassID == LE_ITEM_GEM_ARTIFACTRELIC) ) then
+rewardType = REWARD_GEAR
+rewardIcon = texture
+rewardName = name
+rewardCount = numItems
+foundPrimary = true
+elseif IsArtifactPowerItem(itemID) then
+rewardType = REWARD_ARTIFACT_POWER
+rewardIcon = texture
+rewardName = name
+rewardCount = 1
+foundPrimary = true
+WorldPlanTooltip:SetOwner(self, 'ANCHOR_NONE')
+WorldPlanTooltip:SetHyperlink(itemLink)
+for i = 1, WorldPlanTooltip:NumLines() do
+local line = _G['WorldPlanTooltipTextLeft' .. i]
+local text = line and line:GetText()
+local ap = text and text:gsub(',', ''):match('(%d+) '..ARTIFACT_POWER)
+if ap then
+rewardCount = tonumber(ap)
+print(ap)
+end
+end
+if WorldPlanTooltipTextLeft2 then
+local text = WorldPlanTooltipTextLeft2:GetText()
+end
+print('is an AP token')
+elseif classID == LE_ITEM_CLASS_TRADEGOODS then
+rewardType = REWARD_REAGENT
+rewardIcon = texture
+rewardName = name
+rewardCount = numItems
+foundPrimary = true
+end
+qprint('  reward', i, name, " |T"..tostring(texture)..":12:12|t", quality, isUsable, itemID)
+tinsert(rewardItems, {
+name = name,
+texture = texture,
+numItems = numItems,
+quality = quality,
+isUsable = isUsable
+})
+if not foundPrimary then
+rewardType = REWARD_GEAR
+rewardIcon = texture
+rewardName = name
+rewardCount = numItems
+end
+end
+end
+end
+qprint('  '..self.questID..':|cFFFFFF00SetRewardInfo():', numQuestRewards, rewardType)
+qprint('  ', tostring(self.title), " |T"..tostring(self.itemTexture)..":12:12|t", tostring(self.itemName))
+if (self.itemNumber ~= rewardCount) or (self.rewardType ~= rewardType) or (self.itemName ~= rewardName) or (self.itemTexture ~= rewardIcon) then
+return true, rewardType, rewardName, rewardIcon, rewardCount, quality
+else
+return false
+end
+end
+--[[ set reward category
 local numRewards = GetNumQuestLogRewards(questID)
 local numCurrency = GetNumQuestLogRewardCurrencies(questID)
 local money = GetQuestLogRewardMoney(questID)
 if numRewards >= 1 then
 rewardType, rewardIcon, rewardCount, rewardName, itemID, quality = WorldPlanQuests:GetRewardHeader(questID)
 elseif numCurrency >= 1 then
 rewardName, rewardIcon, rewardCount = GetQuestLogRewardCurrencyInfo(1, questID)
 rewardType = REWARD_CURRENCY
 elseif money >= 1 then
-rewardIcon = ICON_MONEY
 rewardName = GetMoneyString(money)
-rewardType = REWARD_CASH
+end
-end
+--]]
-qprint('  '..self.questID..':|cFFFFFF00SetRewardInfo():', numRewards, rewardType)
-self.itemNumber = tonumber(rewardCount or self.itemNumber)
-self.rewardType = rewardType
-self.quality = quality
-self.itemTexture = rewardIcon or self.itemTexture
-self.itemName = rewardName or self.itemName
--- flag unresolved info
-if not (rewardIcon and rewardName) then
-self.isPending = true
-self.isStale = nil
---WorldPlan:print('|cFFFFFF00'..tostring(self.title)..'|r waiting on texture info')
-else
-if (rewardIcon and rewardName) and self.isPending then
---WorldPlan:print('|cFF00FF00'..tostring(self.title)..'|r has info', rewardIcon, rewardName)
-self.isStale = true
-end
-self.isPending = nil
-end
 end
 end
 -- run from OnShow if .isNew is set
 -- reset flags
 self:SetAlpha(db.PinAlpha)
 self.isAnimating = nil
 end
--- different from owningFrame
+-- Places the pin and triggers display
 function QuestPOI:SetAnchor(owner, dX, dY, mapWidth, mapHeight)
 wqprint(self:GetName()..':SetAnchor()', owner, dX, dY, self.filtered, self.used)
 if not self.used then
 self:HideFrames()
 return
 self.Overlay:SetFrameLevel(overlayBaseIndex + self:GetID())
 if (dX and dY) then
 if not (mapHeight and mapWidth) then
 mapWidth, mapHeight = owner:GetSize()
 end
-local pX = (dX * mapWidth)
+if (self.x ~= dY) or (self.y ~= dY) then
-local pY = (-dY * mapHeight)
+self.x = dX
-self.x = dX
+self.y = dY
-self.y = dY
+local pX = (dX * mapWidth)
-self:SetPoint('CENTER', owner, 'TOPLEFT', pX, pY)
+local pY = (-dY * mapHeight)
+self:SetPoint('CENTER', owner, 'TOPLEFT', pX, pY)
+end
 else
-self:SetPoint('CENTER')
+if self.x or self.y then
+self.x = nil
+self.y = nil
+self:SetPoint('CENTER')
+end
 end
 self:ShowFrames()
 end
 self.used = nil
 end
 function QuestPOI:OnLoad()
 qprint('|cFF00FF88'..self:GetName()..':OnLoad()|r',db.Config)
-self:RegisterEvent('SUPER_TRACKED_QUEST_CHANGED')
 self.title = '|cFF0088FF' .. RETRIEVING_DATA..'|r'
 self.isPending = true
 self.count = self.Overlay.count
 self.timeLabel = self.Overlay.timeLabel
 else
 TaskPOI_OnClick(self, button)
 end
 end
-function QuestPOI:OnEvent(event, ...)
-if event == 'SUPER_TRACKED_QUEST_CHANGED' then
-self.isStale = true
-end
-end
 function QuestPOI:OnUpdate (sinceLast)
 -- control update check intervals
 self.throttle = (self.throttle or self.updateRate) + sinceLast
 if self.throttle >= self.updateRate then
 return
 end
 -- query for reward data if it wasn't found in the original scan
 local questID = self.questID
-if self.isPending then
+if not self.dataLoaded then
 --print('|cFFFF4400'..self:GetID()..':|r polling reward info')
 if not (self.isAnimating) then
 self.PendingFade:Play()
 end
 self:GetData()
 rprint('|cFF00FF88'..self:GetID()..'|r:Refresh() type =', self.rewardType, 'title =', self.title)
-local styleType = (self.isPending and STYLE_TYPE_PENDING) or self.rewardType
+local styleType = (self.dataLoaded and self.rewardType) or STYLE_TYPE_PENDING
 local style,subStyle =  self:GetTypeInfo(self.rewardType)
 if (self.filtered or (not self.dataLoaded)) and (self.questID ~= GetSuperTrackedQuestID()) then
 subStyle = style.minimized
 end
 self.style = style
 if self.itemName then
 if self.itemNumber then
 local numberString = self.itemNumber
-if self.itemNumber >= 1000 then
+if self.itemNumber >= 1000000 then
+numberString = (floor(self.itemNumber/100000)/10) .. 'M'
+elseif self.itemNumber >= 10000 then
+numberString = floor(self.itemNumber/1000) .. 'k'
+elseif self.itemNumber >= 1000 then
 local numeral = floor(self.itemNumber/1000)
 local decimal = mod(self.itemNumber, 1000)
 numberString = numeral
 if decimal > 100 then
 numberString = numberString .. '.' .. tostring(floor(decimal/100))
 end
 if canShow and self.filtered ~= filtered then
 self.isStale = true
 print('  '..self.questID..':|cFFFFFF00CheckFilterRules()|r ', canShow, filtered, self.title)
 end
 self.filtered = filtered
 end
 self.used = canShow

Mercurial > wow > worldplan

comparison QuestPOI.lua @ 65:02f1d3bce558