rest of the owl

Author: vaisest

src/Classes/ItemsTab.lua

@@ -1487,7 +1487,7 @@ local function isAugmentable(item)
 	return (item.sockets and #item.sockets > 0) or (item.base.socketLimit and item.base.socketLimit > 0)
 end
 
-function ItemsTabClass:copyAnointsAndAugments(newItem, copyAugments, overwrite, sourceSlotName)
+function ItemsTabClass:CopyAnointsAndAugments(newItem, copyAugments, overwrite, sourceSlotName)
 	local isWeapon = newItem.base.tags and (newItem.base.tags.onehand or newItem.base.tags.twohand)
 	local isShield = newItem.base.tags and (newItem.base.tags.shield or newItem.base.tags.focus)
 	local newItemType = sourceSlotName or (isWeapon and "Weapon 1") or (isShield and "Weapon 2") or newItem.base.type
@@ -1552,7 +1552,7 @@ end
 function ItemsTabClass:CreateDisplayItemFromRaw(itemRaw, normalise)
 	local newItem = new("Item", itemRaw)
 	if newItem.base then
-		self:copyAnointsAndAugments(newItem, main.migrateAugments, false)
+		self:CopyAnointsAndAugments(newItem, main.migrateAugments, false)
 		if normalise then
 			newItem:NormaliseQuality()
 			newItem:BuildModList()

src/Classes/TradeQuery.lua

@@ -304,7 +304,7 @@ on trade site to work on other leagues and realms)]]
 
 	-- Fetches Box
 	self.maxFetchPerSearchDefault = 2
-	self.controls.fetchCountEdit = new("EditControl", {"TOPRIGHT", nil, "TOPRIGHT"}, {-12, 19, 154, row_height}, "", "Fetch Pages", "%D", 3, function(buf)
+	self.controls.fetchCountEdit = new("EditControl", {"TOPRIGHT", nil, "TOPRIGHT"}, {-12, 19, 150, row_height}, "", "Fetch Pages", "%D", 3, function(buf)
 		self.maxFetchPages = m_min(m_max(tonumber(buf) or self.maxFetchPerSearchDefault, 1), 10)
 		self.tradeQueryRequests.maxFetchPerSearch = 10 * self.maxFetchPages
 		self.controls.fetchCountEdit.focusValue = self.maxFetchPages
@@ -912,23 +912,29 @@ function TradeQueryClass:PriceItemRowDisplay(row_idx, top_pane_alignment_ref, ro
 						self:SetNotice(context.controls.pbNotice, "")
 					end
 
-					-- TODO: REPLACE AUGS
-					-- -- replace eldritch mods or enchants if the user requested
-					-- -- so in TradeQueryGenerator
-					-- if self.tradeQueryGenerator.lastCopyEldritch or
-					-- 	self.tradeQueryGenerator.lastCopyEnchantMode == "Copy Current" then
-					-- 	for i, _ in ipairs(items) do
-					-- 		local item = new("Item", items[i].item_string)
-					-- 		self.itemsTab:CopyAnointsAndEldritchImplicits(item, true, true, context.slotTbl.slotName)
-					-- 		items[i].item_string = item:BuildRaw()
-					-- 	end
-					-- elseif self.tradeQueryGenerator.lastCopyEnchantMode == "Remove" then
-					-- 	for i, _ in ipairs(items) do
-					-- 		local item = new("Item", items[i].item_string)
-					-- 		item.enchantModLines = {}
-					-- 		items[i].item_string = item:BuildRaw()
-					-- 	end
-					-- end
+					if self.tradeQueryGenerator.lastAugmentBehaviour == "Copy Current" or self.tradeQueryGenerator.lastAnointBehaviour == "Copy Current" then
+						for i, _ in ipairs(items) do
+							local item = new("Item", items[i].item_string)
+							self.itemsTab:CopyAnointsAndAugments(item, true, true, context.slotTbl.slotName)
+							items[i].item_string = item:BuildRaw()
+						end
+					elseif self.tradeQueryGenerator.lastAugmentBehaviour == "Remove" then
+						for item_idx, _ in ipairs(items) do
+							local item = new("Item", items[item_idx].item_string)
+							-- sockets are kept as-is so the user can see e.g. exceptional or corrupted sockets
+							for rune_idx, _ in ipairs(item.runes or {}) do
+								item.runes[rune_idx] = "None"
+							end
+							item:UpdateRunes()
+							items[item_idx].item_string = item:BuildRaw()
+						end
+					elseif self.tradeQueryGenerator.lastAnointBehaviour == "Remove" then
+						for i, _ in ipairs(items) do
+							local item = new("Item", items[i].item_string)
+							item.enchantModLines = {}
+							items[i].item_string = item:BuildRaw()
+						end
+					end
 
 					self.resultTbl[context.row_idx] = items
 					self:UpdateControlsWithItems(context.row_idx)

src/Classes/TradeQueryGenerator.lua

@@ -967,32 +967,65 @@ function TradeQueryGeneratorClass:RequestQuery(slot, context, statWeights, callb
 
 	local isJewelSlot = slot and slot.slotName:find("Jewel") ~= nil
 
+	local lastItemAnchor
+	local function updateLastAnchor(anchor, height)
+		lastItemAnchor = anchor
+		popupHeight = popupHeight + (height or 23)
+	end
+
 	controls.includeCorrupted = new("CheckBoxControl", {"TOP",nil,"TOP"}, {-40, 30, 18}, "Corrupted Mods:", function(state) end, "Includes corruption implicit modifiers in the weighted sum.\nNote that there is a maximum search filter count which means this might cause other weights to not be included.")
 	controls.includeCorrupted.state = not context.slotTbl.alreadyCorrupted and (self.lastIncludeCorrupted == nil or self.lastIncludeCorrupted == true)
 	controls.includeCorrupted.enabled = not context.slotTbl.alreadyCorrupted
+	updateLastAnchor(controls.includeCorrupted)
 
-	local canHaveRunes = slot and (slot.slotName:find("Weapon 1") or slot.slotName:find("Weapon 2") or slot.slotName:find("Helmet") or slot.slotName:find("Body Armour") or slot.slotName:find("Gloves") or slot.slotName:find("Boots"))
-	controls.includeRunes = new("CheckBoxControl", {"TOPRIGHT",controls.includeCorrupted,"BOTTOMRIGHT"}, {0, 5, 18}, "Rune Mods:", function(state) end)
-	controls.includeRunes.state = canHaveRunes and (self.lastIncludeRunes == nil or self.lastIncludeRunes == true)
-	controls.includeRunes.enabled = canHaveRunes
 
-	local lastItemAnchor = controls.includeRunes
+	
 
-	local function updateLastAnchor(anchor, height)
-		lastItemAnchor = anchor
-		popupHeight = popupHeight + (height or 23)
+	controls.includeMirrored = new("CheckBoxControl", {"TOPRIGHT",lastItemAnchor,"BOTTOMRIGHT"}, {0, 5, 18}, "Mirrored Items:", function(state) end)
+	controls.includeMirrored.state = (self.lastIncludeMirrored == nil or self.lastIncludeMirrored == true)
+	updateLastAnchor(controls.includeMirrored)
+
+	-- there are also some exceptions like the darkness enthroned belt, but runes on these are not yet working pob
+	local isAugmentableSlot = slot and (slot.slotName:find("Weapon 1") or slot.slotName:find("Weapon 2") or slot.slotName:find("Helmet") or slot.slotName:find("Body Armour") or slot.slotName:find("Gloves") or slot.slotName:find("Boots"))
+	if isAugmentableSlot then
+		local augmentTooltip = [[Controls how augments are used in the search.
+
+Copy Current: augments in weights are skipped and augments are replaced with the current augments when possible.
+Usually the best opinion as this ensures the augments makes sense for your build.
+
+Keep: augments will be included in weights and will not be changed on items.
+Best used when you value an augment greatly, and cannot add it yourself.
+
+Remove: augments are completely ignored, and removed from items.]]
+		controls.augmentBehaviour = new("DropDownControl", {"TOPLEFT", lastItemAnchor, "BOTTOMLEFT"}, {0, 5, 110, 18}, {"Copy Current", "Keep", "Remove"}, function(state) end, augmentTooltip)
+		controls.augmentBehaviour:SetSel(self.lastAugmentBehaviourIdx or 1)
+		controls.augmentBehaviourLabel = new("LabelControl", { "RIGHT", controls.augmentBehaviour, "LEFT" },
+			{ -4, 0, 80, 16 }, "Rune Behaviour:")
+		updateLastAnchor(controls.augmentBehaviour)
+	end
+
+	local isAmulet = slot and (slot.slotName:find("Amulet"))
+	if isAmulet then
+		local augmentTooltip = [[Controls how anoints are used in the search.
+
+Copy Current: anoints are replaced with the current anoint when possible.
+Usually the best opinion as this ensures the anoint makes sense for your build.
+
+Keep: anoints will not be changed on items.
+Best used when you cannot add one yourself. Note that weights cannot be generated for anoints.
+
+Remove: anoints are completely ignored, and removed from items.]]
+		controls.anointBehaviour = new("DropDownControl", {"TOPLEFT", lastItemAnchor, "BOTTOMLEFT"}, {0, 5, 110, 18}, {"Copy Current", "Keep", "Remove"}, function(state) end, augmentTooltip)
+		controls.anointBehaviour:SetSel(self.lastAnointBehaviourIdx or 1)
+		controls.anointBehaviourLabel = new("LabelControl", { "RIGHT", controls.anointBehaviour, "LEFT" },
+			{ -4, 0, 80, 16 }, "Anoint Behaviour:")
+		updateLastAnchor(controls.anointBehaviour)
 	end
 
 	if context.slotTbl.unique then
 		options.special = { itemName = context.slotTbl.slotName }
 	end
 
-	controls.includeMirrored = new("CheckBoxControl", {"TOPRIGHT",lastItemAnchor,"BOTTOMRIGHT"}, {0, 5, 18}, "Mirrored Items:", function(state) end)
-	controls.includeMirrored.state = (self.lastIncludeMirrored == nil or self.lastIncludeMirrored == true)
-	updateLastAnchor(controls.includeMirrored)
-
-	-- TODO: aug copy
-
 
 	if isJewelSlot then
 		controls.jewelType = new("DropDownControl", {"TOPLEFT",lastItemAnchor,"BOTTOMLEFT"}, {0, 5, 100, 18}, { "Any", "Base", "Radius" }, function(index, value) end) -- this does nothing atm
@@ -1054,17 +1087,25 @@ function TradeQueryGeneratorClass:RequestQuery(slot, context, statWeights, callb
 
 		self.tradeTypeIndex = context.controls.tradeTypeSelection.selIndex
 
-		-- TODO: copy aug
-		-- self.lastCopyEnchantMode = controls.copyEnchantMode and controls.copyEnchantMode:GetSelValue()
-
 		if controls.includeMirrored then
 			self.lastIncludeMirrored, options.includeMirrored = controls.includeMirrored.state, controls.includeMirrored.state
 		end
 		if controls.includeCorrupted then
 			self.lastIncludeCorrupted, options.includeCorrupted = controls.includeCorrupted.state, controls.includeCorrupted.state
 		end
-		if controls.includeRunes  then
-			self.lastIncludeRunes, options.includeRunes = controls.includeRunes.state, controls.includeRunes.state
+		if controls.augmentBehaviour then
+			-- remember setting
+			self.lastAugmentBehaviourIdx = controls.augmentBehaviour.selIndex
+			-- used by TradeQuery to change augments accordingly
+			self.lastAugmentBehaviour = controls.augmentBehaviour:GetSelValue()
+			-- whether weights should be generated
+			options.includeRunes = controls.augmentBehaviour:GetSelValue() == "Keep"
+		end
+		if controls.anointBehaviour then
+			-- remember setting
+			self.lastAnointBehaviourIdx = controls.anointBehaviour.selIndex
+			-- used by TradeQuery to change anoints accordingly
+			self.lastAnointBehaviour = controls.anointBehaviour:GetSelValue()
 		end
 		if controls.jewelType then
 			self.lastJewelType = controls.jewelType.selIndex