wow/worldplan: WorldQuests.lua comparison

comparison WorldQuests.lua @ 49:dbd81d49af02

- Solve more frame data flagging issues - Unify method for resolving filter and visibility states - Flight Map modifications respect filter settings - Solve initial draw issues with tag icon, filter state handling - Solve issues with text layer synchronization during map changes

author	Nenue
date	Thu, 29 Dec 2016 13:31:20 -0500
parents	c0b88bd1e40b
children	6439015d74b1

comparison

equal deleted inserted replaced

-:c0b88bd1e40b
+:dbd81d49af02
 hooksecurefunc("ClickWorldMapActionButton", function () self:OnClickWorldMapActionButton() end)
 hooksecurefunc("WorldMapScrollFrame_ReanchorQuestPOIs", function () self:Refresh() end)
 hooksecurefunc("WorldMap_UpdateQuestBonusObjectives", function () self:OnUpdateQuestBonusObjectives() end)
 end
+function Module:OnConfigUpdate()
+if db.Config.FadeWhileGrouped then
+db.PinAlpha = 0.15
+else
+db.PinAlpha = 1
+end
+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)
 self:RegisterEvent('WORLD_QUEST_COMPLETED_BY_SPELL')
 self:RegisterEvent('SKILL_LINES_CHANGED')
 end
 function Module:OnMapInfo()
+print('|cFFFFFF00'..self:GetName()..':OnMapInfo()|r visible =', self:IsVisible())
 if self:IsVisible() then
 self:Refresh(true)
 else
 self.isStale = true
 end
 if not QuestUtils_IsQuestWorldQuest(questID) then
 return nil
 end
+-- if we're grabbing a pin, the filters need to be checked
 local pin = db.QuestsByID[questID]
 if not pin then
 local numFree = #db.FreePins
 if numFree >= 1 then
 pin = tremove(db.FreePins, numFree)
 pin.y = info.y or pin.y
 rprint('|cFFFF4400coords|r', info.x, info.y)
 end
 end
-pin:GetData()
+if not pin.dataLoaded then
-C_TaskQuest.RequestPreloadRewardData(info.questId)
+pin:GetData()
+C_TaskQuest.RequestPreloadRewardData(info.questId)
+end
+pin:IsFiltered()
+pin:IsShowable()
+pin.isStale = true
+rprint(pin:GetID(), pin.filtered, pin.used)
 return pin
 end
 -- remove from index and add it to the recycling heap
 function Module:ReleasePin (pin)
 local scanner = _G.WorldPlanTooltip
 local print = qprint
 if not itemID then
 return
 end
---print('GetRewardHeader', questID)
+qprint('GetRewardHeader', questID)
 scanner:SetOwner(WorldPlan, "ANCHOR_NONE")
 scanner:SetItemByID(itemID)
 scanner:Show()
 local ttl1 = _G['WorldPlanTooltipTextLeft1']
 elseif text:match("Item Level") then
 --print('equipment!', text)
 quantity = text:match("Item Level ([%d\+]+)")
 return REWARD_GEAR, icon, quantity, name, itemID, quality
 elseif  text:match("Crafting Reagent") then
---print('|cFFFF4400it is a reagent', text)
+qprint('|cFFFF4400it is a reagent', text)
 return REWARD_REAGENT, icon, quantity, name, itemID, quality
 end
 end
 end
 if ttl3 then
 local text = ttl3:GetText()
 if text and text:match("Crafting Reagent") then
---print('|cFFFF4400it is a reagent', text)
+qprint('|cFFFF4400it is a reagent', text)
 return REWARD_REAGENT, icon, quantity, name, itemID, quality
 end
 end
 return 128, icon, quantity, name, itemID, quality
 end
 db:print(id, pin.worldQuestType, pin.rewardType, pin.title)
 end
 end
 function Module:Refresh(fromUser)
+self.isUserTriggered = fromUser
 self.currentMapID = GetCurrentMapAreaID()
+rprint('|cFF00FF88'..self:GetName()..':Refresh()|r', fromUser or '|cFFFFFF00internal')
 print('|cFF00FF88'..self:GetName()..':Refresh()|r', fromUser or '|cFFFFFF00internal')
 if not self:IsVisible() then
 print('  not visible, flag for later')
 self.isStale = true
 return
 for index, pin in pairs(db.QuestsByID) do
 pin.used = nil
 end
-self:SetFilteredPins(db.QuestsByID)
 self:UpdateAnchors(nil, fromUser)
 self:Cleanup (fromUser)
 self.isStale = nil
+self.isUserTriggered = nil
 end
 -- update visibility states of all 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
 if not pin then
 return
 end
-print('~ ', pin.mapID, pin.questID, pin.title)
+--print('~ ', pin.mapID, pin.questID, pin.title)
-rprint('|cFF00FF00update|r', x, y, pin.title)
+rprint('|cFF00FF00update|r', x, y, pin.mapID, pin.questID, pin.title)
-pin:IsShowable()
 if x and y then
 pin.x = x
 pin.y = y
-pin:SetFrameLevel(PinBaseIndex+numPins)
+pin.owningFrame = self.hostFrame
-pin:SetPoint('CENTER', self.hostFrame, 'TOPLEFT', self.hostWidth * pin.x, -self.hostHeight * pin.y)
 pin.throttle = 1
-pin:SetShown(pin.used)
+pin:SetParent(self.hostFrame)
+pin:SetFrameLevel(PinBaseIndex+pin:GetID())
+pin:SetAnchor(pin.x, pin.y, self.hostWidth, self.hostHeight)
 tinsert(self.UsedPositions, pin)
 end
-pin.owningFrame = self.hostFrame
-pin:SetParent(self.hostFrame)
 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)
-print('Map', GetMapNameByID(mapID), GetMapNameByID(self.currentMapID))
+rprint('Map', GetMapNameByID(mapID), GetMapNameByID(db.currentMapID))
 for index, info in pairs(taskInfo) do
 self:UpdateQuestButton(info, mapID)
 end
 end
 function Module:UpdateAnchors (fromUser)
 wipe(self.UsedPositions)
 print('  |cFF00FF00'..self:GetName()..':UpdateAnchors()', fromUser)
 self.hostFrame = WorldMapPOIFrame
 self.hostWidth, self.hostHeight = self.hostFrame:GetSize()
 self.nudgeThrescholdX = 16/self.hostWidth
 if isMicroDungeon then
 return
 end
 numPins = 0
-local taskInfo = TQ_GetQuestsForPlayerByMapID(self.currentMapID)
+local taskInfo = TQ_GetQuestsForPlayerByMapID(db.currentMapID)
 if taskInfo then
-self:UpdateMap(taskInfo, self.currentMapID)
+self:UpdateMap(taskInfo, db.currentMapID)
 end
-local numZones = MC_GetNumZones(self.currentMapID)
+local numZones = MC_GetNumZones(db.currentMapID)
 if numZones then
 for i = 1, numZones do
 local mapAreaID = MC_GetZoneInfo(self.currentMapID, i)
-local taskInfo = TQ_GetQuestsForPlayerByMapID(mapAreaID, self.currentMapID)
+local taskInfo = TQ_GetQuestsForPlayerByMapID(mapAreaID, db.currentMapID)
 if taskInfo then
 self:UpdateMap(taskInfo, mapAreaID)
 end
 end
-end
-if self.filtersDirty then
-self:SetFilteredPins(db.QuestsByID)
 end
 end
 -- shows, animates, or hides pins based on their current visibility flags
 function Module:Cleanup (fromUser)
 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.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.isStale = true
-pin:SetShown(pin.used or false)
+pin:SetShown(false)
+end
-if pin.worldQuest and (not C_TaskQuest.IsActive(pin.questID)) then
+end
-self:ReleasePin(pin)
+end
-end
-pin.isStale = true
-end
-end

Mercurial > wow > worldplan

comparison WorldQuests.lua @ 49:dbd81d49af02