Buy similar: match timeless jewel mod

Author: vaisest

src/Classes/CompareBuySimilar.lua

@@ -131,8 +131,13 @@ local function buildURL(item, slotName, controls, modEntries, defenceEntries, is
 			local filter = { id = entry.tradeId }
 			if entry.options then
 				filter.value = { option = entry.value }
+			-- some entries don't want to search for ranges, but aren't
+			-- implemented using options on the trade site (timeless jewels)
+			elseif entry.needsExactValue then
+				filter.value = { min = entry.value, max = entry.value }
 			elseif entry.value then
 				local minVal = tonumber(controls[prefix .. "Min"].buf)
+				
 				local maxVal = tonumber(controls[prefix .. "Max"].buf)
 				local value = {}
 				if minVal then
@@ -213,25 +218,55 @@ function M.openPopup(item, slotName, primaryBuild)
 					local formatted = itemLib.formatModLine(modLine)
 					if formatted then
 						-- Use range-resolved text for matching
-						local resolvedLine = (modLine.range and itemLib.applyRange(modLine.line, modLine.range, modLine.valueScalar)) or modLine.line
-
-						local tradeHash, options, value = tradeHelpers.findTradeHash(item, resolvedLine, source.type)
-						local identifier = tradeHash and string.format("%s.stat_%s", source.type, tradeHash)
-						if not options then
-							value = tradeHelpers.modLineValue(resolvedLine)
+						local resolvedLine = (modLine.range and itemLib.applyRange(modLine.line, modLine.range, modLine.valueScalar)) or
+							modLine.line
+
+						local timelessPatterns = { "bathed in the blood of %d+ sacrificed in the name of (.+)",
+							"carved to glorify %d+ new faithful converted by high templar (.+)",
+							"commanded leadership over %d+ warriors under (.+)",
+							"commissioned %d+ coins to commemorate (.+)",
+							"denoted service of %d+ dekhara in the akhara of (.+)",
+							"remembrancing %d+ songworthy deeds by the line of (.+)" }
+						local conquerorTradeId = nil
+						for _, pat in ipairs(timelessPatterns) do
+							local conqueror = resolvedLine:lower():match(pat)
+							if conqueror then
+								conquerorTradeId = "explicit.pseudo_timeless_jewel_" .. conqueror
+								break
+							end
 						end
 
-						
-						t_insert(modEntries, {
-							line = modLine.line,
-							formatted = formatted,
-							tradeId = identifier,
-							value = value,
-							options = options,
-							modType = source.type,
-							type = source.type,
-							invert = tradeHelpers.shouldBeInverted(identifier, resolvedLine, source.type)
-						})
+						-- timeless jewels have a special trade id format based
+						-- on the conqueror name, which doesn't use a hash
+						if item.jewelData and item.jewelData.conqueredBy and conquerorTradeId then
+							t_insert(modEntries, {
+								line = modLine.line,
+								formatted = formatted,
+								tradeId = conquerorTradeId,
+								value = item.jewelData.conqueredBy.id,
+								-- it doesn't actually use options, but
+								-- searching for ranges is useless here
+								options = nil,
+								needsExactValue = true,
+								type = source.type,
+								invert = false
+							})
+						else
+							local tradeHash, options, value = tradeHelpers.findTradeHash(item, resolvedLine, source.type)
+							local identifier = tradeHash and string.format("%s.stat_%s", source.type, tradeHash)
+							if not options then
+								value = tradeHelpers.modLineValue(resolvedLine)
+							end
+							t_insert(modEntries, {
+								line = modLine.line,
+								formatted = formatted,
+								tradeId = identifier,
+								value = value,
+								options = options,
+								type = source.type,
+								invert = tradeHelpers.shouldBeInverted(identifier, resolvedLine, source.type)
+							})
+						end
 					end
 				end
 			end
@@ -410,7 +445,7 @@ function M.openPopup(item, slotName, primaryBuild)
 			displayText)
 		-- when the trade site has a dropdown for the value, we opt to disable
 		-- the inputs as they are numeric
-		if not entry.options and entry.value then
+		if not (entry.options or entry.needsExactValue) and entry.value then
 			controls[prefix .. "Min"] = newPlainNumericEdit(nil, {minFieldX - popupWidth/2, ctrlY, fieldW, fieldH}, entry.value ~= 0 and tostring(m_floor(entry.value)) or "", "Min", 8)
 			controls[prefix .. "Max"] = newPlainNumericEdit(nil, {maxFieldX - popupWidth/2, ctrlY, fieldW, fieldH}, "", "Max", 8)
 			if not canSearch then

src/Classes/TradeHelpers.lua

@@ -166,7 +166,7 @@ end
 function M.findTradeHash(item, modLine, modType)
 	-- these mod results in false positives and are either useless, or
 	-- effectively found by searching for the unique item's name
-	if modLine == "Passage" or modLine ==  "Passive Skills in Radius can be Allocated without being connected to your tree" then
+	if modLine == "Passage" or modLine == "Passive Skills in Radius can be Allocated without being connected to your tree" then
 		return nil
 	end
 
@@ -175,7 +175,7 @@ function M.findTradeHash(item, modLine, modType)
 	-- are technically just one stat. we handle that here
 
 	local isUnique = item.rarity == "UNIQUE" or item.rarity == "RELIC"
-	function findStat(dbMod, ignoreWeights)
+	local function findStat(dbMod, ignoreWeights)
 		local excludeTags = (not isUnique) and { default = true } or nil
 		-- cluster jewel mod weights are weird
 		local isMatchingClusterMod = dbMod.group and dbMod.group:match("^Affliction") and

src/Data/TimelessJewelData/LegionTradeIds.lua

@@ -25,7 +25,7 @@ return {
 	},
 	[4] = {
 		keystone = {
-			[1] = "explicit.pseudo_timeless_jewel_avarius",  
+			[1] = "explicit.pseudo_timeless_jewel_avarius",
 			[2] = "explicit.pseudo_timeless_jewel_dominus",
 			[3] = "explicit.pseudo_timeless_jewel_maxarius"
 		},