Use temp actor instead of changing calcs

Author: LocalIdentity

spec/System/TestDefence_spec.lua

@@ -358,6 +358,26 @@ describe("TestDefence", function()
 		build.skillsTab.socketGroupList = {}
 	end)
 
+	it("foulborn resistance conversion remains stable across recalculation", function()
+		build.configTab.input.enemyIsBoss = "None"
+		build.configTab.input.customMods = "\z
+		+300 to fire resistance\n\z
+		modifiers to fire resistance also apply to cold and lightning resistances at 50% of their value\n\z
+		mana is increased by 100% of overcapped lightning resistance\n\z
+		"
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(90, build.calcsTab.calcsOutput.LightningResistTotal)
+		assert.are.equals(15, build.calcsTab.calcsOutput.LightningResistOverCap)
+
+		build.configTab:BuildModList()
+		runCallback("OnFrame")
+
+		assert.are.equals(90, build.calcsTab.calcsOutput.LightningResistTotal)
+		assert.are.equals(15, build.calcsTab.calcsOutput.LightningResistOverCap)
+	end)
+
 	-- fun part
 	it("armoured max hits", function()
 		build.configTab.input.enemyIsBoss = "None"
@@ -1177,4 +1197,4 @@ describe("TestDefence", function()
 		assert.are.equals(0, floor(poolsRemaining.Life))
 		assert.are.equals(0, floor(poolsRemaining.OverkillDamage))
 	end)
-end)
+end)

src/Modules/CalcDefence.lua

@@ -513,50 +513,47 @@ function calcs.resistances(actor)
 	output["PhysicalResist"] = 0
 
 	-- Process Resistance conversion mods
-	if not actor.resistConversionApplied then
-		actor.resistConversionApplied = true
-		for _, resFrom in ipairs(resistTypeList) do
-			local maxRes
-			for _, resTo in ipairs(resistTypeList) do
-				local conversionRate = modDB:Sum("BASE", nil, resFrom.."MaxResConvertTo"..resTo) / 100
-				if conversionRate ~= 0 then
-					if not maxRes then
-						maxRes = 0
-						for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."ResistMax")) do
-							if mod.mod.source ~= "Base" then
-								maxRes = maxRes + mod.value
-							end
+	for _, resFrom in ipairs(resistTypeList) do
+		local maxRes
+		for _, resTo in ipairs(resistTypeList) do
+			local conversionRate = modDB:Sum("BASE", nil, resFrom.."MaxResConvertTo"..resTo) / 100
+			if conversionRate ~= 0 then
+				if not maxRes then
+					maxRes = 0
+					for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."ResistMax")) do
+						if mod.mod.source ~= "Base" then
+							maxRes = maxRes + mod.value
 						end
 					end
-					if maxRes ~= 0 then
-						modDB:NewMod(resTo.."ResistMax", "BASE", maxRes * conversionRate, resFrom.." To "..resTo.." Max Resistance Conversion")
-					end
+				end
+				if maxRes ~= 0 then
+					modDB:NewMod(resTo.."ResistMax", "BASE", maxRes * conversionRate, resFrom.." To "..resTo.." Max Resistance Conversion")
 				end
 			end
 		end
+	end
 
-		for _, resFrom in ipairs(resistTypeList) do
-			local res
-			for _, resTo in ipairs(resistTypeList) do
-				local conversionRate = modDB:Sum("BASE", nil, resFrom.."ResConvertTo"..resTo) / 100
-				if conversionRate ~= 0 then
-					if not res then
-						res = 0
-						for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."Resist")) do
-							if mod.mod.source ~= "Base" then
-								res = res + mod.value
-							end
+	for _, resFrom in ipairs(resistTypeList) do
+		local res
+		for _, resTo in ipairs(resistTypeList) do
+			local conversionRate = modDB:Sum("BASE", nil, resFrom.."ResConvertTo"..resTo) / 100
+			if conversionRate ~= 0 then
+				if not res then
+					res = 0
+					for _, mod in ipairs(modDB:Tabulate("BASE", nil, resFrom.."Resist")) do
+						if mod.mod.source ~= "Base" then
+							res = res + mod.value
 						end
 					end
-					if res ~= 0 then
-						modDB:NewMod(resTo.."Resist", "BASE", res * conversionRate, resFrom.." To "..resTo.." Resistance Conversion")
-					end
-					for _, mod in ipairs(modDB:Tabulate("INC", nil, resFrom.."Resist")) do
-						modDB:NewMod(resTo.."Resist", "INC", mod.value * conversionRate, mod.mod.source)
-					end
-					for _, mod in ipairs(modDB:Tabulate("MORE", nil, resFrom.."Resist")) do
-						modDB:NewMod(resTo.."Resist", "MORE", mod.value * conversionRate, mod.mod.source)
-					end
+				end
+				if res ~= 0 then
+					modDB:NewMod(resTo.."Resist", "BASE", res * conversionRate, resFrom.." To "..resTo.." Resistance Conversion")
+				end
+				for _, mod in ipairs(modDB:Tabulate("INC", nil, resFrom.."Resist")) do
+					modDB:NewMod(resTo.."Resist", "INC", mod.value * conversionRate, mod.mod.source)
+				end
+				for _, mod in ipairs(modDB:Tabulate("MORE", nil, resFrom.."Resist")) do
+					modDB:NewMod(resTo.."Resist", "MORE", mod.value * conversionRate, mod.mod.source)
 				end
 			end
 		end

src/Modules/CalcPerform.lua

@@ -3189,8 +3189,16 @@ function calcs.perform(env, skipEHP)
 
 	-- Foulborn Choir of the Storm, needs to be after main auras (incase purity of lightning/elements auras) but before extra auras (Radiant Faith)
 	if modDB:Flag(nil, "ManaIncreasedByOvercappedLightningRes") then
-		-- Calclate resistances for ManaIncreasedByOvercappedLightningRes
-		calcs.resistances(env.player)
+		-- Calculate resistances for ManaIncreasedByOvercappedLightningRes without mutating conversion mods on the player ModDB.
+		local tempResistActor = {
+			modDB = new("ModDB", modDB),
+			output = output,
+			activeSkillList = env.player.activeSkillList,
+			enemy = env.player.enemy,
+		}
+		tempResistActor.player = tempResistActor
+		tempResistActor.modDB.actor = tempResistActor
+		calcs.resistances(tempResistActor)
 		-- Set the life/mana reservations again as we now have increased mana from overcapped lightning resistance
 		doActorLifeMana(env.player)
 		doActorLifeManaReservation(env.player, true)