Mercurial > wow > askmrrobot

changeset 85:8914581c912f v40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update for scanning relics in bags
author yellowfive
date Wed, 31 Aug 2016 11:01:44 -0700
parents 641c2f44d3fd
children 12d0f853eca8
files AskMrRobot-Serializer/AskMrRobot-Serializer.lua AskMrRobot.toc Export.lua
diffstat 3 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Wed Aug 03 18:04:36 2016 -0700
+++ b/AskMrRobot-Serializer/AskMrRobot-Serializer.lua	Wed Aug 31 11:01:44 2016 -0700
@@ -1,7 +1,7 @@
 -- AskMrRobot-Serializer will serialize and communicate character data between users.
 -- This is used primarily to associate character information to logs uploaded to askmrrobot.com.
 
-local MAJOR, MINOR = "AskMrRobot-Serializer", 39
+local MAJOR, MINOR = "AskMrRobot-Serializer", 40
 local Amr, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not Amr then return end -- already loaded by something else
@@ -1145,7 +1145,7 @@
     	if data.BagItems then
 	        for i, v in ipairs(data.BagItems) do
 				local itemData = Amr.ParseItemLink(v)
-				if itemData ~= nil and (IsEquippableItem(v) or Amr.SetTokenIds[itemData.id]) then
+				if itemData ~= nil --[[and (IsEquippableItem(v) or Amr.SetTokenIds[itemData.id])]] then
 					itemData.link = v
 					table.insert(itemObjects, itemData)
 				end
@@ -1154,7 +1154,7 @@
 	    if data.BankItems then
 	        for i, v in ipairs(data.BankItems) do
 	        	local itemData = Amr.ParseItemLink(v)
-				if itemData ~= nil and (IsEquippableItem(v) or Amr.SetTokenIds[itemData.id]) then
+				if itemData ~= nil --[[and (IsEquippableItem(v) or Amr.SetTokenIds[itemData.id])]] then
 					itemData.link = v
 					table.insert(itemObjects, itemData)
 				end
@@ -1163,7 +1163,7 @@
 	    if data.VoidItems then
 	        for i, v in ipairs(data.VoidItems) do
 	        	local itemData = Amr.ParseItemLink(v)
-				if itemData ~= nil and (IsEquippableItem(v) or Amr.SetTokenIds[itemData.id]) then
+				if itemData ~= nil --[[and (IsEquippableItem(v) or Amr.SetTokenIds[itemData.id])]] then
 					itemData.link = v
 					table.insert(itemObjects, itemData)
 				end
--- a/AskMrRobot.toc	Wed Aug 03 18:04:36 2016 -0700
+++ b/AskMrRobot.toc	Wed Aug 31 11:01:44 2016 -0700
@@ -1,7 +1,7 @@
 ## Interface: 70000
 ## Title: Ask Mr. Robot
 ## Author: Team Robot, Inc.
-## Version: 39
+## Version: 40
 ## Notes: Gear import/export, combat logging, and more.
 ## URL: www.askmrrobot.com
 ## SavedVariables: AskMrRobotDb3
--- a/Export.lua	Wed Aug 03 18:04:36 2016 -0700
+++ b/Export.lua	Wed Aug 31 11:01:44 2016 -0700
@@ -127,15 +127,16 @@
 		if itemLink ~= nil then
 			local itemData = Amr.Serializer.ParseItemLink(itemLink)
 			if itemData ~= nil then
+			
 				-- only add equippable items to bag data
-				if IsEquippableItem(itemLink) or Amr.SetTokenIds[itemData.id] then
+				--if IsEquippableItem(itemLink) or Amr.SetTokenIds[itemData.id] then
 	                if isBank then
                     	_lastBankBagId = bagId
                     	_lastBankSlotId = slotId
                 	end
 										
                 	table.insert(bagTable, itemLink)
-                end
+                --end
 				
 				-- all items and counts, used for e.g. shopping list and reagents, etc.
                 if bagItemsWithCount then