Mercurial > wow > worldplan

changeset 48:c0b88bd1e40b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Fixed frame update flagging after proper reward data is processed, which probably also fixes the issue of loaded data mysteriously vanishing.
author Nenue
date Tue, 27 Dec 2016 19:46:40 -0500
parents 733785e306a3
children dbd81d49af02
files QuestPOI.lua WorldPlan.lua WorldQuests.lua
diffstat 3 files changed, 10 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/QuestPOI.lua	Tue Dec 27 17:29:23 2016 -0500
+++ b/QuestPOI.lua	Tue Dec 27 19:46:40 2016 -0500
@@ -302,10 +302,8 @@
       tagAtlas = "worldquest-icon-dungeon"
     end
     self.worldQuestType = worldQuestType
-
     self.tagAtlas = tagAtlas
 
-
     self:SetRewardInfo()
 
     -- force throttle on success
@@ -317,6 +315,7 @@
       self.isPending = nil
       self.throttle = 1
       self.updateRate = PIN_REFRESH_DELAY
+      self.isStale = true
     end
   end
 
@@ -360,7 +359,7 @@
     -- flag unresolved info
     if not (rewardIcon and rewardName) then
       self.isPending = true
-      return true, nil
+      self.isStale = nil
       --WorldPlan:print('|cFFFFFF00'..tostring(self.title)..'|r waiting on texture info')
     else
       if (rewardIcon and rewardName) and self.isPending then
@@ -371,8 +370,6 @@
     end
 
   end
-  return self.isStale, self.isPending
-
 end
 
 -- run from OnShow if .isNew is set
@@ -398,9 +395,6 @@
 end
 
 function QuestPOI:OnShow ()
-  if self.isNew or self.isStale then
-    self:Refresh()
-  end
 
   if self.isNew then
     qprint('|cFFFFFF00'..tostring(self:GetName())..':OnShow()|r update:', self.isStale, 'new:', self.isNew, 'animation:', self.isAnimating)
@@ -410,6 +404,9 @@
     self:SetAlpha(1) -- fix stuck alpha
   end
 
+  if self.isNew or self.isStale then
+    self:Refresh()
+  end
   --WorldPlan:print(self:GetAlpha())
 
 end
--- a/WorldPlan.lua	Tue Dec 27 17:29:23 2016 -0500
+++ b/WorldPlan.lua	Tue Dec 27 19:46:40 2016 -0500
@@ -510,7 +510,7 @@
   info.checked = config.DisplayContinentSummary
   info.func = DropDown_OnClick
   UIDropDownMenu_AddButton(info)
-
+  --[[
 
   info.text = "Nudge Pins"
   info.isNotRadio = true
@@ -529,6 +529,7 @@
   info.checked = config.FadeWhileGrouped
   info.func = DropDown_OnClick
   UIDropDownMenu_AddButton(info)
+  --]]
 end
 
 --------------------------------------------------------------------------------------------------------------------
--- a/WorldQuests.lua	Tue Dec 27 17:29:23 2016 -0500
+++ b/WorldQuests.lua	Tue Dec 27 19:46:40 2016 -0500
@@ -96,14 +96,14 @@
 function Module:OnLoad()
   print('|cFFFF4400'..self:GetName()..':OnLoad()')
 
-  self:SetParent(WorldMapFrame)
+  self:SetParent(WorldMapPOIFrame)
   WorldPlan:AddHandler(self, defaults)
 
   local rgbWhite = {1, 1, 1 }
   WorldPlan:AddTypeInfo(self, REWARD_UNKNOWN, { r = 0, g = 0, b = 0})
-  WorldPlan:AddTypeInfo(self, REWARD_REAGENT, { r = 0, g = .4, b = 1 })
+  WorldPlan:AddTypeInfo(self, REWARD_REAGENT, { r = 0, g = 1, b = .5 })
   WorldPlan:AddTypeInfo(self, REWARD_ARTIFACT_POWER, { r = 1, g = .25, b = .5, hasNumeric = true, numberRGB = rgbWhite })
-  WorldPlan:AddTypeInfo(self, REWARD_GEAR, { r = .1, g = .2, b = 1 })
+  WorldPlan:AddTypeInfo(self, REWARD_GEAR, { r = .3, g = .7, b = 1 })
   WorldPlan:AddTypeInfo(self, REWARD_CURRENCY, { r = 1, g = 1, b = 0, hasNumeric = true, numberRGB = {1,1,0}, })
   WorldPlan:AddTypeInfo(self, REWARD_CASH, { r = 1, g = 1, b = .32, pinMask = false, rewardMask = false })
 
@@ -114,9 +114,6 @@
   -- WORLD_MAP_UPDATE and PLAYER_ENTERING_WORLD are passed down from a higher level
   self:RegisterEvent('WORLD_QUEST_COMPLETED_BY_SPELL')
   self:RegisterEvent('SKILL_LINES_CHANGED')
-
-  WorldMapPOIFrame = _G.WorldMapPOIFrame
-
 end
 
 function Module:OnMapInfo()