wow/worldplan: WorldQuests.lua comparison

comparison WorldQuests.lua @ 69:31de7e9e7849

stop hiding pins when the timeleft returns 0; use C_TQ.IsActive

author	Nenue
date	Wed, 05 Apr 2017 11:36:06 -0400
parents	96183f981acb
children	d6c0bed32c51

comparison

equal deleted inserted replaced

-:cce68795f955
+:31de7e9e7849
 local TQ_GetQuestZoneID = C_TaskQuest.GetQuestZoneID
 local TQ_IsActive = C_TaskQuest.IsActive
 local pairs, ipairs, tinsert, tremove, wipe = pairs, ipairs, tinsert, tremove, table.wipe
 local GetTaskInfo, GetTasksTable, HaveQuestData = GetTaskInfo, GetTasksTable, HaveQuestData
 local GetTime = GetTime
-local SpellCanTargetQuest = SpellCanTargetQuest
+local SpellCanTargetQuest, IsQuestIDValidSpellTarget = SpellCanTargetQuest, IsQuestIDValidSpellTarget
 local tonumber, abs = tonumber, math.abs
 local GetQuestLogRewardInfo = GetQuestLogRewardInfo
 local GetCurrentMapAreaID, GetMapInfo, GetMapNameByID = GetCurrentMapAreaID, GetMapInfo, GetMapNameByID
 local rprint = DEVIAN_WORKSPACE and function(...) _G.print('WQRefresh', ...) end or function() end
 local qprint = DEVIAN_WORKSPACE and function(...) _G.print('POI', ...) end or function() end
 local wprint = DEVIAN_WORKSPACE and function(...) _G.print('WP', ...) end or function() end
 local mprint = DEVIAN_WORKSPACE and function(...) _G.print('Canvas', ...) end or function() end
+local ToggleButton = {}
+local callbacks = {}
 local PinBaseIndex = 1200
 local BROKEN_ISLES_ID, DALARAN_ID, AZSUNA_ID, VALSHARAH_ID, HIGHMOUNTAIN_ID, STORMHEIM_ID, SURAMAR_ID, EOA_ID = 1007, 1014, 1015,1018, 1024, 1017, 1033, 1096
 local WORLD_QUEST_MAPS = { [DALARAN_ID] = 'Dalaran70',  [AZSUNA_ID] = 'Azsuna',  [VALSHARAH_ID] = "Val'sharah",
 [HIGHMOUNTAIN_ID] = 'Highmountain', [STORMHEIM_ID] = 'Stormheim',  [SURAMAR_ID] = 'Suramar',  [EOA_ID] = 'EyeOfAszhara', }
 local REWARD_REAGENT = WORLD_QUEST_REWARD_TYPE_FLAG_MATERIALS
 local SCALE_FACTORS = {
 0.25, 0.7, 1
 }
-local ToggleButton = {}
+local currentScale = WorldMapDetailFrame:GetScale()
+local canTargetQuests
 local numShown = 0
 local numLoaded = 0
-local isDataLoaded
+local isDataLoaded = true
-local numPins = 0
+local numOverlays = 1
-local NumPinFrames = 1
 local scaleConstant = 1
 Module.TasksByID = {}
 --%debug%
 local SetTimedCallbackForAllPins = function(seconds, callback)
 self:UpdateQueuedPins()
 end
 end
-local currentScale = WorldMapDetailFrame:GetScale()
-function Module:RefreshIfChanged()
-local scaleCheck = WorldMapDetailFrame:GetScale()
-if scaleCheck ~= currentScale then
-print('|cFF00FF88scale changed from', currentScale, 'to', scaleCheck)
-self:Refresh()
-currentScale = scaleCheck
-end
-end
 function Module:Setup()
 print('|cFFFF4400'..self:GetName()..':Setup()')
 for mapID, mapName in pairs(WORLD_QUEST_MAPS) do
 db.QuestsByZone[mapID] = {}
 end
+for target, arg in pairs(callbacks) do
-hooksecurefunc("ClickWorldMapActionButton", function () self:OnClickWorldMapActionButton() end)
+print(type(target))
-hooksecurefunc("WorldMapScrollFrame_ReanchorQuestPOIs", function()
+if type(target) == 'table' then
-print("WorldMapScrollFrame_ReanchorQuestPOIs")
+local callerName = target:GetName()
-self:RefreshIfChanged()
+for name, method  in pairs(arg) do
-end)
+print(callerName, arg)
-hooksecurefunc("WorldMap_UpdateQuestBonusObjectives", function ()
+hooksecurefunc(target, name, function(...)
-self:OnUpdateQuestBonusObjectives()
+self:OnSecureHook(callerName .. '.' .. arg, method, ...)
 end)
-hooksecurefunc("WorldMapFrame_UpdateMap", function()
+end
-print("WorldMapFrame_UpdateMap")
+else
-self:RefreshIfChanged()
+hooksecurefunc(target, function(...)
-end)
+self:OnSecureHook(target, arg, ...)
-WorldMapFrame.UIElementsFrame.BountyBoard:SetSelectedBountyChangedCallback(function()
+end)
-self:OnSelectedBountyChanged()
+end
-end);
+end
-WorldMapFrame.UIElementsFrame.ActionButton:SetOnCastChangedCallback(function()
-print("CastChangedCallback")
-self:Refresh(true)
-end);
 self.Status = CreateFrame('Frame', nil, self)
 self.Status:SetPoint('TOPLEFT', WorldMapPOIFrame, 'TOPLEFT', 0, 0)
 self.Status:SetPoint('BOTTOMRIGHT', WorldMapPOIFrame, 'TOPRIGHT', 0, -4)
 self.Status.t = self.Status:CreateTexture(nil, 'OVERLAY')
 status.t:SetWidth(translateTo)
 else
 translateTo = numShown * status:GetWidth()
 status.t:SetWidth(translateTo)
 end
 end)
 self:SetAllPoints(WorldMapPOIFrame)
 for k,v in pairs( ToggleButton) do
 self.Toggle:SetScript(k,v)
 end
 self:Show()
 end
+callbacks.ClickWorldMapActionButton = function(WorldQuests)
+WorldQuests:GetUsedPOIs()
+end
+callbacks.WorldMap_UpdateQuestBonusObjectives = function(WorldQuests)
+WorldQuests:GetUsedPOIs()
+end
+callbacks.WorldMapFrame_UpdateMap = function(WorldQuests)
+WorldQuests:RefreshIfChanged()
+end
+callbacks.WorldMapScrollFrame_ReanchorQuestPOIs = function (WorldQuests)
+WorldQuests:RefreshIfChanged()
+end
+callbacks[WorldMapFrame.UIElementsFrame.BountyBoard] = {
+SetSelectedBountyIndex = function(WorldQuests)
+WorldQuests:UpdateBountyInfo()
+end
+}
+callbacks[WorldMapFrame.UIElementsFrame.ActionButton] = {
+UpdateCastingState = function(WorldQuests)
+WorldQuests:Refresh(true)
+end
+}
 local GetQuestBountyInfoForMapID, GetQuestLogTitle, GetQuestLogIndexByID, IsQuestFlaggedCompleted = GetQuestBountyInfoForMapID, GetQuestLogTitle, GetQuestLogIndexByID, IsQuestFlaggedCompleted
 function Module:UpdateBountyInfo()
 wipe(db.BountyInfo)
 db.selectedBounty = nil
 end
 end
 db.BountyUpdate = nil
 end
-function Module:OnSelectedBountyChanged()
-self:UpdateBountyInfo()
-end
 function Module:OnConfigUpdate()
 print('|cFFFFFF00OnConfigUpdate()|r')
 if db.Config.FadeWhileGrouped then
 db.PinAlpha = 0.15
 else
 if button.questID and db.QuestsByID[button.questID] then
 db.QuestsByID[button.questID]:SetShown(false)
 end
 end
-function Module:UpdateBlizzButtons()
+db.UsedPOIs = {}
+function Module:GetUsedPOIs()
-local func = SpellCanTargetQuest() and InternalShowButton or InternalHideButton
+db.canTargetQuests = SpellCanTargetQuest()
+local func = db.canTargetQuests and InternalShowButton or InternalHideButton
+wipe(db.UsedPOIs)
 for i = 1, NUM_WORLDMAP_TASK_POIS do
 local button = _G['WorldMapFrameTaskPOI'..i]
 if button and button.worldQuest then
 func(button, i)
-end
+db.UsedPOIs[button.questID] = button
 end
 end
+end
-function Module:OnUpdateQuestBonusObjectives()
-rprint('|cFFFF4400WorldMap_UpdateQuestBonusObjectives')
+function Module:OnSecureHook(callbackName, func, ...)
-self:UpdateBlizzButtons()
+rprint('|cFFFF4400'..callbackName..'|r', ...)
-end
+func(self, ...)
-function Module:OnClickWorldMapActionButton()
-rprint('|cFFFF4400ClickWorldMapActionButton')
-self:UpdateBlizzButtons()
 end
 local defaults = {}
 local REWARD_UNKNOWN = 768
 function Module:OnLoad()
 -- WORLD_MAP_UPDATE and PLAYER_ENTERING_WORLD are passed down from a higher level
 self:RegisterEvent('WORLD_QUEST_COMPLETED_BY_SPELL')
 self:RegisterEvent('SUPER_TRACKED_QUEST_CHANGED')
 self:RegisterEvent('SKILL_LINES_CHANGED')
 self:RegisterEvent('CURRENT_SPELL_CAST_CHANGED')
+self:RegisterEvent('ARTIFACT_UPDATE')
 end
 function Module:OnMapInfo(isBrokenIsle, isZoomedOut, mapAreaID, isNewMap, isMapOpen)
 print('|cFFFFFF00'..self:GetName()..':OnMapInfo()|r, mapAreaID =', mapAreaID,'visible =', isMapOpen, 'changed =', isNewMap)
 end
 local superTrackedQuestID
 function Module:OnEvent (event, ...)
 print('|cFFFFFF00'..self:GetName()..':OnEvent() '..event..'|r', GetTime(), ...)
-if (event == 'QUEST_LOG_UPDATE') or (event == 'SUPER_TRACKED_QUEST_CHANGED') then
+if (event == 'QUEST_LOG_UPDATE') then
-local questID, added = ...
+if self:IsVisible() then
-if questID and added then
+self:Refresh()
-local questPOI = self:AcquirePin(questID)
+else
-questPOI:GetQuestInfo()
-questPOI.isStale = true
 self.isStale = true
-else
-self:Refresh()
 end
 print('WorldMapFrame', WorldMapFrame:IsVisible(), 'hasUpdates:', self.isStale)
 elseif event == 'WORLD_QUEST_COMPLETED_BY_SPELL' then
 local questID = ...
 if questID and db.QuestsByID[questID] then
 local ak = C_ArtifactUI.GetArtifactKnowledgeMultiplier()
 if ak and (ak ~= self.akLevel) then
 print('push artifact knowledge update', self.akLevel, 'to', ak)
 self.akLevel = ak
 for index, pin in pairs( db.QuestsByID) do
-pin.dataLoaded = nil
+if pin.rewardType == REWARD_ARTIFACT_POWER then
-end
+pin.dataLoaded = nil
-self:Refresh()
+end
+end
 end
 elseif event == 'SUPER_TRACKED_QUEST_CHANGED' then
 if superTrackedQuestID and db.QuestsByID[superTrackedQuestID] then
 db.QuestsByID[superTrackedQuestID].isStale = true
 end
 if numFree >= 1 then
 pin = tremove(db.FreePins, numFree)
 --print('|cFF00FF00Re-using', pin:GetName())
 else
 totalPins = totalPins + 1
-local name = 'WorldPlanQuestMarker' .. NumPinFrames
+local name = 'WorldPlanQuestMarker' .. numOverlays
 --print('|cFF00FF00Creating', name)
 pin = CreateFrame('Frame', name, WorldMapPOIFrame, 'WorldPlanQuestPin')
 pin:SetFrameStrata('HIGH')
 pin.GetTypeInfo = function(frame, typeID)
 return self:GetTypeInfo(typeID)
 end
 pin:SetID(totalPins)
-NumPinFrames = NumPinFrames + 1
+numOverlays = numOverlays + 1
 --pin.iconBorder:SetVertexColor(0,0,0,1)
 end
 pin.questID = questID
 pin.worldQuest = true
 pin.throttle = 1
 pin.isActive = TQ_IsActive(questID)
 pin:CheckFilterRules()
 rprint(pin:GetID(), pin.filtered, pin.used)
-pin:SetShown(pin.used)
 return pin
 end
 -- remove from index and add it to the recycling heap
 pin:CheckFilterRules()
 local scaleFactor = SCALE_FACTORS[(pin.dataLoaded and not pin.filtered) and scaleConstant or 1]
 print(pin.title, pin.dataLoaded  and not pin.filtered, scaleFactor)
 pin:SetAnchor(nil, pin.x, pin.y, self.hostWidth, self.hostHeight, scaleFactor)
+if pin.isNew then
+pin:OnShow()
+end
 pin = tremove(db.UpdatedPins)
 end
 end
 -- create of update quest pins for a map and its underlying zones
 function Module:UpdateWorldQuests (mapID)
 print('  not visible, flag for later')
 self.isStale = true
 return self:MarkAllPins()
 end
 if not db.Config.EnablePins then
+numShown = 0
 return
 end
 wprint('  |cFF00FF88'..self:GetName()..':Refresh()|r')
 scaleConstant = db.isContinentMap and 2 or 3
 for index, pin in pairs(db.QuestsByID) do
 pin.used = nil
 end
-if SpellCanTargetQuest() then
+canTargetQuests = SpellCanTargetQuest()
-self:UpdateBlizzButtons()
+self:UpdateAnchors()
-else
-self:UpdateAnchors(nil)
+-- calculate quests shown
-end
---local showQuestPOI = db.Config.EnablePins
 numShown = 0
 numLoaded = 0
 for questID, pin in pairs(db.QuestsByID) do
 local oV = pin:IsShown()
 if pin.used then
 else
 if oV == true then
 rprint('|cFFFF4400 -|r', questID, pin.title)
 end
+pin.hideReason = "Not used in map area " .. (db.currentMapID)
 pin:HideFrames()
 end
 end
 print(numShown, 'shown', numLoaded, 'loaded')
 self.isStale = nil
 self.sizesDirty = nil
 self.isZoomDirty = nil
+end
+function Module:RefreshIfChanged()
+local scaleCheck = WorldMapDetailFrame:GetScale()
+if scaleCheck ~= currentScale then
+print('|cFF00FF88scale changed from', currentScale, 'to', scaleCheck)
+self:Refresh()
+currentScale = scaleCheck
+elseif self.isStale then
+print('|cFF00FF88isStale flag was set')
+self:Refresh()
+end
 end
 -- update visibility states of all pins
 function Module:MarkAllPins(pins)
 print('  |cFFFFFF00'..self:GetName()..':MarkAllPins()|r', pins)
 local pin = self:AcquirePin(info)
 if not pin then
 return
 end
 --print('  |- ', pin.questID, pin.title)
 rprint('|cFF00FF00update|r', pin.questID, pin.title)
 if x and y then
 local scaleFactor = SCALE_FACTORS[(pin.dataLoaded and not pin.filtered) and scaleConstant or 1]
 pin:SetFrameLevel(PinBaseIndex+pin:GetID())
 pin.owningFrame = WorldMapFrame
 pin:SetAnchor(WorldMapPOIFrame, x, y, self.hostWidth, self.hostHeight, scaleFactor)
 --tinsert(self.UsedPositions, pin)
 end
 if self:IsVisible() and (pin.isStale) then
 pin:Refresh()
 end
 if mapID then
 if not db.QuestsByZone[mapID] then
 db.QuestsByZone[mapID] = {}
 end
 db.QuestsByZone[mapID][questID] = pin
 end
 end
-function Module:UpdateMap(taskInfo, mapID)
+-- Updates quest markers in taskInfo while associating them with the given map
+function Module:UpdateQuestsForMap(taskInfo, mapID)
 rprint('Map', GetMapNameByID(mapID), GetMapNameByID(db.currentMapID))
 for index, info in pairs(taskInfo) do
 self:UpdateQuestButton(info, mapID)
 end
 end
+-- Used to refresh the visible quest markers
 function Module:UpdateAnchors ()
 wipe(self.UsedPositions)
 print('  |cFF00FF00'..self:GetName()..':UpdateAnchors()')
 self.hostWidth, self.hostHeight = WorldMapPOIFrame:GetSize()
 self.nudgeThrescholdX = 16/self.hostWidth
 self.nudgeThrescholdY = 16/self.hostHeight
 rprint('|cFF00FF00'..self:GetName()..':UpdateAnchors()')
 local mapFileName, textureHeight, textureWidth, isMicroDungeon, microDungeonMapName = GetMapInfo()
 if isMicroDungeon then
 return
 end
--- starts as true
 isDataLoaded = true
-numPins = 0
 local taskInfo = TQ_GetQuestsForPlayerByMapID(db.currentMapID)
 if taskInfo then
-self:UpdateMap(taskInfo, db.currentMapID)
+self:UpdateQuestsForMap(taskInfo, db.currentMapID)
 end
 local numZones = MC_GetNumZones(db.currentMapID)
 if numZones then
 for i = 1, numZones do
 local mapAreaID = MC_GetZoneInfo(db.currentMapID, i)
 local taskInfo = TQ_GetQuestsForPlayerByMapID(mapAreaID, db.currentMapID)
 if taskInfo then
-self:UpdateMap(taskInfo, mapAreaID)
+self:UpdateQuestsForMap(taskInfo, mapAreaID)
 end
 end
 end
 end

Mercurial > wow > worldplan

comparison WorldQuests.lua @ 69:31de7e9e7849