wow/askmrrobot: Gear.lua comparison

comparison Gear.lua @ 129:d9a059484b22 v60

Several bug fixes for 8.0.

author	yellowfive
date	Wed, 18 Jul 2018 13:08:22 -0700
parents	e31b02b24488
children	a0894ffebd15

comparison

equal deleted inserted replaced

-:b16e1f4d100e
+:d9a059484b22
 -- given a table of items (keyed or indexed doesn't matter) find closest match to item, or nil if none are a match
 local function findMatchingItemFromTable(item, list, bestItem, bestDiff, bestLoc, usedItems, tableType)
 	if not list then return nil end
 	local found = false
 	for k,listItem in pairs(list) do
 		if listItem then
 			local diff = countItemDifferences(item, listItem)
 			if diff < bestDiff then
 				-- each physical item can only be used once, the usedItems table has items we can't use in this search
 				local key = string.format("%s_%s", tableType, k)
 	local equipped = player.Equipped and player.Equipped[player.ActiveSpec] or nil
 	local bestItem, bestDiff, bestLoc = findMatchingItemFromTable(item, equipped, nil, 10000, nil, usedItems, "equip")
 	bestItem, bestDiff, bestLoc = findMatchingItemFromTable(item, player.BagItems, bestItem, bestDiff, bestLoc, usedItems, "bag")
 	if player.BankItems then
-		for bagId,bagList in pairs(player.BankItems) do
+		bestItem, bestDiff, bestLoc = findMatchingItemFromTable(item, player.BankItems, bestItem, bestDiff, bestLoc, usedItems, "bank")
-			bestItem, bestDiff, bestLoc = findMatchingItemFromTable(item, bagList, bestItem, bestDiff, bestLoc, usedItems, "bank" .. bagId)
-		end
 	end
 	if bestDiff >= 10000 then
 		return nil, 10000
 	else
 	bestItem, bestDiff, bestLink = scanBagForItem(item, BACKPACK_CONTAINER, bestItem, bestDiff, bestLink)
 	for bagId = 1, NUM_BAG_SLOTS do
 		bestItem, bestDiff, bestLink = scanBagForItem(item, bagId, bestItem, bestDiff, bestLink)
 	end
+	-- with new approach, the item to use should never be equipped, should be in bags at this point
+	--[[
 	-- equipped items, but skip slots we have just equipped (to avoid e.g. just moving 2 of the same item back and forth between mh oh weapon slots)
 	for slotNum = 1, #Amr.SlotIds do
 		local slotId = Amr.SlotIds[slotNum]
 		if _currentGearOp.slotsRemaining[slotId] then
 			local itemLink = GetInventoryItemLink("player", slotId)
 					end
 				end
 			end
 		end
 	end
+	]]
 	-- bank
 	if bestDiff > 0 then
 		bestItem, bestDiff, bestLink = scanBagForItem(item, BANK_CONTAINER, bestItem, bestDiff, bestLink)
 		for bagId = NUM_BAG_SLOTS + 1, NUM_BAG_SLOTS + NUM_BANKBAGSLOTS do
 			bestItem, bestDiff, bestLink = scanBagForItem(item, bagId, bestItem, bestDiff, bestLink)
 			-- if an item is not soulbound, then warn the user and quit
 			Amr:Print(L.GearEquipErrorSoulbound(bestLink))
 			disposeGearOp()
 		else
+			--print("equipping " .. bestLink .. " in slot " .. _currentGearOp.nextSlot)
 			-- an item in the player's bags or already equipped, equip it
 			if bestItem.bag then
 				PickupContainerItem(bestItem.bag, bestItem.slot)
 			else
 		tbl[i], tbl[rand] = tbl[rand], tbl[i]
 	end
 	return tbl
 end
+local _ohFirst = {
+[20] = true, -- PaladinProtection
+[32] = true, -- WarlockDemonology
+[36] = true -- WarriorProtection
+}
 function beginEquipGearSet(spec, passes)
 	local gear = Amr.db.char.GearSets[spec]
 	if not gear then
 		Amr:Print(L.GearEquipErrorEmpty)
 		return
 	end
 	-- ensure all our stored data is up to date
 	local player = Amr:ExportCharacter()
+	local doOhFirst = _ohFirst[player.Specs[spec]]
 	local itemsToEquip = {
 		legendaries = {},
 		weapons = {},
+		mh = {},
+		oh = {},
 		rings = {},
 		trinkets = {},
 		others = {},
 		blanks = {}
 	}
 	local remaining = 0
 	local usedItems = {}
 	-- check for items that need to be equipped, do in a random order to try and defeat any unique constraint issues we might hit
 	local slots = {}
 	for i,s in ipairs(Amr.SlotIds) do
 		table.insert(slots, s)
 	for i,slotId in ipairs(slots) do
 		-- we do stuff in batches that avoids most unique conflicts
 		local list = itemsToEquip.others
-		if slotId == 16 or slotId == 17 then
+		if slotId == 16 then
-			list = itemsToEquip.weapons
+			list = itemsToEquip.mh
+		elseif slotId == 17 then
+			list = itemsToEquip.oh
 		elseif slotId == 11 or slotId == 12 then
 			list = itemsToEquip.rings
 		elseif slotId == 13 or slotId == 14 then
 			list = itemsToEquip.trinkets
 		end
 			local newItem = Item:CreateFromItemID(new.id)
 			local quality = newItem and newItem:GetItemQuality() or 0
 			if quality == 6 then
 				if not old or new.id ~= old.id then
 					list[slotId] = new
+					if list == itemsToEquip.mh or list == itemsToEquip.oh then
+						itemsToEquip.weapons[slotId] = {}
+					end
 					remaining = remaining + 1
 				end
 			else
+				-- find the best matching item anywhere in the player's gear
+				local bestItem, bestDiff = Amr:FindMatchingItem(new, player, usedItems)
+				new = bestItem
 				local diff = countItemDifferences(old, new)
+				--[[
 				if diff > 0 and diff < 1000 then
 					-- same item, see if inventory has one that is closer (e.g. a duplicate item with correct enchants/gems)
 					local bestItem, bestDiff = Amr:FindMatchingItem(new, player, usedItems)
 					if bestDiff and bestDiff < diff then
 						new = bestItem
 						diff = bestDiff
 					end
 				end
+				]]
-				if diff > 0 then
+				if diff > 0 then
 					list[slotId] = new
+					if list == itemsToEquip.mh or list == itemsToEquip.oh then
+						itemsToEquip.weapons[slotId] = {}
+					end
 					remaining = remaining + 1
 				end
 			end
-		else
+		elseif old then
 			-- need to remove this item
 			itemsToEquip.blanks[slotId] = {}
 			remaining = remaining + 1
 		end
 	if remaining > 0 then
 		if passes < 5 then
 			_pendingGearOps = {}
 			if not Amr.IsEmpty(itemsToEquip.blanks) then
 				-- if gear set wants slots to be blank, do that first
 				table.insert(_pendingGearOps, { items = itemsToEquip.blanks, remove = true, label = "blanks" })
 			end
 			if not Amr.IsEmpty(itemsToEquip.weapons) then
-				-- change weapons first: remove both, wait, then equip new ones
+				-- change weapons first: remove both, wait, then equip each weapon one by one, waiting after each
 				table.insert(_pendingGearOps, { items = itemsToEquip.weapons, remove = true, label = "remove weapons" })
-				table.insert(_pendingGearOps, { items = itemsToEquip.weapons, wait = true, label = "equip weapons" })
+				local thisWeapon = doOhFirst and itemsToEquip.oh or itemsToEquip.mh
+				if not Amr.IsEmpty(thisWeapon) then
+					table.insert(_pendingGearOps, { items = thisWeapon, wait = true, label = "equip weapon 1" })
+				end
+				thisWeapon = doOhFirst and itemsToEquip.mh or itemsToEquip.oh
+				if not Amr.IsEmpty(thisWeapon) then
+					table.insert(_pendingGearOps, { items = thisWeapon, wait = true, label = "equip weapon 2" })
+				end
 			end
 			if not Amr.IsEmpty(itemsToEquip.legendaries) then
 				-- remove any legendaries, wait
 				table.insert(_pendingGearOps, { items = itemsToEquip.legendaries, remove = true, label = "remove legendaries" })
 			end
 local function onActiveTalentGroupChanged()
 	local auto = Amr.db.profile.options.autoGear
 	local currentSpec = GetSpecialization()
+	local waitingSpec = _waitingForSpec
-	if currentSpec == _waitingForSpec or auto then
-		-- spec is what we want, now equip the gear
-		beginEquipGearSet(currentSpec, 0)
-	end
 	_waitingForSpec = 0
+	if currentSpec == waitingSpec or auto then
+		-- spec is what we want, now equip the gear but after a short delay because the game auto-swaps artifact weapons
+		Amr.Wait(2, function()
+			beginEquipGearSet(GetSpecialization(), 0)
+		end)
+	end
 end
 -- activate the specified spec and then equip the saved gear set
 function Amr:EquipGearSet(spec)
 	if UnitAffectingCombat("player") then
 		Amr:Print(L.GearEquipErrorCombat)
 		return
 	end
-	_waitingForSpec = spec
 	local currentSpec = GetSpecialization()
 	if currentSpec ~= spec then
+		_waitingForSpec = spec
 		SetSpecialization(spec)
 	else
-		onActiveTalentGroupChanged()
+		-- spec is what we want, now equip the gear
+		beginEquipGearSet(currentSpec, 0)
 	end
 end
 -- moves any gear in bags to the bank if not part of a gear set
 function Amr:CleanBags()

Mercurial > wow > askmrrobot

comparison Gear.lua @ 129:d9a059484b22 v60