wow/worldplan: WorldPlan.lua comparison

comparison WorldPlan.lua @ 9:a2b623043970 v1.0-rc

WorldQuests: - Filter interface controls reworked: Left-Click toggles inclusive filtering, right-click toggle exclusion, and holding ctrl or shift will flip or reset the other filters of that type respectively. - Fix QuestPOI texture masks disappearing when toggling filter options * new masks aren't applied until SetTexture() is called, making a seemingly redundant call necessary for the change to manifest - Implemented configuration data storage and retrieval; tracking menu options should actually do something now. - Ignore remaining time for Profession quests that aren't part of the player's profession loadout - Alternate tooltip data appears for Pet Battle quests involved in the Family Familar achievement. A list of outstanding criteria is provided in the POI tooltip, and the quest name is highlighted in the filter tooltip. ClassPlan: - actually handle the mission complete icon

author	Nenue
date	Sun, 23 Oct 2016 17:18:31 -0400
parents	802abb8a10ea
children	06c9a30d48da

comparison

equal deleted inserted replaced

-:802abb8a10ea
+:a2b623043970
 local WorldPlan = WorldPlanCore
 local QuestPOI = WorldPlanPOIMixin
 local FilterPin = WorldPlanFilterPinMixin
 local WP_VERSION = "1.0"
+local db
 local print = DEVIAN_WORKSPACE and function(...) _G.print('WP', ...) end or function() end
 local qprint = DEVIAN_WORKSPACE and function(...) _G.print('POI', ...) end or function() end
 local iprint = DEVIAN_WORKSPACE and function(...) _G.print('ItemScan', ...) end or function() end
+local wqprint = DEVIAN_WORKSPACE and function(...) _G.print('WorldQuests', ...) end or function() end
+local fbprint = DEVIAN_WORKSPACE and function(...) _G.print('FilterBar', ...) end or function() end
 local wipe, tremove, tinsert, pairs, floor, tContains = table.wipe, table.remove, table.insert, pairs, floor, tContains
 local TQ_GetQuestInfoByQuestID = C_TaskQuest.GetQuestInfoByQuestID -- Return the name of a quest with a given ID
 local TQ_GetQuestsForPlayerByMapID = C_TaskQuest.GetQuestsForPlayerByMapID -- This function is not yet documented
 local TQ_GetQuestTimeLeftMinutes = C_TaskQuest.GetQuestTimeLeftMinutes
 local GetCurrentMapAreaID, GetMapNameByID, GetSuperTrackedQuestID = GetCurrentMapAreaID, GetMapNameByID, GetSuperTrackedQuestID
 local MC_GetNumZones, MC_GetZoneInfo = C_MapCanvas.GetNumZones, C_MapCanvas.GetZoneInfo
-local SearchFaction
 local PinBaseIndex = 1600
-local ShowAllProfessionQuests = false
-local DisplayContinentSummary = true
-local DisplayContinentPins = true
-local NotifyWhenNewQuests = true
-local PinRewardFilter, PinTagFilter
 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
 -- maps where we do our own anchors
 local CONTINENT_MAPS = { [BROKEN_ISLES_ID] = BROKEN_ISLES_ID, }
 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', }
 -- default color templates
 local ARTIFACT_COLOR = ITEM_QUALITY_COLORS[LE_ITEM_QUALITY_ARTIFACT]
 local MONEY_COLOR = {hex ='|cFFFFFF00', r=1, g=1, b=0}
 local COMMON_COLOR = ITEM_QUALITY_COLORS[LE_ITEM_QUALITY_COMMON]
--- operating flags
-local superTrackedID
-local currentMapName
-local hasNewQuestPins
-local isContinentMap
 local ICON_UNKNOWN = "Interface\\ICONS\\inv_misc_questionmark"
 local ICON_MONEY = "Interface\\Buttons\\UI-GroupLoot-Coin-Up"
 local POI_BORDER_MASK = "Interface\\Minimap\\UI-Minimap-Background"
 --continentBorder = 1,
 --zoneBorder = 1,
 }
+local defaults = {
+defaultPinStyle = POI_DEFAULT_TYPE,
+rewardStyle = POI_REWARD_TYPE,
+filterStyle = POI_FILTER_STYLE,
+ShowAllProfessionQuests = true,
+DisplayContinentSummary = true,
+DisplayContinentPins = true,
+NotifyWhenNewQuests = true,
+EnablePins = true,
+FadeWhileGrouped = true,
+}
 -- Summary header structure
 local POI_FILTER_OPTIONS = {
 { label = 'Filters', texture = "Interface\\WorldMap\\WorldMap-Icon" },
 { filterKey= 'rewardType', filterValue = REWARD_ARTIFACT_POWER, label = 'Artifact Power', texture = "Interface\\ICONS\\inv_7xp_inscription_talenttome01" },
 { filterKey= 'rewardType', filterValue = REWARD_CURRENCY,label = 'Currency', texture = "Interface\\ICONS\\inv_misc_elvencoins" },
 { filterKey= 'rewardType', filterValue = REWARD_REAGENT, label = 'Reagents', texture = 1417744 },
 { filterKey= 'rewardType', filterValue = REWARD_CASH, label = 'Reagents', texture = ICON_MONEY },
 { filterKey= 'worldQuestType', filterValue = LE_QUEST_TAG_TYPE_PVP, label = 'PvP', texture = "Interface\\Icons\\Ability_PVP_GladiatorMedallion", spacing = 10 },
 { filterKey= 'worldQuestType', filterValue = LE_QUEST_TAG_TYPE_PET_BATTLE, label = 'Pet Battle', texture = "Interface\\Icons\\PetJournalPortrait", },
 { filterKey= 'worldQuestType', filterValue = LE_QUEST_TAG_TYPE_DUNGEON, label = 'Dungeon', texture = "Interface\\LFGFRAME\\UI-LFR-PORTRAIT", },
+{ filterKey= 'worldQuestType', filterValue = LE_QUEST_TAG_TYPE_PROFESSION, label = 'Profession', texture = "Interface\\ICONS\\70_professions_scroll_02", },
 }
 WorldPlanCore.BrokenIsleID = BROKEN_ISLES_ID
-WorldPlanCore.FilterOptions = POI_FILTER_OPTIONS
 WorldPlanCore.FilterStyle = POI_FILTER_STYLE
+WorldPlanCore.FilterOptions = {}
+-- operating flags
+local superTrackedID
+local currentMapName
+local hasNewQuestPins
+local isContinentMap
 local numPins = 0
 local QuestsByZone = {}
 local QuestsByFaction = {}
 local QuestsByReward = {}
 local QuestsByTag = {}
 local QuestsByID = {}
 local QuestPositions = {}
-local FilterInclusions = {rewardType = {}, worldQuestType = {}}
+local FilterInclusions = {rewardType = {}, worldQuestType = {}, factionID = {}}
-local FilterExclusions = {rewardType = {}, worldQuestType = {} }
+local FilterExclusions = {rewardType = {}, worldQuestType = {}, factionID = {}}
 local NotificationTypes = {}
 local ZoneInfo = {}
 local SummaryHeaders = {}
-WorldPlanCore.QuestsByID = QuestsByID
-WorldPlanCore.QuestsByZone = QuestsByZone
 local FreePins = {}
 local NumPinFrames = 1
 local hasPendingQuestData
 local notifyPlayed
 local scanner, wmtt, WorldMapPOIFrame
+WorldPlanCore.QuestsByID = QuestsByID
+WorldPlanCore.QuestsByZone = QuestsByZone
 local tasksQueue = {}
 local function OnNext (func)
 if #tasksQueue == 0 then
 _G.WorldPlan:SetScript('OnUpdate', function()
 WorldPlanData[key] = nil
 else
 WorldPlanData[key] = true
 end
 end
+WorldPlan:RefreshAll()
 end
 function WorldPlan:print(...)
 local msg
 for i = 1, select('#', ...) do
 self:RegisterEvent("ADDON_LOADED")
 WorldPlan.modules = {
 WorldQuests, FilterBar, WorldPlanFlightMapMixin,
 }
-hooksecurefunc("UIDropDownMenu_Initialize", self.OnDropDownInitialize)
 end
 function WorldPlan:OnEvent (event, ...)
 print()
 print(event, ...)
 end
 if IsLoggedIn() and not self.initialized then
 self:Setup()
 end
 elseif event == 'WORLD_MAP_UPDATE' then
+self.currentMapID = GetCurrentMapAreaID()
 self:RefreshAll()
 end
 for i, module in ipairs(self.modules) do
 if module.OnEvent then
 print('forwarding to', tostring(module))
 if not WorldPlanData then
 WorldPlanData = {key = 0 }
 end
 WorldPlanData.key = (WorldPlanData.key or 0) + 1
 self.db = WorldPlanData
+self.db.WorldQuests = self.db.WorldQuests or {}
+db = self.db
+for k,v in pairs(defaults) do
+db[k] = v
+end
+self.currentMapID = GetCurrentMapAreaID()
 for i, module in ipairs(self.modules) do
+module.db = self.db
 if module.Setup then module:Setup() end
 if not module.RegisterEvent then
 module.RegisterEvent = self.RegisterEvent
 end
 end
 self.initialized = true
+hooksecurefunc("UIDropDownMenu_Initialize", self.OnDropDownInitialize)
 end
 function WorldPlan:RefreshAll (forced)
+if not self.initialized then
+return
+end
+POI_DEFAULT_TYPE = db.defaultPinStyle
+POI_REWARD_TYPE = db.rewardStyle
+POI_FILTER_STYLE = db.filterStyle
+for i, module in ipairs(self.modules) do
+if module.Reset then
+print(module, 'Reset()')
+module:Reset()
+end
+end
 for i, module in ipairs(self.modules) do
 if module.Refresh then
+print(module, 'Refresh()')
 module:Refresh()
+end
+end
+for i, module in ipairs(self.modules) do
+if module.Cleanup then
+print(module, 'Cleanup()')
+module:Cleanup()
 end
 end
 end
 function WorldPlan:UpdateAnchors ()
 for i, module in ipairs(self.modules) do
 -- insert visual options into the tracking button menu
 WorldPlan.OnDropDownInitialize = function  (self, callback, dropType)
 if self ~= WorldMapFrameDropDown then
 return
 end
+local db = WorldPlan.db
 local info = UIDropDownMenu_CreateInfo()
 info.text = ""
 info.isTitle = true
 UIDropDownMenu_AddButton(info)
 info.isTitle = nil
 info.disabled = nil
 info.keepShownOnClick = true
 info.tooltipOnButton = 1
-info.text = "Hidden World Quests"
+info.text = "Enable"
+info.isNotRadio = true
+info.value = "EnablePins"
+info.checked = db.EnablePins
+info.tooltipTitle = "Enable World Quest Overlays"
+info.tooltipText = "Toggle the detail layers here."
+info.func = DropDown_OnClick
+UIDropDownMenu_AddButton(info)
+info.text = "Display All Profession Quests"
 info.isNotRadio = true
 info.value = "ShowAllProfessionQuests"
-info.checked = ShowAllProfessionQuests
+info.checked = db.ShowAllProfessionQuests
 info.tooltipTitle = "Hidden Quests"
 info.tooltipText = "Display work order and profession-related quests that are skipped by the default UI."
 info.func = DropDown_OnClick
 UIDropDownMenu_AddButton(info)
 info.text = "Show Continent Pins"
 info.isNotRadio = true
 info.value = "DisplayContinentPins"
-info.checked = DisplayContinentPins
+info.checked = db.DisplayContinentPins
 info.tooltipTitle = "Continent Pins"
 info.tooltipText = "Display quest pins on the continent map (may get cramped)."
 info.func = DropDown_OnClick
 UIDropDownMenu_AddButton(info)
 info.text = "Show Summary"
 info.isNotRadio = true
 info.value = "DisplayContinentSummary"
 info.tooltipTitle = "Summary Bar"
 info.tooltipText = "Display a summary of active world quests. Note: requires directly viewing Broken Isle and Dalaran maps to gain complete info."
-info.checked = DisplayContinentSummary
+info.checked = db.DisplayContinentSummary
+info.func = DropDown_OnClick
+UIDropDownMenu_AddButton(info)
+info.text = "Fade In Groups"
+info.isNotRadio = true
+info.value = "FadeWhileGrouped"
+info.tooltipTitle = "Group Fade"
+info.tooltipText = "Reduce pin alpha when grouped, so player dots are easier to see."
+info.checked = db.DisplayContinentSummary
 info.func = DropDown_OnClick
 UIDropDownMenu_AddButton(info)
 end
 function WorldQuests:Setup()
 -- refresh positions any time blizzard does so (i.e. mousewheel zoom)
 hooksecurefunc("WorldMapScrollFrame_ReanchorQuestPOIs", function()
-self:Refresh()
+self:Refresh(true)
 end)
 -- hide the original world quest POIs
 hooksecurefunc("WorldMap_UpdateQuestBonusObjectives", function()
 for i = 1, NUM_WORLDMAP_TASK_POIS do
 if button and button.worldQuest then
 button:Hide()
 end
 end
 end)
 end
 function WorldQuests:OnEvent (event, ...)
 print('|cFFFFFF00'..tostring(self)..':OnEvent()'..event..'|r', ...)
 local questID = ...
 if questID and QuestsByID[questID] then
 self:ReleasePin(QuestsByID[questID])
 end
 elseif event == 'SKILL_LINES_CHANGED' then
-self:Refresh()
+self:Refresh(true)
 end
 end
 function WorldQuests:AcquirePin (questID, pinTable)
 local pin = QuestsByID[questID]
 print('|cFFFF4400Clearing out', pin:GetName(),id)
 end
 -- create of update quest pins for a map and its underlying zones
 function WorldQuests:GetPinsForMap (mapID)
+local print = wqprint
 mapID = mapID or GetCurrentMapAreaID()
 superTrackedID = GetSuperTrackedQuestID()
 if not mapID then
 -- info not available yet
 return
 end
 end
 end
 if hasNewQuestPins and not self.fullSearch then
 print('|cFF00FF00NEW PINS DO ANCHOR THINGS')
-self:Refresh ()
+self:Refresh (true)
 hasNewQuestPins = nil
 end
 end
 -- create or update the pin using the given questID and C_TaskQuest results
 if not HaveQuestData(questID) then
 print('|cFFFF4400Retrieval failed.')
 TQ_RequestPreloadRewardData(questID)
 hasPendingQuestData = true
 else
-print('|cFF00FF88HaveQuestData|r')
+wqprint('|cFF00FF88Quest Data Received|r')
 pin.mapID = pin.mapID or C_TaskQuest.GetQuestZoneID(questID)
 -- set reward category
 local numRewards = GetNumQuestLogRewards(questID)
 local numCurrency = GetNumQuestLogRewardCurrencies(questID)
 end
 return QuestsByID[questID]
 end
 function WorldQuests:Refresh(forced)
-print('pushing |cFF00FF88'..tostring(self)..':Refresh()|r')
+local print = wqprint
+print('|cFF00FF88'..tostring(self)..':Refresh()|r')
 if not WorldMapPOIFrame:IsVisible() then
 return
 end
-self:Reset()
+if forced then
+self:Reset()
+end
 self:UpdateAnchors()
-self:Cleanup ()
+if forced then
+self:Cleanup ()
+end
 end
 -- prepares elements for a map update
 function WorldQuests:Reset ()
+local print = wqprint
+print('|cFF00FF88'..tostring(self)..':Reset()|r')
 wipe(QuestPositions)
 wipe(QuestsByReward)
 wipe(QuestsByTag)
 for questID, pin in pairs(QuestsByID) do
 pin.used = nil
 end
-qprint(tostring(self)..':|cFFFFFF00Reset()|r')
 end
 -- update visibility states of all pins
 function WorldQuests:UpdateAnchors (submapID)
+local print = wqprint
+local db = WorldPlan.db
 local mapFileName, textureHeight, textureWidth, isMicroDungeon, microDungeonMapName = GetMapInfo()
 if isMicroDungeon then
 return
 end
 local currentMap = GetCurrentMapAreaID()
 local submapID = submapID or currentMap
-if submapID == BROKEN_ISLES_ID and (not DisplayContinentPins) then
+if submapID == BROKEN_ISLES_ID and (not db.DisplayContinentPins) then
 print('not updating map for reasons')
 return
 end
 print('|cFF88FF00'..tostring(self)..':UpdateAnchors|r', submapID, GetMapNameByID(submapID), 'pin count:', numPins)
 local numZones = MC_GetNumZones(submapID)
 if pins then
 local hostFrame = WorldMapPOIFrame
 local mapWidth, mapHeight = hostFrame:GetSize()
 for questID, pin in pairs(pins) do
-if pin:IsShowable(true) then
+pin:IsShowable()
-pin:SetFrameLevel(PinBaseIndex+numPins)
+if pin.used then
+pin:SetFrameLevel(PinBaseIndex+ (pin.whiteListed and 200 or 0) +numPins)
+print('level', PinBaseIndex+ (pin.whiteListed and 200 or 0) +numPins)
 pin:SetAnchor(WorldMapPOIFrame, currentMap, mapWidth, mapHeight)
-pin.used = true
 numPins = numPins + 1
 end
 end
 end
 end
 -- shows, animates, or hides pins based on their current visibility flags
 local debug_show = {}
 local debug_animate = {}
 local debug_hide = {}
 function WorldQuests:Cleanup ()
-local showQuestPOI = GetCVarBool("questPOI")
+local print = wqprint
+local showQuestPOI = db.EnablePins
 print('|cFFFFFF00'..tostring(self)..':Cleanup()|r')
-wipe(QuestsByReward)
+local mapID = GetCurrentMapAreaID()
-wipe(QuestsByTag)
+isContinentMap = (mapID == BROKEN_ISLES_ID)
 wipe(debug_show)
 wipe(debug_animate)
 wipe(debug_hide)
-local mapID = GetCurrentMapAreaID()
-isContinentMap = (mapID == BROKEN_ISLES_ID)
 -- continent or zone sizing
-local subStyle = isContinentMap and 'continent' or 'zone'
+local fadeGrouped = (db.FadeWhileGrouped and IsInGroup())
 numPins = 0
 for questID, pin in pairs(QuestsByID) do
 -- can we show it?
 if showQuestPOI and (pin.used) then
-pin.subStyle = pin.filtered and 'minimized' or subStyle
+pin:Refresh()
-pin:GetSizeMetrics()
+if fadeGrouped then
+pin:SetAlpha(0.25)
+else
+pin:SetAlpha(1)
+end
 -- is it a new quest?
 if pin.isNew then
 if not pin.isAnimating then
 pin.isAnimating = true
 OnNext(function()
 PlaySoundKitID(23404)
 end
 end
 end
 tinsert(debug_animate,questID)
+else
+print('animating? ', questID, 'filtered:', pin.filtered)
 end
 -- trap new but animating pins here
 else
 -- hard show existing pin
+print('refresh #', questID, 'filtered:', pin.filtered)
 pin:Show()
 tinsert(debug_show,questID)
 end
 else
+if pin:IsShown() then
+tinsert(debug_hide,questID)
+end
+pin.isAnimating = nil
+pin.FadeIn:Stop()
 pin:Hide()
-tinsert(debug_hide,questID)
-end
--- is it part of the current map?
-if pin.used then
-local rewardType = pin.rewardType
-local tagType = pin.worldQuestType
-if rewardType then
-QuestsByReward[rewardType] = QuestsByReward[rewardType] or {}
-tinsert(QuestsByReward[rewardType], pin)
-end
-if tagType then
-QuestsByTag[tagType] = QuestsByTag[tagType] or {}
-tinsert(QuestsByTag[tagType], pin)
-end
 end
 end
 print('   adding:', table.concat(debug_animate, ',' ))
-print('  showing:', table.concat(debug_show, ',' ))
+print('  refresh:', table.concat(debug_show, ',' ))
+print('  hiding:', table.concat(debug_hide, ',' ))
 hasNewQuestPins = nil
 notifyPlayed = nil
 end
 -- data provider manipulations for the taxi map
 local GetTime, mod = GetTime, mod
-function QuestPOI:Refresh ()
+function WorldQuests:FilterCheckByID(questID)
-print('|cFF00FF88["'..tostring(self.title)..'"]|r:Refresh()', tostring(self.title), "|T"..tostring(self.itemTexture)..":12:12|t", tostring(self.itemName))
+local pin = WorldQuests:GetPinByQuestID(questID)
-qprint(self.style)
+return pin:IsShowable()
+end
-local questID = self.questId
-local style = self.style
-local borderMask = style.mask
+function QuestPOI:IsShowable ()
-local borderFill = style.texture
+local print = wqprint
-local iconBorder = self.iconBorder
+local db = WorldPlan.db
-local icon = self.icon
-local count = self.count
---WorldPlan:print(tostring(self.title), "|T"..tostring(self.itemTexture)..":16:16|t", tostring(self.itemName))
-SetMaskedTexture(icon, self.itemTexture or ICON_UNKNOWN, borderMask)
-icon:SetAllPoints(self)
-if self.itemName then
-local color = self.rewardColor or COMMON_COLOR
-if self.itemNumber and  self.target then
-self.count:SetText(color.hex .. tostring(self.itemNumber))
-else
-self.count:SetText(nil)
-end
-end
-SetMaskedTexture(iconBorder, borderFill, borderMask)
-local border = (self.rewardType and POI_REWARD_TYPE[self.rewardType]) or (WORLD_QUEST_QUALITY_COLORS[self.rarity] or COMMON_COLOR)
-iconBorder:SetVertexColor(border.r, border.g, border.b, border.a)
-iconBorder:SetDesaturated(true)
-local trackingBorder = self.supertrackBorder
-self.highlight:SetMask(nil)
-if questID == GetSuperTrackedQuestID() then
-trackingBorder:SetVertexColor(0,0,0,1)
-else
-trackingBorder:SetVertexColor(0,0,0,0.5)
-end
-self.highlight:SetAllPoints(trackingBorder)
-SetMaskedTexture(trackingBorder, borderFill, borderMask)
-self.highlight:SetMask(borderMask)
-local qType = self.worldQuestType
-self.tagIcon:SetAtlas(self.tagAtlas)
-self.tagIcon:SetTexCoord(0,1,0,1)
-if self.isElite then
-self.EliteDecal:Show()
-else
-self.EliteDecal:Hide()
-end
-if style.showNumber then
-self.label:SetText(self.itemNumber)
-else
-self.label:SetText(nil)
-end
-qprint('|cFF88FF00updated', questID, self.title, self.rewardType, (style.showNumber and self.itemNumber) or '')
-end
-function QuestPOI:IsShowable (ignoreFilters)
 local qType = self.worldQuestType
 local rType = self.rewardType
 self.filtered = nil
-print('  |cFFFF4400IsShowable()|r', self.tradeskillLineIndex, self.title)
+self.whiteListed = nil
+self.used = true
 local whiteListed, blackListed
 for filterKey, includes in pairs(FilterInclusions) do
 local controlValue = self[filterKey]
 if FilterInclusions[filterKey][controlValue] then
-whiteListed = true
+self.filtered = nil
+self.whiteListed = true
 break
 end
 if FilterExclusions[filterKey][controlValue] then
-blackListed = true
+self.filtered = true
 end
 end
-print(blackListed, whiteListed)
-self.filtered = (blackListed and (not whiteListed))
 if not TQ_IsActive(self.questID) then
-print('  quest is dead')
+self.used = nil
-return false
 end
 if qType == LE_QUEST_TAG_TYPE_PROFESSION then
+if not (db.ShowAllProfessionQuests or (self.tradeskillLineIndex and GetProfessionInfo(self.tradeskillLineIndex))) then
-if not (ShowAllProfessionQuests or (self.tradeskillLineIndex and GetProfessionInfo(self.tradeskillLineIndex))) then
+self.used = nil
-print('  non-profession')
+end
-return false
+end
-end
+print('  |cFFFF4400IsShowable()|r', self.used, self.filtered, self.title)
-end
+return self.used, self.filtered
-return true
 end
 function QuestPOI:UpdateTimer (timeLeft, timeType)
 print('|cFF0088FFUpdatePinTimer()|r')
 end
---- Re-acquires size information and triggers things
+--- Fixes icons upon size update
-function QuestPOI:GetSizeMetrics (style, subStyle)
+function QuestPOI:UpdateSize (style, subStyle)
 self.style = self.style or POI_DEFAULT_TYPE
 self.subStyle = self.subStyle or 'continent'
 style = style or self.style
 subStyle = style[subStyle or self.subStyle]
 self.tagSize = subStyle.TagSize
 self.TimeleftStage = subStyle.TimeleftStage
 self.NoIcon = subStyle.NoIcon
 self:SetSize(self.currentWidth, self.currentWidth)
-end
--- triggered by OnSizeChanged script
-function QuestPOI:OnSizeChanged ()
 local iconBorder = self.iconBorder
 local trackingBorder = self.supertrackBorder
 local tag = self.tagIcon
 local style = self.style or POI_DEFAULT_TYPE
 local mask = style.mask or POI_BORDER_FILL
 tag:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', borderWidth, -borderWidth)
 else
 tag:Hide()
 end
+--qprint('using mask:', mask, self.name )
 self.icon:SetMask(mask)
+self.icon:SetTexture(self.icon:GetTexture())
 self.iconBorder:SetMask(mask)
 self.supertrackBorder:SetMask(mask)
 if self.NoIcon then
 self.icon:Hide()
 end
 end
 return passesFilter
 end
+local bountyIndex
 local debug_headers = {}
-function FilterBar:Refresh()
-local mapID = GetCurrentMapAreaID()
+function FilterBar:Setup()
+self:GetFilters()
+end
+function FilterBar:OnEvent(event,...)
+if event == 'QUEST_LOG_UPDATE' then
+self:Reset()
+self:Refresh()
+end
+end
+function FilterBar:GetFilters()
+local print = fbprint
+wipe(WorldPlan.FilterOptions)
+for index, info in ipairs(POI_FILTER_OPTIONS) do
+tinsert(WorldPlan.FilterOptions, info)
+end
+self.bounties, self.numBounties = GetQuestBountyInfoForMapID(WorldPlan.currentMapID)
+self.BountyFilters = {}
+for index, data in ipairs(self.bounties) do
+local info = self.BountyFilters[index]
+if not info then
+info  = {}
+self.BountyFilters[index] = info
+end
+local questTitle = GetQuestLogTitle(GetQuestLogIndexByID(data.questID))
+info.filterKey = 'factionID'
+info.filterValue = data.factionID
+info.label = questTitle
+info.texture = data.icon
+print('loading emissary', questTitle)
+tinsert(WorldPlan.FilterOptions, info)
+--{ filterKey= 'worldQuestType', filterValue = LE_QUEST_TAG_TYPE_PROFESSION, label = 'Profession', texture = "Interface\\LFGFRAME\\UI-LFR-PORTRAIT", },
+end
+end
+function FilterBar:Reset()
+self:GetFilters()
+end
+function FilterBar:Refresh(forced)
+local print = fbprint
 local blocks = self.SummaryHeaders
+local relativeFrame = WorldMapFrame.UIElementsFrame.TrackingOptionsButton
 local numHeaders = 0
-local lastButton
+print('|cFF00FF88'..tostring(self)..':Refresh()|r', 'currentMap=',WorldPlan.currentMapID)
-local pinSize, borderSize, trackingSize = 20, 2, 2
-print('|cFF00FF88'..tostring(self)..':Refresh()|r')
-for index, info in pairs(POI_FILTER_OPTIONS) do
+local quests = QuestsByZone[WorldPlan.currentMapID] or QuestsByID
+for index, info in ipairs(WorldPlan.FilterOptions) do
 local numQuests = 0
-local quests = QuestsByZone[mapID] or QuestsByID
 for questID, pin in pairs(quests) do
 if pin.used then
 if not info.filterKey then
 numQuests = numQuests + 1
 elseif pin[info.filterKey] == info.filterValue then
 numQuests = numQuests + 1
 end
 end
 end
-print(tostring(index).. ' ("'..tostring(info.label)..'"'.. tostring(rewardFilter).. ', '..tostring(tagFilter) .. ', '..tostring(numQuests)..')')
+print(tostring(index).. ' ("'..tostring(info.label)..'" f('.. tostring(info.filterKey).. '='..tostring(info.filterValue) .. '), '..tostring(numQuests)..')')
 if numQuests >= 1 then
 numHeaders = numHeaders + 1
 local button = blocks[numHeaders]
 if not blocks[numHeaders] then
 button.supertrackBorder:SetDesaturated(true)
 blocks[numHeaders] = button
 end
 button:SetID(index)
-button.lastButton = lastButton
+button.spacing = ((info.filterKey ~=  relativeFrame.filterKey) and 10) or 0
+button.relativeFrame = relativeFrame
 button:Refresh(info, (numHeaders == 1), numQuests)
 button:Show()
-lastButton = button
+print('  using', button.label:GetText())
-end
+relativeFrame = button
+end
-end
+end
+self.numHeaders = numHeaders
+for i = numHeaders + 1, #WorldPlan.FilterOptions do
+if self.SummaryHeaders[i] then
+self.SummaryHeaders[i]:Hide()
+end
+end
+end
+function FilterBar:Cleanup()
 -- hide trailing buttons
-for i = numHeaders + 1, #POI_FILTER_OPTIONS do
-if blocks[i] then
-blocks[i]:Hide()
-end
-end
 end
 function FilterPin:Refresh(info, isFirst, numQuests)
-info = info or POI_FILTER_OPTIONS[self:GetID()]
+local print = fbprint
 isFirst = isFirst or self.isFirst
 numQuests = numQuests or self.numQuests
-self.isFirst = isFirst
+if info then
-self.numQuests = numQuests
+self.isFirst = isFirst
-self.filterKey = info.filterKey
+self.numQuests = numQuests
-self.filterValue = info.filterValue
+self.filterKey = info.filterKey
-self.tagID = info.tagID
+self.filterValue = info.filterValue
+self.tagID = info.tagID
-self.icon:ClearAllPoints()
-self.icon:SetTexture(info.texture)
+self.icon:ClearAllPoints()
-self.icon:SetAllPoints(self)
+self.icon:SetTexture(info.texture)
-self.supertrackBorder:Hide()
+self.icon:SetAllPoints(self)
-self.label:SetText(numQuests)
+self.supertrackBorder:Hide()
-self:Show()
+self.label:SetText(numQuests)
+self:Show()
+end
+self.itemTexture = self.texture
 if isFirst then
-self:SetPoint('TOP', WorldMapFrame.UIElementsFrame.TrackingOptionsButton, 'BOTTOM', 0, -5)
+self:SetPoint('TOP', self.relativeFrame, 'BOTTOM', 0, -5)
 else
-self:SetPoint('TOPRIGHT', self.lastButton, 'BOTTOMRIGHT', 0, -(3*2 + 1 + (info.spacing or 0)))
+self:SetPoint('TOPRIGHT', self.relativeFrame, 'BOTTOMRIGHT', 0, -(3*2 + 1 + (self.spacing or 0)))
-end
+end
-print(self.filterKey, self.filterValue)
+print('anchor to', self.relativeFrame:GetName())
 local r, g, b, a = 1,1,1,1
 if self.filterKey then
 if FilterInclusions[self.filterKey][self.filterValue] == true then
 r, g, b = 0, 1, 0
 elseif FilterExclusions[self.filterKey][self.filterValue] then
 r, g, b = 1, 0, 0
 end
 end
 self.iconBorder:SetVertexColor(r, g, b, a)
+self:UpdateSize()
-self:GetSizeMetrics()
 end
 function FilterPin:OnLoad()
 self:RegisterForClicks('AnyUp')
 self:SetFrameStrata('HIGH')
 end
 -- shift-click: reset filter
 -- click: rotate through include(1), exclude(-1), ignore(nil)
 function FilterPin:OnClick (button)
+local print = fbprint
 local filterKey = self.filterKey
 local filterValue = self.filterValue
-print('click', filterKey, filterValue)
+local operation = opPrefix
+local setExclude = (button == 'RightButton')
+local filterTable = setExclude and FilterExclusions or FilterInclusions
+local opposingTable = setExclude and FilterInclusions or FilterExclusions
 if not filterKey then
 -- resetting
 for k,v in pairs(FilterInclusions) do
 wipe(v)
 end
 for k,v in pairs(FilterExclusions) do
 wipe(v)
 end
 else
-local setExclude = (button == 'RightButton')
-if IsControlKeyDown() then
+if filterTable[filterKey][filterValue] then
-if setExclude then
+filterTable[filterKey][filterValue] = nil
-if FilterExclusions[filterKey][filterValue] then
+else
-FilterExclusions[filterKey][filterValue] = nil
+filterTable[filterKey][filterValue] = true
-else
+opposingTable[filterKey][filterValue] = nil
-FilterExclusions[filterKey][filterValue] = true
+end
+local overrideFilters = IsControlKeyDown()
+local overrideOpposing = IsShiftKeyDown()
+for k, info  in ipairs(POI_FILTER_OPTIONS) do
+if (info.filterKey == filterKey) and (info.filterValue ~= filterValue) then
+if overrideFilters then
+filterTable[info.filterKey][info.filterValue] = nil
+opposingTable[info.filterKey][info.filterValue] = true
+elseif overrideOpposing then
+filterTable[info.filterKey][info.filterValue] = nil
+opposingTable[info.filterKey][info.filterValue] = nil
+end
 end
-FilterInclusions[filterKey][filterValue] = nil
+end
-else
-if FilterInclusions[filterKey][filterValue] == true then
-FilterInclusions[filterKey][filterValue] = nil
+end
-else
-FilterInclusions[filterKey][filterValue] = true
+print('|cFF00FF88Filter Update:', filterKey, filterValue, operation)
-end
-FilterExclusions[filterKey][filterValue] = nil
-end
-elseif IsShiftKeyDown() then
-FilterInclusions[filterKey][filterValue] = nil
-FilterExclusions[filterKey][filterValue] = nil
-else
-print('limit to', filterKey, filterValue)
-if setExclude then
-FilterExclusions[filterKey][filterValue] = true
-FilterInclusions[filterKey][filterValue] = nil
-else
-FilterInclusions[filterKey][filterValue] = true
-FilterExclusions[filterKey][filterValue] = nil
-end
-for k, info  in ipairs(POI_FILTER_OPTIONS) do
-if info.filterKey and ((info.filterKey ~= filterKey) or (info.filterValue ~= filterValue)) then
-if setExclude then
-FilterExclusions[info.filterKey][info.filterValue] = nil
-FilterInclusions[info.filterKey][info.filterValue] = true
-else
-FilterExclusions[info.filterKey][info.filterValue] = true
-FilterInclusions[info.filterKey][info.filterValue] = nil
-end
-end
-end
-end
-end
 WorldPlan:RefreshAll()
 end
 --%debug%

Mercurial > wow > worldplan

comparison WorldPlan.lua @ 9:a2b623043970 v1.0-rc