Improve mod matching

Author: vaisest

src/Classes/TradeHelpers.lua

@@ -164,12 +164,6 @@ end
 --- the hash that was found
 --- @return number? hash, table[]? optionsIfApplicable, number[]? matchedOptionId
 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
-		return nil
-	end
-
 	local formattedLine = M.formatDatabaseText(modLine)
 	-- the data export splits some mods into different parts, even though they
 	-- are technically just one stat. we handle that here
@@ -180,23 +174,16 @@ function M.findTradeHash(item, modLine, modType)
 		-- cluster jewel mod weights are weird
 		local isMatchingClusterMod = dbMod.group and dbMod.group:match("^Affliction") and
 			item.base.subType == "Cluster"
-		if not (isMatchingClusterMod or ignoreWeights) and #(dbMod.weightKey or {}) > 0 and not (item:GetModSpawnWeight(dbMod, nil, excludeTags) > 0) then
+		local modCanSpawnOnItem = #(dbMod.weightKey or {}) > 0 and
+			(item:GetModSpawnWeight(dbMod, nil, excludeTags) > 0)
+		if (not (isMatchingClusterMod or ignoreWeights)) and not modCanSpawnOnItem then
 			return nil
 		end
 		for tradeHash, description in pairs(dbMod.tradeHashes) do
 			local tradeLine = table.concat(description, "\n")
 			if formattedLine == M.formatDatabaseText(tradeLine) then
 				return tradeHash
 			end
-
-			-- the mod line splitting between the stat export and item parsing
-			-- can be different. hence we test both a combined line and separate
-			-- lines
-			for _, descLine in ipairs(description) do
-				if formattedLine == M.formatDatabaseText(descLine) then
-					return tradeHash
-				end
-			end
 		end
 	end
 
@@ -218,7 +205,7 @@ function M.findTradeHash(item, modLine, modType)
 	end
 	if item.foulborn then
 		for _, dbMod in pairs(data.itemMods.Foulborn) do
-			local tradeHashMaybe = findStat(dbMod)
+			local tradeHashMaybe = findStat(dbMod, true)
 			if tradeHashMaybe then
 				return tradeHashMaybe
 			end