# HG changeset patch # User Nenue # Date 1460718100 14400 # Node ID a3afe6c3771e929da5a96a2b31d4cf053fb88bc9 # Parent 48b3e3959a0afe398011c389c7ca2a92e0c1a00c - organize and display reward icons as a background hint - centralize reward data function diff -r 48b3e3959a0a -r a3afe6c3771e ObjectiveTracker/BonusObjectives.lua --- a/ObjectiveTracker/BonusObjectives.lua Thu Apr 14 19:39:05 2016 -0400 +++ b/ObjectiveTracker/BonusObjectives.lua Fri Apr 15 07:01:40 2016 -0400 @@ -18,49 +18,6 @@ local GetQuestLogRewardMoney, GetMoneyString = GetQuestLogRewardMoney, GetMoneyString local GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime = GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime -local DoQuestRewards = function(t, questID) - local rewards = {} - t.numCurrencies = GetNumQuestLogRewardCurrencies(questID) - for i = 1, t.numCurrencies do - local name, texture, count = GetQuestLogRewardCurrencyInfo(i, questID) - tinsert(rewards,{ - type = 'currency', - index = i, - name = name, - texture = texture, - count = count - }); - end - -- items - t.numItems = GetNumQuestLogRewards(questID) - for i = 1, t.numItems do - local name, texture, count, quality, isUsable = GetQuestLogRewardInfo(i, questID) - tinsert(rewards, { - type = 'item', - index = i , - name = name, - texture = texture, - count = count, - quality = quality, - isUsable = isUsable - }); - end - -- money - - local money = GetQuestLogRewardMoney(questID) - if ( money > 0 ) then - tinsert(rewards, { - type = 'money', - name = GetMoneyString(money), - texture = "Interface\\Icons\\inv_misc_coin_01", - count = 0, - }); - end - - if #rewards >= 1 then - t.rewardInfo = rewards - end -end --- Returns a tasks table modified to include recently completed objectives local InternalGetTasksTable = function() @@ -159,7 +116,7 @@ t.taskIndex = i - DoQuestRewards(t, questID) + T.SetRewards(t, questID) local taskTitle local taskFinished = true; diff -r 48b3e3959a0a -r a3afe6c3771e ObjectiveTracker/Frame.lua --- a/ObjectiveTracker/Frame.lua Thu Apr 14 19:39:05 2016 -0400 +++ b/ObjectiveTracker/Frame.lua Fri Apr 15 07:01:40 2016 -0400 @@ -79,7 +79,7 @@ local wrapperMaxWidth, wrapperMaxHeight = 270, 490 -- these are the hard bounds, actual *Height variables are changed local wrapperHeadFont, wrapperHeadSize, wrapperHeadOutline = [[Interface\Addons\SharedMedia_MyMedia\font\ArchivoNarrow-Bold.ttf]], 16, 'NONE' local wrapperPosition = {'RIGHT', UIParent, 'RIGHT', -84, 0 } -local rewardSize = 32 +local rewardSize = 24 local oprint = B.print('Objectives') local bprint = B.print('Block') local tprint = B.print('Tracker') @@ -248,8 +248,17 @@ block.SelectionOverlay:SetPoint('TOPLEFT', selectionIndent, 0) block.SelectionOverlay:SetPoint('BOTTOMRIGHT') - block.icon:SetSize(rewardSize, rewardSize) - block.icon:SetPoint('TOPRIGHT', block, 'TOPRIGHT', -2, -2) + --block.icon:SetSize(rewardSize, rewardSize) + --block.icon:SetPoint() + local anchor, target, point, x, y = 'TOPRIGHT', block, 'TOPRIGHT', -2, -2 + for i, tile in ipairs(block.rewardTile) do + print(rewardSize) + tile:SetSize(rewardSize, rewardSize) + tile:ClearAllPoints() + tile:SetPoint(anchor, target, point, x, y) + block.rewardLabel[i]:SetPoint('TOP', tile, 'TOP', 0, -2) + anchor, target, point, x, y = 'TOPRIGHT', tile, 'TOPLEFT', -2, 0 + end --- methods for event handlers @@ -528,19 +537,29 @@ --info.itemButton = nil end - local tagPoint, tagAnchor, tagRelative = 'TOPRIGHT', block, 'TOPRIGHT' + local tagPoint, tagAnchor, tagRelative, x, y = 'TOPRIGHT', block, 'TOPRIGHT', -2, -2 - if info.rewardInfo then - print('has immediate reward') - if info.rewardInfo[1].type == 'currency' or info.rewardInfo[1].type == 'item' then - block.icon:Show() - block.iconLabel:SetText(info.rewardInfo[1].count) - block.icon:SetPoint(tagPoint, tagAnchor, tagRelative, -2, -2) - tagPoint, tagAnchor, tagRelative = 'TOPRIGHT', block.icon, 'TOPLEFT' - block.icon:SetTexture(info.rewardInfo[1].texture) + local numCurrency = 0 + for i, rewardTile in ipairs(block.rewardTile) do + local reward = info.rewardInfo[i] + if reward then + --rewardTile:SetPoint(tagPoint, tagAnchor, tagRelative, -2, -2) + rewardTile:SetTexture(reward.texture) + rewardTile:Show() + + print('updating reward tile #'.. i, reward.type, reward.count, reward.text, reward.texture) + if reward.count and reward.count > 1 then + block.rewardLabel[i]:SetText(reward.count) + block.rewardLabel[i]:Show() + end + + rewardTile:ClearAllPoints() + rewardTile:SetPoint(tagPoint, tagAnchor, tagRelative, x, y) + tagPoint, tagAnchor, tagRelative, x, y = 'TOPRIGHT', rewardTile, 'TOPLEFT', -2, 0 + else + rewardTile:Hide() + block.rewardLabel[i]:Hide() end - else - block.icon:Hide() end if info.selected then @@ -578,9 +597,6 @@ block.attachmentHeight = 0 local text, attachment, template - if info.statusKey and (Devian and Devian.InWorkspace()) then - handler:AddLine(block, info.statusKey, nil) - end if info.description and #info.description >= 1 then @@ -607,6 +623,10 @@ end end + if info.statusKey and (Devian and Devian.InWorkspace()) then + handler:AddLine(block, info.statusKey, nil) + end + for i = block.currentLine + 1, block.numLines do print(i, block.numLines) print(' - hide |cFFFF0088'..i..'|r', block.lines[i]) diff -r 48b3e3959a0a -r a3afe6c3771e ObjectiveTracker/ObjectiveTracker.lua --- a/ObjectiveTracker/ObjectiveTracker.lua Thu Apr 14 19:39:05 2016 -0400 +++ b/ObjectiveTracker/ObjectiveTracker.lua Fri Apr 15 07:01:40 2016 -0400 @@ -409,6 +409,67 @@ end end +local iprint = B.print('Info') +T.SetRewards = function(t, questID) + + SelectQuestLogEntry(GetQuestLogIndexByID(questID)) + local numQuestChoices = GetNumQuestLogChoices(); + local skillName, skillIcon, skillPoints = GetQuestLogRewardSkillPoints(); + local xp = GetQuestLogRewardXP(); + local playerTitle = GetQuestLogRewardTitle(); + ProcessQuestLogRewardFactions(); + local rewards = {} + local texture, name, isTradeskillSpell, isSpellLearned, hideSpellLearnText, isBoostSpell, garrFollowerID = GetQuestLogRewardSpell(questID) + if name then + tinsert(rewards,{ + type = 'spell', + name = name, + texture = texture, + }) + end + + t.numCurrencies = GetNumQuestLogRewardCurrencies(questID) + for i = 1, t.numCurrencies do + local name, texture, count = GetQuestLogRewardCurrencyInfo(i, questID) + tinsert(rewards,{ + type = 'currency', + index = i, + name = name, + texture = texture, + count = count + }); + end + -- items + t.numItems = GetNumQuestLogRewards(questID) + for i = 1, t.numItems do + local name, texture, count, quality, isUsable = GetQuestLogRewardInfo(i, questID) + tinsert(rewards, { + type = 'item', + index = i , + name = name, + texture = texture, + count = count, + quality = quality, + isUsable = isUsable + }); + end + -- money + + local money = GetQuestLogRewardMoney(questID) + if ( money > 0 ) then + tinsert(rewards, { + type = 'money', + name = GetMoneyString(money), + texture = "Interface\\Icons\\inv_misc_coin_01", + count = 0, + }); + end + + if #rewards >= 1 then + t.rewardInfo = rewards + end +end + local Play = function(file) if Devian and Devian.InWorkspace() then PlaySoundFile(file) end end function T:OnEvent (event, ...) diff -r 48b3e3959a0a -r a3afe6c3771e ObjectiveTracker/ObjectiveTracker.xml --- a/ObjectiveTracker/ObjectiveTracker.xml Thu Apr 14 19:39:05 2016 -0400 +++ b/ObjectiveTracker/ObjectiveTracker.xml Fri Apr 15 07:01:40 2016 -0400 @@ -329,18 +329,17 @@ - +