wow/buffalo2: Modules/ArtifactPower.lua comparison

comparison Modules/ArtifactPower.lua @ 119:0f47780a83c4

ArtifactPower: - xp bar animations work beyond concordance rank 3

author	Nenue
date	Sat, 20 May 2017 06:10:52 -0400
parents	589045559484
children	5f1ba488c395

comparison

equal deleted inserted replaced

-:a86b99c84ccc
+:0f47780a83c4
 numItems = 0,
 Tokens = {},
 cache = {},
 fishingCache = {},
 scanQueue = {},
+worldQuestAP = 0,
+worldQuestItems = {},
 ItemButtons = {},
 anchorPoint = 'TOP',
 anchorPriority = 3,
 anchorFrom = 'TOP',
 moduleName = 'Artifactor',
 VeneerArtifactPower:TryToShow()
 end)
 end
 end
 local PENDING_HOOKS = {}
+local guid = UnitGUID('player')
 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)
 end
 end
 function Module:Setup()
 print(self:GetName()..':Setup()')
-local guid = UnitGUID('player')
+guid = UnitGUID('player')
 VeneerData.ArtifactPower = VeneerData.ArtifactPower or defaultSettings
 self.db = VeneerData.ArtifactPower
 self.db[guid] = self.db[guid] or {}
 self.db.cache = self.db.cache or {}
 self.db.fishingCache = self.db.fishingCache or {}
 self.db.cache[i] = data
 end
 for i, data in pairs(self.fishingCache) do
 self.db.fishingCache[i] = data
 end
 self.profile = self.db[guid]
 self.profile.cache = self.profile.cache or {}
 self.profile.cache.bagItems = self.profile.cache.bagItems or {}
 self.profile.cache.bags = self.profile.cache.bags or {}
 AddFrameHooks(_G[name], args)
 PENDING_HOOKS[name] = nil
 end
 end
+self:UpdateWorldQuestsAP()
+self:RegisterEvent('QUEST_LOG_UPDATE')
 self.enabled = true
 self:ScanAllBags()
 self:Reanchor()
 end
 function Module:OnHide()
 print('|cFF88FF00OnHide()|r', debugstack())
+self:UnregisterEvent('QUEST_LOG_UPDATE')
 self:Reanchor()
 end
 function Module:OnEnter()
 GameTooltip:SetOwner(self, 'ANCHOR_CURSOR')
 end
 if #queued_hooks >= 1 then
 CreateHook()
 end
+elseif event == 'QUEST_LOG_UPDATE' then
+self:UpdateWorldQuestsAP()
 elseif event == 'PLAYER_REGEN_DISABLED' then
 self:Hide()
 end
 end
 self.Refresh:Hide()
 end
 end
-function Module:OnMouseDown()
+function Module:OnMouseDown(button)
 self.enabled = nil
-self:Hide()
+if button == 'RightButton' then
+self:Hide()
+end
 end
 function Module:Update()
 if not self:IsShown() then
 print('|cFFFF4400Update()|r')
 if self.fishingAP and self.fishingAP > 0 then
 bankText = (bankText and (bankText .. ' | ') or '') .. '|cFF0088FF' .. ShortNumberString(self.fishingAP) .. ' fishing|r'
 end
 end
-self.worldQuestAP = 0
+if self.worldQuestAP then
-if WorldPlan then
+bankText = (bankText and (bankText .. '\n') or '') .. '|cFFFFBB00World Quests:|r |cFFFFFFFF' .. ShortNumberString(self.worldQuestAP) .. ''
+end
-if not self.worldPlanHooked then
-WorldPlan:RegisterDataCallback(function()
-print('data udpate callback')
-self:Update()
-end)
-self.worldPlanHooked = true
-end
-local showWQ
-print('world plan is loaded')
-local worldQuests = WorldPlan:GetQuestPins()
-for index, pin in ipairs(worldQuests) do
-if (pin.rewardType == WORLD_QUEST_REWARD_TYPE_FLAG_ARTIFACT_POWER) and (pin.isActive) and (pin.dataLoaded) then
-showWQ = true
-print(pin.itemNumber)
-self.worldQuestAP = self.worldQuestAP + pin.itemNumber
-end
-end
-if showWQ then
-bankText = (bankText and (bankText .. '\n') or '') .. '|cFFFFBB00World Quests:|r |cFFFFFFFF' .. ShortNumberString(self.worldQuestAP) .. ''
-end
-end
 self.SummaryHeader:SetText(bankText)
 local numButtons = 0
 local contentsHeight = 16 + self.SummaryHeader:GetHeight()
-local contentsWidth = self.SummaryHeader:GetWidth() + 16
+local contentsWidth = 400
 if self.profile.knowledgeMultiplier then
 local artifactsWidth = self:UpdateArtifactButtons()
 if artifactsWidth ~= 0 then
 contentsHeight = contentsHeight + 64
 end
-contentsWidth = max(contentsWidth, artifactsWidth)
+contentsWidth = max(contentsWidth, min(artifactsWidth, 400))
 local itemsWidth, itemsHeight = self:UpdateItemButtons()
 contentsHeight = contentsHeight + itemsHeight
 contentsWidth = max(contentsWidth, itemsWidth)
 end
 self:SetWidth(contentsWidth)
 self:SetHeight(contentsHeight)
 self:Reanchor()
+end
+local BROKEN_ISLE_ID = 1007
+function Module:UpdateWorldQuestsAP()
+self.waitingForQuestRewardData = false
+self.worldQuestAP = 0
+wipe(self.worldQuestItems)
+for zoneIndex = 1, C_MapCanvas.GetNumZones(BROKEN_ISLE_ID) do
+local zoneMapID, zoneName, zoneDepth, left, right, top, bottom = C_MapCanvas.GetZoneInfo(BROKEN_ISLE_ID, zoneIndex);
+--print(zoneMapID, zoneName)
+if zoneDepth <= 1 then -- Exclude subzones
+local taskInfo = C_TaskQuest.GetQuestsForPlayerByMapID(zoneMapID, BROKEN_ISLE_ID);
+if taskInfo then
+for i, info in ipairs(taskInfo) do
+local questID = info.questId
+local questTitle, factionID, capped = C_TaskQuest.GetQuestInfoByQuestID(questID)
+--print(questTitle, HaveQuestRewardData(questID))
+if HaveQuestRewardData(questID) then
+local numQuestRewards = GetNumQuestLogRewards(questID);
+if numQuestRewards > 0 then
+for i = 1, numQuestRewards do
+local name, texture, numItems, quality, isUsable, itemID = GetQuestLogRewardInfo(i, questID)
+if IsArtifactPowerItem(itemID) then
+local _, link = GetItemInfo(itemID)
+if link then
+local ap = self:GetItemAP(itemID, link)
+--print('ap =', ap)
+if ap then
+self.worldQuestAP = self.worldQuestAP + ap
+end
+self.worldQuestItems[itemID] = (self.worldQuestItems[itemID] or 0) + 1
+end
+--print(self.worldQuestAP)
+end
+end
+end
+else
+C_TaskQuest.RequestPreloadRewardData(questID);
+self.waitingForQuestRewardData = true
+end
+end
+end
+end
+end
 end
 function Module:UpdateArtifactButtons()
 -- Artifact icons, in no particular order
 -- total      total of invested and inventory XP
 -- totalCost  total of costs between current and actual level
 local actualXP = artifact.currentXP
 local actualLevel = artifact.level
 local actualCost = C_ArtifactUI.GetCostForPointAtRank(actualLevel, artifact.tier)
-local totalXP = actualXP + unusedXP
+local totalXP = actualXP
 local totalCost = actualCost
 local totalLevel = actualLevel
 print('tier:', artifact.tier)
 print('current:', self.level, self.currentXP, '/', self.currentCost)
 end
 print('actual:', actualLevel, actualXP, '/', actualCost)
 if unusedXP > 0 then
-local remaining = totalXP
+local remaining = totalXP + unusedXP
 local nextCost = artifact.currentCost
 totalCost = nextCost
 while remaining > nextCost do
 totalLevel = totalLevel + 1
-totalCost = totalCost + nextCost
+remaining = remaining - nextCost
 nextCost = C_ArtifactUI.GetCostForPointAtRank(totalLevel, artifact.tier)
-remaining = remaining - nextCost
+print('|cFFFFFF00+ ', totalLevel, remaining, '/', totalCost)
-print('|cFFFFFF00+ ', totalLevel, remaining, '/', nextCost)
+end
-end
+totalXP = remaining
+totalCost = nextCost
 end
 print('total:', totalLevel, totalXP, '/', totalCost)
 self.currentLevel = self.level
 -- current:   amount shown in blizz ui
 -- actual:    amount contributing the next level, will be same until current point cap is reached
 -- potential: total of ap on hand
 print(self.currentXP, self.actualXP, self.potentialXP)
 if self.actualLevel ~= self.level then
 levelText = self.actualLevel
 r1, g1, b1 = 0, 1, 0
 --r2, g2, b2 = 0, 1, 0
 xpText = ShortNumberString(self.actualXP)
 costText = ShortNumberString(self.actualCost)
 self:SetSize(48,48)
 self:SetNormalTexture(nil, 'ADD')
 end
 local currentProgress = (self.currentXP < self.currentCost) and (self.currentXP / self.currentCost) or 1
-if self.level <= 53 then
+print('|cFFFF4400', currentProgress)
+if self.level <= 92 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.actualXP ~= self.currentXP then
+if self.totalXP ~= self.currentXP then
-local projectedProgress = (self.actualXP ~= self.actualCost) and (self.actualXP / self.actualCost) or 1
+local projectedProgress = (self.totalXP / self.totalCost)
+print('|cFF00FFFF', projectedProgress)
 if (projectedProgress > currentProgress) then
 self.AdjustedProgress:SetPoint('BOTTOM', self.CurrentProgress, 'TOP')
 projectedProgress = projectedProgress - currentProgress
 else
 self.CurrentProgress:Hide()
 self.AdjustedProgress.animateFrom = self.AdjustedProgress:GetHeight() or 1
 self.AdjustedProgress.animateTo = projectedProgress * self:GetHeight()
 self.AdjustedLine:Show()
 self.AdjustedProgress:Show()
 else
+self.CurrentProgress:SetPoint('BOTTOM', self, 'BOTTOM')
 self.AdjustedProgress:Hide()
 self.AdjustedLine:Hide()
 end
+print(self.CurrentProgress:GetPoint(3))
+print(self.CurrentProgress:GetSize())
 if self.actualLevel ~= self.currentLevel then
 self:SetNormalTexture([[Interface\Buttons\UI-Quickslot-Depress]], 'ADD')
 self:GetNormalTexture():SetBlendMode('BLEND')
 self:GetNormalTexture():SetVertexColor(1,1,1)
 else
 self:SetNormalTexture(nil, 'ADD')
+end
-end
 self.Icon:SetTexture(self.texture)
 end
+local XP_SCALING_DURATION = .5
 function Artifact:AnimateProgress(region)
 local cTime = GetTime()
 if not region.animateStart then
 region.animateStart = cTime
 end
 local progressTo, progressFrom = region.animateTo, region.animateFrom
 local elapsed = cTime - region.animateStart
-if elapsed >= .5 then
+if elapsed >= XP_SCALING_DURATION then
 region:SetHeight(progressTo)
 region.animateTo = nil
 region.animateStart = nil
 region.animateFrom = nil
 else
-local progress = elapsed / .5
+local progress = elapsed / XP_SCALING_DURATION
 local height = (progressFrom + (progressTo - progressFrom) * progress)
 --print(self:GetName(), progressTo, progressFrom, (progressTo - progressFrom), ceil(progress*10)/10, ceil(height))
 region:SetHeight(height)
 end
 end
 end
 function Artifact:OnEnter()
 GameTooltip:SetOwner(self, 'ANCHOR_CURSOR')
 GameTooltip:SetText(self.name)
-GameTooltip:AddLine(ShortNumberString(self.currentXP) .. ' / '..ShortNumberString(self.currentCost), 1, 1, 0)
+GameTooltip:AddLine(ShortNumberString(self.currentXP) .. ' / '..ShortNumberString(self.currentCost), 1, 1, 1)
 if self.actualLevel ~= self.level then
-GameTooltip:AddLine(ShortNumberString(self.actualLevel - self.level) .. ' points unlocked', 0, 1, 0)
+GameTooltip:AddLine(ShortNumberString(self.actualLevel - self.level) .. ' points unlocked', 1, 1, 0)
 end
 if self.currentXP < self.currentCost then
 GameTooltip:AddLine(ShortNumberString(self.currentCost - self.currentXP) .. ' for level ' .. (self.currentLevel+1), 1, 1, 0)
 else
 GameTooltip:AddLine(ShortNumberString(self.actualCost - self.actualXP) .. ' for level ' .. (self.actualLevel+1), 0, 1, 0)
 function Artifact:OnClick(button, down)
 if self.isEquipped then
 SocketInventoryItem(16)
 else
 if IsShiftKeyDown() then
 SocketContainerItem(self.containerID, self.slotID)
 else
 end
 end
 end

Mercurial > wow > buffalo2

comparison Modules/ArtifactPower.lua @ 119:0f47780a83c4