Fix QueryMods.lua generation. Change soulcores.lua to export trade hashes in a similar format as previous mod export changes.

Author: vaisest

src/Classes/TradeQueryGenerator.lua

@@ -183,9 +183,28 @@ function TradeQueryGeneratorClass.WeightedRatioOutputs(baseOutput, newOutput, st
 	return meanStatDiff
 end
 
+ 
 function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemCategoriesMask, itemCategoriesOverride)
-
-	for index, modLine in ipairs(mod) do
+-- processes mods from the data exports to a format that is more useful for
+-- generating weights.
+
+-- this function generally uses the .tradeHashes field of each exported mod,
+-- which contains a map from the trade hash to the mod lines/stats
+
+-- at a high level, this function matches each stat / mod line to an entry in
+-- https://www.pathofexile.com/api/trade2/data/stats via the trade hash. that
+-- entry is then used to determine if the mod is inverted, i.e. that the mod
+-- here is x increased by y, while the trade site has x decreased by -y. the
+-- function also records the minimum and maximum values of each stat, so we can
+-- later test for a midpoint of those values to generate a weight
+	for tradeHash, modLines in pairs(mod.tradeHashes) do
+		-- the mod export sometimes splits stats to multiple lines. they should
+		-- still get parsed correctly if we combine them, and that makes it
+		-- simpler to process them
+		if not modLines then
+			ConPrintf("")
+		end
+		local modLine = table.concat(modLines, " ")
 		if modLine:find("Grants Level") or modLine:find("inflict Decay") then -- skip mods that grant skills / decay, as they will often be overwhelmingly powerful but don't actually fit into the build
 			goto nextModLine
 		end
@@ -214,8 +233,11 @@ function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemCat
 		-- iterate trade mod category to find mod with matching text.
 		local function getTradeMod()
 			local entry
-			local tradeHashStr = tostring(mod.tradeHash)
+			local tradeHashStr = tostring(tradeHash)
 			for _, v in ipairs(tradeQueryStatsParsed.result[tradeStatCategoryIndices[modType]].entries) do
+				if _ == 33 then
+					ConPrintf("")
+				end
 				-- prefix removed
 				local ids = v.id:gsub(".+..stat_", "").."|"
 				-- split by non-integer
@@ -247,7 +269,7 @@ function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemCat
 		local tradeMod = nil
 		local invert
 
-		local uniqueIndex = tostring(mod.tradeHash)
+		local uniqueIndex = tostring(tradeHash)
 
 		if self.modData[modType][uniqueIndex] == nil then
 			if tradeMod == nil then
@@ -306,7 +328,7 @@ function TradeQueryGeneratorClass:ProcessMod(mod, tradeQueryStatsParsed, itemCat
 		end
 
 		if #tokens ~= 0 and #tokens ~= 2 and #tokens ~= 4 then
-			logToFile("Unexpected # of tokens found for mod: %s", mod[index])
+			logToFile("Unexpected # of tokens found for mod: %s", modLine)
 			goto nextModLine
 		end
 
@@ -461,7 +483,7 @@ function TradeQueryGeneratorClass:InitMods()
 	for name, runeMods in pairsSortByKey(data.itemMods.Runes) do
 		for slotType, mods in pairs(runeMods) do
 			for i, modLine in ipairs(mods) do
-				local mod = {modLine, tradeHash = mods.tradeHashes[i], type = "Rune"}
+				local mod = {modLine, tradeHashes = mods.tradeHashes, type = "Rune"}
 				if slotType == "weapon" then
 					self:ProcessMod(mod, tradeQueryStatsParsed, regularItemMask, { ["1HWeapon"] = true, ["2HWeapon"] = true, ["1HMace"] = true, ["Claw"] = true, ["Quarterstaff"] = true, ["Bow"] = true, ["2HMace"] = true, ["Crossbow"] = true, ["Spear"] = true, ["Flail"] = true, ["Talisman"] = true  })
 				elseif slotType == "armour" then
@@ -493,7 +515,16 @@ function TradeQueryGeneratorClass:InitMods()
 	end
 
 	local queryModsFile = io.open(queryModFilePath, 'w')
-	queryModsFile:write("-- This file is automatically generated, do not edit!\n-- Stat data (c) Grinding Gear Games\n\n")
+	queryModsFile:write([[-- This file is automatically generated, do not edit!
+-- Stat data (c) Grinding Gear Games
+
+-- This file contains categories of stats, mapped from trade hash to details
+-- relevant for generating search weights Note that the trade site requires a
+-- prefix of e.g. explicit.stat_{hash}. See
+-- https://www.pathofexile.com/api/trade2/data/stats for a list of all trade
+-- site stats.
+
+]])
 	queryModsFile:write("return " .. stringify(self.modData))
 	queryModsFile:close()
 end