From 992277e3b1e8fb6d6e5a4403609d2bf53860dda4 Mon Sep 17 00:00:00 2001 From: Darthpred Date: Sat, 10 Sep 2016 11:53:25 +0300 Subject: [PATCH] Fix for gem link being wrong on artifact relics in the armory --- .../Armory/CharacterArmory/CharacterArmory.lua | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua index 7bda9f3..ce768ee 100644 --- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua +++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua @@ -7,6 +7,7 @@ local _G = _G local _ local IsShiftKeyDown = IsShiftKeyDown local SetItemRef = SetItemRef +local GetItemGem = GetItemGem local GetCursorInfo, CursorHasItem = GetCursorInfo, CursorHasItem local SocketInventoryItem = SocketInventoryItem local HandleModifiedItemClick = HandleModifiedItemClick @@ -567,15 +568,17 @@ function CA:Update_Gear() Slot["Socket'..GemCount_Enable].GemType = 'PRISMATIC' end ]] - + self:ClearTooltip(self.ScanTT) self.ScanTT:SetInventoryItem('player', Slot.ID) - + -- Apply current item's gem setting for i = 1, MAX_NUM_SOCKETS do ItemTexture = _G["Knight_CharacterArmory_ScanTTTexture"..i]:GetTexture() + + local _, GemLink = GetItemGem(ItemLink, i) GemID = T.select(i, GetInventoryItemGems(Slot.ID)) - + if Slot["Socket"..i].GemType and Info.Armory_Constants.GemColor[Slot["Socket"..i].GemType] then R, G, B = T.unpack(Info.Armory_Constants.GemColor[Slot["Socket"..i].GemType]) Slot["Socket"..i].Socket:SetBackdropColor(R, G, B, .5) @@ -584,21 +587,22 @@ function CA:Update_Gear() Slot["Socket"..i].Socket:SetBackdropColor(1, 1, 1, .5) Slot["Socket"..i].Socket:SetBackdropBorderColor(1, 1, 1) end - + if ItemTexture or GemID then if E.db.sle.Armory.Character.Gem.Display == 'Always' or E.db.sle.Armory.Character.Gem.Display == 'MouseoverOnly' and Slot.Mouseovered or E.db.sle.Armory.Character.Gem.Display == 'MissingOnly' then Slot["Socket"..i]:Show() Slot.SocketWarning:Point(Slot.Direction, Slot["Socket"..i], (Slot.Direction == 'LEFT' and 'RIGHT' or 'LEFT'), Slot.Direction == 'LEFT' and 3 or -3, 0) end - + GemCount_Now = GemCount_Now + 1 - + if GemID then GemCount = GemCount + 1 Slot["Socket"..i].GemItemID = GemID - - _, Slot["Socket"..i].Socket.Link, _, _, _, _, _, _, _, ItemTexture = T.GetItemInfo(GemID) - + Slot["Socket"..i].Socket.Link = GemLink + + ItemTexture = T.select(10, T.GetItemInfo(GemID)) + if ItemTexture then Slot["Socket"..i].Texture:SetTexture(ItemTexture) else -- 1.7.9.5