- fix for item level tracker.

This commit is contained in:
Tercioo
2015-12-31 12:30:24 -02:00
parent 98e22d0fb3
commit e13a415d26
6 changed files with 41 additions and 26 deletions
+6 -4
View File
@@ -1,5 +1,5 @@
local MAJOR, MINOR = "LibItemUpgradeInfo-1.0", 13
local type,tonumber,GetItemInfoFromHyperlink=type,tonumber,GetItemInfoFromHyperlink
local MAJOR, MINOR = "LibItemUpgradeInfo-1.0", 15
local type,tonumber,select,strsplit,GetItemInfoFromHyperlink=type,tonumber,select,strsplit,GetItemInfoFromHyperlink
local library,previous = _G.LibStub:NewLibrary(MAJOR, MINOR)
local lib=library --#lib Needed to keep Eclipse LDT happy
if not lib then return end
@@ -75,10 +75,12 @@ end
-- does not contain upgrade info
function lib:GetUpgradeID(itemString)
--local instaid,upgradeid =itemString:match("item:%d+:%d+:%d+:%d+:%d+:%d+:%-?%d+:%-?%d+:%d+:(%d+):%d:%d:(%d)")
local instaid,upgradeid =itemString:match("item:%d+:%d+:%d+:%d+:%d+:%d+:%-?%d+:%-?%d+:%d+:%d+:(%d+):%d+:%d+:(%d+)")
--local instaid,upgradeid =itemString:match("item:%d+:%d+:%d+:%d+:%d+:%d+:%-?%d+:%-?%d+:%d+:%d+:(%d+):%d+:%d+:(%d+)")
local itemString = itemString:match("item[%-?%d:]+") or ""-- Standardize itemlink to itemstring
local instaid, _, numBonuses, affixes = select(12, strsplit(":", itemString, 15))
instaid=tonumber(instaid) or 7
if instaid >0 and (instaid-4)%8==0 then
return tonumber(upgradeid)
return tonumber(select(numBonuses + 1, strsplit(":", affixes)))
end
end
@@ -2,10 +2,10 @@
## Title: Lib: ItemUpgradeInfo-1.0
## Notes: Database of item upgrade IDs
## Author: eridius
## Version: Release-60203-13 6.2.2
## X-Revision: 3155174
## Version: Release-60203-15 6.2.2
## X-Revision: efdd719
## X-Category: Library
## X-Curse-Packaged-Version: Release-60203-13
## X-Curse-Packaged-Version: Release-60203-15
## X-Curse-Project-Name: LibItemUpgradeInfo-1.0
## X-Curse-Project-ID: libitemupgradeinfo-1-0
## X-Curse-Repository-ID: wow/libitemupgradeinfo-1-0/mainline
@@ -5,7 +5,7 @@
## X-Website: http://www.wowace.com/addons/libstub/
## X-Category: Library
## X-License: Public Domain
## X-Curse-Packaged-Version: Release-60203-13
## X-Curse-Packaged-Version: Release-60203-15
## X-Curse-Project-Name: LibItemUpgradeInfo-1.0
## X-Curse-Project-ID: libitemupgradeinfo-1-0
## X-Curse-Repository-ID: wow/libitemupgradeinfo-1-0/mainline
+6 -6
View File
File diff suppressed because one or more lines are too long
+4 -9
View File
@@ -1104,21 +1104,16 @@ function ilvl_core:CalcItemLevel (unitid, guid, shout)
if (equip_id ~= 4) then --shirt slot
local item = GetInventoryItemLink (unitid, equip_id)
if (item) then
local _, _, _, iLevel, _, _, _, _, equipSlot = GetItemInfo (item)
if (iLevel and iLevel >= 100) then
local _, _, itemRarity, iLevel, _, _, _, _, equipSlot = GetItemInfo (item)
if (iLevel) then
--local _, _, _, _, _, _, _, _, _, _, _, upgradeTypeID, _, numBonusIDs, bonusID1, bonusID2 = strsplit (":", item)
--> upgrades handle by LibItemUpgradeInfo-1.0
--> http://www.wowace.com/addons/libitemupgradeinfo-1-0/
if (ItemUpgradeInfo) then
local upgrade, max, delta = ItemUpgradeInfo:GetItemUpgradeInfo (item)
if (upgrade) then
local ilvl = ItemUpgradeInfo:GetUpgradedItemLevel (item)
item_level = item_level + (ilvl or iLevel)
else
item_level = item_level + iLevel
end
local ilvl = ItemUpgradeInfo:GetUpgradedItemLevel (item)
item_level = item_level + (ilvl or iLevel)
else
item_level = item_level + iLevel
end
+21 -3
View File
@@ -1046,6 +1046,8 @@ function SlashCmdList.DETAILS (msg, editbox)
_detalhes_global.ALOOT = r
elseif (msg == "ilvl") then
--
local ilvl_frame = CreateFrame ("GameTooltip", "details_ilvl_tooltip", UIParent, "GameTooltipTemplate");
local get_ilvl = function (itemLink)
ilvl_frame:SetOwner (UIParent, "ANCHOR_NONE")
@@ -1053,13 +1055,29 @@ function SlashCmdList.DETAILS (msg, editbox)
ilvl_frame:SetHyperlink (itemLink)
for i = 1, 13 do
print (_G ["details_ilvl_tooltipTextLeft" .. i]:GetText())
local text = _G ["details_ilvl_tooltipTextLeft" .. i] and _G ["details_ilvl_tooltipTextLeft" .. i]:GetText()
if (text and text:find (ITEM_UPGRADE_STAT_AVERAGE_ITEM_LEVEL)) then
print ("ItemLevel:", text:gsub (ITEM_UPGRADE_STAT_AVERAGE_ITEM_LEVEL, ""))
break
end
end
end
local item = GetInventoryItemLink ("player", 1)
print ("item:", item)
local item = GetInventoryItemLink ("player", 14)
get_ilvl (item)
print (item)
local ItemUpgradeInfo = LibStub("LibItemUpgradeInfo-1.0")
local SlotNames = "Trinket1"
local Slot = GetInventoryItemLink ("player", GetInventorySlotInfo (("%sSlot"):format (SlotNames)))
print (Slot)
--local upgrade, max, delta = ItemUpgradeInfo:GetItemUpgradeInfo (item)
local upgrade, max, delta = ItemUpgradeInfo:GetItemUpgradeInfo (item)
local ilvl = ItemUpgradeInfo:GetUpgradedItemLevel (item)
print (ilvl, upgrade, max, delta)
print (GetItemInfo (item))
elseif (msg == "score") then