Port Volatile Vaal Orb support

Author: vaisest

src/Classes/Control.lua

@@ -35,6 +35,7 @@ local rect = {
 local ControlClass = newClass("Control", function(self, anchor, rect)
 	self.rectStart = rect or {0, 0, 0, 0}
 	self.x, self.y, self.width, self.height = unpack(self.rectStart)
+	---@type (fun(): boolean) | boolean
 	self.shown = true
 	self.enabled = true
 	self.anchor = { }

src/Classes/Item.lua

@@ -697,6 +697,8 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 						end
 					elseif k == "range" then
 						modLine.range = tonumber(val)
+					elseif k == "corruptedRange" then
+						modLine.corruptedRange = tonumber(val)
 					elseif lineFlags[k] then
 						modLine[k] = true
 					end
@@ -888,13 +890,13 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
 						modLine.range = bestPrecisionRange
 					end
 				end
-				local rangedLine = itemLib.applyRange(line, 1, catalystScalar)
+				local rangedLine = itemLib.applyRange(line, 1, catalystScalar, modLine.corruptedRange)
 				local modList, extra = modLib.parseMod(rangedLine)
 				if (not modList or extra) and self.rawLines[l+1] then
 					-- Try to combine it with the next line
 					local nextLine = self.rawLines[l+1]:gsub("%b{}", ""):gsub(" ?%(%l+%)","")
 					local combLine = line.." "..nextLine
-					rangedLine = itemLib.applyRange(combLine, 1, catalystScalar)
+					rangedLine = itemLib.applyRange(combLine, 1, catalystScalar, modLine.corruptedRange)
 					modList, extra = modLib.parseMod(rangedLine, true)
 					if modList and not extra then
 						line = line.."\n"..nextLine
@@ -1262,6 +1264,9 @@ function ItemClass:BuildRaw()
 		if modLine.range and line:match("%(%-?[%d%.]+%-%-?[%d%.]+%)") then
 			line = "{range:" .. round(modLine.range, 3) .. "}" .. line
 		end
+		if modLine.corruptedRange then
+			line = "{corruptedRange:" .. round(modLine.corruptedRange, 2) .. "}" .. line
+		end
 		if modLine.crafted then
 			line = "{crafted}" .. line
 		end
@@ -1863,7 +1868,7 @@ function ItemClass:BuildModList()
 						local strippedModeLine = modLine.line:gsub("\n"," ")						
 						local catalystScalar = getCatalystScalar(self.catalyst, modLine, self.catalystQuality)
 						-- Put the modified value into the string
-						local line = itemLib.applyRange(strippedModeLine, modLine.range, catalystScalar)
+						local line = itemLib.applyRange(strippedModeLine, modLine.range, catalystScalar, modLine.corruptedRange)
 						-- Check if we can parse it before adding the mods
 						local list, extra = modLib.parseMod(line)
 						if list and not extra then

src/Classes/ItemsTab.lua

@@ -0,0 +1,37 @@
+if not loadStatFile then
+	dofile("statdesc.lua")
+end
+loadStatFile("stat_descriptions.txt")
+
+local out = io.open("../Data/ModScalability.lua", "w")
+out:write('-- This file is automatically generated, do not edit!\n')
+out:write('-- Item data (c) Grinding Gear Games\n\nreturn {\n')
+local scalabilityLines = describeScalability("stat_descriptions.txt")
+local lines = {}
+for line, _ in pairs(scalabilityLines) do
+	table.insert(lines, line)
+end
+table.sort(lines)
+for _, line in ipairs(lines) do
+	local scalability = scalabilityLines[line]
+	out:write('\t["', line, '"] = { ')
+	for i, scalable in ipairs(scalability) do
+		out:write("{ isScalable = " .. tostring(scalable.isScalable))
+		if scalable.formats then
+			out:write(', formats = { ')
+			for j, format in ipairs(scalable.formats) do
+				out:write('"' .. format .. '"')
+				if j < #scalable.formats then out:write(", ") end
+			end
+			out:write(" }")
+		end
+		out:write(" }")
+		if i < #scalability then out:write(", ") end
+	end
+	out:write(" },\n")
+end
+
+out:write('}')
+out:close()
+
+print("Stat mod scalability exported.")

src/Data/ModCache.lua

@@ -443,3 +443,45 @@ function describeMod(mod)
 	out.modTags = describeModTags(mod.ImplicitTags)
 	return out, orders
 end
+
+function describeScalability(fileName)
+	local out = {}
+	local stats = dat("stats")
+	for stat, statDescription in pairsSortByKey(statDescriptors[fileName]) do
+		local scalability = {}
+		if statDescription.stats then
+			for i, stat in ipairs(statDescription.stats) do
+				table.insert(scalability, stats:GetRow("Id", stat).IsScalable)
+			end
+			for _, wordings in ipairs(statDescription[1]) do
+				local wordingFormats = {}
+				local inOrderScalability = {}
+				for _, format in ipairs(wordings) do
+					if type(format.v) == "number" then
+						if wordingFormats[tonumber(format.v)] then
+							table.insert(wordingFormats[tonumber(format.v)], format.k)
+						else
+							wordingFormats[tonumber(format.v)] = { format.k }
+						end
+					end
+				end
+				local strippedLine = wordings.text:gsub("[%+%-]?(%b{})", function(num)
+					local statNum = (num:match("%d") or 0) + 1
+					table.insert(inOrderScalability,
+						{ isScalable = scalability[statNum], formats = wordingFormats[statNum] })
+					return "#"
+				end)
+				if out[strippedLine] then -- we want to use the format with the least oddities in it. If their are less formats then that will be used instead.
+					for j, priorScalability in ipairs(out[strippedLine]) do
+						if (priorScalability.formats and #priorScalability.formats or 0) > (wordingFormats[j] and #wordingFormats[j] or 0) then
+							out[strippedLine][j] = inOrderScalability[j]
+						end
+					end
+				else -- no present
+					out[strippedLine] = inOrderScalability
+				end
+			end
+		end
+	end
+	return out
+end

src/Data/ModScalability.lua

@@ -642,6 +642,8 @@ function naturalSortCompare(a, b)
 end
 
 -- Rounds a number to the nearest <dec> decimal places
+---@param val number
+---@param dec? number
 function round(val, dec)
 	if dec then
 		return m_floor(val * 10 ^ dec + 0.5) / 10 ^ dec
@@ -652,7 +654,7 @@ end
 
 --- Rounds down a number to the nearest <dec> decimal places
 ---@param val number
----@param dec number
+---@param dec? number
 ---@return number
 function floor(val, dec)
 	if dec then
@@ -663,6 +665,70 @@ function floor(val, dec)
 	end
 end
 
+---@param val number
+---@param dec? integer decimal places
+-- Symmetric round with precision: Rounds towards zero to <dec> decimal places.
+function roundSymmetric(val, dec)
+	if dec then
+		local factor = 10 ^ dec
+		if val >= 0 then
+			return m_floor(val * factor + 0.5) / factor
+		else
+			return m_ceil(val * factor - 0.5) / factor
+		end
+	else
+		if val >= 0 then
+			return m_floor(val + 0.5)
+		else
+			return m_ceil(val - 0.5)
+		end
+	end
+end
+
+---@param val number
+---@param dec? integer decimal places
+-- Use rounding formula for positive numbers always used in corrupted unique roll ranges this is an incorrect way to round numbers.
+function alwaysPositiveRound(val, dec)
+	if dec then
+		local factor = 10 ^ dec
+		return floorSymmetric(val * factor + 0.5) / factor
+	else
+		return floorSymmetric(val + 0.5)
+	end
+end
+
+---@param val number
+---@param dec? integer decimal places
+---@return number
+-- Symmetric floor with precision: Rounds down towards zero to <dec> decimal places.
+function floorSymmetric(val, dec)
+	if dec then
+		local factor = 10 ^ dec
+		return select(1, math.modf(val * factor)) / factor
+	else
+		return select(1, math.modf(val))
+	end
+end
+
+---@param val number
+---@param dec? integer decimal places
+-- Symmetric ceil with precision: Rounds up away from zero to <dec> decimal places.
+function ceilSymmetric(val, dec)
+	if dec then
+		local factor = 10 ^ dec
+		if val >= 0 then
+			return m_ceil(val * factor) / factor
+		else
+			return m_floor(val * factor) / factor
+		end
+	else
+		if val >= 0 then
+			return m_ceil(val)
+		else
+			return m_floor(val)
+		end
+	end
+end
 ---@param n number
 ---@return number
 function triangular(n)

src/Export/Scripts/modScalability.lua

@@ -356,6 +356,7 @@ data.nonDamagingAilment = {
 
 -- Used in ModStoreClass:ScaleAddMod(...) to identify high precision modifiers
 data.defaultHighPrecision = 1
+data.modScalability = LoadModule("Data/ModScalability")
 data.highPrecisionMods = {
 	["CritChance"] = {
 		["BASE"] = 2,