wow/worldplan: WorldQuests.lua comparison

comparison WorldQuests.lua @ 45:db570c6a0ffb v1.0-rc12

- Fixed filter buttons losing their anchor after FlightMap interactions - Fixed flickering tooltips - Fixed a source of hangs while opening the world map, particularly in non-Broken-Isle continents. - Workaround for World Map Action Button: Temporarily activate blizzard POI buttons while a quest-targeting spell is on the cursor.

author	Nenue
date	Mon, 26 Dec 2016 10:20:52 -0500
parents	77c2ffb5c7f5
children	733785e306a3

comparison

equal deleted inserted replaced

-:59e9d66195dd
+:db570c6a0ffb
 -- WorldPlan
 -- WorldQuests.lua
 -- Created: 11/2/2016 3:40 PM
 -- %file-revision%
 local _, db = ...
-local WorldQuests = WorldPlanQuestsMixin
+local Module = WorldPlanQuestsMixin
 local MC_GetNumZones, MC_GetZoneInfo = C_MapCanvas.GetNumZones, C_MapCanvas.GetZoneInfo
 local TQ_GetQuestsForPlayerByMapID = C_TaskQuest.GetQuestsForPlayerByMapID -- This function is not yet documented
 local TQ_GetQuestZoneID = C_TaskQuest.GetQuestZoneID
 local GetMapInfo = GetMapInfo
 local print = DEVIAN_WORKSPACE and function(...) _G.print('WorldQuests', ...) end or function() end
 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 pairs = pairs
 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 numPins = 0
 local NumPinFrames = 1
-WorldQuests.TasksByID = {}
+Module.TasksByID = {}
 --%debug%
 local SetTimedCallbackForAllPins = function(seconds, callback)
 C_Timer.After(seconds, function()
 for id, pin in pairs(WorldPlanQuests.QuestsByID) do
 callback(pin)
 end
 end)
 end
-function WorldQuests:OnUpdate(sinceLast)
+function Module:OnUpdate(sinceLast)
 if self.filtersDirty or self.isStale then
 self:Refresh()
 end
 end
-function WorldQuests:Setup()
+function Module:Setup()
 print('|cFFFF4400'..self:GetName()..':Setup()')
 for mapID, mapName in pairs(WORLD_QUEST_MAPS) do
 db.QuestsByZone[mapID] = {}
 end
+hooksecurefunc("ClickWorldMapActionButton", function () self:OnClickWorldMapActionButton() end)
--- refresh positions any time blizzard does so (i.e. mousewheel zoom)
+hooksecurefunc("WorldMapScrollFrame_ReanchorQuestPOIs", function () self:Refresh() end)
-hooksecurefunc("WorldMapScrollFrame_ReanchorQuestPOIs", function()
+hooksecurefunc("WorldMap_UpdateQuestBonusObjectives", function () self:OnUpdateQuestBonusObjectives() end)
-print('|cFFFF4400WorldMapScrollFrame_ReanchorQuestPOIs')
+end
-self:Refresh(true)
-end)
+local InternalHideButton = function(button, index)
+button:Hide()
+if button.questID and db.QuestsByID[button.questID] then
--- hide the original world quest POIs
+if db.QuestsByID[button.questID].used and not db.QuestsByID[button.questID].filtered then
+db.QuestsByID[button.questID]:SetShown(true)
-hooksecurefunc("WorldMap_UpdateQuestBonusObjectives", function()
+end
-print('|cFFFF4400WorldMap_UpdateQuestBonusObjectives')
+end
-for i = 1, NUM_WORLDMAP_TASK_POIS do
+end
-local button = _G['WorldMapFrameTaskPOI'..i]
+local InternalShowButton = function(button, index)
-if button and button.worldQuest then
+button:Show()
-button:Hide()
+if button.questID and db.QuestsByID[button.questID] then
-end
+db.QuestsByID[button.questID]:SetShown(false)
 end
-end)
+end
-end
+function Module:OnUpdateQuestBonusObjectives()
+print('|cFFFF4400WorldMap_UpdateQuestBonusObjectives')
+local func = SpellCanTargetQuest() and InternalShowButton or InternalHideButton
+print(SpellCanTargetQuest())
+for i = 1, NUM_WORLDMAP_TASK_POIS do
+local button = _G['WorldMapFrameTaskPOI'..i]
+if button and button.worldQuest then
+func(button, i)
+end
+end
+end
+function Module:OnClickWorldMapActionButton()
+self.IsTargeting = SpellCanTargetQuest()
+self:OnUpdateQuestBonusObjectives()
+end
 local defaults = {}
 local REWARD_UNKNOWN = 768
-function WorldQuests:OnLoad()
+function Module:OnLoad()
 print('|cFFFF4400'..self:GetName()..':OnLoad()')
 self:SetParent(WorldMapFrame)
 WorldPlan:AddHandler(self, defaults)
 WorldMapPOIFrame = _G.WorldMapPOIFrame
 end
-function WorldQuests:OnMapInfo()
+function Module:OnMapInfo()
 if self:IsVisible() then
 self:Refresh()
 else
 self.isStale = true
 end
 end
-function WorldQuests:OnEvent (event, ...)
+function Module:OnEvent (event, ...)
 print('|cFFFFFF00'..self:GetName()..':OnEvent() '..event..'|r', GetTime(), ...)
 if event == 'QUEST_LOG_UPDATE' then
 local questID, added = ...
 if questID and added then
 end
 end
 local totalPins = 0
 local TQ_GetQuestLocation = C_TaskQuest.GetQuestLocation
-function WorldQuests:AcquirePin (info)
+function Module:AcquirePin (info)
 local questID = info.questId
 if not questID then
 return nil
 end
 C_TaskQuest.RequestPreloadRewardData(info.questId)
 return pin
 end
 -- remove from index and add it to the recycling heap
-function WorldQuests:ReleasePin (pin)
+function Module:ReleasePin (pin)
 local id = pin.questID
 if id then
 db.QuestsByID[id] = nil
 tinsert(db.FreePins, pin)
 print('|cFF00FF00-'.. (pin.mapID and GetMapNameByID(pin.mapID) or '???') ..'|r', id, pin.title)
 end
-function WorldQuests:GetBonusObjectives()
+function Module:GetBonusObjectives()
 local tasksTable = GetTasksTable()
 if tasksTable ~= nil then
 print('|cFF00FF88'..self:GetName()..':BonusObjectives()|r ')
 -- use tooltip object to extract item details
-function WorldQuests:GetRewardHeader(questID)
+function Module:GetRewardHeader(questID)
 local name, icon, quantity, quality, _, itemID = GetQuestLogRewardInfo(1, questID)
 local scanner = _G.WorldPlanTooltip
 local print = qprint
 if not itemID then
 return
 end
 local GetCurrentMapAreaID, GetMapNameByID= GetCurrentMapAreaID, GetMapNameByID
 local wipe, pairs = wipe, pairs
 -- create of update quest pins for a map and its underlying zones
-function WorldQuests:UpdateWorldQuests (mapID)
+function Module:UpdateWorldQuests (mapID)
 mapID = mapID or db.currentMapID
 if not mapID then
 -- info not available yet
 return
 if self.isStale and self:IsVisible() then
 self:Refresh()
 end
 end
-function WorldQuests:Report()
+function Module:Report()
 for i, pin in ipairs(db.UsedPins) do
 db:print(i, pin.questID, pin.title)
 end
 for id, pin in pairs(db.QuestsByID) do
 db:print(id, pin.worldQuestType, pin.rewardType, pin.title)
 end
 end
-function WorldQuests:Refresh(fromUser)
+function Module:Refresh(fromUser)
 self.currentMapID = GetCurrentMapAreaID()
 print('|cFF00FF88'..self:GetName()..':Refresh()|r', fromUser or '|cFFFFFF00internal')
 if not self:IsVisible() then
 print('  not visible, flag for later')
 self.isStale = true
 end
 wprint('  |cFF00FF88'..self:GetName()..':Refresh()|r', fromUser or '|cFFFFFF00internal')
 for index, pin in pairs(db.QuestsByID) do
 pin.used = nil
-pin:SetShown(false)
 end
 self:SetFilteredPins(db.QuestsByID)
 self:UpdateAnchors(nil, fromUser)
 self:Cleanup (fromUser)
 self.isStale = nil
 end
 -- update visibility states of all pins
-function WorldQuests:SetFilteredPins(pins)
+function Module:SetFilteredPins(pins)
 print('  |cFFFFFF00'..self:GetName()..':SetFilteredPins()|r', pins)
 pins = pins or db.QuestsByID
 for questID, pin in pairs(pins) do
 pin.filtered = pin:IsFiltered()
 pin.isStale =  true
 rprint('|cFF00FF00filter', pin.questID, pin.filtered, 'used:', pin.used)
 end
 end
 local abs = math.abs
-function WorldQuests:UpdateQuestButton(info, mapID)
+function Module:UpdateQuestButton(info, mapID)
 local questID, x, y = info.questId, info.x, info.y
 local pin = self:AcquirePin(info)
 if not pin then
 return
 end
 end
 db.QuestsByZone[mapID][questID] = pin
 end
 end
-function WorldQuests:UpdateMap(taskInfo, mapID)
+function Module:UpdateMap(taskInfo, mapID)
 print('Map', GetMapNameByID(mapID), GetMapNameByID(self.currentMapID))
 for index, info in pairs(taskInfo) do
 self:UpdateQuestButton(info, mapID)
 end
 end
-function WorldQuests:UpdateAnchors (fromUser)
+function Module:UpdateAnchors (fromUser)
 wipe(self.UsedPositions)
 print('  |cFF00FF00'..self:GetName()..':UpdateAnchors()', fromUser)
 self.hostFrame = WorldMapPOIFrame
 self:SetFilteredPins(db.QuestsByID)
 end
 end
 -- shows, animates, or hides pins based on their current visibility flags
-function WorldQuests:Cleanup (fromUser)
+function Module:Cleanup (fromUser)
 print('|cFFFFFF00'..self:GetName()..':Cleanup()|r')
 local print = rprint
 print('|cFFFFFF00'..self:GetName()..':Cleanup()|r')
 --local showQuestPOI = db.Config.EnablePins
 for questID, pin in pairs(db.QuestsByID) do
 local oV = pin:IsShown()
 if pin.used then
-pin:SetShown(true)
 pin.throttle = 1
 if oV == false then
 print('|cFF00FF00cleanup +|r', questID, pin.title)
 end
 else
 if oV == true then
 print('|cFFFF4400 -|r', questID, pin.title)
 end
 end
+pin:SetShown(pin.used or false)
 if pin.worldQuest and (not C_TaskQuest.IsActive(pin.questID)) then
 self:ReleasePin(pin)
 end
 pin.isStale = true

Mercurial > wow > worldplan

comparison WorldQuests.lua @ 45:db570c6a0ffb v1.0-rc12