Revert extra statdesc.lua changes

Author: vaisest

src/Export/statdesc.lua

@@ -122,16 +122,8 @@ end
 ---@param lang table A stat descriptor
 ---@param val table[] An array of {min = #, max = #} corresponding to each stat
 ---@return table? desc A stat description matching the stat values
----@return integer? canonicalStat The index of the stat which the trade site uses for this description
 local function matchLimit(lang, val)
-	-- by default, the trade site uses the first stat listed, but there can be a flag that says otherwise.
-	local canonicalStat = 1
 	for _, desc in ipairs(lang) do
-		for _, flag in ipairs(desc) do
-			if flag.k == "canonical_stat" then
-				canonicalStat = flag.v
-			end
-		end
 		local match = true
 		for i, limit in ipairs(desc.limit) do
 			if limit[1] == "!" then
@@ -145,7 +137,7 @@ local function matchLimit(lang, val)
 			end
 		end
 		if match then
-			return desc, canonicalStat
+			return desc
 		end
 	end
 end
@@ -187,14 +179,13 @@ function describeStats(stats)
 		table.insert(descOrdered, descriptor)
 	end
 	table.sort(descOrdered, function(a, b) return a.order < b.order end)
-	local canonicalValues
 	for _, descriptor in ipairs(descOrdered) do
 		local val = { }
 		for i, s in ipairs(descriptor.stats) do
 			val[i] = stats[s] or { min = 0, max = 0 }
 			val[i].fmt = "d"
 		end
-		local desc, canonicalStat = matchLimit(descriptor[1], val)
+		local desc = matchLimit(descriptor[1], val)
 
 		-- Hack to handle ranges starting or ending at 0 where no descriptor is defined for 0
 		-- Attempt to adapt existing ranges
@@ -208,25 +199,14 @@ function describeStats(stats)
 					s.maxZ = true
 				end
 			end
-			desc, canonicalStat = matchLimit(descriptor[1], val)
+			desc = matchLimit(descriptor[1], val)
 			for _, s in ipairs(val) do
 				if s.minZ then s.min = 0 end
 				if s.maxZ then s.max = 0 end
 			end
 		end
 
 		if desc then
-			local stat1Name = descriptor.stats[canonicalStat]
-			local stat2Name = descriptor.stats[canonicalStat + 1]
-			local from = val[canonicalStat]
-			if stat1Name:match("minimum") and stat2Name and stat2Name:match("maximum") then
-				local to = val[canonicalStat + 1]
-				local min = (from.min + to.min) / 2
-				local max = (from.max + to.max) / 2
-				canonicalValues = { min = min, max = max }
-			else
-				canonicalValues = { min = from.min, max = from.max }
-			end
 			for _, spec in ipairs(desc) do
 				if spec.k == "negate" then
 					val[spec.v].max, val[spec.v].min = -val[spec.v].min, -val[spec.v].max
@@ -439,7 +419,7 @@ function describeStats(stats)
 			end
 		end
 	end
-	return out, orders, missing, canonicalValues
+	return out, orders, missing
 end
 
 function describeMod(mod)