Mercurial > wow > worldplan

changeset 47:733785e306a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Fixed an update lag that occurs between map changes. - Aesthetic polish
author Nenue
date Tue, 27 Dec 2016 17:29:23 -0500
parents 0873a1b00bb2
children c0b88bd1e40b
files QuestPOI.lua WorldPlan.lua WorldPlan.xml WorldQuests.lua
diffstat 4 files changed, 30 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/QuestPOI.lua	Mon Dec 26 10:24:49 2016 -0500
+++ b/QuestPOI.lua	Tue Dec 27 17:29:23 2016 -0500
@@ -34,7 +34,7 @@
 local ICON_MONEY = "Interface\\Buttons\\UI-GroupLoot-Coin-Up"
 
 local WORLD_QUEST_BORDER = "Interface\\UNITPOWERBARALT\\Generic1Target_Circular_Frame"
-local PENDING_BORDER
+local PENDING_BORDER = "Interface\\BUTTONS\\YELLOWORANGE64"
 local PENDING_ICON = "Interface\\BUTTONS\\YELLOWORANGE64"
 
 local REWARD_CASH = WORLD_QUEST_REWARD_TYPE_FLAG_GOLD
@@ -410,7 +410,6 @@
     self:SetAlpha(1) -- fix stuck alpha
   end
 
-  self.Overlay:SetShown(true)
   --WorldPlan:print(self:GetAlpha())
 
 end
@@ -572,12 +571,12 @@
   end
   icon:SetMask("Interface\\Minimap\\UI-Minimap-Background")
   if self.itemTexture then
-    iconBorder:SetTexture(WORLD_QUEST_BORDER)
+    --iconBorder:SetTexture(WORLD_QUEST_BORDER)
 
     if self.NoIcon then
       icon:SetTexture(PENDING_ICON)
       icon:SetDesaturated(true)
-      icon:SetVertexColor(style.r, style.g, style.b, style.a)
+      icon:SetVertexColor(style.r, style.g, style.b)
     else
 
       icon:SetTexture(self.itemTexture)
@@ -585,35 +584,34 @@
       icon:SetVertexColor(1, 1, 1)
     end
   else
-    iconBorder:SetTexture(PENDING_BORDER)
+    --
     icon:SetTexture(PENDING_ICON)
     icon:SetDesaturated(true)
-    icon:SetVertexColor(style.r, style.g, style.b, style.a)
+    icon:SetVertexColor(style.r, style.g, style.b)
   end
 
   local borderStyle = style
-  if self.rarity and WORLD_QUEST_QUALITY_COLORS[self.rarity] then
-    borderStyle = WORLD_QUEST_QUALITY_COLORS[self.rarity]
-  end
+  iconBorder:SetMask("Interface\\Minimap\\UI-Minimap-Background")
+  iconBorder:SetTexture(PENDING_BORDER)
 
   iconBorder:SetVertexColor(borderStyle.r, borderStyle.g, borderStyle.b, 1)
   iconBorder:SetDesaturated(true)
   iconBorder:SetAlpha(subStyle.alpha or 1)
 
-  if questID == GetSuperTrackedQuestID() then
-    trackingBorder:SetVertexColor(0,0,0,1)
-  else
-    trackingBorder:SetVertexColor(0,0,0,0.5)
-  end
+  trackingBorder:SetMask("Interface\\Minimap\\UI-Minimap-Background")
+  trackingBorder:SetTexture(PENDING_BORDER)
+  trackingBorder:SetVertexColor(0,0,0,1)
 
   self.tagIcon:SetShown(self.tagSize and true or false)
   self.tagIcon:SetAtlas(self.tagAtlas)
   self.tagIcon:SetAlpha(subStyle.alpha or 1)
-  self.EliteBorder:SetShown(self.isElite and not self.filtered)
-  self.Overlay:SetShown(self:IsShown())
+  self.Overlay:SetShown(true)
+  self.Overlay:ClearAllPoints(self)
   self.Overlay:SetParent(self:GetParent())
   self.Overlay:SetFrameLevel(self:GetFrameLevel()+200)
-  self.Overlay:SetAllPoints(self)
+  self.Overlay:SetPoint('TOPLEFT', self, 'TOPLEFT', 0, 4)
+  self.Overlay:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', 0, -4)
+  self.EliteBorder:SetShown(self.isElite and not self.filtered)
 
 
   self:UpdateSize()
@@ -684,9 +682,16 @@
   local iconWidth = subStyle.iconWidth
   local borderWidth = iconWidth + (subStyle.borderWidth * 2)
   local highlightWidth = borderWidth + (subStyle.highlightWidth * 2)
-
   local iconTexture = self.itemTexture
 
+
+  if self.questID == GetSuperTrackedQuestID() then
+    highlightWidth = highlightWidth + 2
+  end
+
+  if self.rarity and WORLD_QUEST_QUALITY_COLORS[self.rarity] then
+    highlightWidth = highlightWidth + self.rarity
+  end
   self.tagIcon:SetSize(self.tagSize, self.tagSize)
   self:SetSize(iconWidth, iconWidth)
   icon:SetSize(iconWidth, iconWidth)
--- a/WorldPlan.lua	Mon Dec 26 10:24:49 2016 -0500
+++ b/WorldPlan.lua	Tue Dec 27 17:29:23 2016 -0500
@@ -51,7 +51,7 @@
   },
   zone = {
     iconWidth = 22,
-    borderWidth = 3,
+    borderWidth = 2,
     highlightWidth = 2,
     TagSize = 12,
     maxAlertLevel = 3,
@@ -61,7 +61,7 @@
   minimized = {
     r = 0, g = 0, b = 0, a = 0.1,
     iconWidth = 8,
-    borderWidth = 2,
+    borderWidth = 1,
     alpha = 0.5,
     highlightWidth = 0,
     maxAlertLevel = 0,
--- a/WorldPlan.xml	Mon Dec 26 10:24:49 2016 -0500
+++ b/WorldPlan.xml	Tue Dec 27 17:29:23 2016 -0500
@@ -80,14 +80,14 @@
         </Texture>
       </Layer>
       <Layer level="BACKGROUND" textureSubLevel="1">
-        <Texture parentKey="icon" setAllPoints="true">
+        <Texture parentKey="RewardBorder" file="Interface\UNITPOWERBARALT\Generic1Target_Circular_Frame" desaturated="true">
           <Anchors>
             <Anchor point="CENTER" />
           </Anchors>
         </Texture>
       </Layer>
       <Layer level="BORDER">
-        <Texture parentKey="RewardBorder" file="Interface\UNITPOWERBARALT\Generic1Target_Circular_Frame" desaturated="true">
+        <Texture parentKey="icon" setAllPoints="true">
           <Anchors>
             <Anchor point="CENTER" />
           </Anchors>
--- a/WorldQuests.lua	Mon Dec 26 10:24:49 2016 -0500
+++ b/WorldQuests.lua	Tue Dec 27 17:29:23 2016 -0500
@@ -100,8 +100,8 @@
   WorldPlan:AddHandler(self, defaults)
 
   local rgbWhite = {1, 1, 1 }
-  WorldPlan:AddTypeInfo(self, REWARD_UNKNOWN, { r = 1, g = 1, b = 1})
-  WorldPlan:AddTypeInfo(self, REWARD_REAGENT, { r = 0, g = 1, b = 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_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_CURRENCY, { r = 1, g = 1, b = 0, hasNumeric = true, numberRGB = {1,1,0}, })
@@ -121,7 +121,7 @@
 
 function Module:OnMapInfo()
   if self:IsVisible() then
-    self:Refresh()
+    self:Refresh(true)
   else
     self.isStale = true
   end