Mercurial > wow > buffalo2

changeset 112:7c77fde36287

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- WorldPlan pins are checked for completion state when available AP is tallied.
author Nick@Zahhak
date Thu, 23 Mar 2017 05:29:03 -0400
parents 1196c2bad31c
children 2105b6e5095f
files Modules/ArtifactPower.lua Modules/BuffFrame.xml Modules/WorldState.lua Veneer.lua
diffstat 4 files changed, 16 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Modules/ArtifactPower.lua	Tue Mar 21 16:33:51 2017 -0400
+++ b/Modules/ArtifactPower.lua	Thu Mar 23 05:29:03 2017 -0400
@@ -433,7 +433,7 @@
     print('world plan is loaded')
     local worldQuests = WorldPlan:GetQuestPins()
     for index, pin in ipairs(worldQuests) do
-      if pin.dataLoaded and (pin.rewardType == WORLD_QUEST_REWARD_TYPE_FLAG_ARTIFACT_POWER) then
+      if pin.dataLoaded and (pin.rewardType == WORLD_QUEST_REWARD_TYPE_FLAG_ARTIFACT_POWER) and (pin.isActive) then
         showWQ = true
         print(pin.itemNumber)
         self.worldQuestAP = self.worldQuestAP + pin.itemNumber
--- a/Modules/BuffFrame.xml	Tue Mar 21 16:33:51 2017 -0400
+++ b/Modules/BuffFrame.xml	Thu Mar 23 05:29:03 2017 -0400
@@ -62,29 +62,29 @@
       <Frame name="$parentOverlay" parentKey="overlay" setAllPoints="true">
         <Layers>
           <Layer level="OVERLAY">
-            <FontString name="$parentCount" parentKey="count" inherits="VeneerNumberFontLarge">
-              <Anchors>
-                <Anchor point="TOPRIGHT" x="-2" y="-2" />
-              </Anchors>
-            </FontString>
             <FontString name="$parentValue1" parentKey="Value1" inherits="VeneerNumberFont">
               <Anchors>
-                <Anchor point="TOPLEFT" x="2" y="-2" />
+                <Anchor point="TOPLEFT" x="0" y="0" />
               </Anchors>
               <Color r="0" g="1" b="0" />
             </FontString>
             <FontString name="$parentValue2" parentKey="Value2" inherits="VeneerNumberFont">
               <Anchors>
-                <Anchor point="TOPLEFT" x="0" y="-2" relativeTo="BOTTOMELFT" relativeKey="$parent.Value1" />
+                <Anchor point="TOPLEFT" x="0" y="-2" relativePoint="BOTTOMLEFT" relativeKey="$parent.Value1" />
               </Anchors>
               <Color r="0" g="1" b="1" />
             </FontString>
             <FontString name="$parentValue3" parentKey="Value3" inherits="VeneerNumberFont">
               <Anchors>
-                <Anchor point="TOPLEFT" x="0" y="-2" relativeTo="BOTTOMELFT" relativeKey="$parent.Value1" />
+                <Anchor point="TOPLEFT" x="0" y="-2" relativePoint="BOTTOMLEFT" relativeKey="$parent.Value2" />
               </Anchors>
               <Color r="1" g="1" b="0" />
             </FontString>
+            <FontString name="$parentCount" parentKey="count" inherits="VeneerNumberFontLarge">
+              <Anchors>
+                <Anchor point="TOPRIGHT" x="0" y="0" />
+              </Anchors>
+            </FontString>
           </Layer>
         </Layers>
       </Frame>
--- a/Modules/WorldState.lua	Tue Mar 21 16:33:51 2017 -0400
+++ b/Modules/WorldState.lua	Thu Mar 23 05:29:03 2017 -0400
@@ -197,11 +197,12 @@
 
   OrderHallCommandBar:ClearAllPoints()
   OrderHallCommandBar:SetAllPoints(self)
-  OrderHallCommandBar:SetWidth(600)
+
   OrderHallCommandBar.Background:SetColorTexture(0,0,0,0.5)
   OrderHallCommandBar.WorldMapButton:Hide()
   OrderHallCommandBar:EnableMouse(false)
-  self:SetSize(OrderHallCommandBar:GetSize())
+  self:SetSize(700, 24)
+
 
   print('|cFF00AAFF'..self:GetName()..'|r:Update()', OrderHallCommandBar:IsVisible(), self:IsShown())
   print(debugstack(6))
--- a/Veneer.lua	Tue Mar 21 16:33:51 2017 -0400
+++ b/Veneer.lua	Thu Mar 23 05:29:03 2017 -0400
@@ -349,16 +349,18 @@
           if frame.anchorFrame then
             print(frame.anchorPoint)
             frame:SetPoint(frame.anchorPoint, frame.anchorFrame, frame.anchorFrom, frame.anchorX, frame.anchorY)
-            print(frame:GetTop(), frame:GetRight())
+            print('anchored to', frame.anchorFrame,frame:GetTop(), frame:GetRight())
           else
             anchorPoint = frame.anchorPoint or anchorPoint
             frame:ClearAllPoints()
             if lastFrame then
               frame:SetPoint(anchorPoint, lastFrame, ANCHOR_OFFSET_POINT[anchorPoint], 0, 0)
+
+              print('moved after', lastFrame,frame:GetTop(), frame:GetRight())
             else
               frame:SetPoint(anchorPoint, UIParent, anchorPoint, frame.anchorX, frame.anchorY)
+              print('stub', anchorPoint, frame.anchorX, frame.anchorY)
             end
-            print(frame:GetTop(), frame:GetRight())
             lastFrame = frame
           end