wow/worldplan: WorldQuests.lua comparison

comparison WorldQuests.lua @ 73:25f7dbc20a72

fix WorldMapTooltip getting stranded when flightmap is closed - quests that are not valid spell targets will have their icon go red - auto-complete scrolls will no longer hide pin frames; instead they become click through and blizzard POIs are activated beneath for taint-free interaction

author	Nenue
date	Fri, 07 Apr 2017 07:20:28 -0400
parents	6db0b9696936
children	2ba11b25aa7f

comparison

equal deleted inserted replaced

-:6db0b9696936
+:25f7dbc20a72
 self:UpdateBounties('SETUP')
 self:Show()
 end
 callbacks.ClickWorldMapActionButton = function(WorldQuests)
-WorldQuests:GetUsedPOIs()
+WorldQuests:Refresh('CLICK_MAP_ACTION_BUTTON')
 end
 callbacks.WorldMap_UpdateQuestBonusObjectives = function(WorldQuests)
-WorldQuests:GetUsedPOIs()
+WorldQuests:UpdateTaskPOIs()
 end
 callbacks.WorldMapFrame_UpdateMap = function(WorldQuests)
 WorldQuests:RefreshIfChanged()
 end
 callbacks.WorldMapScrollFrame_ReanchorQuestPOIs = function (WorldQuests)
 end
 callbacks[BountyBoard] = {}
 callbacks[BountyBoard].SetSelectedBountyIndex = function(WorldQuests)
 WorldQuests:UpdateBounties('BOUNTY_SELECTED')
-WorldQuests:RefreshIfChanged()
+WorldQuests:Refresh('BOUNTY_SELECTED')
 end
 callbacks[ActionButton] = {}
 callbacks[ActionButton].UpdateCastingState = function(WorldQuests)
-WorldQuests:Refresh(true)
+WorldQuests:Refresh('CASTING_STATE_CHANGED')
 end
 function Module:OnConfigUpdate()
 print('|cFFFFFF00OnConfigUpdate()|r')
 if db.Config.FadeWhileGrouped then
 ToggleButton.OnShow(self.Toggle)
 end
 local InternalHideButton = function(button, index)
 button:Hide()
-if button.questID and db.QuestsByID[button.questID] then
-if db.QuestsByID[button.questID].used and not db.QuestsByID[button.questID].filtered then
-db.QuestsByID[button.questID]:SetShown(true)
-end
-end
 end
 local InternalShowButton = function(button, index)
 button:Show()
-if button.questID and db.QuestsByID[button.questID] then
-db.QuestsByID[button.questID]:SetShown(false)
-end
 end
 db.UsedPOIs = {}
-function Module:GetUsedPOIs()
+function Module:UpdateTaskPOIs()
-db.canTargetQuests = SpellCanTargetQuest()
+canTargetQuests = SpellCanTargetQuest()
-local func = db.canTargetQuests and InternalShowButton or InternalHideButton
+local func = canTargetQuests and 'Show' or 'Hide'
-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)
+button[func](button)
-db.UsedPOIs[button.questID] = button
 end
 end
 end
 function Module:OnSecureHook(callbackName, func, ...)
 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')
+self:RegisterEvent('QUEST_LOG_UPDATE')
 end
 local artifactKnowledgeMultiplier
 local superTrackedQuestID
 function Module:OnEvent (event, ...)
 print('|cFFFFFF00'..self:GetName()..':OnEvent() '..event..'|r', GetTime(), ...)
 if (event == 'QUEST_LOG_UPDATE') then
-if self:IsVisible() then
+self:UpdateBounties(event)
-self:Refresh()
+self:RefreshIfChanged(event)
-else
-self.isStale = true
-end
-print('WorldMapFrame', WorldMapFrame:IsVisible(), 'hasUpdates:', self.isStale)
 elseif event == 'WORLD_QUEST_COMPLETED_BY_SPELL' then
 local questID = ...
+self:UpdateBounties(event)
 if questID and db.QuestsByID[questID] then
 self:ReleasePin(db.QuestsByID[questID])
 rprint('|cFFFF4400release|r', questID)
 end
+self:Refresh(event)
 elseif event == 'SKILL_LINES_CHANGED' or event == 'CURRENT_SPELL_CAST_CHANGED' then
 self:Refresh(event)
 elseif event == 'ARTIFACT_UPDATE' then
 local akCheck = C_ArtifactUI.GetArtifactKnowledgeMultiplier()
 if akCheck and (akCheck ~= artifactKnowledgeMultiplier) then
 end
 end
+local bountyQuests = {}
 local bountyInfo = {}
 local bountyDisplayLocation, bountyLockedQuestID, selectedBountyIndex, selectedBountyQuestID
 function Module:UpdateBounties(...)
 print('|cFF00FF88BountyInfo()|r', ...)
 wipe(db.BountiesByFactionID)
+wipe(bountyQuests)
-bountiesDirty = nil
 db.selectedBounty = nil
 selectedBountyIndex = BountyBoard:GetSelectedBountyIndex()
 bountyInfo, bountyDisplayLocation, bountyLockedQuestID = GetQuestBountyInfoForMapID(db.currentMapID, bountyInfo)
 local numBounties = 0
-for index, data in ipairs(bountyInfo) do
+for index, info in ipairs(bountyInfo) do
-if data.factionID then
+if info.factionID then
 numBounties = numBounties + 1
-data.index = index
+info.index = index
-data.complete =  IsQuestComplete(data.questID)
+info.complete =  IsQuestComplete(info.questID)
-if not data.complete then
+if not info.complete then
-db.BountiesByFactionID[data.factionID] = data
+db.BountiesByFactionID[info.factionID] = info
 if index == selectedBountyIndex then
-db.selectedBounty = data
+db.selectedBounty = info
-selectedBountyQuestID = data.questID
+selectedBountyQuestID = info.questID
 end
-print(' ', index, data.factionID, GetQuestLogTitle(GetQuestLogIndexByID(data.questID)), data.complete, (index == selectedBountyIndex) and 'SELECTED' or '')
+print(' ', index, info.factionID, GetQuestLogTitle(GetQuestLogIndexByID(info.questID)), info.complete, (index == selectedBountyIndex) and 'SELECTED' or '')
-end
+bountyQuests[info.questID] = info
 end
 end
+end
-local numUpdated = 0
+bountiesDirty = nil
-local numHidden = 0
-for questID, pin in pairs(db.QuestsByID) do
-end
---print(numUpdated, 'changes from Bounty Board ('..tostring(numHidden)..' hidden)')
 end
 function Module:OnMapInfo(isBrokenIsle, isZoomedOut, mapAreaID, isNewMap, isMapOpen)
 if isNewMap then
-print('|cFF00FF88'..self:GetName()..':OnMapInfo()|r, mapAreaID =', mapAreaID,'visible =', isMapOpen, 'changed =', isNewMap)
+print('|cFF00FF88OnMapInfo()|r, mapAreaID =', mapAreaID,'visible =', isMapOpen, 'changed =', isNewMap)
 if isMapOpen then
 self:Refresh(true)
 else
 self.isStale = true
 end
 local msg = '|cFF00FF88WorldQuests:Refresh()|r|cFF00FFFF'
 function Module:Refresh(...)
 rprint(msg, ...)
-print('|cFF00FF88WorldQuests:Refresh()|r', ...)
 if not self:IsVisible() then
-print('  not visible, flag for later')
+rprint('|cFF00FF88WorldQuests:Refresh()|r', ...)
 self.isStale = true
 return self:MarkAllPins()
-end
+else
+rprint('|cFF00FF88WorldQuests:Refresh()|r', ...)
+print('|cFF00FF88WorldQuests:Refresh()|r', ...)
+end
 if not db.Config.EnablePins then
 numShown = 0
 return
 end
 wprint('  '..msg)
-layoutDirty = nil
 scaleConstant = db.isContinentMap and 2 or 3
 canTargetQuests = SpellCanTargetQuest()
 for index, pin in pairs(db.QuestsByID) do
 pin.used = nil
 self:UpdateAnchors()
 if bountiesDirty then
 print('  bounties dirty, pushing that')
 self:UpdateBounties()
-bountiesDirty = nil
 end
 -- calculate quests shown
 numShown = 0
 end
 end
-print(numShown, 'shown,', numLoaded, 'with data')
+print(' ', numShown, 'shown,', numLoaded, 'with data')
 if numShown > numLoaded then
 self.Status:Show()
 end
+layoutDirty = nil
 self.isStale = nil
 self.sizesDirty = nil
 self.isZoomDirty = nil
 end
+local refreshReason
 function Module:RefreshIfChanged()
 local scaleCheck = WorldMapDetailFrame:GetScale()
+refreshReason = nil
 if scaleCheck ~= currentScale then
-print('|cFF00FF88RefreshIfChanged()|r map scale updated')
+refreshReason = 'map scale updated'
 self:Refresh('WORLD_MAP_SCALE_CHANGED')
 currentScale = scaleCheck
 elseif self.isStale or layoutDirty then
-print('|cFF00FF88RefreshIfChanged()|r layout is dirty')
+refreshReason = 'layout is marked dirty'
+end
+if not refreshReason then
+return
+end
+if self:IsVisible() then
+print('|cFF00FFFFRefreshIfChanged()|r', refreshReason)
 self:Refresh()
+else
+rprint('|cFF00FFFFRefreshIfChanged()|r flagging for later refresh', refreshReason)
+self.isStale = true
 end
 end
 -- update visibility states of all pins
 function Module:MarkAllPins(pins)
 pin.owningFrame = WorldMapFrame
 pin:SetAnchor(WorldMapPOIFrame, x, y, self.hostWidth, self.hostHeight, scaleFactor)
 --tinsert(self.UsedPositions, pin)
 end
 local isCriteria, isBounty
 if pin.factionID then
 if db.BountiesByFactionID[pin.factionID] then
 isCriteria = true
 end
 if selectedBountyQuestID then
 isBounty = IsQuestCriteriaForBounty(pin.questID, selectedBountyQuestID) and true or nil
 end
 end
-if (pin.isBounty ~= isBounty) or (pin.isCriteria ~= isCriteria) then
+local isSpellTarget
-print(pin.isBounty, '~=', isBounty)
+if canTargetQuests then
-print(pin.isCriteria, '~=', isCriteria)
+isSpellTarget = IsQuestIDValidSpellTarget(pin.questID)
+end
+if (pin.isBounty ~= isBounty) or (pin.isCriteria ~= isCriteria) or (pin.isSpellTarget ~= isSpellTarget) then
+pin.isSpellTarget = isSpellTarget
 pin.isBounty = isBounty
 pin.isCriteria = isCriteria
 if pin:IsVisible() then
 --print(' changed', pin.title)
 --numUpdated = numUpdated + 1
 pin:Refresh('BOUNTY_UPDATE')
 else
 --numHidden = numHidden + 1
 pin.isStale = true
 end
-layoutDirty = true
 end
 if self:IsVisible() and (pin.isStale) then
 pin:Refresh()
 end

Mercurial > wow > worldplan

comparison WorldQuests.lua @ 73:25f7dbc20a72