Quantcast

Real fix for proving grounds and challenge mode

Repooc [02-25-14 - 02:34]
Real fix for proving grounds and challenge mode
Filename
ElvUI_SLE/modules/characterframe/characterframe.lua
ElvUI_SLE/modules/characterframe/core.lua
diff --git a/ElvUI_SLE/modules/characterframe/characterframe.lua b/ElvUI_SLE/modules/characterframe/characterframe.lua
index 7f4c661..acbd3b7 100755
--- a/ElvUI_SLE/modules/characterframe/characterframe.lua
+++ b/ElvUI_SLE/modules/characterframe/characterframe.lua
@@ -316,7 +316,9 @@ function CFO:ArmoryFrame_DataSetting()
 				for i = 1, f.ScanTTForEnchanting1:NumLines() do
 					CurrentLineText = _G['KnightArmoryScanTT_E1TextLeft'..i]:GetText()

-					if CurrentLineText:find(C.ItemLevelKey) then
+					if CurrentLineText:find(C.ItemLevelKey_Alt) then
+						TrueItemLevel = tonumber(CurrentLineText:match(C.ItemLevelKey_Alt))
+					elseif CurrentLineText:find(C.ItemLevelKey) then
 						TrueItemLevel = tonumber(CurrentLineText:match(C.ItemLevelKey))
 					elseif CurrentLineText:find(C.EnchantKey) then
 						CurrentLineText = CurrentLineText:match(C.EnchantKey) -- Get enchant string
@@ -342,7 +344,6 @@ function CFO:ArmoryFrame_DataSetting()
 						if ItemUpgradeID == '0' then
 							ItemUpgradeID = nil
 						else
-							if not TrueItemLevel then TrueItemLevel = BasicItemLevel end
 							if not C.ItemUpgrade[ItemUpgradeID] then
 								print('New Upgrade ID |cffceff00['..ItemUpgradeID..']|r : |cffceff00'..(TrueItemLevel - BasicItemLevel))
 							end
diff --git a/ElvUI_SLE/modules/characterframe/core.lua b/ElvUI_SLE/modules/characterframe/core.lua
index 900b91f..6a12ae5 100644
--- a/ElvUI_SLE/modules/characterframe/core.lua
+++ b/ElvUI_SLE/modules/characterframe/core.lua
@@ -3,6 +3,7 @@ local E, L, V, P, G, _  = unpack(ElvUI)
 -- Constants
 SLArmoryConstants = {
 	['ItemLevelKey'] = ITEM_LEVEL:gsub('%%d', '(.+)'),
+	['ItemLevelKey_Alt'] = ITEM_LEVEL_ALT:gsub('%%d', '.+', 1):gsub('%(%%d%)', '%%((.+)%%)'),
 	['EnchantKey'] = ENCHANTED_TOOLTIP_LINE:gsub('%%s', '(.+)'),
 	['ItemSetBonusKey'] = ITEM_SET_BONUS:gsub('%%s', '(.+)'),
 	['TransmogrifiedKey'] = TRANSMOGRIFIED:gsub('%%s', '(.+)'),