# HG changeset patch # User Nenue # Date 1531942275 14400 # Node ID 414e37af1b1bd5c6f25fb6b5a25a9b25ab63b89d # Parent 4979b5cca6deadbc165072d371f8d22474c1e5a1 8.0.1 "pre-patch" updates - disabled PaperDoll, ArtifactPower, and Social/LFG modules diff -r 4979b5cca6de -r 414e37af1b1b .idea/codeStyleSettings.xml --- /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 @@ + + + + + + \ No newline at end of file diff -r 4979b5cca6de -r 414e37af1b1b Modules/ArtifactPower.lua --- 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 diff -r 4979b5cca6de -r 414e37af1b1b Modules/BuffFrame.lua --- 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) diff -r 4979b5cca6de -r 414e37af1b1b Modules/Currency.lua --- 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 diff -r 4979b5cca6de -r 414e37af1b1b Modules/Currency.xml --- 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"> - - - - - - - - - - - -