wow/buffalo2: ObjectiveTracker/BonusObjectives.lua comparison

comparison ObjectiveTracker/BonusObjectives.lua @ 33:64f2a9bbea79

- implementing structural revisions in bonus objectives - prevent instances of nil arithmetic - decide on where to keep style values - start widgets with dummy values for operability

author	Nenue
date	Fri, 15 Apr 2016 17:01:06 -0400
parents	a3afe6c3771e
children	9856ebc63fa4

comparison

equal deleted inserted replaced

-:a3afe6c3771e
+:64f2a9bbea79
 local B = select(2,...).frame
 local T = B:RegisterModule("ObjectiveTracker", _G.VeneerObjectiveWrapper, 'BuffFrame')
 local Default, Quest = T.DefaultHandler, T.Quest
 local print = B.print('Tracker')
 local lprint = B.print('Line')
+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 GetNumQuestLogRewardCurrencies, GetQuestLogRewardCurrencyInfo = GetNumQuestLogRewardCurrencies, GetQuestLogRewardCurrencyInfo
-local GetNumQuestLogRewards, GetQuestLogRewardInfo = GetNumQuestLogRewards, GetQuestLogRewardInfo
-local GetQuestLogRewardMoney, GetMoneyString = GetQuestLogRewardMoney, GetMoneyString
 local GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime = GetQuestProgressBarPercent, PERCENTAGE_STRING, GetTime
+local STICKY_TASKS = true
 --- Returns a tasks table modified to include recently completed objectives
 local InternalGetTasksTable = function()
 local savedTasks = T.Conf.TasksLog
 local char = UnitName("player")
 Bonus.POI = {}
 Bonus.Scenario = {}
 Bonus.QuestBlock = {}
 Bonus.WatchInfo = {}
 function Bonus:GetNumWatched ()
+local print = iprint
 print(self.name, self)
 local tasks = InternalGetTasksTable()
 local numWatched = 0
 local numAll = 0
+local existingTasks = {}
 self.WatchInfo = {}
 print('|cFFFFFF00Bonus.GetNumWatched()|r', #tasks)
 print('  TasksTable pull:')
 for i, questID in ipairs(tasks) do
 local isInArea, isOnMap, numObjectives = InternalGetTaskInfo(questID)
 --local test = true
 if test then
 self.Info[questID] = self.Info[questID] or {}
 local t = self.Info[questID]
-self.WatchInfo[i] = t
+if (isOnMap or isInArea) and existingTask then
-t.isInArea = isInArea
+t.areaID = GetCurrentMapAreaID()
-t.isOnMap = isOnMap
+local _
-t.existingTask = existingTask
+t.mapName, _, _, t.isMicroDungeon, t.microDungeonMapName = GetMapInfo()
-t.questID = questID
+print('|cFF00FF00scooping map info (questID '..questID..'):|r', t.areaID, t.mapName)
-t.id = questID
+end
+local taskTitle
 t.objectives = {}
-t.taskIndex = i
-T.SetRewards(t, questID)
-local taskTitle
 local taskFinished = true;
 for objectiveIndex = 1, numObjectives do
 local text, objectiveType, finished, displayAsObjective = InternalGetQuestObjectiveInfo(questID, objectiveIndex, false);
 displayObjectiveHeader = displayObjectiveHeader or displayAsObjective;
 if not taskTitle then
 o.finished = finished
 o.displayAsObjective = displayAsObjective
 print('     |cFF00FF88*', objectiveIndex, text)
 end
+T.SetRewards(t, questID)
 -- didn't get a name from progress bar? what about area name
 if not taskTitle then
 if isInArea then
 taskTitle = GetMapNameByID(GetCurrentMapAreaID())
 end
 end
+t.isInArea = isInArea
+t.isOnMap = isOnMap
+t.existingTask = existingTask
+t.questID = questID
+t.id = questID
+t.taskIndex = i
 t.title = taskTitle
+self.WatchInfo[i] = t
 end
 print ('    |cFF00FF88#', i, 'questID', questID, 'inArea', isInArea, 'onMap', isOnMap, 'existing', (existingTask and 'Y' or 'N'), (test and '|cFF00FF00show|r' or '|cFFFF0088hide|r'))
 end
 --return #tasks
 return #self.WatchInfo
 end
 --- info cleanup done when  turn-ins are detected
-Bonus.OnTurnIn = function(self, questID, xp, money)
+Bonus.OnTurnIn = function(self, block, questID, xp, money)
+local info = self.Info[questID]
-if #self.info.rewardInfo >= 1 then
+if info.rewardInfo and #info.rewardInfo >= 1 then
-for i, reward in ipairs(self.info.rewardInfo) do
+for i, reward in ipairs(info.rewardInfo) do
 --[[
 type = 'item',
 index = i ,
 name = name,
 texture = texture,
 print(' reward ', i, ' ', reward.type, reward.name, reward.count)
 end
 end
-print('|cFFFF8800'..self.name..':OnTurnIn call', questID, xp, money)
+print('|cFFFF8800'..block.name..':OnTurnIn call', questID, xp, money)
 local savedTasks = B.Conf.TasksLog
-self.Info[questID].completedTime = GetTime()
+info.completedTime = GetTime()
-self.Info[questID].animate = true
+info.animate = true
-T.SetAnimate(self.watchReasonModule)
+T.SetAnimate(handler.watchReasonModule)
-savedTasks[questID] = self.Info[questID]
+savedTasks[questID] = info
+print('adding', info.title, 'to cache')
 end
 Bonus.GetInfo = function(self, taskIndex)
 print(self.name, self)
 return self.WatchInfo[taskIndex]
 --- Update hooks
 Bonus.UpdateObjectives = function(handler, block)
 Default.UpdateObjectives(handler, block)
 end
-Bonus.UpdateLine = function(handler, objectiveType, line, data)
+Bonus.UpdateLine = function(handler, block, line, data)
 local info = block.info
 local print = lprint
 local text, attachment = '', nil
 line.displayColor = 'FFFFFF'
 print('  ', data.objectiveIndex,'|cFFFF0088-|r', data.objectiveType, data.text)
 if data.objectiveType == 'progressbar' then
 print('    |cFFFF44DDpercent='..tostring(GetQuestProgressBarPercent(info.questID)))
-data.value = GetQuestProgressBarPercent(info.questID) or 0
+local percent = 100
-data.maxValue = 100
 attachment = T.SetWidget(line, data, 'ProgressBar', info.questID..'-'..data.objectiveIndex)
+if not data.finished then
+percent = GetQuestProgressBarPercent(info.questID)
+end
+attachment.value = percent
+attachment.maxValue = 100
 attachment:SetPoint('TOP', line, 'TOP', 0, 0)
-attachment.status:SetFormattedText(PERCENTAGE_STRING, (data.value / data.maxValue))
+attachment.status:SetFormattedText(PERCENTAGE_STRING, (percent / 100))
 print('    |cFFFF0022** text:|r', data.text, '|cFFFF0022value:|r', data.value, '|cFFFF0022max:|r', data.maxValue)
 else
 text = data.text
 end
 return text, attachment
 end
-Bonus.Select = function(self)
+Bonus.Select = function(handler, block)
-Bonus:OnTurnIn(self.info.questID)
+print(handler, block)
+handler:OnTurnIn(block, block.info.questID)
 end
 Bonus.Remove = function(self)
 end

Mercurial > wow > buffalo2

comparison ObjectiveTracker/BonusObjectives.lua @ 33:64f2a9bbea79