wow/worldplan: WorldPlan.lua comparison

comparison WorldPlan.lua @ 27:4a7e89bffbcb r27-beta

- Order Hall resource rewards now show numerals in quest pins. - Fixed an occasional lua error that occurs when opening the quest map for the first time. - Fixed another source of textures losing their masks.

author	Nenue
date	Thu, 27 Oct 2016 06:18:16 -0400
parents	08b03bcdfeac
children	c1612c2c1840

comparison

equal deleted inserted replaced

-:99f6e6ffb2d1
+:4a7e89bffbcb
 local POI_DEFAULT_TYPE = {
 a = 1,
 r = 1, g = 1, b = 1,
 x = 0, y = 0,
 desaturated = true,
-mask = POI_BORDER_MASK,
+pinMask = POI_BORDER_MASK,
+rewardMask = POI_BORDER_MASK,
 texture = POI_BORDER_FILL,
 continent = {
 PinSize = 18,
 Border = 3,
 TrackingBorder = 2,
 TagSize = 6,
 TimeleftStage = 3,
+showNumber = true,
 },
 zone = {
 PinSize = 22,
 Border = 3,
 TrackingBorder = 2,
 TagSize = 12,
 TimeleftStage = 3,
+showNumber = true,
 },
 minimized = {
 PinSize = 4,
 Border = 1,
 TrackingBorder = 2,
 NoIcon = true,
 TimeleftStage = 1,
+showNumber = false,
 }
 }
 local POI_REWARD_TYPE =  setmetatable({}, {
 __newindex = function(t, k, v)
 if type(v) == 'table' then
 POI_REWARD_TYPE[REWARD_REAGENT] = {
 r = 0, g = 1, b = 1,
 }
 POI_REWARD_TYPE[REWARD_ARTIFACT_POWER] = {
 r = 1, g = .25, b = .5,
-showNumber = true,
+hasNumeric = true,
+numberRGB = {1, 1, 1},
 }
 POI_REWARD_TYPE[REWARD_GEAR] = {
 r = .1, g = .2, b = 1,
 }
 POI_REWARD_TYPE[REWARD_CURRENCY] = {
 r = 1, g = 1, b = 0,
+hasNumeric = true,
+numberRGB = {1, 1, 1},
 }
 POI_REWARD_TYPE[REWARD_CASH] = {
 r = 0, g = 0, b = 0,
 --x = 0, y = -1,
 --mask = ICON_MONEY,
 local defaults = {
 defaultPinStyle = POI_DEFAULT_TYPE,
 rewardStyle = POI_REWARD_TYPE,
 filterStyle = POI_FILTER_STYLE,
-ShowAllProfessionQuests = true,
+ShowAllProfessionQuests = false,
 DisplayContinentSummary = true,
 DisplayContinentPins = true,
 NotifyWhenNewQuests = true,
 EnablePins = true,
 FadeWhileGrouped = true,
 if #tasksQueue == 0 then
 _G.WorldPlan:SetScript('OnUpdate', nil)
 end
 end)
 end
+print('inserting task #', #tasksQueue+1, func)
 tinsert(tasksQueue, func)
 end
 -- combines templates
 local function DoMixins(frame,...)
 self:RegisterEvent("WORLD_QUEST_COMPLETED_BY_SPELL")
 self:RegisterEvent("SUPER_TRACKED_QUEST_CHANGED")
 self:RegisterEvent("SKILL_LINES_CHANGED")
 self:RegisterEvent("ARTIFACT_XP_UPDATE")
 self:RegisterEvent("ADDON_LOADED")
+self:SetParent(WorldMapFrame)
 WorldPlan.modules = {
 WorldQuests, FilterBar, WorldPlanFlightMapMixin,
 }
 end
+function WorldPlan:OnShow()
+print(self:GetName()..':OnShow()')
+if self.isStale then
+self:RefreshAll()
+end
+end
 function WorldPlan:OnEvent (event, ...)
 print()
-print(event, ...)
+print(event, self.initialized)
 if event == 'ADDON_LOADED' then
 local addon = ...
 if addon == "Blizzard_FlightMap" then
 print('do mixin junk')
 self.OnFlightMapLoaded()
 self:Setup()
 end
 elseif event == 'WORLD_MAP_UPDATE' then
 self.currentMapID = GetCurrentMapAreaID()
 self:RefreshAll()
-end
+else
 for i, module in ipairs(self.modules) do
 if module.OnEvent then
 print('forwarding to', tostring(module))
 module:OnEvent(event, ...)
+end
 end
 end
 end
 end)
 end
 function WorldQuests:OnEvent (event, ...)
-print('|cFFFFFF00'..tostring(self)..':OnEvent()'..event..'|r', ...)
+print('|cFFFFFF00'..tostring(self)..':OnEvent()'..event..'|r', GetTime(), ...)
 if event == 'QUEST_LOG_UPDATE' then
 local questID, added = ...
 if questID and added then
 self:GetPinByQuestID(questID)
 else
 self:GetPinsForMap()
 end
+print('WorldMapFrame', WorldMapFrame:IsVisible(), 'doRefresh:', hasNewQuestPins)
+if WorldMapFrame:IsVisible() and hasNewQuestPins then
+self:Refresh(true)
+end
 elseif event == 'WORLD_QUEST_COMPLETED_BY_SPELL' then
 local questID = ...
 if questID and QuestsByID[questID] then
 self:ReleasePin(QuestsByID[questID])
 end
 QuestsByZone[mapID][questID] = self:GetPinByQuestID(questID, info)
 numQuests = numQuests + 1
 end
 end
 end
-if hasNewQuestPins and not self.fullSearch then
-print('|cFF00FF00NEW PINS DO ANCHOR THINGS')
-self:Refresh (true)
-hasNewQuestPins = nil
-end
 end
 -- create or update the pin using the given questID and C_TaskQuest results
 function WorldQuests:GetPinByQuestID (questID, taskInfo)
-if (QuestMapFrame_IsQuestWorldQuest (questID)) then
 local questTitle, rewardIcon, rewardName, rewardCount, rewardStyle, rewardType, itemID, quantity, quality, _
 local pin = self:AcquirePin(questID, taskInfo)
 if pin.isNew then
 if not hasNewQuestPins then
 local questTitle, factionID, capped = TQ_GetQuestInfoByQuestID(questID)
 if factionID then
 QuestsByFaction[factionID] = QuestsByFaction[factionID] or {}
 QuestsByFaction[factionID][questID] = pin
 end
-pin.title = questTitle or "|cFFFF0000Retrieving..."
 pin.factionID = factionID
 pin.capped = capped
 -- set tag details
 local tagID, tagName, worldQuestType, rarity, isElite, tradeskillLineIndex = GetQuestTagInfo(questID);
 pin.worldQuestType = worldQuestType
 pin.isElite = isElite
 pin.tradeskillLineIndex = tradeskillLineIndex
 pin.rarity = rarity
 pin.tagAtlas = tagAtlas
-end
 -- flag unresolved info
 if not (rewardIcon and rewardName) then
 if not pin.isPending then
 pin.isPending = true
 --WorldPlan:print('|cFF00FF00'..tostring(pin.title)..'|r has info', rewardIcon, rewardName)
 pin.hasUpdate = true
 end
 pin.isPending = nil
 end
+pin.title = questTitle or "|cFFFF0000Retrieving..."
 pin.itemTexture = rewardIcon or pin.itemTexture
 pin.itemName = rewardName or pin.itemName
 qprint('  |cFF00FFFF'..questID..'|r:->', (HaveQuestData(questID) and "|cFF00FF00HaveQuestData" or "-"), (C_TaskQuest.IsActive(questID) and "|cFF88FF00IsActive|r" or ""))
 qprint(' ', pin.title, pin.itemTexture, 'rewardType:', pin.rewardType, 'tag:', pin.tagID, 'style', pin.style )
 numPins = 0
 for questID, pin in pairs(QuestsByID) do
 -- can we show it?
 if showQuestPOI and (pin.used) then
-pin:Refresh()
 if fadeGrouped then
 pin:SetAlpha(0.25)
 else
 pin:SetAlpha(1)
 -- is it a new quest?
 if pin.isNew then
 if not pin.isAnimating then
 pin.isAnimating = true
 OnNext(function()
-pin.isNew = nil
+pin:ShowNew()
-pin:Show()
-pin.FadeIn:Play()
 end)
 if not notifyPlayed then
 for k,v in pairs(NotificationTypes) do
 if v[pin[k]] then
 notifyPlayed = true
 end
 -- trap new but animating pins here
 else
 -- hard show existing pin
 print('refresh #', questID, 'filtered:', pin.filtered)
-pin:Show()
+pin.hasUpdate = true
+pin:Show(true)
 tinsert(debug_show,questID)
 end
 else
 if pin:IsShown() then
 tinsert(debug_hide,questID)
 end
 --- Fixes icons upon size update
 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]
+subStyle = subStyle or self.subStyle
+qprint('|cFF00FF88'..self:GetName()..'|r:UpdateSize()', style, subStyle)
 self.currentWidth = subStyle.PinSize
 self.borderSize = subStyle.Border
 self.trackingBorderSize = subStyle.TrackingBorder
 self.tagSize = subStyle.TagSize
 self.TimeleftStage = subStyle.TimeleftStage
 self.NoIcon = subStyle.NoIcon
 self:SetSize(self.currentWidth, self.currentWidth)
+local icon = self.icon
 local iconBorder = self.iconBorder
 local trackingBorder = self.supertrackBorder
 local tag = self.tagIcon
-local style = self.style or POI_DEFAULT_TYPE
+local pinMask = style.pinMask
-local mask = style.mask or POI_BORDER_FILL
+local rewardMask = style.rewardMask
-self.icon:SetMask(nil)
+if self.NoIcon then
-self.iconBorder:SetMask(nil)
+self.icon:Hide()
-self.supertrackBorder:SetMask(nil)
+else
+self.icon:Show()
+icon:SetMask(nil)
+icon:SetMask(rewardMask)
+icon:SetTexture(self.icon:GetTexture())
+end
+iconBorder:SetMask(nil)
+trackingBorder:SetMask(nil)
 local borderWidth = self.borderSize
 local trackingWidth = self.trackingBorderSize
 else
 tag:Hide()
 end
 --qprint('using mask:', mask, self.name )
-self.icon:SetMask(mask)
+iconBorder:SetMask(pinMask)
-self.icon:SetTexture(self.icon:GetTexture())
+trackingBorder:SetMask(pinMask)
-self.iconBorder:SetMask(mask)
-self.supertrackBorder:SetMask(mask)
-if self.NoIcon then
-self.icon:Hide()
-else
-self.icon:Show()
-end
 end
 function FilterBar:OnEvent(event)
 function FilterPin:OnLoad()
 self:RegisterForClicks('AnyUp')
 self:SetFrameStrata('HIGH')
 self:SetFrameLevel(151)
 self:SetScript('OnUpdate', nil)
+self.style = db.filterStyle
+self.subStyle = db.defaultPinStyle.continent
 end
 function FilterPin:OnUpdate ()
 end

Mercurial > wow > worldplan

comparison WorldPlan.lua @ 27:4a7e89bffbcb r27-beta