Add item parsing handling, fix corruptItem(), and apply range in formatModLine()

Author: vaisest

src/Classes/Item.lua

@@ -701,6 +701,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
@@ -892,13 +894,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,10 +1264,14 @@ function ItemClass:BuildRaw()
 		t_insert(rawLines, "Item Level: " .. self.itemLevel)
 	end
 	local function writeModLine(modLine)
-		local line = modLine.line
+		local displayValueScalar = modLine.displayValueScalar and (modLine.valueScalar or 1) * modLine.displayValueScalar
+		local line = displayValueScalar and itemLib.applyRange(modLine.line, modLine.range or main.defaultItemAffixQuality, displayValueScalar, modLine.corruptedRange) or modLine.line
 		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
@@ -1867,7 +1873,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

@@ -2748,28 +2748,37 @@ function ItemsTabClass:CorruptDisplayItem(modType)
 		if controls.implicit3 then controls.implicit3:UpdateSearch() end
 		if controls.implicit4 then controls.implicit4:UpdateSearch() end
 	end
-	local function corruptItem()
+	local function corruptItem(addingImplicits)
 		local item = new("Item"):Item(self.displayItem:BuildRaw())
 		item.id = self.displayItem.id
 		item.corrupted = true
-		local newImplicit = { }
-		for _, control in ipairs { controls.implicit1, controls.implicit2, controls.implicit3, controls.implicit4 } do
-			if control.selIndex > 1 then
-				local mod = control.list[control.selIndex].mod
-				for _, modLine in ipairs(mod) do
-					modLine = (currentModType == "ScourgeUpside" and "{scourge}" or "") .. modLine
-					if mod.modTags[1] then
-						t_insert(newImplicit, { line = "{tags:" .. table.concat(mod.modTags, ",") .. "}" .. modLine })
-					else
-						t_insert(newImplicit, { line = modLine })
+		-- either add implicits or roll ranges. if in the future it is possible
+		-- to double corrupt an item, this needs to be changed to not remove
+		-- implicits, like in pob2
+		if addingImplicits then
+			local newImplicit = {}
+			for _, control in ipairs { controls.implicit1, controls.implicit2, controls.implicit3, controls.implicit4 } do
+				if control.selIndex > 1 then
+					local mod = control.list[control.selIndex].mod
+					for _, modLine in ipairs(mod) do
+						modLine = (currentModType == "ScourgeUpside" and "{scourge}" or "") .. modLine
+						if mod.modTags[1] then
+							t_insert(newImplicit, { line = "{tags:" .. table.concat(mod.modTags, ",") .. "}" .. modLine })
+						else
+							t_insert(newImplicit, { line = modLine })
+						end
 					end
 				end
 			end
-		end
-		if #newImplicit > 0 then
-			wipeTable(currentModType == "Corrupted" and item.implicitModLines or item.scourgeModLines)
-			for i, implicit in ipairs(newImplicit) do
-				t_insert(currentModType == "Corrupted" and item.implicitModLines or item.scourgeModLines, i, implicit)
+			if #newImplicit > 0 then
+				wipeTable(currentModType == "Corrupted" and item.implicitModLines or item.scourgeModLines)
+				for i, implicit in ipairs(newImplicit) do
+					t_insert(currentModType == "Corrupted" and item.implicitModLines or item.scourgeModLines, i, implicit)
+				end
+			end
+		else
+			for i, modLine in ipairs(item.explicitModLines) do
+				if corruptedRanges[i] ~= 1 then modLine.corruptedRange = corruptedRanges[i] end
 			end
 		end
 		item:BuildAndParseRaw()
@@ -2964,12 +2973,12 @@ function ItemsTabClass:CorruptDisplayItem(modType)
 		end
 	end
 	controls.save = new("ButtonControl"):ButtonControl({ "BOTTOM", nil, "BOTTOM" }, { -45, -4, 80, 20 }, modType, function()
-		self:SetDisplayItem(corruptItem())
+		self:SetDisplayItem(corruptItem(controls.implicit1.shown))
 		main:ClosePopup()
 	end)
 	controls.save.tooltipFunc = function(tooltip)
 		tooltip:Clear()
-		self:AddItemTooltip(tooltip, corruptItem(), nil, true)
+		self:AddItemTooltip(tooltip, corruptItem(controls.implicit1.shown), nil, false)
 	end	
 	controls.close = new("ButtonControl"):ButtonControl({ "BOTTOM", nil, "BOTTOM" }, { 45, -4, 80, 20 }, "Cancel", function()
 		main:ClosePopup()

src/Modules/ItemTools.lua

@@ -337,7 +337,7 @@ function itemLib.applyRange(line, range, valueScalar, baseValueScalar)
 end
 
 function itemLib.formatModLine(modLine, dbMode)
-	local line = (not dbMode and modLine.range and itemLib.applyRange(modLine.line, modLine.range, modLine.valueScalar)) or modLine.line
+	local line = (not dbMode and modLine.range and itemLib.applyRange(modLine.line, modLine.range, modLine.valueScalar, modLine.corruptedRange)) or modLine.line
 	if line:match("^%+?0%%? ") or (line:match(" %+?0%%? ") and not line:match("0 to [1-9]")) or line:match(" 0%-0 ") or line:match(" 0 to 0 ") then -- Hack to hide 0-value modifiers
 		return
 	end