trader tool: option to use current implicits and enchants

Author: vaisest

src/Classes/ItemsTab.lua

@@ -1585,14 +1585,14 @@ function ItemsTabClass:DeleteItem(item, deferUndoState)
 	end
 end
 
-local function copyAnointsAndEldritchImplicits(newItem, activeItemSet, items)
-	local newItemType = newItem.base.type
-	if activeItemSet[newItemType] then
-		local currentItem = activeItemSet[newItemType].selItemId and items[activeItemSet[newItemType].selItemId]
+function ItemsTabClass:CopyAnointsAndEldritchImplicits(newItem, migrateEldritchImplicits, overwrite)
+	local newItemType = newItem.base.weapon and "Weapon 1" or newItem.base.type
+	if self.activeItemSet[newItemType] then
+		local currentItem = self.activeItemSet[newItemType].selItemId and self.items[self.activeItemSet[newItemType].selItemId]
 		-- if you don't have an equipped item that matches the type of the newItem, no need to do anything
 		if currentItem then
 			-- if the new item is anointable and does not have an anoint and your current respective item does, apply that anoint to the new item
-			if isAnointable(newItem) and #newItem.enchantModLines == 0 and activeItemSet[newItemType].selItemId > 0 then
+			if isAnointable(newItem) and (#newItem.enchantModLines == 0 or overwrite) and self.activeItemSet[newItemType].selItemId > 0 then
 				local currentAnoint = currentItem.enchantModLines
 				if currentAnoint and #currentAnoint == 1 then -- skip if amulet has more than one anoint e.g. Stranglegasp
 					newItem.enchantModLines = currentAnoint
@@ -1607,12 +1607,24 @@ local function copyAnointsAndEldritchImplicits(newItem, activeItemSet, items)
 					return
 				end
 			end
-			if main.migrateEldritchImplicits and isValueInTable(eldritchBaseTypes, newItem.base.type) and isValueInTable(eldritchRarities, newItem.rarity)
-				and #newItem.implicitModLines == 0 and not newItem.corrupted and (currentItem.cleansing or currentItem.tangle) and currentItem.implicitModLines then
+			
+			local modifiableItem = not (newItem.corrupted or newItem.mirrored)
+			if migrateEldritchImplicits and isValueInTable(eldritchBaseTypes, newItem.base.type) and isValueInTable(eldritchRarities, newItem.rarity)
+				and (#newItem.implicitModLines == 0 or overwrite) and modifiableItem and (currentItem.cleansing or currentItem.tangle) and currentItem.implicitModLines then
 					newItem.implicitModLines = currentItem.implicitModLines
 					newItem.tangle = currentItem.tangle
 					newItem.cleansing = currentItem.cleansing
 			end
+
+			-- harvest and heist enchantments on modifiable body armour or weapons
+			if newItem.base.weapon or newItem.base.type == "Body Armour"
+				and (#newItem.enchantModLines == 0 or overwrite)
+				and self.activeItemSet[newItemType].selItemId > 0
+				and modifiableItem and currentItem.enchantModLines
+				then
+					newItem.enchantModLines = currentItem.enchantModLines
+			end
+
 			newItem:BuildAndParseRaw()
 		end
 	end
@@ -1622,7 +1634,7 @@ end
 function ItemsTabClass:CreateDisplayItemFromRaw(itemRaw, normalise)
 	local newItem = new("Item", itemRaw)
 	if newItem.base then
-		copyAnointsAndEldritchImplicits(newItem, self.activeItemSet, self.items)
+		self:CopyAnointsAndEldritchImplicits(newItem, main.migrateEldritchImplicits, false)
 		if normalise then
 			newItem:NormaliseQuality()
 			newItem:BuildModList()

src/Classes/TradeQuery.lua

@@ -357,16 +357,23 @@ Highest Stat Value / Price - Sorts from highest to lowest Stat Value per currenc
 Lowest Price - Sorts from lowest to highest price of retrieved items
 Highest Weight - Displays the order retrieved from trade]]
 	self.controls.itemSortSelection:SetSel(self.pbItemSortSelectionIndex)
-	self.controls.itemSortSelectionLabel = new("LabelControl", {"TOPRIGHT", self.controls.itemSortSelection, "TOPLEFT"}, {-4, 0, 60, 16}, "^7Sort By:")
-
-	-- Use Enchant in DPS sorting
-	self.controls.enchantInSort = new("CheckBoxControl", {"TOPRIGHT",self.controls.fetchCountEdit,"TOPLEFT"}, {-8, 0, row_height}, "Include Enchants:", function(state)
-		self.enchantInSort = state
-		for row_idx, _ in pairs(self.resultTbl) do
-			self:UpdateControlsWithItems(row_idx)
-		end
-	end)
-	self.controls.enchantInSort.tooltipText = "This includes enchants in sorting that occurs after trade results have been retrieved"
+	self.controls.itemSortSelectionLabel = new("LabelControl", {"TOPRIGHT", self.controls.itemSortSelection, "TOPLEFT"}, {-4, 0, 56, 16}, "^7Sort By:")
+
+	-- Implicit mod and enchant behaviour in searching and sorting
+	local eldritchTooltip =
+	[[Controls how eldritch implicits and enchants are treated.
+Copy Current: current implicit modifiers and enchants are copied to the item before sorting, and eldritch weights are not used in the search.
+Include Weights: eldritch mod weights are used for searching items and the results are not edited.
+Ignored: eldritch mod weights are not used, enchants and eldritch implicits are removed before sorting.
+Note that the search filter limit might make results with implicit weights misleading.]]
+	local eldritchOptions = { "Copy Current", "Include Weights", "Ignored" }
+	self.controls.eldritchEnchantMode = new("DropDownControl", { "TOPRIGHT", self.controls.fetchCountEdit, "TOPLEFT" },
+		{ -4, 0, 120, row_height },
+		eldritchOptions, function(state) self.lastEldritchEnchantMode = state end, eldritchTooltip)
+	self.controls.eldritchEnchantMode:SetSel(self.lastEldritchEnchantMode or 1)
+	self.controls.eldritchEnchantLabel = new("LabelControl", { "RIGHT", self.controls.eldritchEnchantMode, "LEFT" },
+		{ -4, 0, 50, 16 },
+		"^7Implicits and Enchants:")
 
 	-- Realm selection
 	self.controls.realmLabel = new("LabelControl", {"LEFT", self.controls.setSelect, "RIGHT"}, {18, 0, 20, row_height - 4}, "^7Realm:")
@@ -762,10 +769,17 @@ function TradeQueryClass:GetResultEvaluation(row_idx, result_index, calcFunc, ba
 		table.sort(result.evaluation, function(a, b) return a.weight > b.weight end)
 	else
 		local item = new("Item", result.item_string)
-		if not self.enchantInSort then -- Calc item DPS without anoint or enchant as these can generally be added after.
-			item.enchantModLines = { }
+
+		-- if applicable: apply same eldritch implicits or anoints as equipped
+		if self.controls.eldritchEnchantMode:GetSelValue() == "Copy Current" then
+			self.itemsTab:CopyAnointsAndEldritchImplicits(item, true, true)
+		elseif self.controls.eldritchEnchantMode:GetSelValue() == "Ignored" then
+			item.enchantModLines = {}
 			item:BuildAndParseRaw()
 		end
+		-- edit the item string so that the user can see what was evaluated
+		result.item_string = item:BuildRaw()
+
 		local output = self:ReduceOutput(calcFunc({ repSlotName = slotName, repItem = item }))
 		local weight = self.tradeQueryGenerator.WeightedRatioOutputs(baseOutput, output, self.statSortSelectionList)
 		result.evaluation = {{ output = output, weight = weight }}

src/Classes/TradeQueryGenerator.lua

@@ -924,13 +924,17 @@ function TradeQueryGeneratorClass:ExecuteQuery()
 	if self.calcContext.options.includeScourge then
 		self:GenerateModWeights(self.modData["Scourge"])
 	end
-	if self.calcContext.options.includeEldritch then
+	if self.calcContext.options.includeEldritch and
+		-- skip weights if we need an influenced item as they can produce really
+		-- bad results due to the filter limit
+	    self.calcContext.options.influence1 == 1 and
+		self.calcContext.options.influence2 == 1 then
 		self:GenerateModWeights(self.modData["Eater"])
 		self:GenerateModWeights(self.modData["Exarch"])
 	end
-	if self.calcContext.options.includeSynthesis then
-		self:GenerateModWeights(self.modData["Synthesis"])
-	end
+	-- if self.calcContext.options.includeSynthesis then
+	-- 	self:GenerateModWeights(self.modData["Synthesis"])
+	-- end
 end
 
 function TradeQueryGeneratorClass:addMoreWEMods()
@@ -1184,7 +1188,7 @@ function TradeQueryGeneratorClass:RequestQuery(slot, context, statWeights, callb
 	local isAmuletSlot = slot and slot.slotName == "Amulet"
 	local isEldritchModSlot = slot and eldritchModSlots[slot.slotName] == true
 
-	controls.includeCorrupted = new("CheckBoxControl", {"TOP",nil,"TOP"}, {-40, 30, 18}, "Corrupted Mods:", function(state) end)
+	controls.includeCorrupted = new("CheckBoxControl", {"TOP",nil,"TOP"}, {-40, 30, 18}, "Corrupted Mods:", function(state) end, "Includes corruption implicit modifiers in the weighted sum. Note 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
 
@@ -1214,7 +1218,7 @@ function TradeQueryGeneratorClass:RequestQuery(slot, context, statWeights, callb
 	if not isJewelSlot and not isAbyssalJewelSlot and includeScourge then
 		controls.includeScourge = new("CheckBoxControl", {"TOPRIGHT",lastItemAnchor,"BOTTOMRIGHT"}, {0, 5, 18}, "Scourge Mods:", function(state) end)
 		controls.includeScourge.state = (self.lastIncludeScourge == nil or self.lastIncludeScourge == true)
-		updateLastAnchor(controls.includeScourge)
+		updateLastAnchor(controls.includrecteScourge)
 	end
 
 	if isAmuletSlot then
@@ -1223,12 +1227,6 @@ function TradeQueryGeneratorClass:RequestQuery(slot, context, statWeights, callb
 		updateLastAnchor(controls.includeTalisman)
 	end
 
-	if isEldritchModSlot then
-		controls.includeEldritch = new("CheckBoxControl", {"TOPRIGHT",lastItemAnchor,"BOTTOMRIGHT"}, {0, 5, 18}, "Eldritch Mods:", function(state) end)
-		controls.includeEldritch.state = (self.lastIncludeEldritch == true)
-		updateLastAnchor(controls.includeEldritch)
-	end
-
 	if isJewelSlot and context.slotTbl.slotName ~= "Watcher's Eye" then
 		controls.jewelType = new("DropDownControl", {"TOPLEFT",lastItemAnchor,"BOTTOMLEFT"}, {0, 5, 100, 18}, { "Any", "Base", "Abyss" }, function(index, value) end)
 		controls.jewelType.selIndex = self.lastJewelType or 1
@@ -1315,16 +1313,18 @@ function TradeQueryGeneratorClass:RequestQuery(slot, context, statWeights, callb
 		main:ClosePopup()
 
 		self.tradeTypeIndex = context.controls.tradeTypeSelection.selIndex
+		options.includeEldritch = context.controls.eldritchEnchantMode:GetSelValue() == "Include Weights"
+		options.useCurrentEnchantsImplicits = context.controls.eldritchEnchantMode:GetSelValue() == "Copy Current"
 
 		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.includeSynthesis then
-			self.lastIncludeSynthesis, options.includeSynthesis = controls.includeSynthesis.state, controls.includeSynthesis.state
-		end
+		-- if controls.includeSynthesis then
+		-- 	self.lastIncludeSynthesis, options.includeSynthesis = controls.includeSynthesis.state, controls.includeSynthesis.state
+		-- end
 		if controls.includeEldritch then
 			self.lastIncludeEldritch, options.includeEldritch = controls.includeEldritch.state, controls.includeEldritch.state
 		end