wow/buffalo2: ObjectiveTracker/BonusObjectives.lua comparison

comparison ObjectiveTracker/BonusObjectives.lua @ 40:03ed70f846de

- move block accessors into a new file - define a tMove function for reconciling the free/used tables as needed - when retrieving an old block frame, confirm ID still matches; resolves multiple watch items on one block - stop any animations when a block is freed; resolves stuck flare graphics

author	Nenue
date	Sun, 24 Apr 2016 14:15:25 -0400
parents	1f8f9cc3d956
children

comparison

equal deleted inserted replaced

-:92534dc793f2
+:03ed70f846de
 local GetMapNameByID, GetCurrentMapAreaID = GetMapNameByID, GetCurrentMapAreaID
 local tinsert, ipairs, pairs, tostring, wipe = tinsert, ipairs, pairs, tostring, table.wipe
 local GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime = GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime
 local TASK_DISPLAY_TEST = 1 -- 1: normal (is nearby or on the map) 2: strict (is nearby) 3: data exists
+--- Holds data for recently completed tasks
+local completedTasks = {}
 --- Returns a tasks table modified to include recently completed objectives
 local InternalGetTasksTable = function()
 local print = Bonus.print
-local savedTasks = T.Conf.TasksLog
 local char = UnitName("player")
 local realm = GetRealmName()
 local tasks = GetTasksTable()
 for questID, data in pairs(Bonus.Info) do
 for i, o in ipairs(data.objectives) do
 print('GetTasksTable', questID, i, o.text)
 end
 end
-for questID, data in pairs(savedTasks) do
+for questID, data in pairs(completedTasks) do
 if questID > 0  then
 local found = false
 for i = 1, #tasks do
 if tasks[i] == questID then
 found = true
 end
 return tasks
 end
 --- Returns an entry from the composed tasks table if possible, otherwise makes an API pull
 local InternalGetTaskInfo = function(questID)
-local completedTasks = T.Conf.TasksLog
 if completedTasks[questID] then
+-- if it's a recently completed task, use the information stored for it
 return true, true, #completedTasks[questID].objectives
 else
 return GetTaskInfo(questID)
 end
 end
 --- Same as above but for the objective entries
 local InternalGetQuestObjectiveInfo = function(questID, objectiveIndex)
-local completedTasks = T.Conf.TasksLog
 if ( completedTasks[questID] ) then
 print('using internal data')
 return completedTasks[questID].objectives[objectiveIndex], completedTasks[questID].objectiveType, true;
 else
 return GetQuestObjectiveInfo(questID, objectiveIndex, false);
 for i, questID in ipairs(tasks) do
 local isInArea, isOnMap, numObjectives = InternalGetTaskInfo(questID)
 local existingTask = self.InfoBlock[questID]
 local displayObjectiveHeader = false;
-if CanShowTask(isInArea, isOnMap, existingTask) then
+local displayTask = CanShowTask(isInArea, isOnMap, existingTask)
+if displayTask then
 print('TaskInfo', '|cFF00FF00showable objective list', questID)
 self.Info[questID] = self.Info[questID] or {}
 local t = self.Info[questID]
 if (isOnMap or isInArea) and existingTask then
 end
 local taskTitle
 t.id = questID
 t.objectives = {}
-local taskFinished = true;
+local isComplete = true;
 for objectiveIndex = 1, numObjectives do
 local text, objectiveType, finished, displayAsObjective = InternalGetQuestObjectiveInfo(questID, objectiveIndex, false);
 displayObjectiveHeader = displayObjectiveHeader or displayAsObjective;
 if not taskTitle then
 if objectiveType == 'progressbar' and not text:match('^%d%+\\%d+') then
 o.index = objectiveIndex
 o.text = text
 o.type = objectiveType
 o.finished = finished
 o.displayAsObjective = displayAsObjective
+isComplete = (isComplete and finished)
 end
 T.SetRewards(t, questID)
 -- didn't get a name from progress bar? what about area name
 t.existingTask = existingTask
 t.questID = questID
 t.id = questID
 t.taskIndex = i
 t.title = taskTitle
+t.isComplete = isComplete
 self.WatchList[i] = t
 elseif existingTask then
 print('TaskInfo', '|cFFFF4400hideable task', questID)
 existingTask:Hide()
 end
-print ('TaskInfo', i, 'questID', questID, 'inArea', isInArea, 'onMap', isOnMap, 'existing', (existingTask and 'Y' or 'N'), (test and '|cFF00FF00show|r' or '|cFFFF0088hide|r'))
+print ('TaskInfo', i, '|cFFFFFF00'.. questID..'|r', '('..(isInArea and '|cFF88FF88' or '|cFF666666') .. 'isInArea|r', 'AND', (isOnMap and '|cFF88FF88' or '|cFF666666') .. 'isOnMap|r)', 'OR', (existingTask and '|cFF88FF88' or '|cFF666666') .. 'existingTask|r', (displayTask and '|cFF00FF00show|r' or '|cFFFF4400hide|r'))
 end
 self.numWatched = #self.WatchList
 self.numAll = #existingTasks
 return self.numWatched, self.numWatched, self.WatchList
+end
+Bonus.OnEvent = function(block, event, ...)
+if event == 'QUEST_LOG_UPDATE' then
+local info = block.info
+local isInArea, isOnMap, numObjectives = InternalGetTaskInfo(info.questID)
+if not CanShowTask(isInArea, isOnMap, block, numObjectives) then
+block:Hide()
+end
+end
+end
+Bonus.GetBlock = function(self, index)
+local block = Default.GetBlock(self, index)
+block:SetScript('OnEvent', self.OnEvent)
+block:RegisterEvent('QUEST_LOG_UPDATE')
+return block
 end
 --- info cleanup done when  turn-ins are detected
 Bonus.OnTurnIn = function(self, block, questID, xp, money)
 --[=[
 local print = lprint
 local text, attachment = '', nil
 if data.type == 'progressbar' then
 print('    |cFFFF44DDpercent='..tostring(GetQuestProgressBarPercent(info.questID)))
 local percent = 100
+if not data.finished then
+percent = GetQuestProgressBarPercent(info.questID)
+end
+data.value = percent
+data.maxValue = 100
 attachment = T.GetWidget(data, 'StatusBar', info.questID..'-'..data.index)
 attachment:SetParent(block)
-if not data.finished then
-percent = GetQuestProgressBarPercent(info.questID)
-end
-data.value = percent
-data.maxValue = 100
 print(attachment:GetNumPoints())
 for i = 1, attachment:GetNumPoints() do
 print('  ',attachment:GetPoint(i))
 end
 attachment.value = percent
 attachment.maxValue = 100
 attachment.status:SetFormattedText(PERCENTAGE_STRING, percent)
 --attachment:SetParent(handler.frame)

Mercurial > wow > buffalo2

comparison ObjectiveTracker/BonusObjectives.lua @ 40:03ed70f846de