wow/askmrrobot: AskMrRobot-Serializer/AskMrRobot-Serializer.lua comparison

comparison AskMrRobot-Serializer/AskMrRobot-Serializer.lua @ 185:a7f2ba17c39a v90

Shadowlands pre-patch update.

author	yellowfive
date	Tue, 13 Oct 2020 10:49:07 -0700
parents	c6369f8f277c
children	180cb1458674

comparison

equal deleted inserted replaced

-:f374d84470db
+:a7f2ba17c39a
 -- AskMrRobot-Serializer will serialize and communicate character data between users.
-local MAJOR, MINOR = "AskMrRobot-Serializer", 86
+local MAJOR, MINOR = "AskMrRobot-Serializer", 90
 local Amr, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 if not Amr then return end -- already loaded by something else
 -- event and comm used for player snapshotting on entering combat
 ["Alliance"] = 1,
 ["Horde"] = 2
 }
 Amr.InstanceIds = {
-	Uldir = 1861,
+	Nathria = 2296
-	Dazar = 2070,
-	Storms = 2096,
-	Palace = 2164,
-	Nyalotha = 2217
 }
 -- instances that AskMrRobot currently supports logging for
 Amr.SupportedInstanceIds = {
-	[1861] = true,
+	[2296] = true
-	[2070] = true,
-	[2096] = true,
-	[2164] = true,
-	[2217] = true
 }
 ----------------------------------------------------------------------------------------
 -- Public Utility Methods
 item.gemIds = { tonumber(parts[3]) or 0, tonumber(parts[4]) or 0, tonumber(parts[5]) or 0, tonumber(parts[6]) or 0 }
 item.suffixId = math.abs(tonumber(parts[7]) or 0) -- convert suffix to positive number, that's what we use in our code
 -- part 8 is some unique ID... we never really used it
 -- part 9 is current player level
 	-- part 10 is player spec
-	local upgradeIdType = tonumber(parts[11]) or 0 -- part 11 indicates what kind of upgrade ID is just after the bonus IDs
+	-- unsure what 11 is now  --local upgradeIdType = tonumber(parts[11]) or 0 -- part 11 indicates what kind of upgrade ID is just after the bonus IDs
 -- part 12 is instance difficulty id
+	-- 13 is num bonus IDs, followed by bonus IDs
 local numBonuses = tonumber(parts[13]) or 0
 	local offset = numBonuses
 if numBonuses > 0 then
 item.bonusIds = readBonusIdList(parts, 14, 13 + numBonuses)
 end
 	item.upgradeId = 0
 	item.level = 0
-	-- the next part after bonus IDs depends on the upgrade id type
+	-- part 14 + numBonuses, unsure what this is... sometimes it is "2"
-	if upgradeIdType == 4 then
+	-- part 15 + numBonuses, unsure what this is... may indicate what part 16 will mean?
-		item.upgradeId = tonumber(parts[14 + offset]) or 0
+	-- part 16 + numBonuses, is player level at drop when applicable
-	elseif upgradeIdType == 512 then
+	-- part 17 + numBonuses, unsure what this is...
-		item.level = tonumber(parts[14 + offset]) or 0
+	-- part 18 + numBonuses, unsure what this is...
-	elseif #parts > 16 + offset then
+	-- part 19 + numBonuses, relic info would be here for legion artifacts
+	local someNumber = tonumber(parts[15 + offset]) or 0
+	if someNumber ~= 0 then
+		local lvl = tonumber(parts[16 + offset]) or 0
+		if lvl <= 60 then
+			item.level = lvl
+		end
+	end
+	-- we don't need relic information anymore
+	--[[elseif #parts > 19 + offset then
 		-- check for relic info
 		item.relicBonusIds = { nil, nil, nil }
 		numBonuses = tonumber(parts[16 + offset])
 		if numBonuses then
 			if numBonuses > 0 then
 						end
 					end
 				end
 			end
 		end
-	end
+	end]]
 return item
 end
 local AZERITE_EMPOWERED_BONUS_ID = 4775
 	else
 	   return tostring(o)
 	end
 end
+--[[
 -- read azerite powers on the item in loc and put it on itemData
 function Amr.ReadAzeritePowers(loc)
 	local ret = {}
 	local hasSome = false
 		return ret
 	else
 		return nil
 	end
 end
+]]
 -- get currently equipped items, store with currently active spec
 local function readEquippedItems(ret)
 	local equippedItems = {};
 	local loc = ItemLocation.CreateEmpty()
 		local slotId = Amr.SlotIds[slotNum]
 		local itemLink = GetInventoryItemLink("player", slotId)
 		if itemLink then
 			local itemData = Amr.ParseItemLink(itemLink)
 			if itemData then
+				--[[
 				-- see if this is an azerite item and read azerite power ids
 				loc:SetEquipmentSlot(slotId)
 				if C_AzeriteEmpoweredItem.IsAzeriteEmpoweredItem(loc) then
 					local powers = Amr.ReadAzeritePowers(loc)
 					if powers then
 						itemData.azerite = powers
 					end
 				end
+				]]
 				equippedItems[slotId] = itemData
 			end
 		end
 	end
 -- store last-seen equipped gear for each spec
 	ret.Equipped[GetSpecialization()] = equippedItems
 end
+--[[
 local function readHeartOfAzerothLevel(ret)
 	local azeriteItemLocation = C_AzeriteItem.FindActiveAzeriteItem();
 	if azeriteItemLocation then
 		local azeriteItem = Item:CreateFromItemLocation(azeriteItemLocation);
 		ret.HeartOfAzerothLevel = C_AzeriteItem.GetPowerLevel(azeriteItemLocation)
 	else
 		ret.HeartOfAzerothLevel = 0
 	end
 end
+]]
 -- Get just the player's currently equipped gear
 function Amr:GetEquipped()
 	local ret= {}
 	ret.Equipped = {}
 ret.Realm = GetRealmName()
 ret.Name = UnitName("player")
 	ret.Guild = GetGuildInfo("player")
 ret.ActiveSpec = GetSpecialization()
 ret.Level = UnitLevel("player");
-	readHeartOfAzerothLevel(ret)
+	--readHeartOfAzerothLevel(ret)
 local _, clsEn = UnitClass("player")
 ret.Class = clsEn;
 local _, raceEn = UnitRace("player")
 	ret.Specs = {}
 ret.Talents = {}
 	readSpecs(ret)
 	-- these get updated later, since need to cache info for inactive specs
-	ret.UnlockedEssences = {}
+	--ret.UnlockedEssences = {}
-	ret.Essences = {}
+	--ret.Essences = {}
 	ret.Equipped = {}
 	readEquippedItems(ret)
 	return ret
 local prevGemId = 0
 local prevEnchantId = 0
 local prevUpgradeId = 0
 local prevBonusId = 0
 	local prevLevel = 0
-	local prevAzeriteId = 0
+	--local prevAzeriteId = 0
 	local prevRelicBonusId = 0
 for i, itemData in ipairs(itemObjects) do
 local itemParts = {}
 table.insert(itemParts, itemData.id - prevItemId)
 table.insert(itemParts, "b" .. (bValue - prevBonusId))
 prevBonusId = bValue
 end
 		end
+		--[[
 		if itemData.azerite then
 			for aIndex, aValue in ipairs(itemData.azerite) do
 table.insert(itemParts, "a" .. (aValue - prevAzeriteId))
 prevAzeriteId = aValue
 end
 		end
+		]]
 		if itemData.gemIds[1] ~= 0 then
 			table.insert(itemParts, "x" .. (itemData.gemIds[1] - prevGemId))
 			prevGemId = itemData.gemIds[1]
 		end
 		if itemData.gemIds[2] ~= 0 then
 raceval = Amr.FactionIds[data.Faction]
 if raceval == nil then raceval = 1 end
 table.insert(fields, raceval)
 	table.insert(fields, data.Level)
-	table.insert(fields, data.HeartOfAzerothLevel)
 local profs = {}
 local noprofs = true
 if data.Professions then
 	    for k, v in pairs(data.Professions) do
 	        local profval = Amr.ProfessionIds[k]
 for spec = 1, 4 do
 if data.Specs[spec] and (complete or spec == data.ActiveSpec) then
 table.insert(fields, ".s" .. spec) -- indicates the start of a spec block
 			table.insert(fields, data.Specs[spec])
 			table.insert(fields, data.Talents[spec] or "")
+			table.insert(fields, data.ActiveSoulbinds and data.ActiveSoulbinds[spec] or "0")
+			--[[
 			local essences = {}
 			if data.Essences and data.Essences[spec] then
 				for i, ess in ipairs(data.Essences[spec]) do
 					table.insert(essences, table.concat(ess, "."))
 				end
 			end
 			table.insert(fields, table.concat(essences, "_"))
+			]]
 end
 end
 -- export equipped gear
 if data.Equipped then
 appendItemsToExport(fields, itemObjects)
 end
 end
 	end
+	-- export soulbind tree info
+	if data.Soulbinds then
+		table.insert(fields, ".sol")
+		for soulbindId, soulbindData in pairs(data.Soulbinds) do
+			table.insert(fields, string.format("u.%s.%s", soulbindId, soulbindData.UnlockedTier))
+			for tier, node in pairs(soulbindData.Nodes) do
+				table.insert(fields, table.concat(node, "."))
+			end
+		end
+	end
+	-- export unlocked conduits
+	if data.UnlockedConduits then
+		table.insert(fields, ".con")
+		for i, conduit in ipairs(data.UnlockedConduits) do
+			table.insert(fields, table.concat(conduit, "."))
+		end
+	end
+	--[[
 	-- export unlocked essences
 	if data.UnlockedEssences then
 		table.insert(fields, ".ess")
 		for i, ess in ipairs(data.UnlockedEssences) do
 			table.insert(fields, table.concat(ess, "_"))
 		end
 	end
+	]]
 -- if doing a complete export, include bank/bag items too
 	if complete then
 local itemObjects = {}
 	if data.BagItems then

Mercurial > wow > askmrrobot

comparison AskMrRobot-Serializer/AskMrRobot-Serializer.lua @ 185:a7f2ba17c39a v90