wow/buffalo2: ObjectiveTracker/BonusObjectives.lua comparison

comparison ObjectiveTracker/BonusObjectives.lua @ 38:1f8f9cc3d956

- module integration brought up to speed with current frame management structure

author	Nenue
date	Thu, 21 Apr 2016 11:36:41 -0400
parents	e84d645c8ab8
children	03ed70f846de

comparison

equal deleted inserted replaced

-:e84d645c8ab8
+:1f8f9cc3d956
 local iprint = B.print('Info')
 local Bonus = T.Bonus
 local UnitName, GetRealmName, GetQuestObjectiveInfo, GetTasksTable, GetTaskInfo = UnitName, GetRealmName, GetQuestObjectiveInfo, GetTasksTable, GetTaskInfo
 local GetMapNameByID, GetCurrentMapAreaID = GetMapNameByID, GetCurrentMapAreaID
-local tinsert, ipairs, pairs, tostring = tinsert, ipairs, pairs, tostring
+local tinsert, ipairs, pairs, tostring, wipe = tinsert, ipairs, pairs, tostring, table.wipe
 local GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime = GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime
-local STICKY_TASKS = true
+local TASK_DISPLAY_TEST = 1 -- 1: normal (is nearby or on the map) 2: strict (is nearby) 3: data exists
 --- 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
+print('GetTasksTable', questID, #data.objectives)
-print('  -- questID:', questID, #data.objectives)
 for i, o in ipairs(data.objectives) do
-print('    --', i, o.text)
+print('GetTasksTable', questID, i, o.text)
 end
+end
-end
 for questID, data in pairs(savedTasks) do
 if questID > 0  then
 local found = false
 for i = 1, #tasks do
 Bonus.Completed = {}
 Bonus.POI = {}
 Bonus.Scenario = {}
 Bonus.QuestBlock = {}
 Bonus.WatchInfo = {}
+local function CanShowTask(isInArea, isOnMap, existingTask, numObjectives)
+if TASK_DISPLAY_TEST == 1 then
+return (isInArea)
+elseif TASK_DISPLAY_TEST == 2 then
+return (isInArea and(isOnMap and existingTask))
+elseif TASK_DISPLAY_TEST == 3 then
+return true
+end
+end
 function Bonus:GetNumWatched ()
-if true then return 0, 0, nil end
-local print = iprint
+local print = self.print
 print(self.name, self)
 local tasks = InternalGetTasksTable()
 local numWatched = 0
 local numAll = 0
 local existingTasks = {}
-self.WatchInfo = {}
+wipe(self.WatchList)
-print('|cFFFFFF00Bonus.GetNumWatched()|r', #tasks)
+print('|cFF'..self.internalColor..'Bonus.GetNumWatched()|r', #tasks)
-print(' |cFF00FFFFInternalGetTaskInfo|r:')
+print('InternalGetTaskInfo')
 for i, questID in ipairs(tasks) do
 local isInArea, isOnMap, numObjectives = InternalGetTaskInfo(questID)
-local existingTask = self.QuestBlock[questID]
+local existingTask = self.InfoBlock[questID]
 local displayObjectiveHeader = false;
-local test = (isInArea or (isOnMap and existingTask))
+if CanShowTask(isInArea, isOnMap, existingTask) then
---local test = true
+print('TaskInfo', '|cFF00FF00showable objective list', questID)
-if test then
 self.Info[questID] = self.Info[questID] or {}
 local t = self.Info[questID]
 if (isOnMap or isInArea) and existingTask then
 t.areaID = GetCurrentMapAreaID()
 local _
 t.mapName, _, _, t.isMicroDungeon, t.microDungeonMapName = GetMapInfo()
-print('|cFF00FF00scooping map info (questID '..questID..'):|r', t.areaID, t.mapName)
+print('InternalGetTaskInfo', 'map data', t.areaID, t.mapName)
 end
 local taskTitle
+t.id = questID
 t.objectives = {}
 local taskFinished = true;
 for objectiveIndex = 1, numObjectives do
 local text, objectiveType, finished, displayAsObjective = InternalGetQuestObjectiveInfo(questID, objectiveIndex, false);
 displayObjectiveHeader = displayObjectiveHeader or displayAsObjective;
 text = ''
 end
 end
-print('  --', text, objectiveType, finished, displayAsObjective)
+print('TaskObjective', text, objectiveType, finished, displayAsObjective)
 t.objectives[objectiveIndex] = t.objectives[objectiveIndex] or  {}
 local  o = t.objectives[objectiveIndex]
 o.index = objectiveIndex
 o.text = text
 t.existingTask = existingTask
 t.questID = questID
 t.id = questID
 t.taskIndex = i
 t.title = taskTitle
-self.WatchInfo[i] = t
+self.WatchList[i] = t
-end
+elseif existingTask then
+print('TaskInfo', '|cFFFF4400hideable task', questID)
-print ('    |cFF00FF88#', i, 'questID', questID, 'inArea', isInArea, 'onMap', isOnMap, 'existing', (existingTask and 'Y' or 'N'), (test and '|cFF00FF00show|r' or '|cFFFF0088hide|r'))
+existingTask:Hide()
 end
-for i = 1, #self.usedBlocks do
+print ('TaskInfo', i, 'questID', questID, 'inArea', isInArea, 'onMap', isOnMap, 'existing', (existingTask and 'Y' or 'N'), (test and '|cFF00FF00show|r' or '|cFFFF0088hide|r'))
-self.usedBlocks[i]:Hide()
+end
-end
+self.numWatched = #self.WatchList
-self.numAll = #tasks
+self.numAll = #existingTasks
-self.numWatched = #self.WatchInfo
+return self.numWatched, self.numWatched, self.WatchList
-print('  stats:', self.numAll, 'active tasks,', self.numWatched, 'nearby or animating')
---return #tasks
-return #self.WatchInfo
 end
 --- info cleanup done when  turn-ins are detected
 Bonus.OnTurnIn = function(self, block, questID, xp, money)
+--[=[
 local info = self.Info[questID]
 if info.rewardInfo and #info.rewardInfo >= 1 then
 for i, reward in ipairs(info.rewardInfo) do
 --[[
 type = 'item',
 for o, j in ipairs(savedTasks[questID].objectives) do
 print('     |cFF00FFFF#'.. o ..'|r', j.type, j.finished)
 end
 print('adding', info.title, 'to cache')
+--]=]
 end
 Bonus.GetInfo = function(self, taskIndex)
 print(self.name, self)
 return self.WatchInfo[taskIndex]
 end
 --- Update hooks
-Bonus.UpdateObjectives = function(handler, block)
+Bonus.UpdateObjectives = function(handler, block, blockSchema)
+block.schema = blockSchema or 'default'
+local info = block.info
+block.title:SetText(info.title)
 Default.UpdateObjectives(handler, block)
-return 'default'
+return blockSchema
 end
-Bonus.UpdateLine = function(handler, block, line, data)
+Bonus.UpdateLine = function(handler, block, data)
 local info = block.info
 local print = lprint
 local text, attachment = '', nil
-line.displayColor = 'FFFFFF'
 if data.type == 'progressbar' then
 print('    |cFFFF44DDpercent='..tostring(GetQuestProgressBarPercent(info.questID)))
 local percent = 100
-attachment = T.SetWidget(line, data, 'ProgressBar', info.questID..'-'..data.index)
+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
 end
 attachment.value = percent
 attachment.maxValue = 100
-attachment:SetPoint('TOP', line, 'TOP', 0, 0)
 attachment.status:SetFormattedText(PERCENTAGE_STRING, percent)
-attachment:SetParent(handler.frame)
+--attachment:SetParent(handler.frame)
-print(attachment.status:GetText())
+--print(attachment.status:GetText())
 print('    |cFFFF0022** text:|r', data.text, '|cFFFF0022value:|r', data.value, '|cFFFF0022max:|r', data.maxValue)
 end
 text = data.text
-return text, attachment
+return text, attachment, 'default'
 end
 Bonus.Select = function(handler, block)
 print(handler, block)
 handler:OnTurnIn(block, block.info.questID)

Mercurial > wow > buffalo2

comparison ObjectiveTracker/BonusObjectives.lua @ 38:1f8f9cc3d956