From f4c1ba48013d7748a05193fe39725b44d0763cf8 Mon Sep 17 00:00:00 2001 From: Repooc Date: Wed, 9 Nov 2016 21:44:37 -0500 Subject: [PATCH] Maybe a quick dirty fix for #395 --- .../Armory/CharacterArmory/CharacterArmory.lua | 56 +++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua index 7706d58..dfdf194 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua @@ -1309,36 +1309,40 @@ do --<< Artifact Monitor >> _, _, _, _, _, _, PowerItemLink = GetContainerItemInfo(BagID, SlotID) if PowerItemLink then - self:ClearTooltip(self.ArtifactMonitor.ScanTT) - self.ArtifactMonitor.ScanTT:SetHyperlink(PowerItemLink) - SearchingPhase = 1 - CurrentItemPower = 0 - - for i = 1, self.ArtifactMonitor.ScanTT:NumLines() do - SearchingText = CleanString(_G['Knight_CharacterArmory_ArtifactScanTTTextLeft' .. i]:GetText()) + if GetItemInfo(PowerItemLink) then + -- print(GetItemInfo(PowerItemLink)) + -- print(PowerItemLink) + self:ClearTooltip(self.ArtifactMonitor.ScanTT) + self.ArtifactMonitor.ScanTT:SetHyperlink(PowerItemLink) + SearchingPhase = 1 + CurrentItemPower = 0 - if SearchingPhase == 1 and SearchingText == ARTIFACT_POWER then - SearchingPhase = 2 - elseif SearchingPhase == 2 and SearchingText:find(ITEM_SPELL_TRIGGER_ONUSE) then - CurrentItemPower = tonumber(SearchingText:gsub(',', ''):match('%d+')) - TotalPower = TotalPower + CurrentItemPower + for i = 1, self.ArtifactMonitor.ScanTT:NumLines() do + SearchingText = CleanString(_G['Knight_CharacterArmory_ArtifactScanTTTextLeft' .. i]:GetText()) - if not LowestPower or LowestPower > CurrentItemPower then - LowestPower = CurrentItemPower - LowestPower_BagID = BagID - LowestPower_SlotID = SlotID - LowestPower_Link = PowerItemLink + if SearchingPhase == 1 and SearchingText == ARTIFACT_POWER then + SearchingPhase = 2 + elseif SearchingPhase == 2 and SearchingText:find(ITEM_SPELL_TRIGGER_ONUSE) then + CurrentItemPower = tonumber(SearchingText:gsub(',', ''):match('%d+')) + TotalPower = TotalPower + CurrentItemPower + + if not LowestPower or LowestPower > CurrentItemPower then + LowestPower = CurrentItemPower + LowestPower_BagID = BagID + LowestPower_SlotID = SlotID + LowestPower_Link = PowerItemLink + end + + break end - - break end - end - - if SearchingPhase == 2 and not (LowestPower and LowestPower > 0) then - LowestPower = CurrentItemPower - LowestPower_BagID = BagID - LowestPower_SlotID = SlotID - LowestPower_Link = PowerItemLink + + if SearchingPhase == 2 and not (LowestPower and LowestPower > 0) then + LowestPower = CurrentItemPower + LowestPower_BagID = BagID + LowestPower_SlotID = SlotID + LowestPower_Link = PowerItemLink + end end end end -- 1.7.9.5