wow/worldplan: WorldQuests.lua comparison

comparison WorldQuests.lua @ 96:8591401ec278

- Fixed quest markers for other maps becoming visible due to ambiguous interpretations of pin.used. - Removed some redundant filter checking calls on pins obtained through Acquire()

author	Nenue
date	Sun, 14 May 2017 23:45:08 -0400
parents	b29b35cb8539
children	5d90d09cb7b7

comparison

equal deleted inserted replaced

-:b29b35cb8539
+:8591401ec278
 local GetQuestLogRewardInfo = GetQuestLogRewardInfo
 local GetCurrentMapAreaID, GetMapInfo, GetMapNameByID = GetCurrentMapAreaID, GetMapInfo, GetMapNameByID
 local GetQuestBountyInfoForMapID, GetQuestLogTitle, GetQuestLogIndexByID, IsQuestComplete = GetQuestBountyInfoForMapID, GetQuestLogTitle, GetQuestLogIndexByID, IsQuestComplete
 local HaveQuestRewardData = HaveQuestRewardData
 local TQ_GetQuestLocation = C_TaskQuest.GetQuestLocation
+local InCombatLockdown, hooksecurefunc = InCombatLockdown, hooksecurefunc
 local ToggleButton = {}
 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 continentScanned
 local layoutDirty = true
 local bountiesDirty = true
 local artifactPowerDirty = true
+local hooksDirty = true
 local currentScale = WorldMapDetailFrame:GetScale()
 local canTargetQuests
 local isDataLoaded = true
 local artifactKnowledgeLevel
 local superTrackedQuestID
 callbacks[ActionButton] = {}
 callbacks[ActionButton].UpdateCastingState = function(WorldQuests)
 WorldQuests:Refresh('CASTING_STATE_CHANGED')
 end
-function Module:Setup()
+callbacks.UseWorldMapActionButtonSpellOnQuest = function(questID)
---print('|cFFFF4400'..self:GetName()..':Setup()')
+if db.QuestsByID[questID] then
-for mapID, mapName in pairs(WORLD_QUEST_MAPS) do
+db.QuestsByID[questID].isStale = true
-db.QuestsByZone[mapID] = {}
+end
 end
+function Module:SetupCallbacks()
+if InCombatLockdown() then
+return nil
+end
+print('SetupCallbacks()')
 for target, arg in pairs(callbacks) do
 --print(type(target))
 if type(target) == 'table' then
 local callerName = target:GetName() or tostring(target)
 for name, method  in pairs(arg) do
 self:OnSecureHook(target, arg, ...)
 end)
 end
 end
+end
+function Module:Setup()
+--print('|cFFFF4400'..self:GetName()..':Setup()')
+for mapID, mapName in pairs(WORLD_QUEST_MAPS) do
+db.QuestsByZone[mapID] = {}
+end
+hooksDirty = self:SetupCallbacks()
 self:SetAllPoints(WorldMapFrame.UIElementsFrame)
 self:UpdateArtifactPower()
 self:UpdateBounties('SETUP')
 self:Show()
 end
 -- re-anchors and scales pins that have had either of these changed due to data loading delays
 function Module:UpdateNext()
 --print('|cFF00FF88UpdateNext()')
 local pin = tremove(db.UpdatedPins)
--- criteria state is asserted independently
 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)
 if pin.used then
+pin:SetShown(true)
 pin:SetAnchor(nil, pin.x, pin.y, self.hostWidth, self.hostHeight, scaleFactor)
-if pin:IsVisible() then
+pin:Refresh()
-pin:Refresh()
+else
-else
+print('|cFFFF4400flagging queued pin that got hidden:', pin.title)
 pin.isStale = true
-end
 end
 end
 function Module:UpdateBounties(...)
 print('|cFF00FF88BountyInfo()|r', ...)
 artifactPowerDirty = nil
 end
 local msg = '|cFF00FF88WorldQuests:Refresh()|r|cFF00FFFF'
 function Module:Refresh(...)
+if hooksDirty then
+hooksDirty = self:SetupCallbacks()
+end
 if not self:IsVisible() then
 print('|cFFFF4400Refresh()|r', ...)
---layoutDirty = true
 return
 else
---
 if lastRefresh == GetTime() then
 print('|cFFFF4400multiple refreshes tried')
 end
 lastRefresh = GetTime()
---rprint(msg, ...)
 print(msg, lastRefresh, ...)
 end
 if not db.Config.EnablePins then
 numShown = 0
 self.refreshBenchMark = GetTime()
 self.refreshBenchMarkTicker = 2
 print('starting bench', self.refreshBenchMark)
 return
 end
---wprint('  '..msg)
 scaleConstant = db.isContinentMap and 2 or 3
 canTargetQuests = SpellCanTargetQuest()
 for index, pin in pairs(db.QuestsByID) do
 pin.used = nil
 end
 self:UpdateAnchors(...)
---[[
-if bountiesDirty then
---print('  bounties dirty, pushing that')
-self:UpdateBounties()
-end
---]]
 if artifactPowerDirty and not InCombatLockdown() then
 self:UpdateArtifactPower()
 end
 -- calculate quests shown
 numShown = 0
 numLoaded = 0
 for questID, pin in pairs(db.QuestsByID) do
 local oV = pin:IsShown()
 if pin.used then
+print('show', pin.title)
 pin.throttle = 1
---[[
-if oV == false then
---rprint('|cFF00FF00cleanup +|r', questID, pin.title)
-end
---]]
 pin:SetShown(true)
 numShown = numShown + 1
 if pin.dataLoaded then
 numLoaded = numLoaded + 1
 end
 else
---[[
+if pin:IsShown() then
-if oV == true then
+print('|cFFFF4400need to remove', pin.title)
-rprint('|cFFFF4400 -|r', questID, pin.title)
 end
---]]
 pin.hideReason = "Not used in map area " .. (db.currentMapID)
 pin:SetShown(false)
 end
 end
---print('flags ', layoutDirty, self.isStale)
---print(' ', numShown, 'shown,', numLoaded, 'with data')
 --
 self.refreshBenchMark = GetTime()
 self.refreshBenchMarkTicker = 2
 print('|cFF00FFFFRefreshIfChanged()|r', refreshReason)
 self.isStale = true
 end
 end
--- marks a pin set for passive update
-function Module:MarkAllPins(pins)
---print('  |cFFFFFF00'..self:GetName()..':MarkAllPins()|r', pins)
-pins = pins or db.QuestsByID
-for questID, pin in pairs(pins) do
-pin.isStale =  true
---rprint('|cFF00FF00filter', pin.questID, pin.filtered, 'used:', pin.used)
-end
-end
 -- Walks the current map tree and fires updates as needed
 function Module:UpdateAnchors (event)
 wipe(self.UsedPositions)
 local hostWidth, hostHeight = WorldMapPOIFrame:GetSize()
 end
 end
 end
 end
--- Applies map association to the pins corresponding with each TaskInfo item
+-- Attempt to display the pins for quests in taskInfo
 function Module:UpdateQuestsForMap(taskInfo, mapID)
 print('|cFF00FF00UpdateQuestsForMap()|r', GetMapNameByID(mapID), GetMapNameByID(db.currentMapID), layoutDirty)
 if db.QuestsByZone[mapID] then
 wipe(db.QuestsByZone[mapID])
 elseif db.isBrokenIsle then
 continentScanned = true
 end
+print('layoutDirty =',layoutDirty)
 for index, info in pairs(taskInfo) do
 local questID, x, y = info.questId, info.x, info.y
 local pin = self:AcquirePin(info)
-if pin then
+if pin.canShow then
 pin.used = true
-print(pin.title, pin.isStale, layoutDirty, (pin.owningFrame ~= WorldMapFrame))
+print('using', pin.title, (pin.owningFrame ~= WorldMapFrame))
-if pin:IsShown() and (layoutDirty or pin.isStale or (pin.owningFrame ~= WorldMapFrame)) then
+if layoutDirty or (pin.owningFrame ~= WorldMapFrame) then
 local scaleFactor = SCALE_FACTORS[(not pin.filtered and scaleConstant) or 1]
 pin.owningFrame = WorldMapFrame
 pin:SetAnchor(WorldMapPOIFrame, x, y, self.hostWidth, self.hostHeight, scaleFactor)
 if pin.isStale then
 pin:Refresh('WORLDMAP_REFRESH ' .. GetTime())
 end
-else
+end
-if layoutDirty then
+if db.QuestsByZone[mapID] then
-pin.isStale = true
-end
-end
-if db.QuestsByZone[mapID] and pin.used then
 db.QuestsByZone[mapID][questID] = pin
 end
+else
+print('|cFFFF4400not using|r', pin.title)
 end
 end
 end
 -- locates or creates a corresponding pin frame for the provided TaskInfo data

Mercurial > wow > worldplan

comparison WorldQuests.lua @ 96:8591401ec278