Mercurial > wow > buffalo2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.idea/codeStyleSettings.xml	Wed Jul 18 15:31:15 2018 -0400
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value />
+    </option>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+  </component>
+</project>
\ No newline at end of file
--- a/Modules/ArtifactPower.lua	Thu Jan 25 20:58:10 2018 -0500
+++ b/Modules/ArtifactPower.lua	Wed Jul 18 15:31:15 2018 -0400
@@ -70,10 +70,9 @@
       self:Update()
     elseif arg == 'reset' then
       if self.db then
-        table.wipe(self.db.cache)
-        table.wipe(self.db.fishingCache)
+        self:ResetCache()
       end
-      self:Print('Cache data reset.')
+      self:Print('Forced refresh.')
       self:Update()
     elseif arg:match('item') then
       print('name', arg:match("^item (%S.+)"))
@@ -298,6 +297,7 @@
   self.enabled = true

   self:ScanAllBags()
+  self:TryToShow()
   self:Reanchor()
 end
 function Module:OnHide()
@@ -342,7 +342,15 @@
   --print('|cFF00FF88OnEvent()', event, ...)
   if event == 'PLAYER_ENTERING_WORLD' then
     self:TryToShow()
+
+  elseif event == 'UNIT_LEVEL' then
+
+    if UnitLevel('player') == 110 then
+      self.profile.knowledgeMultiplier = 52
+    end
+
   elseif event == 'BAG_UPDATE' then
+
     local containerID = ...
     self:QueueBag(containerID)
   elseif event == 'ITEM_LOCK_CHANGED' then
@@ -357,16 +365,19 @@

   elseif event == 'PLAYER_BANKSLOTS_CHANGED' then
     self:ScanAllBags()
+    self:TryToShow()
   elseif event == 'BAG_UPDATE_DELAYED' then
     if not self.firstHit then
       -- prevent double call from login
       self.firstHit = true
     else
       self:ScanAllBags()
+      self:TryToShow()
     end
   elseif event == 'BANKFRAME_OPENED' then
     self.bankAccess = true
     self:ScanAllBags()
+    self:TryToShow()
   elseif event == 'BANKFRAME_CLOSED' then
     self.bankAccess = nil
   elseif event == 'ARTIFACT_UPDATE' then
@@ -386,10 +397,10 @@

     if self.queuedScan then
       self:ScanAllBags(self.backAccess)
-    else
-      self:TryToShow()
     end

+    self:TryToShow()
+
     if #queued_hooks >= 1 then
       CreateHook()
     end
@@ -464,10 +475,17 @@
   end
   print('|cFFFFFF00pdate()|r')

+
+  local level = UnitLevel('player')
+  if level ~= self.profile.playerLevel then
+    self.profile.playerLevel = level
+    self:ResetCache()
+  end
+
+
   local numButtons = 0
   local contentsHeight = 16
   local contentsWidth = 400
-  if self.profile.knowledgeMultiplier then
     local artifactsWidth = self:UpdateArtifactButtons()

     if artifactsWidth ~= 0 then
@@ -479,12 +497,11 @@
     local itemsWidth, itemsHeight = self:UpdateItemButtons()
     contentsHeight = contentsHeight + itemsHeight
     contentsWidth = max(contentsWidth, itemsWidth)
-  end


   local bankText, bagText
-  if not self.profile.knowledgeMultiplier then
+  if artifactsWidth == 0 then
     bankText = '|cFF00FF00Shift-Right-Click an artifact weapon to start building data.'
   elseif not (self.bankAP and self.bagAP) then
     bankText = '|cFFFF0000Open bank frame to count all AP|r '
@@ -954,10 +971,9 @@
     self.queuedScan = true
     return
   end
-  if not self.profile.knowledgeMultiplier then
-    print('need to get knowledge level')
-    return
-  end
+
+
+

   self.queuedScan = nil

@@ -1002,7 +1018,6 @@
   end
   self.lastUpdate = GetTime()
   self.queuedScan = nil
-  self:TryToShow()
 end


@@ -1031,15 +1046,21 @@
   local actualXP = artifact.currentXP
   local actualLevel = artifact.level
   local actualCost = C_ArtifactUI.GetCostForPointAtRank(actualLevel, artifact.tier)
+  local actualTier = artifact.tier

   print('tier:', artifact.tier)
   print('current:', self.level, self.currentXP, '/', self.currentCost)
   while (actualXP >= actualCost) and (actualCost > 0) do
     actualXP = actualXP - actualCost
     actualLevel = actualLevel + 1
-    actualCost = C_ArtifactUI.GetCostForPointAtRank(actualLevel, artifact.tier)
+    if actualLevel == 35 then
+      -- accomodate the auto-empowerment that occurs at 35 as of patch 7.3
+      actualTier = 2
+      print('tier =', actualTier)
+    end
+    actualCost = C_ArtifactUI.GetCostForPointAtRank(actualLevel, actualTier)

-    print('* ', actualLevel, actualXP, actualCost, totalCost)
+    print('* ', actualLevel, actualXP, actualCost, actualCost)
   end
   print('actual:', actualLevel, actualXP, '/', actualCost)

@@ -1055,7 +1076,7 @@
     while (remaining >= nextCost) and (nextCost > 0) do
       totalLevel = totalLevel + 1
       remaining = remaining - nextCost
-      nextCost = C_ArtifactUI.GetCostForPointAtRank(totalLevel, artifact.tier)
+      nextCost = C_ArtifactUI.GetCostForPointAtRank(totalLevel, actualTier)
       print('|cFFFFFF00+ ', totalLevel, remaining, '/', totalCost)
     end
     totalXP = remaining
@@ -1069,10 +1090,12 @@
   self.actualCost = actualCost
   self.actualLevel = actualLevel
   self.actualXP = actualXP
+  self.actualTier = actualTier

   self.totalXP = totalXP
   self.totalCost = totalCost
   self.totalLevel = totalLevel
+  self.totalTier = totalTier
--- a/Modules/BuffFrame.lua	Thu Jan 25 20:58:10 2018 -0500
+++ b/Modules/BuffFrame.lua	Wed Jul 18 15:31:15 2018 -0400
@@ -394,7 +394,7 @@
     button:RegisterForClicks('AnyUp')
     button:SetScript('OnClick', Audit_OnClick)
     button:SetScript('OnEvent', Audit_OnEvent)
-    button:RegisterEvent('POWER_REGEN_ENABLED')
+    --button:RegisterEvent('POWER_REGEN_ENABLED')
     button:SetPoint('TOPLEFT', 0, (i-1) * 16 * -1)
     facade.Audit[i] = button
   end
@@ -423,13 +423,15 @@
   end
     --]]

-  local name, rank, icon, count, dispelType, duration, expires, caster, isStealable, nameplateShowPersonal, spellID, canApplyAura, isBossDebuff, _, nameplateShowAll, timeMod, value1, value2, value3 = UnitAura(frame.unit, frame:GetID(), frame.filter)
+  local name, icon, count, dispelType, duration, expires, caster, isStealable, nameplateShowPersonal, spellID, canApplyAura, isBossDebuff, _, nameplateShowAll, timeMod, value1, value2, value3 = UnitAura(frame.unit, frame:GetID(), frame.filter)
   values[1] = value1
   values[2] = value2
   values[3] = value3

   facade.buffName = name

+  print(expires, duration)
+
   if expires and duration then
     if duration ~= 0 then
       local startTime = (expires - duration)
--- a/Modules/Currency.lua	Thu Jan 25 20:58:10 2018 -0500
+++ b/Modules/Currency.lua	Wed Jul 18 15:31:15 2018 -0400
@@ -63,7 +63,12 @@
   anchorPoint = 'TOP',
   anchorPriority = 2,
 }
-VeneerCurrencyBlockMixin = {}
+VeneerCurrencyBlockMixin = {
+  OnLoad = function() end,
+  OnEvent = function() end,
+  OnShow = function() end,
+  OnHide = function() end,
+}
 local module = VeneerCurrencyMixin
 local block = VeneerCurrencyBlockMixin
--- a/Modules/Currency.xml	Thu Jan 25 20:58:10 2018 -0500
+++ b/Modules/Currency.xml	Wed Jul 18 15:31:15 2018 -0400
@@ -2,22 +2,6 @@
 ..\FrameXML\UI.xsd">


-    <Frame parent="UIParent" name="VeneerBankDB" parentArray="modules" mixin="VeneerBankDBMixin" hidden="true" inherits="VeneerHandlerTemplate">
-        <Size x="240" y="24" />
-        <Anchors>
-            <Anchor point="CENTER" />
-        </Anchors>
-        <Layers>
-            <Layer level="OVERLAY">
-                <FontString parentArray="ConfigLayer" parentKey="Info" inherits="GameFontNormal" hidden="true">
-                    <Anchors>
-                        <Anchor point="CENTER" />
-                    </Anchors>
-                </FontString>
-            </Layer>
-        </Layers>
-    </Frame>
-
     <Script file="Currency.lua" />
     <Frame virtual="true" name="VeneerCurrencyTemplate" parentArray="Blocks" mixin="VeneerCurrencyBlockMixin" hidden="true">
         <Scripts>
--- a/Modules/LFGFrame.lua	Thu Jan 25 20:58:10 2018 -0500
+++ b/Modules/LFGFrame.lua	Wed Jul 18 15:31:15 2018 -0400
@@ -58,7 +58,10 @@
     PVEFrame_ShowFrame("GroupFinderFrame", LFGListPVEStub);
     local panel = LFGListFrame.CategorySelection
     LFGListCategorySelection_SelectCategory(panel, 6, 0);
-    LFGListCategorySelection_StartFindGroup(panel, locationName);
+
+    local bossName = locationName:match('Greater Invasion Point: (.+)')
+
+    LFGListCategorySelection_StartFindGroup(panel, bossName or locationName);
   end
 end
--- a/Modules/WorldState.xml	Thu Jan 25 20:58:10 2018 -0500
+++ b/Modules/WorldState.xml	Wed Jul 18 15:31:15 2018 -0400
@@ -3,6 +3,12 @@

   <Script file="WorldState.lua" />

-  <Frame name="VeneerOrderHallHandler" hidden="true" parent="UIParent" mixin="VeneerOrderHallMixin" inherits="VeneerMixinScripts" />
+  <Frame name="VeneerOrderHallHandler" hidden="true" parent="UIParent" mixin="VeneerOrderHallMixin">
+    <Scripts>
+      <OnLoad method="OnLoad"  />
+      <OnShow method="OnShow" />
+      <OnUpdate method="OnUpdate" />
+    </Scripts>
+  </Frame>

 </Ui>
\ No newline at end of file
--- a/Templates.lua	Thu Jan 25 20:58:10 2018 -0500
+++ b/Templates.lua	Wed Jul 18 15:31:15 2018 -0400
@@ -153,7 +153,8 @@

 -- Replace if module requires anything besides fixing frame anchors

-
+function Handler:OnEvent()
+end
 function Handler:OnShow()
   self:Reanchor()
   _G.Veneer:DynamicReanchor()
--- a/Templates.xml	Thu Jan 25 20:58:10 2018 -0500
+++ b/Templates.xml	Wed Jul 18 15:31:15 2018 -0400
@@ -36,11 +36,14 @@
     <Scripts>
       <OnLoad method="OnLoad"  />
       <OnEvent method="OnEvent" />
+      <!--
       <OnUpdate method="OnUpdate" />
       <OnShow method="OnShow" />
       <OnHide method="OnHide" />
       <OnMouseDown method="OnMouseDown" />
       <OnSizeChanged method="OnSizeChanged" />
+
+      -->
     </Scripts>
   </Frame>
--- a/Veneer.lua	Thu Jan 25 20:58:10 2018 -0500
+++ b/Veneer.lua	Wed Jul 18 15:31:15 2018 -0400
@@ -103,8 +103,8 @@
   print('|cFFFFFF00Veneer!|r')
   self:RegisterEvent('ADDON_LOADED')
   self:RegisterEvent('PLAYER_LOGIN')
-  self:RegisterEvent('PLAYER_REGEN_ENABLED')
-  self:RegisterEvent('PLAYER_REGEN_DISABLED')
+  --self:RegisterEvent('PLAYER_REGEN_ENABLED')
+  --self:RegisterEvent('PLAYER_REGEN_DISABLED')

   self.DEVIAN_PNAME = 'Veneer'
   self:RegisterForDrag('LeftButton')
--- a/Veneer.toc	Thu Jan 25 20:58:10 2018 -0500
+++ b/Veneer.toc	Wed Jul 18 15:31:15 2018 -0400
@@ -1,4 +1,4 @@
-## Interface: 70300
+## Interface: 80000
 ## Title: Veneer
 ## Notes: Collection of interface enhancements that make life easier
 ## Author: Krakyn
@@ -17,8 +17,8 @@
 Modules\Currency.xml
 Modules\TalkingHead.xml
 Modules\BuffFrame.xml
-Modules\PaperDoll.xml
-Modules\PetBattle.xml
-Modules\ArtifactPower.xml
-Modules\FriendsFrame.xml
-Modules\LFGFrame.xml
\ No newline at end of file
+##Modules\PaperDoll.xml
+##Modules\PetBattle.xml
+##Modules\ArtifactPower.xml
+##Modules\FriendsFrame.xml
+##Modules\LFGFrame.xml
\ No newline at end of file
--- a/Veneer.xml	Thu Jan 25 20:58:10 2018 -0500
+++ b/Veneer.xml	Wed Jul 18 15:31:15 2018 -0400
@@ -10,7 +10,14 @@


-  <Frame name="Veneer" inherits="VeneerMixinScripts" mixin="VeneerCore" hidden="true" enableMouse="true" movable="true" frameStrata="DIALOG">
+  <Frame name="Veneer" mixin="VeneerCore" hidden="true" enableMouse="true" movable="true" frameStrata="DIALOG">
+
+    <Scripts>
+      <OnLoad method="OnLoad"  />
+      <OnEvent method="OnEvent" />
+
+    </Scripts>
+
     <Size x="400" y="400" />
     <Anchors>
       <Anchor point="CENTER" relativePoint="CENTER" x="0" y="0" />
@@ -26,7 +33,7 @@
         </Texture>
       </Layer>
       <Layer level="ARTWORK">
-        <FontString name="$parentHeader" parentKey="header" inherits="VeneerFontHighlightLarge" text="Veneer">
+        <FontString name="$parentHeader" parentKey="header" inherits="GameFontNormal" text="Veneer">
           <Anchors>
             <Anchor point="TOPLEFT" x="3" y="-4" />
           </Anchors>