Update corruption to support relics and double corruption properly

Author: vaisest

src/Classes/ItemsTab.lua

@@ -54,8 +54,8 @@ for _, entry in pairs(data.flavourText) do
 end
 
 local function isAnointable(item)
-	return (item.canBeAnointed or item.base.type == "Amulet") and not item.sanctified
-		and not item.corrupted and not item.mirrored
+	return (item.canBeAnointed or item.base.type == "Amulet")
+		-- and not item.sanctified and not item.corrupted and not item.mirrored
 end
 
 local function buildModSortList()
@@ -916,7 +916,7 @@ holding Shift will put it in the second.]])
 		if not self.displayItem or not self.displayItem.rangeLineList[1] then
 			return 0
 		end
-		if main.showAllItemAffixes and self.displayItem.rarity == "UNIQUE" then
+		if main.showAllItemAffixes and (self.displayItem.rarity == "UNIQUE" or self.displayItem.rarity == "RELIC") then
 			local count = #self.displayItem.rangeLineList
 			return count * 22 + 4
 		else
@@ -927,7 +927,8 @@ holding Shift will put it in the second.]])
 		self.controls.displayItemRangeSlider.val = self.displayItem.rangeLineList[index].range
 	end)
 	self.controls.displayItemRangeLine.shown = function()
-		return self.displayItem and self.displayItem.rangeLineList[1] ~= nil and not (main.showAllItemAffixes and self.displayItem.rarity == "UNIQUE")
+		return self.displayItem and self.displayItem.rangeLineList[1] ~= nil and
+		not (main.showAllItemAffixes and (self.displayItem.rarity == "UNIQUE" or self.displayItem.rarity == "RELIC"))
 	end
 	self.controls.displayItemRangeSlider = new("SliderControl", {"LEFT",self.controls.displayItemRangeLine,"RIGHT"}, {8, 0, 100, 18}, function(val)
 		self.displayItem.rangeLineList[self.controls.displayItemRangeLine.selIndex].range = val
@@ -956,7 +957,9 @@ holding Shift will put it in the second.]])
 			return ""
 		end)
 		self.controls["displayItemStackedRangeSlider"..i].shown = function()
-			return main.showAllItemAffixes and self.displayItem and self.displayItem.rarity == "UNIQUE" and self.displayItem.rangeLineList[i] ~= nil
+			return main.showAllItemAffixes and self.displayItem and
+			(self.displayItem.rarity == "UNIQUE" or self.displayItem.rarity == "RELIC") and
+			self.displayItem.rangeLineList[i] ~= nil
 		end
 
 		self.controls["displayItemStackedRangeLine"..i].shown = function()
@@ -2008,6 +2011,7 @@ function ItemsTabClass:UpdateDisplayItemRangeLines()
 	end
 end
 
+---@param line string
 local function checkLineForAllocates(line, nodes)
 	if nodes and string.match(line, "Allocates") then
 		local nodeId = tonumber(string.match(line, "%d+"))
@@ -2465,15 +2469,17 @@ end
 function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outcomes this code is for poe 1
 	local controls = { }
 	local enchantList = { }
-	local enchantNum = 1
+	local enchantNum = 2
 	local shownExplicits = {}
 	local explicitOffset = 0
 	local corruptedRanges = {}
 	local currentModType = "Corrupted"
 	local sourceList = { "Corrupted" }
 	local sortList, sortTransforms = buildModSortList()
+
 	if self.displayItem.base.type == "Helmet" then
 		t_insert(sourceList, "Glimpse of Chaos")
+		enchantNum = 8
 	end
 	local function buildEnchantList(modType)
 		if enchantList[modType] then
@@ -2528,6 +2534,17 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 				end
 			end
 		end
+
+		local temp = {}
+		-- currently enchants are always either corruptions or anoints, so we
+		-- can just save the anoints
+		for _, mod in ipairs(item.enchantModLines) do
+			if mod.line:match("Allocates .*") then
+				table.insert(temp, mod)
+			end
+		end
+		item.enchantModLines = temp
+
 		if #newEnchant > 0 then
 			table.sort(newEnchant, function(a, b)
 				return a.order < b.order
@@ -2553,7 +2570,7 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 		end
 	end
 	local function rebuildEnchantControls(resetSelection)
-		for i = 1, 8 do
+		for i = 1, enchantNum do
 			local shown = i <= enchantNum
 			controls["enchant"..i].shown = shown
 			controls["enchant"..i.."Label"].shown = shown
@@ -2571,7 +2588,7 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 			end
 		end
 	end
-	local function corruptItem()
+	local function corruptItem(enchanting)
 		local item = new("Item", self.displayItem:BuildRaw())
 		item.id = self.displayItem.id
 		item.corrupted = true
@@ -2582,14 +2599,20 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 				t_insert(mods, control.list[control.selIndex].mod)
 			end
 		end
-		applyCorruptionMods(item, mods)
-		for i, modLine in ipairs(item.explicitModLines) do
-			if corruptedRanges[i] ~= 1 then modLine.corruptedRange = corruptedRanges[i] end
+		-- avoid removing corruption mods or rolls so that the user can make a
+		-- vaal rolled item with enchants
+		if enchanting then
+			applyCorruptionMods(item, mods)
+
+		else
+			for i, modLine in ipairs(item.explicitModLines) do
+				if corruptedRanges[i] ~= 1 then modLine.corruptedRange = corruptedRanges[i] end
+			end
 		end
 		item:BuildAndParseRaw()
 		return item
 	end
-	if self.displayItem.rarity == "UNIQUE" then
+	if self.displayItem.rarity == "UNIQUE" or self.displayItem.rarity == "RELIC" then
 		local item = new("Item", self.displayItem:BuildRaw())
 		local offset = 20
 		for i, mod in ipairs(item.explicitModLines) do
@@ -2660,10 +2683,10 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 		controls.save.y = 73 + 20 * enchantNum
 	end)
 	controls.enchants.shown = function ()
-		return self.displayItem.rarity == "UNIQUE"
+		return self.displayItem.rarity == "UNIQUE" or self.displayItem.rarity == "RELIC"
 	end
 	controls.rolls = new("ButtonControl", {"LEFT", controls.enchants, "RIGHT"}, {5, 0, 80, 20}, "Roll Ranges", function()
-		for i = 1, 8 do
+		for i = 1, enchantNum do
 			controls["enchant"..i].shown = false
 			controls["enchant"..i.."Label"].shown = false
 		end
@@ -2681,7 +2704,7 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 		controls.save.y = 25 + explicitOffset
 	end)
 	controls.rolls.shown = function ()
-		return self.displayItem.rarity == "UNIQUE"
+		return self.displayItem.rarity == "UNIQUE" or self.displayItem.rarity == "RELIC"
 	end
 	controls.sourceLabel = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {95, 30, 0, 16}, "^7Source:")
 	controls.source = new("DropDownControl", {"TOPLEFT",nil,"TOPLEFT"}, {100, 30, 150, 18}, sourceList, function(index, value)
@@ -2696,7 +2719,6 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 				enchantNum = 2
 			end
 		end
-
 		if controls.sort then
 			sortEnchantList(controls.sort.list[controls.sort.selIndex].stat)
 		end
@@ -2710,7 +2732,7 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 		sortEnchantList(value.stat)
 		rebuildEnchantControls()
 	end)
-	for i = 1, 8 do
+	for i = 1, enchantNum do
 		if i == 1 then
 			controls.enchant1Label = new("LabelControl", {"TOPRIGHT",nil,"TOPLEFT"}, {95, 55, 0, 16}, function()
 				if enchantNum == 1 then -- update label so 1 doesn't appear in case of 1 enchant.
@@ -2737,12 +2759,12 @@ function ItemsTabClass:CorruptDisplayItem() -- todo implement vaal orb new outco
 	end
 	rebuildEnchantControls()
 	controls.save = new("ButtonControl", nil, {-45, 69 + enchantNum * 20, 80, 20}, "Corrupted", function()
-		self:SetDisplayItem(corruptItem())
+		self:SetDisplayItem(corruptItem(controls.enchant1.shown))
 		main:ClosePopup()
 	end)
 	controls.save.tooltipFunc = function(tooltip)
 		tooltip:Clear()
-		self:AddItemTooltip(tooltip, corruptItem(), nil, true)
+		self:AddItemTooltip(tooltip, corruptItem(controls.enchant1.shown), nil, true)
 	end	
 	controls.close = new("ButtonControl", nil, {45, 69 + enchantNum * 20, 80, 20}, "Cancel", function()
 		main:ClosePopup()