Mercurial > wow > buffalo2

changeset 83:4ec4fd89fced

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- order of operations regarding frame visibility checking - interaction with WorldPlan OrderHall module - fancy shmancy transition fades resulting from above
author Nenue
date Tue, 18 Oct 2016 01:57:02 -0400
parents be813a9d99c0
children 16b300d96724
files Modules/OrderHall.lua Veneer.xml
diffstat 2 files changed, 12 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Modules/OrderHall.lua	Mon Oct 17 13:00:26 2016 -0400
+++ b/Modules/OrderHall.lua	Tue Oct 18 01:57:02 2016 -0400
@@ -46,6 +46,10 @@
       frame:SetShown(true)
       self:Show()
     end
+    function frame.HidePanel(frame)
+      frame:SetShown(false)
+      self:UpdateSize()
+    end
   end
   self:SetOrderHallUIMods()
 end
@@ -99,9 +103,9 @@
   elseif event == 'PLAYER_ENTERING_WORLD' then
     self:Update()
   elseif event == 'PLAYER_REGEN_ENABLED' then
-    self:Show()
+    self:SetShown(true)
   elseif event == 'PLAYER_REGEN_DISABLED' then
-    self:Hide()
+    self:SetShown(false)
   end
 end
 
@@ -294,7 +298,7 @@
     end
     hasNewInfo = (self.progressAmount ~= xp)
 
-    progressChange = (hasNewInfo and not self.modeChanged) and (xp - self.progressAmount) / self:GetWidth()
+    progressChange = (hasNewInfo and not self.modeChanged) and ((xp - self.progressAmount) / xpMax)
 
 
     self.progressAmount = xp
@@ -307,7 +311,7 @@
     if itemID then
       local nextRankCost = GetCostForPointAtRank(pointsSpent) or 0
       hasNewInfo = (self.progressAmount ~= totalXP)
-      progressChange = (hasNewInfo and not self.modeChanged) and (totalXP - self.progressAmount) / self:GetWidth()
+      progressChange = (hasNewInfo and not self.modeChanged) and (((totalXP - self.progressAmount) / nextRankCost))
 
       if totalXP > nextRankCost then
         self.progressPercent = 1
@@ -370,7 +374,7 @@
       self.ProgressBar:Hide()
     end
   else
-    self:Hide()
+    self:HidePanel()
   end
 
   self.modeChanged = nil
--- a/Veneer.xml	Mon Oct 17 13:00:26 2016 -0400
+++ b/Veneer.xml	Tue Oct 18 01:57:02 2016 -0400
@@ -279,10 +279,10 @@
         </Layers>
         <Animations>
           <AnimationGroup parentKey="TransitionFadeOut" setToFinalAlpha="true">
-            <Alpha fromAlpha="1" toAlpha="0" duration="0.15" order="1" />
+            <Alpha fromAlpha="1" toAlpha="0" duration="1.12" order="1" />
             <Scripts>
               <OnPlay>
-                print('VnWorldState','fade out')
+                --print('VnWorldState','fade out')
               </OnPlay>
               <OnFinished>
                 self:GetParent():Hide()
@@ -296,7 +296,7 @@
               <OnPlay>
                 self:GetParent():ShowPanel()
                 self:GetParent().timeLived = 0
-                print('VnWorldState', 'fade in')
+                --print('VnWorldState', 'fade in')
               </OnPlay>
               <OnFinished>
                 self:GetParent().timeLived = 0