Mercurial > wow > buffalo2

diff ObjectiveTracker/Quests.lua @ 32:a3afe6c3771e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- organize and display reward icons as a background hint - centralize reward data function
author Nenue
date Fri, 15 Apr 2016 07:01:40 -0400
parents 48b3e3959a0a
children 9856ebc63fa4
line wrap: on
line diff
--- a/ObjectiveTracker/Quests.lua	Thu Apr 14 19:39:05 2016 -0400
+++ b/ObjectiveTracker/Quests.lua	Fri Apr 15 07:01:40 2016 -0400
@@ -115,13 +115,21 @@
 
   Quest.Info[questID] = Quest.Info[questID] or {}
 
-  local showQuest = true
-  if isTask then
-    showQuest = false
-  end
 
   local q = Quest.Info[questID]
+  q.watchIndex = watchIndex
+  q.type = 'Quest'
+  q.id = questID
+  q.questID = questID
+  q.title = title
+  q.level = level
+  q.displayQuestID = displayQuestID
+  q.suggestedGroup = suggestedGroup
+  q.questLogIndex = questLogIndex
+
   -- re-use Blizzard logic for consistency
+  local showQuest = true
+  if isTask then showQuest = false end
   local watchMoney = false;
   local tagID, typeTag, frequencyTag, completionTag, completionText
   local isAccount, isFaction, isWeekly, isDaily = false, false, false, false
@@ -211,8 +219,11 @@
   end
   q.numObjectives = numObjectives
   q.objectives = objectives
+  q.requiredMoney = requiredMoney
   q.moneyInfo = moneyInfo
   q.timerInfo = timerInfo
+  q.failureTime = failureTime
+  q.timeElapsed = timeElapsed
   q.completionText = completionText
 
   -- POI data
@@ -316,25 +327,14 @@
     }
   end
 
-  -- resolved data
+  if moneyInfo or timerInfo then
+    numObjectives = #objectives
+  end
 
   -- raw data
-  q.watchIndex = watchIndex
-  q.type = 'Quest'
-  q.id = questID
-  q.questID = questID
-  q.title = title
-  q.level = level
-  q.displayQuestID = displayQuestID
-  q.suggestedGroup = suggestedGroup
-  q.questLogIndex = questLogIndex
-  q.numObjectives = numObjectives
-  q.requiredMoney = requiredMoney
   q.isComplete = isComplete
   q.startEvent = startEvent
   q.isAutoComplete = isAutoComplete
-  q.failureTime = failureTime
-  q.timeElapsed = timeElapsed
   q.questType = questType
   q.isTask = isTask
   q.isStory = isStory
@@ -345,8 +345,10 @@
   q.isStory = isStory
   q.isTask = isTask
   q.statusKey = temp_status
+  q.selected =  (questID == superTrackQuestID)
 
-  q.selected =  (questID == superTrackQuestID) -- call directly so artifact data doesn't become an issue
+  T.SetRewards(q, questID)
+
   self.WatchInfo[watchIndex] = q
   self.LogInfo[questLogIndex] = q