diff --git a/ElvUI_SLE/core/toolkit.lua b/ElvUI_SLE/core/toolkit.lua
index 2049617..c6cd949 100644
--- a/ElvUI_SLE/core/toolkit.lua
+++ b/ElvUI_SLE/core/toolkit.lua
@@ -68,6 +68,7 @@ T.GetInventorySlotInfo = GetInventorySlotInfo
T.GetInventoryItemDurability = GetInventoryItemDurability
T.GetInventoryItemQuality = GetInventoryItemQuality
T.GetItemInfo = GetItemInfo
+T.GetDetailedItemLevelInfo = GetDetailedItemLevelInfo
T.GetBuybackItemLink = GetBuybackItemLink
T.GetItemIcon = GetItemIcon
T.GetItemCooldown = GetItemCooldown
diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua
index d4f0511..cfdce20 100644
--- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua
+++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua
@@ -545,6 +545,7 @@ function CA:Update_Gear()
for _, SlotName in T.pairs(T.type(self.GearUpdated) == 'table' and self.GearUpdated or Info.Armory_Constants.GearList) do
Slot = self[SlotName]
ItemLink = T.GetInventoryItemLink('player', Slot.ID)
+ -- if ItemLink then local DaName = GetItemInfo(ItemLink); print(DaName, GetDetailedItemLevelInfo(ItemLink)) end
ErrorDetected = nil
if not (SlotName == 'ShirtSlot' or SlotName == 'TabardSlot') then
@@ -668,17 +669,14 @@ function CA:Update_Gear()
end
end
- _, _, ItemRarity, BasicItemLevel, _, _, _, _, ItemType, ItemTexture = T.GetItemInfo(ItemLink)
+ _, _, ItemRarity, _, _, _, _, _, ItemType, ItemTexture = T.GetItemInfo(ItemLink)
+ TrueItemLevel, _, BasicItemLevel = T.GetDetailedItemLevelInfo(ItemLink)
R, G, B = T.GetItemQualityColor(ItemRarity)
--<< Enchant Parts >>--
for i = 1, self.ScanTT:NumLines() do
CurrentLineText = _G["Knight_CharacterArmory_ScanTTTextLeft"..i]:GetText()
- if CurrentLineText:find(Info.Armory_Constants.ItemLevelKey_Alt) then
- TrueItemLevel = T.tonumber(CurrentLineText:match(Info.Armory_Constants.ItemLevelKey_Alt))
- elseif CurrentLineText:find(Info.Armory_Constants.ItemLevelKey) then
- TrueItemLevel = T.tonumber(CurrentLineText:match(Info.Armory_Constants.ItemLevelKey))
- elseif CurrentLineText:find(Info.Armory_Constants.EnchantKey) then
+ if CurrentLineText:find(Info.Armory_Constants.EnchantKey) then
if E.db.sle.Armory.Character.Enchant.Display ~= 'Hide' then
CurrentLineText = CurrentLineText:match(Info.Armory_Constants.EnchantKey) -- Get enchant string
CurrentLineText = T.gsub(CurrentLineText, ITEM_MOD_AGILITY_SHORT, AGI)
diff --git a/ElvUI_SLE/modules/Armory/Constants.lua b/ElvUI_SLE/modules/Armory/Constants.lua
index bad80f8..a696850 100644
--- a/ElvUI_SLE/modules/Armory/Constants.lua
+++ b/ElvUI_SLE/modules/Armory/Constants.lua
@@ -5,8 +5,6 @@ local KF, Info, Timer = unpack(ElvUI_KnightFrame)
local gsub = gsub
Info.Armory_Constants = {
- ItemLevelKey = ITEM_LEVEL:gsub('%%d', '(.+)'),
- ItemLevelKey_Alt = ITEM_LEVEL_ALT:gsub('%%d', '.+'):gsub('%(.+%)', '%%((.+)%%)'),
EnchantKey = ENCHANTED_TOOLTIP_LINE:gsub('%%s', '(.+)'),
ItemSetBonusKey = ITEM_SET_BONUS:gsub('%%s', '(.+)'),
--TransmogrifiedKey = TRANSMOGRIFIED:gsub('%%s', '(.+)'),
diff --git a/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua b/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua
index e4c296a..6bf687f 100644
--- a/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua
+++ b/ElvUI_SLE/modules/Armory/InspectArmory/InspectArmory.lua
@@ -1833,7 +1833,8 @@ function IA:InspectFrame_DataSetting(DataTable)
end
end
- _, _, ItemRarity, BasicItemLevel, _, _, _, _, ItemType, ItemTexture = T.GetItemInfo(Slot.Link)
+ _, _, ItemRarity, _, _, _, _, _, ItemType, ItemTexture = T.GetItemInfo(Slot.Link)
+ TrueItemLevel, _, BasicItemLevel = T.GetDetailedItemLevelInfo(Slot.Link)
R, G, B = T.GetItemQualityColor(ItemRarity)
ItemUpgradeID = Slot.Link:match(":(%d+)\124h%[")
@@ -1841,12 +1842,7 @@ function IA:InspectFrame_DataSetting(DataTable)
--<< Enchant Parts >>--
for i = 1, self.ScanTT:NumLines() do
CurrentLineText = _G["InspectArmoryScanTTTextLeft"..i]:GetText()
-
- if CurrentLineText:find(Info.Armory_Constants.ItemLevelKey_Alt) then
- TrueItemLevel = T.tonumber(CurrentLineText:match(Info.Armory_Constants.ItemLevelKey_Alt))
- elseif CurrentLineText:find(Info.Armory_Constants.ItemLevelKey) then
- TrueItemLevel = T.tonumber(CurrentLineText:match(Info.Armory_Constants.ItemLevelKey))
- elseif CurrentLineText:find(Info.Armory_Constants.EnchantKey) then
+ if CurrentLineText:find(Info.Armory_Constants.EnchantKey) then
if E.db.sle.Armory.Inspect.Enchant.Display ~= 'Hide' then
CurrentLineText = CurrentLineText:match(Info.Armory_Constants.EnchantKey) -- Get enchant string
CurrentLineText = gsub(CurrentLineText, ITEM_MOD_AGILITY_SHORT, AGI)