wow/worldplan: QuestPOI.lua comparison

comparison QuestPOI.lua @ 36:21bcff08b0f4

WorldPlan: - Quest pins are now placed on the flight map. Their visibility rules will mirror the filter options from the world map. - Filter controls polish: - First click negates other reward type filters. Subsequent clicks will then toggle individual reward types until the filters are reset via Right-click. - Adheres to the Blizzard CVars added in patch 7.1 - Numerous optimizations to how data and visual updates are handled; should see an even better load time, and snappier world map interaction. ClassPlan: - The 'Available Missions' list is now recorded. It can be reviewed by clicking on the mission list heading. - Information filtering by character and realm.

author	Nenue
date	Fri, 04 Nov 2016 01:40:39 -0400
parents	26dfa661daa7
children	78cf1f19856a

comparison

equal deleted inserted replaced

-:26dfa661daa7
+:21bcff08b0f4
 local LE_QUEST_TAG_TYPE_PROFESSION = LE_QUEST_TAG_TYPE_PROFESSION
 local LE_QUEST_TAG_TYPE_NORMAL = LE_QUEST_TAG_TYPE_NORMAL
 local subStyles = {
 continent = {
-PinSize = 14,
+iconWidth = 14,
-Border = 2,
+borderWidth = 2,
-TrackingBorder = 1,
+highlightWidth = 1,
 TagSize = 6,
-TimeleftStage = 0,
+maxAlertLevel = 0,
 showNumber = false,
 numberFontObject = 'WorldPlanFont'
 },
 zone = {
-PinSize = 22,
+iconWidth = 22,
-Border = 3,
+borderWidth = 3,
-TrackingBorder = 2,
+highlightWidth = 2,
 TagSize = 12,
-TimeleftStage = 3,
+maxAlertLevel = 3,
 showNumber = true,
 numberFontObject = 'WorldPlanNumberFontThin'
 },
 minimized = {
-PinSize = 4,
+iconWidth = 4,
-Border = 0,
+borderWidth = 0,
-TrackingBorder = 1,
+highlightWidth = 1,
 NoIcon = true,
-TimeleftStage = 1,
+maxAlertLevel = 1,
 showNumber = false,
 }
 }
 -- Pin color/display variables
 end
 return 128, icon, quantity, name, itemID, quality
 end
 function WorldPlanPOIMixin:OnEnter()
-WorldMap_HijackTooltip(self)
+if not WorldMapFrame:IsVisible() then
+WorldMap_HijackTooltip(self)
+end
 local completed = select(4,GetAchievementInfo(familiars_id))
 if not completed then
 if self.worldQuestType == LE_QUEST_TAG_TYPE_PET_BATTLE and familiars[self.questID] then
 WorldMapTooltip:SetOwner(self, 'ANCHOR_RIGHT')
 WorldMapTooltip:AddLine(self.title, 1, 1, 1)
 self.FadeIn:Play()
 end
 end
 function WorldPlanPOIMixin:OnShow ()
-qprint('|cFFFFFF00'..tostring(self:GetName())..':OnShow()|r update:', self.isStale, 'new:', self.isNew, 'animation:', self.isAnimating)
 -- pop this on principle
 if self.isNew or self.isStale then
 self:Refresh()
 end
 -- is it a new quest?
 if self.isNew then
-print('|cFFFFFF00popping new pin handler')
+qprint('|cFFFFFF00'..tostring(self:GetName())..':OnShow()|r update:', self.isStale, 'new:', self.isNew, 'animation:', self.isAnimating)
+--qprint('|cFFFFFF00popping new pin handler')
 self:OnNew()
 elseif not self.isAnimating then
 self:SetAlpha(1)
 end
+self.Overlay:SetShown(true)
 --WorldPlan:print(self:GetAlpha())
 end
 function WorldPlanPOIMixin:OnHide()
 --qprint('|cFFFFFF00["'..tostring(self.title)..'"]|r:OnHide()')
 if not self:IsShown() then
 self.isAnimating = nil
 self:SetAlpha(1)
 end
+self.Overlay:SetShown(false)
 end
 function WorldPlanPOIMixin:SetAnchor(frame, mapID, mapWidth, mapHeight)
 --qprint('  |cFF00FF00'..self:GetName()..':SetAnchor()|r', self.questID, mapID, mapWidth)
 self:ClearAllPoints()
 function WorldPlanPOIMixin:OnLoad()
 qprint('|cFF00FF88'..self:GetName()..':OnLoad()|r',WorldPlan.db)
 self:RegisterEvent('SUPER_TRACKED_QUEST_CHANGED')
-self.style = WorldPlan.db.defaultPinStyle
-self.subStyle = WorldPlan.db.defaultPinStyle.continent
+self.count = self.Overlay.count
+self.timeLabel = self.Overlay.timeLabel
 end
 function WorldPlanPOIMixin:OnEvent(event, ...)
 if event == 'SUPER_TRACKED_QUEST_CHANGED' then
 self.isStale = true
 self.throttle = PIN_UPDATE_DELAY - self.throttle
 else
 return
 end
 if self.isStale and not self.isAnimating then
-print('|cFFFFFF00push poi update')
+wprint('|cFFFFFF00push poi update')
 self:Refresh()
 return
 end
 -- query for reward data if it wasn't found in the original scan
 end
 end
 -- update time elements
-local tl = self.timeThreschold
+local tl = self.alertLevel
 local timeLeft = TQ_GetQuestTimeLeftMinutes(questID)
 if timeLeft > 0 then
-local text, timeState = WorldPlan:GetTimeInfo(timeLeft, self.TimeleftStage)
+local text, timeState = WorldPlan:GetTimeInfo(timeLeft, self.maxAlertLevel)
 if tl ~= timeState then
 tl = timeState
 self.timeLabel:SetText(text)
 end
 else
 if self.worldQuestType ~= LE_QUEST_TAG_TYPE_PROFESSION then
 self:Hide()
 end
 end
 end
-self.timeThreschold = tl
+self.alertLevel = tl
 if self:IsMouseOver() then
 self.MouseGlow:Show()
 else
 self.MouseGlow:Hide()
 print('|cFF00FF88'..self:GetName()..'|r:Refresh()')
 local questID = self:GetID()
-local style,subStyle =  WorldPlanQuests:GetTypeInfo(self.rewardType)
+local iconBorder = self.RewardBorder
-if self.filtered then
+local trackingBorder = self.HighlightBorder
-subStyle = style.minimized
-end
-self.style = style
-self.subStyle = subStyle
-local borderMask = style.mask
-local borderFill = style.texture
-local iconBorder = self.iconBorder
 local icon = self.icon
 local count = self.count
-self.hasNumeric = style.hasNumeric
-self.numberRGB = style.numberRGB
-self.showNumber = subStyle.showNumber
 --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
-if self.hasNumeric then
-if subStyle.numberFontObject then
---wqprint('change font', _G[subStyle.numberFontObject]:GetName())
-self.count:SetFontObject(_G[subStyle.numberFontObject])
-end
 --wqprint('filtered:', self.filtered, 'showNumber:', self.showNumber)
-self.count:SetShown(self.showNumber)
 self.count:SetText(self.itemNumber)
-self.count:SetTextColor(unpack(self.numberRGB))
+end
-else
+if self.itemTexture then
-self.count:SetShown(false)
+icon:SetTexture(self.itemTexture)
-self.count:SetText(nil)
+icon:SetMask("Interface\\Minimap\\UI-Minimap-Background")
 end
-end
-SetMaskedTexture(iconBorder, borderFill, borderMask)
 local border = self:GetTypeInfo(self.rewardType)
 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)
+self.EliteBorder:SetShown(self.isElite and not self.filtered)
-if self.isElite then
-self.EliteBorder:Show()
-else
-self.EliteBorder:Hide()
-end
 --qprint('|cFF88FF00updated', questID, self.title, self.rewardType, (style.showNumber and self.itemNumber) or '')
 --print('  - subStyle:', (self.filtered == true), self.subStyle)
+self.Overlay:SetShown(self:IsShown())
+self.Overlay:SetParent(self:GetParent())
+self.Overlay:SetFrameLevel(self:GetFrameLevel()+200)
+self.Overlay:SetAllPoints(self)
 self:UpdateSize()
 self.isStale = nil
 [REWARD_GEAR] = 'worldQuestFilterEquipment',
 }
 function QuestPOI:IsShowable ()
-local print = wqprint
+local print = qprint
 local db = WorldPlan.db
 local qType = self.worldQuestType
 local rType = self.rewardType
 self.filtered = nil
 self.used = true
+for filterKey, value in pairs(WorldPlan.UsedFilters) do
+print('|cFFFF4400', filterKey, self[filterKey])
+if self[filterKey] ~= value then
+self.filtered = true
+end
+end
 self.questId  = self:GetID()
 if self.rewardType then
-if cvar_check[self.rewardType] and not GetCVarBool(cvar_check[self.rewardType]) then
+if cvar_check[self.rewardType] then
-self.filtered = true
+if self.rewardType == REWARD_CASH then
-end
+print('##', cvar_check[self.rewardType], GetCVarBool(cvar_check[self.rewardType]))
-else
+end
-for filterKey, value in pairs(WorldPlan.UsedFilters) do
+if not GetCVarBool(cvar_check[self.rewardType]) then
-if self[filterKey] ~= value then
 self.filtered = true
 end
 end
 end
 if not TQ_IsActive(self.questID) then
 self.used = nil
 elseif qType == LE_QUEST_TAG_TYPE_PROFESSION then
 if not (db.ShowAllProfessionQuests or (self.tradeskillLineIndex and GetProfessionInfo(self.tradeskillLineIndex))) then
 self.used = nil
 end
 end
-print('  |cFFFF4400IsShowable()|r', self.isNew, self.isAnimating, self.used, self.filtered, self.title)
+print('  |cFF'.. (((self.rewardType == REWARD_CASH) and 'FFFF00') or '0088FF') ..'IsShowable()|r ', cvar_check[self.rewardType], 'used:', self.used, 'filtered:', self.filtered, self.title)
 return self.used, self.filtered
 end
 function QuestPOI:UpdateTimer (timeLeft, timeType)
 print('|cFF0088FFUpdatePinTimer()|r')
 end
 --- Fixes icons upon size update
-function QuestPOI:UpdateSize (style, subStyle)
+function QuestPOI:UpdateSize ()
-style = style or self.style
-subStyle = subStyle or self.subStyle
+local style,subStyle =  self:GetTypeInfo(self.rewardType)
+if self.filtered then
+subStyle = style.minimized
+end
 --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 iconBorder = self.RewardBorder
-local trackingBorder = self.supertrackBorder
+local trackingBorder = self.HighlightBorder
 local tag = self.tagIcon
-local pinMask = style.pinMask
-local rewardMask = style.rewardMask
+local iconWidth = subStyle.iconWidth
+local borderWidth = iconWidth + (subStyle.borderWidth * 2)
-if self.NoIcon then
+local highlightWidth = borderWidth + (subStyle.highlightWidth * 2)
-self.icon:Hide()
-else
+local iconTexture = self.itemTexture
-self.icon:Show()
-icon:SetMask(nil)
+self:SetSize(iconWidth, iconWidth)
-icon:SetMask(rewardMask)
+icon:SetSize(iconWidth, iconWidth)
-icon:SetTexture(self.icon:GetTexture())
+iconBorder:SetSize(borderWidth, borderWidth)
-end
+trackingBorder:SetSize(highlightWidth, highlightWidth)
-iconBorder:SetMask(nil)
-trackingBorder:SetMask(nil)
+iconBorder:SetPoint('CENTER', (style.x or 0), (style.y or 0))
+trackingBorder:SetPoint('CENTER', (style.x or 0), (style.y or 0))
-local borderWidth = self.borderSize
-local trackingWidth = self.trackingBorderSize
+if style.hasNumeric then
-iconBorder:ClearAllPoints()
+self.count:SetTextColor(unpack(style.numberRGB))
-iconBorder:SetPoint('BOTTOMLEFT', self, 'BOTTOMLEFT', -borderWidth + (style.x or 0), -borderWidth + (style.y or 0))
+if subStyle.numberFontObject then
-iconBorder:SetPoint('TOPRIGHT', self, 'TOPRIGHT', borderWidth + (style.x or 0), borderWidth + (style.y or 0))
+--wqprint('change font', _G[subStyle.numberFontObject]:GetName())
+self.count:SetFontObject(_G[subStyle.numberFontObject])
-trackingBorder:ClearAllPoints()
+end
-trackingBorder:SetPoint('BOTTOMLEFT', iconBorder, 'BOTTOMLEFT', -trackingWidth, -trackingWidth)
+end
-trackingBorder:SetPoint('TOPRIGHT', iconBorder, 'TOPRIGHT', trackingWidth, trackingWidth)
+self.count:SetShown((subStyle.showNumber and self.itemNumber) and style.hasNumeric)
+--[[
 if self.tagSize then
 tag:Show()
 tag:ClearAllPoints()
 tag:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', borderWidth, -borderWidth)
 else
 tag:Hide()
 end
-qprint('using mask:', pinMask, self.name )
+if self.NoIcon then
-iconBorder:SetMask(pinMask)
+self.icon:Hide()
-trackingBorder:SetMask(pinMask)
+else
+self.icon:Show()
+if style.rewardMask then
+icon:SetMask(rewardMask)
+else
+icon:SetMask(iconTexture)
+end
+if style.pinMask then
+iconBorder:Show()
+trackingBorder:Show()
+iconBorder:SetMask(pinMask)
+trackingBorder:SetMask(pinMask)
+else
+iconBorder:Hide()
+trackingBorder:Hide()
+end
+end
+icon:SetTexture(iconTexture)
 iconBorder:SetTexture(iconBorder:GetTexture())
 trackingBorder:SetTexture(trackingBorder:GetTexture())
-end
+--]]
+self.currentWidth = subStyle.iconWidth
+self.borderWidth = subStyle.borderWidth
+self.highlightWidth = subStyle.highlightWidth
+self.tagSize = subStyle.TagSize
+self.maxAlertLevel = subStyle.maxAlertLevel
+self.NoIcon = subStyle.NoIcon
+self.style = style
+self.subStyle = subStyle
+if self.rewardType == REWARD_CASH then
+qprint('using mask:', pinMask or iconTexture, rewardMask or iconTexture, self.used, self.filtered)
+end
+end

Mercurial > wow > worldplan

comparison QuestPOI.lua @ 36:21bcff08b0f4