Change tradehash exports to export a map of hash to stat description for each mod

Author: vaisest

src/Classes/CompareTradeHelpers.lua

@@ -92,25 +92,19 @@ function M.findTradeHash(item, modLine, modType)
 	-- the data export splits some mods into different parts, even though they
 	-- are technically just one stat. we handle that here
 	function findStat(dbMod)
-		local lineIdx = 1
-		local statIdx = 1
-		while dbMod.statOrder[lineIdx] do
-			local skipped = false
-			while dbMod.statOrder[lineIdx] == m_floor(dbMod.statOrder[lineIdx + 1] or -1) do
-				-- some stats are split, skip those for now
-				lineIdx = lineIdx + 1
-				skipped = true
-			end
-			if not skipped and dbMod[lineIdx] then
-				local dbFormatted = M.formatDatabaseText(dbMod[lineIdx])
-				if formattedLine == dbFormatted and item:GetModSpawnWeight(dbMod, nil, {default = true}) then
-					return dbMod.tradeHashes[statIdx]
+		if not item:GetModSpawnWeight(dbMod, nil, { default = true }) then
+			return nil
+		end
+		for tradeHash, description in pairs(dbMod.tradeHashes) do
+			for _, line in ipairs(description) do
+				local dbFormatted = M.formatDatabaseText(line)
+				if formattedLine == dbFormatted then
+					return tradeHash
 				end
 			end
-			lineIdx = lineIdx + 1
-			statIdx = statIdx + 1
 		end
 	end
+
 	-- corruptions
 	if modType == "enchant" then
 		for _, dbMod in pairs(data.itemMods.Corruption) do
@@ -119,24 +113,23 @@ function M.findTradeHash(item, modLine, modType)
 				return tradeHashMaybe
 			end
 		end
-	-- explicit
+		-- explicit
 	elseif modType ~= "implicit" then
 		for _, dbMod in pairs(data.itemMods.Item) do
 			local tradeHashMaybe = findStat(dbMod)
-				if tradeHashMaybe then
-					return tradeHashMaybe
-				end
+			if tradeHashMaybe then
+				return tradeHashMaybe
+			end
 		end
 	end
 	-- implicit, and special explicit (e.g. unique and essence)
 	for _, dbMod in pairs(data.itemMods.Exclusive) do
 		local tradeHashMaybe = findStat(dbMod)
-			if tradeHashMaybe then
-				return tradeHashMaybe
-			end
+		if tradeHashMaybe then
+			return tradeHashMaybe
+		end
 	end
 end
-
 -- Map slot name + item type to (trade API category string, itemCategoryTags key).
 -- queryStr:      e.g. "armour.shield", "weapon.onemace"
 -- categoryLabel: e.g. "Shield", "1HMace", "1HWeapon" (nil for flask / generic jewel / unsupported)

src/Data/ModCharm.lua

@@ -2,16 +2,16 @@
 -- Item data (c) Grinding Gear Games
 
 return {
-	["IncursionLeg1"] = { affix = "", "(20-30)% increased Evasion Rating", statOrder = { 866 }, level = 0, group = "GlobalEvasionRatingPercent", weightKey = { }, weightVal = {  }, modTags = { "evasion", "defences" }, tradeHashes = { 2106365538 }, },
-	["IncursionLeg2"] = { affix = "", "(6-10)% increased Movement Speed while Sprinting", statOrder = { 9465 }, level = 0, group = "MovementVelocityWhileSprinting", weightKey = { }, weightVal = {  }, modTags = {  }, tradeHashes = { 3107707789 }, },
-	["IncursionLeg3"] = { affix = "", "(15-25)% increased Stun Threshold", statOrder = { 2878 }, level = 0, group = "IncreasedStunThreshold", weightKey = { }, weightVal = {  }, modTags = {  }, tradeHashes = { 680068163 }, },
-	["IncursionLeg4"] = { affix = "", "(5-10)% reduced Movement Speed Penalty from using Skills while moving", statOrder = { 8594 }, level = 0, group = "MovementVelocityPenaltyWhilePerformingAction", weightKey = { }, weightVal = {  }, modTags = { "speed" }, tradeHashes = { 2590797182 }, },
-	["IncursionLeg5"] = { affix = "", "(20-30)% increased Mana Regeneration Rate while moving", statOrder = { 7532 }, level = 0, group = "ManaRegenerationRateWhileMoving", weightKey = { }, weightVal = {  }, modTags = { "resource", "mana" }, tradeHashes = { 1327522346 }, },
-	["IncursionLeg6"] = { affix = "", "(6-10)% of Damage taken Recouped as Life", statOrder = { 970 }, level = 0, group = "DamageTakenGainedAsLife", weightKey = { }, weightVal = {  }, modTags = { "resource", "life" }, tradeHashes = { 1444556985 }, },
-	["IncursionArm1"] = { affix = "", "(8-12)% increased Block chance", statOrder = { 1064 }, level = 0, group = "IncreasedBlockChance", weightKey = { }, weightVal = {  }, modTags = { "block" }, tradeHashes = { 4147897060 }, },
-	["IncursionArm2"] = { affix = "", "(6-10)% increased Attack Speed", statOrder = { 941 }, level = 0, group = "IncreasedAttackSpeed", weightKey = { }, weightVal = {  }, modTags = { "attack", "speed" }, tradeHashes = { 681332047 }, },
-	["IncursionArm3"] = { affix = "", "(6-10)% increased Cast Speed", statOrder = { 942 }, level = 0, group = "IncreasedCastSpeed", weightKey = { }, weightVal = {  }, modTags = { "caster", "speed" }, tradeHashes = { 2891184298 }, },
-	["IncursionArm4"] = { affix = "", "(12-16)% increased Curse Magnitudes", statOrder = { 2266 }, level = 0, group = "CurseEffectiveness", weightKey = { }, weightVal = {  }, modTags = { "caster", "curse" }, tradeHashes = { 2353576063 }, },
-	["IncursionArm5"] = { affix = "", "(6-10)% increased Deflection Rating", statOrder = { 5721 }, level = 0, group = "GlobalDeflectionRating", weightKey = { }, weightVal = {  }, modTags = { "evasion", "defences" }, tradeHashes = { 3040571529 }, },
-	["IncursionArm6"] = { affix = "", "(15-25)% increased Presence Area of Effect", statOrder = { 1002 }, level = 0, group = "PresenceRadius", weightKey = { }, weightVal = {  }, modTags = {  }, tradeHashes = { 101878827 }, },
+	["IncursionLeg1"] = { affix = "", "(20-30)% increased Evasion Rating", statOrder = { 866 }, level = 0, group = "GlobalEvasionRatingPercent", weightKey = { }, weightVal = {  }, modTags = { "evasion", "defences" }, tradeHashes = { [2106365538] = { "(20-30)% increased Evasion Rating" }, } },
+	["IncursionLeg2"] = { affix = "", "(6-10)% increased Movement Speed while Sprinting", statOrder = { 9465 }, level = 0, group = "MovementVelocityWhileSprinting", weightKey = { }, weightVal = {  }, modTags = {  }, tradeHashes = { [3107707789] = { "(6-10)% increased Movement Speed while Sprinting" }, } },
+	["IncursionLeg3"] = { affix = "", "(15-25)% increased Stun Threshold", statOrder = { 2878 }, level = 0, group = "IncreasedStunThreshold", weightKey = { }, weightVal = {  }, modTags = {  }, tradeHashes = { [680068163] = { "(15-25)% increased Stun Threshold" }, } },
+	["IncursionLeg4"] = { affix = "", "(5-10)% reduced Movement Speed Penalty from using Skills while moving", statOrder = { 8594 }, level = 0, group = "MovementVelocityPenaltyWhilePerformingAction", weightKey = { }, weightVal = {  }, modTags = { "speed" }, tradeHashes = { [2590797182] = { "(5-10)% reduced Movement Speed Penalty from using Skills while moving" }, } },
+	["IncursionLeg5"] = { affix = "", "(20-30)% increased Mana Regeneration Rate while moving", statOrder = { 7532 }, level = 0, group = "ManaRegenerationRateWhileMoving", weightKey = { }, weightVal = {  }, modTags = { "resource", "mana" }, tradeHashes = { [1327522346] = { "(20-30)% increased Mana Regeneration Rate while moving" }, } },
+	["IncursionLeg6"] = { affix = "", "(6-10)% of Damage taken Recouped as Life", statOrder = { 970 }, level = 0, group = "DamageTakenGainedAsLife", weightKey = { }, weightVal = {  }, modTags = { "resource", "life" }, tradeHashes = { [1444556985] = { "(6-10)% of Damage taken Recouped as Life" }, } },
+	["IncursionArm1"] = { affix = "", "(8-12)% increased Block chance", statOrder = { 1064 }, level = 0, group = "IncreasedBlockChance", weightKey = { }, weightVal = {  }, modTags = { "block" }, tradeHashes = { [4147897060] = { "(8-12)% increased Block chance" }, } },
+	["IncursionArm2"] = { affix = "", "(6-10)% increased Attack Speed", statOrder = { 941 }, level = 0, group = "IncreasedAttackSpeed", weightKey = { }, weightVal = {  }, modTags = { "attack", "speed" }, tradeHashes = { [681332047] = { "(6-10)% increased Attack Speed" }, } },
+	["IncursionArm3"] = { affix = "", "(6-10)% increased Cast Speed", statOrder = { 942 }, level = 0, group = "IncreasedCastSpeed", weightKey = { }, weightVal = {  }, modTags = { "caster", "speed" }, tradeHashes = { [2891184298] = { "(6-10)% increased Cast Speed" }, } },
+	["IncursionArm4"] = { affix = "", "(12-16)% increased Curse Magnitudes", statOrder = { 2266 }, level = 0, group = "CurseEffectiveness", weightKey = { }, weightVal = {  }, modTags = { "caster", "curse" }, tradeHashes = { [2353576063] = { "(12-16)% increased Curse Magnitudes" }, } },
+	["IncursionArm5"] = { affix = "", "(6-10)% increased Deflection Rating", statOrder = { 5721 }, level = 0, group = "GlobalDeflectionRating", weightKey = { }, weightVal = {  }, modTags = { "evasion", "defences" }, tradeHashes = { [3040571529] = { "(6-10)% increased Deflection Rating" }, } },
+	["IncursionArm6"] = { affix = "", "(15-25)% increased Presence Area of Effect", statOrder = { 1002 }, level = 0, group = "PresenceRadius", weightKey = { }, weightVal = {  }, modTags = {  }, tradeHashes = { [101878827] = { "(15-25)% increased Presence Area of Effect" }, } },
 }