wow/worldplan: QuestPOI.lua comparison

comparison QuestPOI.lua @ 116:bf4a36378bb9

- Fixed flight map pins jumping about

author	Nenue
date	Fri, 24 Nov 2017 23:51:44 -0500
parents	e8b6c5433128
children	1fcc4fe645dc

comparison

equal deleted inserted replaced

-:f4dedbad7a11
+:bf4a36378bb9
 [1506] = true, -- argus waystone
 }
 --- Returns true if data has changed (either from loading in or qualifications changed)
 function QuestPOI:UpdateRewards()
+dprint('UpdateRewards()', self.questTitle)
 local questID = self.questID
 if not HaveQuestRewardData(questID) then
 C_TaskQuest.RequestPreloadRewardData(questID);
 return false;
 else
 if artifactXP > 0 then
 rewardAP = artifactXP
 rewardIcon = "Interface\\ICONS\\inv_7xp_inscription_talenttome01"
 rewardCount = artifactXP
 rewardType = REWARD_ARTIFACT_POWER
---dprint('  artifactXP', artifactXP)
+dprint('  artifactXP', artifactXP)
 foundPrimary = true
 end
 local numQuestCurrencies = GetNumQuestLogRewardCurrencies(questID);
 for i = 1, numQuestCurrencies do
 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
+if IsArtifactPowerItem(itemID) 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 = self:UpdateArtifactPower(itemLink)
 foundPrimary = true
 --dprint('is an AP token')
+elseif ( 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 classID == LE_ITEM_CLASS_TRADEGOODS then
 rewardType = REWARD_REAGENT
 rewardIcon = texture
 rewardName = name
 rewardCount = numItems
 foundPrimary = true
 end
---dprint('  reward', i, name, " |T"..tostring(texture)..":12:12|t", quality, isUsable, itemID)
+dprint('  reward', i, name, " |T"..tostring(texture)..":12:12|t", rewardCount, rewardType, isUsable, itemID)
 tinsert(rewardItems, {
 name = name,
 texture = texture,
 numItems = numItems,
 quality = quality,
 end
 end
 end
+local ap_strings = {
+'([%d%.]+) billion ' .. ARTIFACT_POWER,
+'([%d%.]+) million ' .. ARTIFACT_POWER,
+'([%d]+) ' .. ARTIFACT_POWER,
+}
+local ap_factors = {1000000000, 1000000, 1}
 function QuestPOI:UpdateArtifactPower(rewardLink)
+dprint('UpdateArtifactPower')
 if not (rewardLink or self.rewardLink) then
 return
 end
 self.rewardLink = rewardLink or self.rewardLink
 WorldPlanTooltip:SetOwner(self, 'ANCHOR_NONE')
 WorldPlanTooltip:SetHyperlink(rewardLink or self.rewardLink)
 for i = 1, WorldPlanTooltip:NumLines() do
 local line = _G['WorldPlanTooltipTextLeft' .. i]
 local text = line and line:GetText()
-local multiplier = (text:match('million') and 1000000) or 1
 if text then
 text = text:gsub(',', '')
-local ap = text:match('([%d]+) '..ARTIFACT_POWER)
+for j, format in ipairs(ap_strings) do
-if not ap then
-ap = text:match('([%d%.]+) million '..ARTIFACT_POWER)
+local ap = text:match(format)
 if ap then
-ap = tonumber(ap) * 1000000
+rewardCount = tonumber(ap) * ap_factors[j]
+dprint('  ap text', format,  tonumber(ap), ap_factors[j], rewardCount)
+break
 end
-end
-if ap then
-rewardCount = tonumber(ap)
 end
 end
 end
 return rewardCount
 end
 -- Applies position and sizing parameters to the pin data
 function QuestPOI:SetAnchor(owner, dX, dY, mapWidth, mapHeight, scaleFactor)
 --dprint(self:GetName()..':SetAnchor()', owner, dX, dY, scaleFactor, self.filtered, self.used)
+--dprint(debugstack(1,1))
+--dprint(self:GetPoint(1))
 if not self.used then
 self.hideReason = 'SetAnchor() on an unused frame.'
 self:HideOrShowFrames(false)
 return
 end
 self:OnCursor()
 end
 local style = DEFAULT_STYLE
 if self.filtered or db.IgnoreTimers[self.questID] then
-print('choose minimized')
+print('minimized type')
 style = MINIMIZED_STYLE
 elseif self.dataLoaded then
-print('choose reward type')
+print('reward type', self.rewardType)
 style = REWARD_TYPE_STYLES[self.rewardType]
 else
-print('choose default')
+print('default type')
 end
 local currentWidth = style.iconWidth or DEFAULT_STYLE.iconWidth
 local borderWidth = style.borderWidth or DEFAULT_STYLE.borderWidth
 local highlightWidth = style.highlightWidth or DEFAULT_STYLE.highlightWidth
 end
 if self.itemName then
 if self.itemNumber and (self.itemNumber > 1) and (not hideNumbers) then
 local numberString = self.itemNumber
-if self.itemNumber >= 1000000 then
+if self.itemNumber >= 1000000000 then
-numberString = (floor(self.itemNumber/100000)/10) .. 'M'
+numberString = (floor(self.itemNumber/100000000)/10) .. '|cFFFF8800B|r'
+elseif self.itemNumber >= 1000000 then
+numberString = (floor(self.itemNumber/100000)/10) .. '|cFFFFFF00M|r'
 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)

Mercurial > wow > worldplan

comparison QuestPOI.lua @ 116:bf4a36378bb9